har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpeg12dec: stop propagating AVCPBProperties side data

Browse Source 
It's already exported using the relevant AVCodecContext fields.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-09-01 13:39:23 -03:00
parent 8e972b13a9
commit 3744ada3b8
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpeg12dec.c
View File

@ -1248,7 +1248,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate) { if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate &&
(s->bit_rate != 0x3FFFF*400)) {
avctx->rc_max_rate = s->bit_rate; avctx->rc_max_rate = s->bit_rate;
} else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && s->bit_rate && } else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && s->bit_rate &&
(s->bit_rate != 0x3FFFF*400 || s->vbv_delay != 0xFFFF)) { (s->bit_rate != 0x3FFFF*400 || s->vbv_delay != 0xFFFF)) {
@ -1371,7 +1372,6 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
int horiz_size_ext, vert_size_ext; int horiz_size_ext, vert_size_ext;
int bit_rate_ext; int bit_rate_ext;
AVCPBProperties *cpb_props;
skip_bits(&s->gb, 1); /* profile and level esc*/ skip_bits(&s->gb, 1); /* profile and level esc*/
s->avctx->profile = get_bits(&s->gb, 3); s->avctx->profile = get_bits(&s->gb, 3);
@ -1403,12 +1403,6 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
ff_dlog(s->avctx, "sequence extension\n"); ff_dlog(s->avctx, "sequence extension\n");
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
if (cpb_props = ff_add_cpb_side_data(s->avctx)) {
cpb_props->buffer_size = s->avctx->rc_buffer_size;
if (s->bit_rate != 0x3FFFF*400)
cpb_props->max_bitrate = s->bit_rate;
}
if (s->avctx->debug & FF_DEBUG_PICT_INFO) if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, av_log(s->avctx, AV_LOG_DEBUG,
"profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n",

2
libavcodec/mpegvideo_parser.c
View File

@ -233,7 +233,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (set_dim_ret < 0) if (set_dim_ret < 0)
av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions\n"); av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions\n");
if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) { if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate && bit_rate != 0x3FFFF) {
avctx->rc_max_rate = 400LL*bit_rate; avctx->rc_max_rate = 400LL*bit_rate;
} }
if (bit_rate && if (bit_rate &&