videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Avcodec/swscale: use AV_PIX_FMT consistently

pull/35/head
Jean-Baptiste Kempf 11 years ago
parent
cdf35ce011
commit
faa7bd357b
3 changed files with 68 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      modules/codec/avcodec/chroma.c
  2. 4
      modules/codec/avcodec/video.c
  3. 28
      modules/video_chroma/swscale.c

104
modules/codec/avcodec/chroma.c
View File

@ -62,74 +62,74 @@ static const struct
} chroma_table[] =
{
/* Planar YUV formats */
{VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 },
{VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 },
{VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 },
{VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 },
{VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 },
{VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 },
{VLC_CODEC_I420, PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_YV12, PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_J420, PIX_FMT_YUVJ420P, 0, 0, 0 },
{VLC_CODEC_I411, PIX_FMT_YUV411P, 0, 0, 0 },
{VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_CODEC_NV12, PIX_FMT_NV12, 0, 0, 0 },
{VLC_CODEC_NV21, PIX_FMT_NV21, 0, 0, 0 },
{VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 },
{VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 },
{VLC_CODEC_I420_10L, PIX_FMT_YUV420P10LE, 0, 0, 0 },
{VLC_CODEC_I420_10B, PIX_FMT_YUV420P10BE, 0, 0, 0 },
{VLC_CODEC_I422_9L, PIX_FMT_YUV422P9LE, 0, 0, 0 },
{VLC_CODEC_I422_9B, PIX_FMT_YUV422P9BE, 0, 0, 0 },
{VLC_CODEC_I422_10L, PIX_FMT_YUV422P10LE, 0, 0, 0 },
{VLC_CODEC_I422_10B, PIX_FMT_YUV422P10BE, 0, 0, 0 },
{VLC_CODEC_YUV420A, PIX_FMT_YUVA420P, 0, 0, 0 },
{VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 },
{VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 },
{VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 },
{VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 },
{VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 },
{VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 },
{VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_FOURCC('I','Y','U','V'), AV_PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 },
{VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 },
{VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_FOURCC('Y','V','U','9'), AV_PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_CODEC_NV12, AV_PIX_FMT_NV12, 0, 0, 0 },
{VLC_CODEC_NV21, AV_PIX_FMT_NV21, 0, 0, 0 },
{VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 },
{VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 },
{VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 },
{VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 },
{VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 },
{VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 },
{VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 },
{VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 },
{VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 },
{VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 },
{VLC_CODEC_YUVA, AV_PIX_FMT_YUVA444P, 0, 0, 0 },
{VLC_CODEC_YUVA_444_10L, AV_PIX_FMT_YUVA444P10LE, 0, 0, 0 },
{VLC_CODEC_YUVA_444_10B, AV_PIX_FMT_YUVA444P10BE, 0, 0, 0 },
{VLC_CODEC_I444_9L, PIX_FMT_YUV444P9LE, 0, 0, 0 },
{VLC_CODEC_I444_9B, PIX_FMT_YUV444P9BE, 0, 0, 0 },
{VLC_CODEC_I444_10L, PIX_FMT_YUV444P10LE, 0, 0, 0 },
{VLC_CODEC_I444_10B, PIX_FMT_YUV444P10BE, 0, 0, 0 },
{VLC_CODEC_I444_16L, PIX_FMT_YUV444P16LE, 0, 0, 0 },
{VLC_CODEC_I444_16B, PIX_FMT_YUV444P16BE, 0, 0, 0 },
{VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 },
{VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 },
{VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 },
{VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 },
{VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 },
{VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 },
/* Packed YUV formats */
{VLC_CODEC_YUYV, PIX_FMT_YUYV422, 0, 0, 0 },
{VLC_FOURCC('Y','U','Y','V'), PIX_FMT_YUYV422, 0, 0, 0 },
{VLC_CODEC_UYVY, PIX_FMT_UYVY422, 0, 0, 0 },
{VLC_FOURCC('Y','4','1','1'), PIX_FMT_UYYVYY411, 0, 0, 0 },
{VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422, 0, 0, 0 },
{VLC_FOURCC('Y','U','Y','V'), AV_PIX_FMT_YUYV422, 0, 0, 0 },
{VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, 0, 0, 0 },
{VLC_FOURCC('Y','4','1','1'), AV_PIX_FMT_UYYVYY411, 0, 0, 0 },
/* Packed RGB formats */
VLC_RGB( VLC_FOURCC('R','G','B','4'), PIX_FMT_RGB4, PIX_FMT_BGR4, 0x10, 0x06, 0x01 )
VLC_RGB( VLC_CODEC_RGB8, PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 )
VLC_RGB( VLC_FOURCC('R','G','B','4'), AV_PIX_FMT_RGB4, AV_PIX_FMT_BGR4, 0x10, 0x06, 0x01 )
VLC_RGB( VLC_CODEC_RGB8, AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, 0xC0, 0x38, 0x07 )
VLC_RGB( VLC_CODEC_RGB15, PIX_FMT_RGB555, PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB16, PIX_FMT_RGB565, PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB24, PIX_FMT_BGR24, PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff )
VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff )
VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32, PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff )
VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 )
VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff )
VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32_1, AV_PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 )
#ifdef AV_PIX_FMT_0BGR32
VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 )
#endif
{VLC_CODEC_RGBA, PIX_FMT_RGBA, 0, 0, 0 },
{VLC_CODEC_ARGB, PIX_FMT_ARGB, 0, 0, 0 },
{VLC_CODEC_BGRA, PIX_FMT_BGRA, 0, 0, 0 },
{VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0},
{VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 },
{VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 },
{VLC_CODEC_BGRA, AV_PIX_FMT_BGRA, 0, 0, 0 },
{VLC_CODEC_GREY, AV_PIX_FMT_GRAY8, 0, 0, 0},
/* Paletized RGB */
{VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0},
@ -199,5 +199,5 @@ int FindFfmpegChroma( vlc_fourcc_t fourcc )
for( int i = 0; chroma_table[i].i_chroma != 0; i++ )
if( chroma_table[i].i_chroma == fourcc )
return chroma_table[i].i_chroma_id;
return PIX_FMT_NONE;
return AV_PIX_FMT_NONE;
}

