RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/ac3enc: use long long after switch to 64 bit bitrate 

Commit 7404f3bdb switched bitrate to 64 bits.
This triggers -Wabsolute-value on clang, e.g
http://fate.ffmpeg.org/log.cgi?time=20150917122742&log=compile&slot=x86_64-darwin-clang-3.7-O3.
Therefore, usage of abs is changed to llabs, which is available on all of the platforms.
Unfortunately, LLONG_MAX is not always available, so INT64_MAX is used instead.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ganesh Ajjanagadde 2015-09-19 09:57:56 -04:00 committed by Michael Niedermayer
parent 07cd8d5676
commit 7179add427
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/ac3enc.c
View File

@ -2153,8 +2153,9 @@ static av_cold int validate_options(AC3EncodeContext *s)
/* validate bit rate */
if (s->eac3) {
int max_br, min_br, wpf, min_br_dist, min_br_code;
int max_br, min_br, wpf, min_br_code;
int num_blks_code, num_blocks, frame_samples;
long long min_br_dist;
/* calculate min/max bitrate */
/* TODO: More testing with 3 and 2 blocks. All E-AC-3 samples I've
@ -2184,9 +2185,9 @@ static av_cold int validate_options(AC3EncodeContext *s)
this is needed for lookup tables for bandwidth and coupling
parameter selection */
min_br_code = -1;
min_br_dist = INT_MAX;
min_br_dist = INT64_MAX;
for (i = 0; i < 19; i++) {
int br_dist = abs(ff_ac3_bitrate_tab[i] * 1000 - avctx->bit_rate);
long long br_dist = llabs(ff_ac3_bitrate_tab[i] * 1000 - avctx->bit_rate);
if (br_dist < min_br_dist) {
min_br_dist = br_dist;
min_br_code = i;
@ -2199,10 +2200,11 @@ static av_cold int validate_options(AC3EncodeContext *s)
wpf--;
s->frame_size_min = 2 * wpf;
} else {
int best_br = 0, best_code = 0, best_diff = INT_MAX;
int best_br = 0, best_code = 0;
long long best_diff = INT64_MAX;
for (i = 0; i < 19; i++) {
int br = (ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift) * 1000;
int diff = abs(br - avctx->bit_rate);
long long diff = llabs(br - avctx->bit_rate);
if (diff < best_diff) {
best_br = br;
best_code = i;