Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems.

Browse Source 
Originally committed as revision 19391 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Alex Converse 16 years ago
parent 181b336304
commit 988c170547
3 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      libavcodec/aaccoder.c
  2. 2
      libavcodec/aacenc.c
  3. 6
      libavcodec/aacpsy.c

18
libavcodec/aaccoder.c
Unescape View File

@ -511,8 +511,8 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
for (i = 0; i < sce->ics.swb_sizes[g]; i++) { for (i = 0; i < sce->ics.swb_sizes[g]; i++) {
float t = fabsf(coefs[w2*128+i]); float t = fabsf(coefs[w2*128+i]);
if (t > 0.0f) if (t > 0.0f)
qmin = fminf(qmin, t); qmin = FFMIN(qmin, t);
qmax = fmaxf(qmax, t); qmax = FFMAX(qmax, t);
} }
} }
if (nz) { if (nz) {
@ -534,8 +534,8 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
} }
dist = dists[0]; dist = dists[0];
for (i = 1; i <= ESC_BT; i++) for (i = 1; i <= ESC_BT; i++)
dist = fminf(dist, dists[i]); dist = FFMIN(dist, dists[i]);
minrd = fminf(minrd, dist); minrd = FFMIN(minrd, dist);
for (i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++) { for (i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++) {
float cost; float cost;
@ -640,7 +640,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
uplims[w*16+g] = uplim *512; uplims[w*16+g] = uplim *512;
sce->zeroes[w*16+g] = !nz; sce->zeroes[w*16+g] = !nz;
if (nz) if (nz)
minthr = fminf(minthr, uplim); minthr = FFMIN(minthr, uplim);
allz = FFMAX(allz, nz); allz = FFMAX(allz, nz);
} }
} }
@ -650,7 +650,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
sce->sf_idx[w*16+g] = SCALE_ONE_POS; sce->sf_idx[w*16+g] = SCALE_ONE_POS;
continue; continue;
} }
sce->sf_idx[w*16+g] = SCALE_ONE_POS + fminf(log2(uplims[w*16+g]/minthr)*4,59); sce->sf_idx[w*16+g] = SCALE_ONE_POS + FFMIN(log2(uplims[w*16+g]/minthr)*4,59);
} }
} }
@ -810,7 +810,7 @@ static void search_for_quantizers_faac(AVCodecContext *avctx, AACEncContext *s,
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
float t = coefs[w2*128+i]*coefs[w2*128+i]; float t = coefs[w2*128+i]*coefs[w2*128+i];
maxq[w*16+g] = fmaxf(maxq[w*16+g], fabsf(coefs[w2*128 + i])); maxq[w*16+g] = FFMAX(maxq[w*16+g], fabsf(coefs[w2*128 + i]));
thr += t; thr += t;
if (sce->ics.num_windows == 1 && maxval < t) { if (sce->ics.num_windows == 1 && maxval < t) {
maxval = t; maxval = t;
@ -963,8 +963,8 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe,
for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) { for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) {
FFPsyBand *band0 = &s->psy.psy_bands[(s->cur_channel+0)*PSY_MAX_BANDS+(w+w2)*16+g]; FFPsyBand *band0 = &s->psy.psy_bands[(s->cur_channel+0)*PSY_MAX_BANDS+(w+w2)*16+g];
FFPsyBand *band1 = &s->psy.psy_bands[(s->cur_channel+1)*PSY_MAX_BANDS+(w+w2)*16+g]; FFPsyBand *band1 = &s->psy.psy_bands[(s->cur_channel+1)*PSY_MAX_BANDS+(w+w2)*16+g];
float minthr = fminf(band0->threshold, band1->threshold); float minthr = FFMIN(band0->threshold, band1->threshold);
float maxthr = fmaxf(band0->threshold, band1->threshold); float maxthr = FFMAX(band0->threshold, band1->threshold);
for (i = 0; i < sce0->ics.swb_sizes[g]; i++) { for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
M[i] = (sce0->coeffs[start+w2*128+i] M[i] = (sce0->coeffs[start+w2*128+i]
+ sce1->coeffs[start+w2*128+i]) * 0.5; + sce1->coeffs[start+w2*128+i]) * 0.5;

2
libavcodec/aacenc.c
Unescape View File

@ -604,7 +604,7 @@ static int aac_encode_frame(AVCodecContext *avctx,
if (!(avctx->flags & CODEC_FLAG_QSCALE)) { if (!(avctx->flags & CODEC_FLAG_QSCALE)) {
float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits; float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits;
s->lambda *= ratio; s->lambda *= ratio;
s->lambda = fminf(s->lambda, 65536.f); s->lambda = FFMIN(s->lambda, 65536.f);
} }
if (!data) if (!data)

6
libavcodec/aacpsy.c
Unescape View File

@ -141,7 +141,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
for (g = 0; g < ctx->num_bands[j]; g++) { for (g = 0; g < ctx->num_bands[j]; g++) {
minscale = ath(ctx->avctx->sample_rate * start / 1024.0, ATH_ADD); minscale = ath(ctx->avctx->sample_rate * start / 1024.0, ATH_ADD);
for (i = 1; i < ctx->bands[j][g]; i++) for (i = 1; i < ctx->bands[j][g]; i++)
minscale = fminf(minscale, ath(ctx->avctx->sample_rate * (start + i) / 1024.0 / 2.0, ATH_ADD)); minscale = FFMIN(minscale, ath(ctx->avctx->sample_rate * (start + i) / 1024.0 / 2.0, ATH_ADD));
coeffs->ath[g] = minscale - minath; coeffs->ath[g] = minscale - minath;
start += ctx->bands[j][g]; start += ctx->bands[j][g];
} }
@ -289,8 +289,8 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel,
for (g = 0; g < num_bands; g++) { for (g = 0; g < num_bands; g++) {
band[g].thr_quiet = FFMAX(band[g].thr, coeffs->ath[g]); band[g].thr_quiet = FFMAX(band[g].thr, coeffs->ath[g]);
if (wi->num_windows != 8 && wi->window_type[1] != EIGHT_SHORT_SEQUENCE) if (wi->num_windows != 8 && wi->window_type[1] != EIGHT_SHORT_SEQUENCE)
band[g].thr_quiet = fmaxf(PSY_3GPP_RPEMIN*band[g].thr_quiet, band[g].thr_quiet = FFMAX(PSY_3GPP_RPEMIN*band[g].thr_quiet,
fminf(band[g].thr_quiet, FFMIN(band[g].thr_quiet,
PSY_3GPP_RPELEV*pch->prev_band[w+g].thr_quiet)); PSY_3GPP_RPELEV*pch->prev_band[w+g].thr_quiet));
band[g].thr = FFMAX(band[g].thr, band[g].thr_quiet * 0.25); band[g].thr = FFMAX(band[g].thr, band[g].thr_quiet * 0.25);

Write Preview
Loading…
Cancel
Save