virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpeg12dec: Use CHROMA_* defines

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-04 17:11:32 +01:00
parent 8940a6153f
commit ce1cec673e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mpeg12dec.c
View File

@ -780,7 +780,7 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx)
ff_mpeg12_init_vlcs(); ff_mpeg12_init_vlcs();
s2->chroma_format = 1; s2->chroma_format = CHROMA_420;
avctx->color_range = AVCOL_RANGE_MPEG; avctx->color_range = AVCOL_RANGE_MPEG;
return 0; return 0;
} }
@ -864,11 +864,11 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
if (CONFIG_GRAY && (avctx->flags & AV_CODEC_FLAG_GRAY)) if (CONFIG_GRAY && (avctx->flags & AV_CODEC_FLAG_GRAY))
return AV_PIX_FMT_GRAY8; return AV_PIX_FMT_GRAY8;
if (s->chroma_format < 2) if (s->chroma_format < CHROMA_422)
pix_fmts = avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ? pix_fmts = avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ?
mpeg1_hwaccel_pixfmt_list_420 : mpeg1_hwaccel_pixfmt_list_420 :
mpeg2_hwaccel_pixfmt_list_420; mpeg2_hwaccel_pixfmt_list_420;
else if (s->chroma_format == 2) else if (s->chroma_format == CHROMA_422)
pix_fmts = mpeg12_pixfmt_list_422; pix_fmts = mpeg12_pixfmt_list_422;
else else
pix_fmts = mpeg12_pixfmt_list_444; pix_fmts = mpeg12_pixfmt_list_444;
@ -990,9 +990,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
switch (s->chroma_format) { switch (s->chroma_format) {
case 1: avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break; case CHROMA_420: avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break;
case 2: case CHROMA_422:
case 3: avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; break; case CHROMA_444: avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; break;
default: av_assert0(0); default: av_assert0(0);
} }
} // MPEG-2 } // MPEG-2
@ -1066,7 +1066,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */ s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */
if (!s->chroma_format) { if (!s->chroma_format) {
s->chroma_format = 1; s->chroma_format = CHROMA_420;
av_log(s->avctx, AV_LOG_WARNING, "Chroma format invalid\n"); av_log(s->avctx, AV_LOG_WARNING, "Chroma format invalid\n");
} }
@ -1545,7 +1545,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
if (s->mb_y >= s->mb_height) { if (s->mb_y >= s->mb_height) {
int left = get_bits_left(&s->gb); int left = get_bits_left(&s->gb);
int is_d10 = s->chroma_format == 2 && int is_d10 = s->chroma_format == CHROMA_422 &&
s->pict_type == AV_PICTURE_TYPE_I && s->pict_type == AV_PICTURE_TYPE_I &&
avctx->profile == 0 && avctx->level == 5 && avctx->profile == 0 && avctx->level == 5 &&
s->intra_dc_precision == 2 && s->intra_dc_precision == 2 &&
@ -1843,7 +1843,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->picture_structure = PICT_FRAME; s->picture_structure = PICT_FRAME;
s->first_field = 0; s->first_field = 0;
s->frame_pred_frame_dct = 1; s->frame_pred_frame_dct = 1;
s->chroma_format = 1; s->chroma_format = CHROMA_420;
s->codec_id = s->codec_id =
s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY)
@ -1895,7 +1895,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
s->picture_structure = PICT_FRAME; s->picture_structure = PICT_FRAME;
s->first_field = 0; s->first_field = 0;
s->frame_pred_frame_dct = 1; s->frame_pred_frame_dct = 1;
s->chroma_format = 1; s->chroma_format = CHROMA_420;
if (s->codec_tag == AV_RL32("BW10")) { if (s->codec_tag == AV_RL32("BW10")) {
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
} else { } else {