diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-31 21:28:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-01-01 21:11:47 +0100 |
| commit | 33d1fb06279c1febc64c7426eccd034fc59640ad (patch) | |
| tree | 8fc46fc855ab2f1e1ca2316f1de6e64b9832eb6d | |
| parent | 044be48faeadf33d3ec75cad9a9fac4fbd47fe7a (diff) | |
| download | ffmpeg-33d1fb06279c1febc64c7426eccd034fc59640ad.tar.gz | |
avcodec/aacdec_fixed: Provide context to av_log()
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/aac.h | 2 | ||||
| -rw-r--r-- | libavcodec/aacdec_fixed.c | 4 | ||||
| -rw-r--r-- | libavcodec/aacdec_template.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 05bc95385f..c2b9c980cb 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -368,7 +368,7 @@ struct AACContext { INTFLOAT *in, IndividualChannelStream *ics); void (*update_ltp)(AACContext *ac, SingleChannelElement *sce); 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); }; diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index 1bdb93f5bc..2c594c6792 100644 --- a/libavcodec/aacdec_fixed.c +++ b/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 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; } } else { - av_log(NULL, AV_LOG_ERROR, "Overflow in subband_scale()\n"); + av_log(log_context, AV_LOG_ERROR, "Overflow in subband_scale()\n"); } } diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index dce6035d67..721511c5e9 100644 --- a/libavcodec/aacdec_template.c +++ b/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) { for (group = 0; group < (int)g_len; group++, cfo+=128) { 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], scale, 23, - offsets[i + 1] - offsets[i]); + offsets[i + 1] - offsets[i] ,ac->avctx); #else ac->fdsp->vector_fmul_scalar(coef1 + group * 128 + offsets[i], coef0 + group * 128 + offsets[i], |