History

lavc/aac_ac3_parser: fix potential overflow when averaging bitrate

The new code is analog to how it's done in our mpegaudio parser.

Alexander Strasser committed 6 years ago

Commit ecd71911 parent 12016873 files · +3 −5Browse files

Unified · Split

3 files
  1. libavcodec/aac_ac3_parser.c +2 −3
  2. libavcodec/aac_ac3_parser.h +0 −1
  3. tests/ref/fate/adtstoasc_ticket3715 +1 −1
libavcodec/aac_ac3_parser.c+2−3
@@ -100,9 +100,8 @@ get_next: · 99 unmodified lines
100100 /* Calculate the average bit rate */
101101 s->frame_number++;
102102 if (avctx->codec_id != AV_CODEC_ID_EAC3) {
103− avctx->bit_rate =
104− (s->last_bit_rate * (s->frame_number -1) + s->bit_rate)/s->frame_number;
105− s->last_bit_rate = avctx->bit_rate;
103+ avctx->bit_rate +=
104+ (s->bit_rate - avctx->bit_rate) / s->frame_number;
106105 }
107106 }
108107
libavcodec/aac_ac3_parser.h+0−1
@@ -56,7 +56,6 @@ typedef struct AACAC3ParseContext { · 55 unmodified lines
5656
5757 int need_next_header;
5858 int frame_number;
59− int last_bit_rate;
6059 enum AVCodecID codec_id;
6160 } AACAC3ParseContext;
6261
tests/ref/fate/adtstoasc_ticket3715+1−1
@@ -1,4 +1,4 @@
1−3e63cbb6bb6ec756d79fab2632fef305 *tests/data/fate/adtstoasc_ticket3715.mov
1+29ef0632a8eb5c336bf45a1d5076626e *tests/data/fate/adtstoasc_ticket3715.mov
22 33324 tests/data/fate/adtstoasc_ticket3715.mov
33 #extradata 0: 2, 0x00340022
44 #tb 0: 1/44100

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t