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/mpegvideo: Move vbv_delay to Mpeg1Context

Browse Source 
Only used there and only by the main thread.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-01-29 06:50:51 +01:00
parent 6e225123d8
commit c709a3d424
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg12dec.c
View File

@ -90,6 +90,7 @@ typedef struct Mpeg1Context {
int tmpgexs; int tmpgexs;
int first_slice; int first_slice;
int extradata_decoded; int extradata_decoded;
int vbv_delay;
int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */
} Mpeg1Context; } Mpeg1Context;
@ -953,7 +954,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
(s->bit_rate != 0x3FFFF*400)) { (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 || s1->vbv_delay != 0xFFFF)) {
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
} }
s1->save_aspect = s->avctx->sample_aspect_ratio; s1->save_aspect = s->avctx->sample_aspect_ratio;
@ -1024,7 +1025,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
vbv_delay = get_bits(&s->gb, 16); vbv_delay = get_bits(&s->gb, 16);
s->vbv_delay = vbv_delay; s1->vbv_delay = vbv_delay;
if (s->pict_type == AV_PICTURE_TYPE_P || if (s->pict_type == AV_PICTURE_TYPE_P ||
s->pict_type == AV_PICTURE_TYPE_B) { s->pict_type == AV_PICTURE_TYPE_B) {
s->full_pel[0] = get_bits1(&s->gb); s->full_pel[0] = get_bits1(&s->gb);

1
libavcodec/mpegvideo.h
View File

@ -204,7 +204,6 @@ typedef struct MpegEncContext {
int adaptive_quant; ///< use adaptive quantization int adaptive_quant; ///< use adaptive quantization
int dquant; ///< qscale difference to prev qscale int dquant; ///< qscale difference to prev qscale
int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ...
int vbv_delay;
int last_pict_type; //FIXME removes int last_pict_type; //FIXME removes
int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol
int droppable; int droppable;