eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-06 06:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

packed 8:8:8, 32bpp (1 byte unused) not in libavutil 52.3.0

Browse Source
This commit is contained in:
niels
2015-08-04 23:55:31 +02:00
parent 0eca12bd1b
commit a00ce1cf8e
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
veejay-current/veejay-server/libyuv/yuvconv.c
View File

@@ -84,10 +84,16 @@ static struct {
{ PIX_FMT_RGB32_1, "PIX_FMT_RGB32_1"},
{ PIX_FMT_YUYV422, "PIX_FMT_YUYV422"},
{ PIX_FMT_UYVY422, "PIX_FMT_UYVY422"},
/* packed rgb 8:8:8:0,
* exists in avutil 54.27.100
* but not in 52.3.0
*/
#if LIBAVUTL_VERSION_MAJOR > 52
{ PIX_FMT_0BGR, "PIX_FMT_0BGR"},
{ PIX_FMT_0RGB, "PIX_FMT_0RBB"},
{ PIX_FMT_BGR0, "PIX_FMT_BGR0"},
{ PIX_FMT_RGB0, "PIX_FMT_RGB0"},
#endif
{ 0 , NULL}
};
@@ -345,10 +351,12 @@ void yuv_init_lib(int extra_flags, int auto_ccir_jpeg, int default_zoomer)
put( PIX_FMT_BGR24, IMG_RGB24 );
put( PIX_FMT_RGB32, IMG_RGBA32 );
put( PIX_FMT_RGBA, IMG_RGBA32 );
#if LIBAVUTIL_VERSION_MAJOR > 52
put( PIX_FMT_0BGR, IMG_ABGR32 );
put( PIX_FMT_BGR0, IMG_BGRA32 );
put( PIX_FMT_RGB0, IMG_RGBA32 );
put( PIX_FMT_0RGB, IMG_ARGB32 );
#endif
put( PIX_FMT_ARGB, IMG_ARGB32 );
put( PIX_FMT_RGB32_1, IMG_RGBA32 );
put( PIX_FMT_YUYV422, IMG_YUY2);
@@ -395,10 +403,12 @@ void yuv_plane_sizes( VJFrame *src, int *p1, int *p2, int *p3, int *p4 )
*p4 = 0;
break;
case PIX_FMT_RGBA:
#if LIBAVUTIL_VERSION_MAJOR > 52
case PIX_FMT_RGB0:
case PIX_FMT_BGR0:
case PIX_FMT_0BGR:
case PIX_FMT_0RGB:
#endif
if( p1 != NULL )
*p1 = src->len * 4;
*p2 = 0;
@@ -481,10 +491,12 @@ VJFrame *yuv_yuv_template( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int h, int
break;
case PIX_FMT_BGR32:
case PIX_FMT_RGB32:
#if LIBAVUTIL_VERSION_MAJOR > 52
case PIX_FMT_RGB0:
case PIX_FMT_BGR0:
case PIX_FMT_0BGR:
case PIX_FMT_0RGB:
#endif
f->stride[0] = w * 4;
f->uv_width = 0; f->uv_height = 0;
f->data[1] = NULL; f->data[2] = NULL;
@@ -1304,8 +1316,12 @@ void yuv_convert_and_scale_from_rgb(void *sws , VJFrame *src, VJFrame *dst)
{
vj_sws *s = (vj_sws*) sws;
int n = 3;
#if LIBAVUTIL_VERSION_MAJOR > 52
if( src->format == PIX_FMT_RGBA || src->format == PIX_FMT_BGRA || src->format == PIX_FMT_ARGB || src->format == PIX_FMT_BGR32 || src->format == PIX_FMT_RGB32 ||
src->format == PIX_FMT_BGR0 || src->format == PIX_FMT_0BGR || src->format == PIX_FMT_RGB0 || src->format == PIX_FMT_0RGB )
#else
if( src->format == PIX_FMT_RGBA || src->format == PIX_FMT_BGRA || src->format == PIX_FMT_ARGB || src->format == PIX_FMT_BGR32 || src->format == PIX_FMT_RGB32 )
#endif
n = 4;
const int src_stride[3] = { src->width*n,0,0};
const int dst_stride[3] = { dst->width,dst->uv_width,dst->uv_width };
@@ -1317,9 +1333,14 @@ void yuv_convert_and_scale_rgb(void *sws , VJFrame *src, VJFrame *dst)
{
vj_sws *s = (vj_sws*) sws;
int n = 3;
#if LIBAVUTIL_VERSION_MAJOR > 52
if( dst->format == PIX_FMT_RGBA || dst->format == PIX_FMT_BGRA || dst->format == PIX_FMT_ARGB ||
dst->format == PIX_FMT_RGB32 || dst->format == PIX_FMT_BGR32 || dst->format == PIX_FMT_BGR0 || dst->format == PIX_FMT_0BGR ||
dst->format == PIX_FMT_RGB0 || dst->format == PIX_FMT_0RGB )
#else
if( dst->format == PIX_FMT_RGBA || dst->format == PIX_FMT_BGRA || dst->format == PIX_FMT_ARGB ||
dst->format == PIX_FMT_RGB32 || dst->format == PIX_FMT_BGR32 )
#endif
n = 4;
const int src_stride[3] = { src->width,src->uv_width,src->uv_width };