The new code is analog to how it's done in our mpegaudio parser.
Unified · Split
| @@ -100,9 +100,8 @@ get_next: · 99 unmodified lines | |||
| 100 | /* Calculate the average bit rate */ | 100 | /* Calculate the average bit rate */ |
| 101 | s->frame_number++; | 101 | s->frame_number++; |
| 102 | if (avctx->codec_id != AV_CODEC_ID_EAC3) { | 102 | if (avctx->codec_id != AV_CODEC_ID_EAC3) { |
| 103 | avctx->bit_rate = | 103 | avctx->bit_rate += |
| 104 | (s->last_bit_rate * (s->frame_number -1) + s->bit_rate)/s->frame_number; | 104 | (s->bit_rate - avctx->bit_rate) / s->frame_number; |
| 105 | s->last_bit_rate = avctx->bit_rate; | ||
| 106 | } | 105 | } |
| 107 | } | 106 | } |
| 108 | 107 | ||
| @@ -56,7 +56,6 @@ typedef struct AACAC3ParseContext { · 55 unmodified lines | |||
| 56 | 56 | ||
| 57 | int need_next_header; | 57 | int need_next_header; |
| 58 | int frame_number; | 58 | int frame_number; |
| 59 | int last_bit_rate; | ||
| 60 | enum AVCodecID codec_id; | 59 | enum AVCodecID codec_id; |
| 61 | } AACAC3ParseContext; | 60 | } AACAC3ParseContext; |
| 62 | 61 | ||
| @@ -1,4 +1,4 @@ | |||
| 1 | 3e63cbb6bb6ec756d79fab2632fef305 *tests/data/fate/adtstoasc_ticket3715.mov | 1 | 29ef0632a8eb5c336bf45a1d5076626e *tests/data/fate/adtstoasc_ticket3715.mov |
| 2 | 33324 tests/data/fate/adtstoasc_ticket3715.mov | 2 | 33324 tests/data/fate/adtstoasc_ticket3715.mov |
| 3 | #extradata 0: 2, 0x00340022 | 3 | #extradata 0: 2, 0x00340022 |
| 4 | #tb 0: 1/44100 | 4 | #tb 0: 1/44100 |