January 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/bfi: Provide non NULL context to av_log()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:32:37 2018 +0100| [1dcb5b7dca2bbaa7e2dfa062c0941f5509c238f4] | committer: Michael Niedermayer avcodec/bfi: Provide non NULL context to av_log() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dcb5b7dca2bbaa7e… --- libavcodec/bfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 233a1d27a8..a4cb002053 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -71,7 +71,7 @@ static int bfi_decode_frame(AVCodecContext *avctx, void *data, frame->key_frame = 1; /* Setting the palette */ if (avctx->extradata_size > 768) { - av_log(NULL, AV_LOG_ERROR, "Palette is too large.\n"); + av_log(avctx, AV_LOG_ERROR, "Palette is too large.\n"); return AVERROR_INVALIDDATA; } pal = (uint32_t *)frame->data[1];

1 0

avcodec/bink: Provide non NULL context to av_log()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:32:37 2018 +0100| [b89fc3d01b8ed586acbf69e520f748710c85347f] | committer: Michael Niedermayer avcodec/bink: Provide non NULL context to av_log() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b89fc3d01b8ed586a… --- libavcodec/bink.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 9c17dedcba..6673afa789 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -609,7 +609,7 @@ static inline int binkb_get_value(BinkContext *c, int bundle_num) * @param quant_matrices quantization matrices * @return 0 for success, negative value in other cases */ -static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], +static int read_dct_coeffs(BinkContext *c, GetBitContext *gb, int32_t block[64], const uint8_t *scan, int *coef_count_, int coef_idx[64], int q) { @@ -692,7 +692,7 @@ static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], } else { quant_idx = q; if (quant_idx > 15U) { - av_log(NULL, AV_LOG_ERROR, "quant_index %d out of range\n", quant_idx); + av_log(c->avctx, AV_LOG_ERROR, "quant_index %d out of range\n", quant_idx); return AVERROR_INVALIDDATA; } } @@ -885,7 +885,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = binkb_get_value(c, BINKB_SRC_INTRA_DC); qp = binkb_get_value(c, BINKB_SRC_INTRA_Q); - if ((quant_idx = read_dct_coeffs(gb, dctblock, bink_scan, &coef_count, coef_idx, qp)) < 0) + if ((quant_idx = read_dct_coeffs(c, gb, dctblock, bink_scan, &coef_count, coef_idx, qp)) < 0) return quant_idx; unquantize_dct_coeffs(dctblock, binkb_intra_quant[quant_idx], coef_count, coef_idx, bink_scan); c->binkdsp.idct_put(dst, stride, dctblock); @@ -920,7 +920,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = binkb_get_value(c, BINKB_SRC_INTER_DC); qp = binkb_get_value(c, BINKB_SRC_INTER_Q); - if ((quant_idx = read_dct_coeffs(gb, dctblock, bink_scan, &coef_count, coef_idx, qp)) < 0) + if ((quant_idx = read_dct_coeffs(c, gb, dctblock, bink_scan, &coef_count, coef_idx, qp)) < 0) return quant_idx; unquantize_dct_coeffs(dctblock, binkb_inter_quant[quant_idx], coef_count, coef_idx, bink_scan); c->binkdsp.idct_add(dst, stride, dctblock); @@ -1093,7 +1093,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, case INTRA_BLOCK: memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTRA_DC); - if ((quant_idx = read_dct_coeffs(gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) + if ((quant_idx = read_dct_coeffs(c, gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) return quant_idx; unquantize_dct_coeffs(dctblock, bink_intra_quant[quant_idx], coef_count, coef_idx, bink_scan); c->binkdsp.idct_put(ublock, 8, dctblock); @@ -1168,7 +1168,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, case INTRA_BLOCK: memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTRA_DC); - if ((quant_idx = read_dct_coeffs(gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) + if ((quant_idx = read_dct_coeffs(c, gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) return quant_idx; unquantize_dct_coeffs(dctblock, bink_intra_quant[quant_idx], coef_count, coef_idx, bink_scan); c->binkdsp.idct_put(dst, stride, dctblock); @@ -1184,7 +1184,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, return ret; memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTER_DC); - if ((quant_idx = read_dct_coeffs(gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) + if ((quant_idx = read_dct_coeffs(c, gb, dctblock, bink_scan, &coef_count, coef_idx, -1)) < 0) return quant_idx; unquantize_dct_coeffs(dctblock, bink_inter_quant[quant_idx], coef_count, coef_idx, bink_scan); c->binkdsp.idct_add(dst, stride, dctblock);

1 0

avcodec/mss2: Provide non NULL context to av_log()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:32:37 2018 +0100| [9446c5887f99d1e02b836e7e134b833e591ca62b] | committer: Michael Niedermayer avcodec/mss2: Provide non NULL context to av_log() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9446c5887f99d1e02… --- libavcodec/mss2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 3180af1d60..2eb366ee78 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -174,7 +174,7 @@ static int decode_pal_v2(MSS12Context *ctx, const uint8_t *buf, int buf_size) return 1 + ncol * 3; } -static int decode_555(GetByteContext *gB, uint16_t *dst, ptrdiff_t stride, +static int decode_555(AVCodecContext *avctx, GetByteContext *gB, uint16_t *dst, ptrdiff_t stride, int keyframe, int w, int h) { int last_symbol = 0, repeat = 0, prev_avail = 0; @@ -212,7 +212,7 @@ static int decode_555(GetByteContext *gB, uint16_t *dst, ptrdiff_t stride, repeat = 0; while (b-- > 130) { if (repeat >= (INT_MAX >> 8) - 1) { - av_log(NULL, AV_LOG_ERROR, "repeat overflow\n"); + av_log(avctx, AV_LOG_ERROR, "repeat overflow\n"); return AVERROR_INVALIDDATA; } repeat = (repeat << 8) + bytestream2_get_byte(gB) + 1; @@ -634,7 +634,7 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (is_555) { bytestream2_init(&gB, buf, buf_size); - if (decode_555(&gB, (uint16_t *)c->rgb_pic, c->rgb_stride >> 1, + if (decode_555(avctx, &gB, (uint16_t *)c->rgb_pic, c->rgb_stride >> 1, keyframe, avctx->width, avctx->height)) return AVERROR_INVALIDDATA;

1 0

avcodec/imc: Provide non NULL context to av_log()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:32:37 2018 +0100| [052ad4d25540f9e3a4d46beb10a37257a2c38024] | committer: Michael Niedermayer avcodec/imc: Provide non NULL context to av_log() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=052ad4d25540f9e3a… --- libavcodec/imc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 7cd6db930b..82a908160a 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -104,6 +104,8 @@ typedef struct IMCContext { int8_t cyclTab[32], cyclTab2[32]; float weights1[31], weights2[31]; + + AVCodecContext *avctx; } IMCContext; static VLC huffman_vlc[4][4]; @@ -466,7 +468,7 @@ static int bit_allocation(IMCContext *q, IMCChannel *chctx, for (i = 0; i < BANDS - 1; i++) { if (chctx->flcoeffs5[i] <= 0) { - av_log(NULL, AV_LOG_ERROR, "flcoeffs5 %f invalid\n", chctx->flcoeffs5[i]); + av_log(q->avctx, AV_LOG_ERROR, "flcoeffs5 %f invalid\n", chctx->flcoeffs5[i]); return AVERROR_INVALIDDATA; } chctx->flcoeffs4[i] = chctx->flcoeffs3[i] - log2f(chctx->flcoeffs5[i]); @@ -1022,6 +1024,8 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data, LOCAL_ALIGNED_16(uint16_t, buf16, [(IMC_BLOCK_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) / 2]); + q->avctx = avctx; + if (buf_size < IMC_BLOCK_SIZE * avctx->channels) { av_log(avctx, AV_LOG_ERROR, "frame too small!\n"); return AVERROR_INVALIDDATA;

1 0

avcodec/aacdec_fixed: Provide context to av_log()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:28:31 2018 +0100| [33d1fb06279c1febc64c7426eccd034fc59640ad] | committer: Michael Niedermayer avcodec/aacdec_fixed: Provide context to av_log() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33d1fb06279c1febc… --- libavcodec/aac.h | 2 +- libavcodec/aacdec_fixed.c | 4 ++-- 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],

1 0

avcodec/acelp_pitch_delay: Minor simplification by using ff_exp10()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:21:42 2018 +0100| [044be48faeadf33d3ec75cad9a9fac4fbd47fe7a] | committer: Michael Niedermayer avcodec/acelp_pitch_delay: Minor simplification by using ff_exp10() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=044be48faeadf33d3… --- libavcodec/acelp_pitch_delay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index c345a99c81..a070d1b25d 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -118,7 +118,7 @@ int16_t ff_acelp_decode_gain_code( (mr_energy >> 15) - 25 ); #else - mr_energy = gain_corr_factor * exp(M_LN10 / (20 << 23) * mr_energy) / + mr_energy = gain_corr_factor * ff_exp10((double)mr_energy / (20 << 23)) / sqrt(adsp->scalarproduct_int16(fc_v, fc_v, subframe_size)); return mr_energy >> 12; #endif

1 0

avfilter/af_biquads: minor simplification by using ff_exp10()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:12:42 2018 +0100| [1b6695354d9e2da1967e51a76c5a87e1c78c7812] | committer: Michael Niedermayer avfilter/af_biquads: minor simplification by using ff_exp10() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b6695354d9e2da19… --- libavfilter/af_biquads.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index ae5e1c6ade..86cd10df3b 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -63,6 +63,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/ffmath.h" #include "libavutil/opt.h" #include "audio.h" #include "avfilter.h" @@ -245,7 +246,7 @@ static int config_filter(AVFilterLink *outlink, int reset) AVFilterContext *ctx = outlink->src; BiquadsContext *s = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; - double A = exp(s->gain / 40 * log(10.)); + double A = ff_exp10(s->gain / 40); double w0 = 2 * M_PI * s->frequency / inlink->sample_rate; double alpha, beta;

1 0

avfilter/af_crossfeed: Use ff_exp10()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:08:06 2018 +0100| [5785e0e9c401e3bb2c5af5096209ba560c9a2c0e] | committer: Michael Niedermayer avfilter/af_crossfeed: Use ff_exp10() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5785e0e9c401e3bb2… --- libavfilter/af_crossfeed.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_crossfeed.c b/libavfilter/af_crossfeed.c index a0af280432..beee67964d 100644 --- a/libavfilter/af_crossfeed.c +++ b/libavfilter/af_crossfeed.c @@ -17,6 +17,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/ffmath.h" #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" @@ -57,7 +58,7 @@ static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; CrossfeedContext *s = ctx->priv; - double A = exp(s->strength * -30 / 40 * log(10.)); + double A = ff_exp10(s->strength * -30 / 40); double w0 = 2 * M_PI * (1. - s->range) * 2100 / inlink->sample_rate; double alpha;

1 0

avfilter/ebur128: Simplify by using log10()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 21:07:09 2018 +0100| [796807022c939dc593aa2a3c0d1a4ad2b3770736] | committer: Michael Niedermayer avfilter/ebur128: Simplify by using log10() Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=796807022c939dc59… --- libavfilter/ebur128.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/ebur128.c b/libavfilter/ebur128.c index e11008078d..c8986fb5e1 100644 --- a/libavfilter/ebur128.c +++ b/libavfilter/ebur128.c @@ -368,7 +368,7 @@ EBUR128_FILTER(double, 1.0) static double ebur128_energy_to_loudness(double energy) { - return 10 * (log(energy) / log(10.0)) - 0.691; + return 10 * log10(energy) - 0.691; } static size_t find_histogram_index(double energy)

1 0

avfilter/vf_tonemap_opencl: Make static tables const
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 20:54:12 2018 +0100| [47c3a10b16f2721c7afa333869aafa8c007fb419] | committer: Michael Niedermayer avfilter/vf_tonemap_opencl: Make static tables const Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47c3a10b16f2721c7… --- libavfilter/vf_tonemap_opencl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index cd293c2522..ae3f98d817 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -98,12 +98,12 @@ static const struct LumaCoefficients luma_coefficients[AVCOL_SPC_NB] = { [AVCOL_SPC_BT2020_NCL] = { 0.2627, 0.6780, 0.0593 }, }; -static struct PrimaryCoefficients primaries_table[AVCOL_PRI_NB] = { +static const struct PrimaryCoefficients primaries_table[AVCOL_PRI_NB] = { [AVCOL_PRI_BT709] = { 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 }, [AVCOL_PRI_BT2020] = { 0.708, 0.292, 0.170, 0.797, 0.131, 0.046 }, }; -static struct WhitepointCoefficients whitepoint_table[AVCOL_PRI_NB] = { +static const struct WhitepointCoefficients whitepoint_table[AVCOL_PRI_NB] = { [AVCOL_PRI_BT709] = { 0.3127, 0.3290 }, [AVCOL_PRI_BT2020] = { 0.3127, 0.3290 }, };

1 0