virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/aacdec_fixed: Provide context to av_log()

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-12-31 21:28:31 +01:00
parent 044be48fae
commit 33d1fb0627
3 changed files with 5 additions and 5 deletions

2
libavcodec/aac.h

@ -368,7 +368,7 @@ struct AACContext {
INTFLOAT *in, IndividualChannelStream *ics); INTFLOAT *in, IndividualChannelStream *ics);
void (*update_ltp)(AACContext *ac, SingleChannelElement *sce); void (*update_ltp)(AACContext *ac, SingleChannelElement *sce);
void (*vector_pow43)(int *coefs, int len); void (*vector_pow43)(int *coefs, int len);
void (*subband_scale)(int *dst, int *src, int scale, int offset, int len); void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
}; };

4
libavcodec/aacdec_fixed.c

@ -162,7 +162,7 @@ static void vector_pow43(int *coefs, int len)
} }
} }
static void subband_scale(int *dst, int *src, int scale, int offset, int len) static void subband_scale(int *dst, int *src, int scale, int offset, int len, void *log_context)
{ {
int ssign = scale < 0 ? -1 : 1; int ssign = scale < 0 ? -1 : 1;
int s = FFABS(scale); int s = FFABS(scale);
@ -189,7 +189,7 @@ static void subband_scale(int *dst, int *src, int scale, int offset, int len)
dst[i] = out * (unsigned)ssign; dst[i] = out * (unsigned)ssign;
} }
} else { } else {
av_log(NULL, AV_LOG_ERROR, "Overflow in subband_scale()\n"); av_log(log_context, AV_LOG_ERROR, "Overflow in subband_scale()\n");
} }
} }

4
libavcodec/aacdec_template.c

@ -1927,7 +1927,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, INTFLOAT coef[1024],
if (cbt_m1 < NOISE_BT - 1) { if (cbt_m1 < NOISE_BT - 1) {
for (group = 0; group < (int)g_len; group++, cfo+=128) { for (group = 0; group < (int)g_len; group++, cfo+=128) {
ac->vector_pow43(cfo, off_len); ac->vector_pow43(cfo, off_len);
ac->subband_scale(cfo, cfo, sf[idx], 34, off_len); ac->subband_scale(cfo, cfo, sf[idx], 34, off_len, ac->avctx);
} }
} }
} }
@ -2158,7 +2158,7 @@ static void apply_intensity_stereo(AACContext *ac,
coef0 + group * 128 + offsets[i], coef0 + group * 128 + offsets[i],
scale, scale,
23, 23,
offsets[i + 1] - offsets[i]); offsets[i + 1] - offsets[i] ,ac->avctx);
#else #else
ac->fdsp->vector_fmul_scalar(coef1 + group * 128 + offsets[i], ac->fdsp->vector_fmul_scalar(coef1 + group * 128 + offsets[i],
coef0 + group * 128 + offsets[i], coef0 + group * 128 + offsets[i],