4
modules/codec/avcodec/video.c
View File

@ -1112,7 +1112,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
enum PixelFormat swfmt = avcodec_default_get_format(p_context, pi_fmt);
bool can_hwaccel = false;
for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ )
{
const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(pi_fmt[i]);
if (dsc == NULL)
@ -1130,7 +1130,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
wait_mt(p_sys);
for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ )
for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ )
{
enum PixelFormat hwfmt = pi_fmt[i];

28
modules/video_chroma/swscale.c
View File

@ -248,35 +248,35 @@ static void FixParameters( int *pi_fmt, bool *pb_has_a, bool *pb_swap_uv, vlc_fo
switch( fmt )
{
case VLC_CODEC_YUV422A:
*pi_fmt = PIX_FMT_YUV422P;
*pi_fmt = AV_PIX_FMT_YUV422P;
*pb_has_a = true;
break;
case VLC_CODEC_YUV420A:
*pi_fmt = PIX_FMT_YUV420P;
*pi_fmt = AV_PIX_FMT_YUV420P;
*pb_has_a = true;
break;
case VLC_CODEC_YUVA:
*pi_fmt = PIX_FMT_YUV444P;
*pi_fmt = AV_PIX_FMT_YUV444P;
*pb_has_a = true;
break;
case VLC_CODEC_RGBA:
*pi_fmt = PIX_FMT_BGR32;
*pi_fmt = AV_PIX_FMT_BGR32;
*pb_has_a = true;
break;
case VLC_CODEC_ARGB:
*pi_fmt = PIX_FMT_BGR32_1;
*pi_fmt = AV_PIX_FMT_BGR32_1;
*pb_has_a = true;
break;
case VLC_CODEC_BGRA:
*pi_fmt = PIX_FMT_RGB32;
*pi_fmt = AV_PIX_FMT_RGB32;
*pb_has_a = true;
break;
case VLC_CODEC_YV12:
*pi_fmt = PIX_FMT_YUV420P;
*pi_fmt = AV_PIX_FMT_YUV420P;
*pb_swap_uv = true;
break;
case VLC_CODEC_YV9:
*pi_fmt = PIX_FMT_YUV410P;
*pi_fmt = AV_PIX_FMT_YUV410P;
*pb_swap_uv = true;
break;
default:
@ -305,7 +305,7 @@ static int GetParameters( ScalerConfiguration *p_cfg,
{
if( p_fmti->i_chroma == VLC_CODEC_YUVP && ALLOW_YUVP )
{
i_fmti = i_fmto = PIX_FMT_GRAY8;
i_fmti = i_fmto = AV_PIX_FMT_GRAY8;
i_sws_flags = SWS_POINT;
}
}
@ -318,9 +318,9 @@ static int GetParameters( ScalerConfiguration *p_cfg,
* Without SWS_ACCURATE_RND the quality is really bad for some conversions */
switch( i_fmto )
{
case PIX_FMT_ARGB:
case PIX_FMT_RGBA:
case PIX_FMT_ABGR:
case AV_PIX_FMT_ARGB:
case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_ABGR:
i_sws_flags |= SWS_ACCURATE_RND;
break;
}
@ -394,8 +394,8 @@ static int Init( filter_t *p_filter )
const unsigned i_fmto_visible_width = p_fmto->i_visible_width * p_sys->i_extend_factor;
for( int n = 0; n < (cfg.b_has_a ? 2 : 1); n++ )
{
const int i_fmti = n == 0 ? cfg.i_fmti : PIX_FMT_GRAY8;
const int i_fmto = n == 0 ? cfg.i_fmto : PIX_FMT_GRAY8;
const int i_fmti = n == 0 ? cfg.i_fmti : AV_PIX_FMT_GRAY8;
const int i_fmto = n == 0 ? cfg.i_fmto : AV_PIX_FMT_GRAY8;
struct SwsContext *ctx;
ctx = sws_getContext( i_fmti_visible_width, p_fmti->i_visible_height, i_fmti,

Write Preview
Loading…
Cancel
Save