Unified · Split
| @@ -64,6 +64,7 @@ typedef struct Mpeg1Context { · 63 unmodified lines | |||
| 64 | int slice_count; | 64 | int slice_count; |
| 65 | AVRational save_aspect; | 65 | AVRational save_aspect; |
| 66 | int save_width, save_height, save_progressive_seq; | 66 | int save_width, save_height, save_progressive_seq; |
| 67 | int rc_buffer_size; | ||
| 67 | AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ | 68 | AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ |
| 68 | int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ | 69 | int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ |
| 69 | int tmpgexs; | 70 | int tmpgexs; |
| @@ -1417,7 +1418,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) · 1347 unmodified lines | |||
| 1417 | bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ | 1418 | bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ |
| 1418 | s->bit_rate += (bit_rate_ext << 18) * 400LL; | 1419 | s->bit_rate += (bit_rate_ext << 18) * 400LL; |
| 1419 | check_marker(s->avctx, &s->gb, "after bit rate extension"); | 1420 | check_marker(s->avctx, &s->gb, "after bit rate extension"); |
| 1420 | s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10; | 1421 | s1->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10; |
| 1421 | 1422 | ||
| 1422 | s->low_delay = get_bits1(&s->gb); | 1423 | s->low_delay = get_bits1(&s->gb); |
| 1423 | if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) | 1424 | if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) |
| @@ -1433,7 +1434,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) · 9 unmodified lines | |||
| 1433 | av_log(s->avctx, AV_LOG_DEBUG, | 1434 | av_log(s->avctx, AV_LOG_DEBUG, |
| 1434 | "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", | 1435 | "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", |
| 1435 | s->avctx->profile, s->avctx->level, s->progressive_sequence, s->chroma_format, | 1436 | s->avctx->profile, s->avctx->level, s->progressive_sequence, s->chroma_format, |
| 1436 | s->avctx->rc_buffer_size, s->bit_rate); | 1437 | s1->rc_buffer_size, s->bit_rate); |
| 1437 | } | 1438 | } |
| 1438 | 1439 | ||
| 1439 | static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) | 1440 | static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) |
| @@ -2118,7 +2119,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, · 678 unmodified lines | |||
| 2118 | return AVERROR_INVALIDDATA; | 2119 | return AVERROR_INVALIDDATA; |
| 2119 | } | 2120 | } |
| 2120 | 2121 | ||
| 2121 | s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16; | 2122 | s1->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16; |
| 2122 | skip_bits(&s->gb, 1); | 2123 | skip_bits(&s->gb, 1); |
| 2123 | 2124 | ||
| 2124 | /* get matrix */ | 2125 | /* get matrix */ |
| @@ -2167,7 +2168,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, · 42 unmodified lines | |||
| 2167 | 2168 | ||
| 2168 | if (s->avctx->debug & FF_DEBUG_PICT_INFO) | 2169 | if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 2169 | av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%"PRId64", aspect_ratio_info: %d \n", | 2170 | av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%"PRId64", aspect_ratio_info: %d \n", |
| 2170 | s->avctx->rc_buffer_size, s->bit_rate, s->aspect_ratio_info); | 2171 | s1->rc_buffer_size, s->bit_rate, s->aspect_ratio_info); |
| 2171 | 2172 | ||
| 2172 | return 0; | 2173 | return 0; |
| 2173 | } | 2174 | } |