[FFmpeg-cvslog] doc/filters: improve afir description a little

2019-01-01 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Tue Jan  1 11:56:29 
2019 +0100| [f7745edeaaeeb3f4f9cc0a4f545d538cd86fa418] | committer: Paul B Mahol

doc/filters: improve afir description a little

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7745edeaaeeb3f4f9cc0a4f545d538cd86fa418
---

 doc/filters.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b3e2081bcf..45582dd2bd 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1165,7 +1165,7 @@ up to 60 seconds long.
 
 It can be used as component for digital crossover filters,
 room equalization, cross talk cancellation, wavefield synthesis,
-auralization, ambiophonics and ambisonics.
+auralization, ambiophonics, ambisonics and spatialization.
 
 This filter uses second stream as FIR coefficients.
 If second stream holds single channel, it will be used

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] afilter/af_sofalizer: check explicitly other type

2019-01-01 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Tue Jan  1 12:29:19 
2019 +0100| [e1f7881d926f960cbf49f870d9c94393d5b4dbde] | committer: Paul B Mahol

afilter/af_sofalizer: check explicitly other type

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1f7881d926f960cbf49f870d9c94393d5b4dbde
---

 libavfilter/af_sofalizer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c
index 48123594a6..109cf5695b 100644
--- a/libavfilter/af_sofalizer.c
+++ b/libavfilter/af_sofalizer.c
@@ -588,7 +588,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 
 if (s->type == TIME_DOMAIN) {
 ctx->internal->execute(ctx, sofalizer_convolute, &td, NULL, 2);
-} else {
+} else if (s->type == FREQUENCY_DOMAIN) {
 ctx->internal->execute(ctx, sofalizer_fast_convolute, &td, NULL, 2);
 }
 emms_c();
@@ -825,7 +825,7 @@ static int load_data(AVFilterContext *ctx, int azim, int 
elev, float radius, int
 if (s->type == TIME_DOMAIN) {
 s->ringbuffer[0] = av_calloc(s->buffer_length, sizeof(float) * 
nb_input_channels);
 s->ringbuffer[1] = av_calloc(s->buffer_length, sizeof(float) * 
nb_input_channels);
-} else {
+} else if (s->type == FREQUENCY_DOMAIN) {
 /* get temporary HRTF memory for L and R channel */
 data_hrtf_l = av_malloc_array(n_fft, sizeof(*data_hrtf_l) * n_conv);
 data_hrtf_r = av_malloc_array(n_fft, sizeof(*data_hrtf_r) * n_conv);
@@ -876,7 +876,7 @@ static int load_data(AVFilterContext *ctx, int azim, int 
elev, float radius, int
 s->data_ir[0][offset + j] = lir[ir_samples - 1 - j] * gain_lin;
 s->data_ir[1][offset + j] = rir[ir_samples - 1 - j] * gain_lin;
 }
-} else {
+} else if (s->type == FREQUENCY_DOMAIN) {
 memset(fft_in_l, 0, n_fft * sizeof(*fft_in_l));
 memset(fft_in_r, 0, n_fft * sizeof(*fft_in_r));
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/af_adelay: allow setting delays in seconds

2019-01-01 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Tue Jan  1 13:33:16 
2019 +0100| [35a8179149c1995c4b720f0e9ac7762c5a9a46df] | committer: Paul B Mahol

avfilter/af_adelay: allow setting delays in seconds

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35a8179149c1995c4b720f0e9ac7762c5a9a46df
---

 doc/filters.texi| 1 +
 libavfilter/af_adelay.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 45582dd2bd..5c651fc345 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -683,6 +683,7 @@ Set list of delays in milliseconds for each channel 
separated by '|'.
 Unused delays will be silently ignored. If number of given delays is
 smaller than number of channels all remaining channels will not be delayed.
 If you want to delay exact number of samples, append 'S' to number.
+If you want instead to delay in seconds, append 's' to number.
 @end table
 
 @subsection Examples
diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
index 7bc731d48a..eb97039566 100644
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@@ -141,7 +141,7 @@ static int config_input(AVFilterLink *inlink)
 p = s->delays;
 for (i = 0; i < s->nb_delays; i++) {
 ChanDelay *d = &s->chandelay[i];
-float delay;
+float delay, div;
 char type = 0;
 int ret;
 
@@ -152,8 +152,9 @@ static int config_input(AVFilterLink *inlink)
 
 ret = av_sscanf(arg, "%d%c", &d->delay, &type);
 if (ret != 2 || type != 'S') {
+div = type == 's' ? 1.0 : 1000.0;
 av_sscanf(arg, "%f", &delay);
-d->delay = delay * inlink->sample_rate / 1000.0;
+d->delay = delay * inlink->sample_rate / div;
 }
 
 if (d->delay < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: bump year

2019-01-01 Thread James Almer 
ffmpeg | branch: master | James Almer  | Tue Jan  1 15:26:31 
2019 -0300| [3209d7b3930bab554bf7d97d8041d9d0b88423a8] | committer: James Almer

configure: bump year

Happy new year!

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3209d7b3930bab554bf7d97d8041d9d0b88423a8
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 04d3417200..ead5181bc3 100755
--- a/configure
+++ b/configure
@@ -7270,7 +7270,7 @@ cat > $TMPH

[FFmpeg-cvslog] avfilter/af_asetnsamples: fix last frame props

2019-01-01 Thread Marton Balint 
ffmpeg | branch: release/4.1 | Marton Balint  | Tue Dec 25 
22:26:18 2018 +0100| [ddc284300eb09b516cef96b6242041b410369302] | committer: 
Marton Balint

avfilter/af_asetnsamples: fix last frame props

Frame properties were not copied, so e.g. PTS was not set for the last frame.

Regression since ef3babb2c70f564dc1634b3f29c6e35a2b2dc239.

Signed-off-by: Marton Balint 
(cherry picked from commit f9e947845f9ac5ccb84cf5e6f4121ec2e23b9946)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddc284300eb09b516cef96b6242041b410369302
---

 libavfilter/af_asetnsamples.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index e8daec8d8f..c60ce3063f 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -76,6 +76,13 @@ static int activate(AVFilterContext *ctx)
 return AVERROR(ENOMEM);
 }
 
+ret = av_frame_copy_props(pad_frame, frame);
+if (ret < 0) {
+av_frame_free(&pad_frame);
+av_frame_free(&frame);
+return ret;
+}
+
 av_samples_copy(pad_frame->extended_data, frame->extended_data,
 0, 0, frame->nb_samples, frame->channels, 
frame->format);
 av_samples_set_silence(pad_frame->extended_data, frame->nb_samples,

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/aacps: Return more specific error codes.

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:16:52 2018 +0100| [5d9a69167cb1736ba6f866580e7ab31c2d81a022] | 
committer: Michael Niedermayer

avcodec/aacps: Return more specific error codes.

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d9a69167cb1736ba6f866580e7ab31c2d81a022
---

 libavcodec/aacps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index b16c3393d1..d5dca64b0f 100644
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -118,7 +118,7 @@ static int read_ ## PAR ## _data(AVCodecContext *avctx, 
GetBitContext *gb, PSCon
 return 0; \
 err: \
 av_log(avctx, AV_LOG_ERROR, "illegal "#PAR"\n"); \
-return -1; \
+return AVERROR_INVALIDDATA; \
 }
 
 READ_PAR_DATA(iid,huff_offset[table_idx],0, FFABS(ps->iid_par[e][b]) > 
7 + 8 * ps->iid_quant)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/4xm: Fix returned error codes

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:11:44 2018 +0100| [07607a1db879d0d96e2c91e1354bc4e425937d3a] | 
committer: Michael Niedermayer

avcodec/4xm: Fix returned error codes

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07607a1db879d0d96e2c91e1354bc4e425937d3a
---

 libavcodec/4xm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 7440dccf1f..2b88c899d0 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -498,7 +498,7 @@ static int decode_i_block(FourXContext *f, int16_t *block)
 
 if (get_bits_left(&f->gb) < 2){
 av_log(f->avctx, AV_LOG_ERROR, "%d bits left before 
decode_i_block()\n", get_bits_left(&f->gb));
-return -1;
+return AVERROR_INVALIDDATA;
 }
 
 /* DC coef */
@@ -732,7 +732,7 @@ static int decode_i2_frame(FourXContext *f, const uint8_t 
*buf, int length)
 for (x = 0; x < width; x += 16) {
 unsigned int color[4] = { 0 }, bits;
 if (buf_end - buf < 8)
-return -1;
+return AVERROR_INVALIDDATA;
 // warning following is purely guessed ...
 color[0] = bytestream2_get_le16u(&g3);
 color[1] = bytestream2_get_le16u(&g3);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/bitstream: Return specific error codes when building vlc tables

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:21:41 2018 +0100| [057328b29d749d03af9d205c6eec352621f5bc1c] | 
committer: Michael Niedermayer

avcodec/bitstream: Return specific error codes when building vlc tables

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=057328b29d749d03af9d205c6eec352621f5bc1c
---

 libavcodec/bitstream.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index ed528fe4af..8762e5f4b2 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -164,7 +164,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int 
nb_codes,
 
 table_size = 1 << table_nb_bits;
 if (table_nb_bits > 30)
-   return -1;
+   return AVERROR(EINVAL);
 table_index = alloc_table(vlc, table_size, flags & 
INIT_VLC_USE_NEW_STATIC);
 ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size);
 if (table_index < 0)
@@ -306,7 +306,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int 
nb_codes,
 av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", 
buf[j].bits);\
 if (!(flags & INIT_VLC_USE_NEW_STATIC)) \
 av_free(buf);   \
-return -1;  \
+return AVERROR(EINVAL); \
 }   \
 GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);\
 if (buf[j].code >= (1LL

[FFmpeg-cvslog] swscale/yuv2rgb: Return a more specific error code from ff_yuv2rgb_c_init_tables()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:14:46 2018 +0100| [fe17f9b956838e76e377ded48cc2b86f4dfecdcf] | 
committer: Michael Niedermayer

swscale/yuv2rgb: Return a more specific error code from 
ff_yuv2rgb_c_init_tables()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe17f9b956838e76e377ded48cc2b86f4dfecdcf
---

 libswscale/yuv2rgb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 737cbb06c8..d0df061e4d 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -993,7 +993,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const 
int inv_table[4],
 default:
 if(!isPlanar(c->dstFormat) || bpp <= 24)
 av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp);
-return -1;
+return AVERROR(EINVAL);
 }
 return 0;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dct: Propagate error code from ff_rdft_init()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:51:20 2018 +0100| [0505b35a38c5086ab21b4305907d48c35458ad98] | 
committer: Michael Niedermayer

avcodec/dct: Propagate error code from ff_rdft_init()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0505b35a38c5086ab21b4305907d48c35458ad98
---

 libavcodec/dct.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dct.c b/libavcodec/dct.c
index cca51eeaf8..52f082d062 100644
--- a/libavcodec/dct.c
+++ b/libavcodec/dct.c
@@ -178,6 +178,7 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum 
DCTTransformType inverse)
 {
 int n = 1 << nbits;
 int i;
+int ret;
 
 memset(s, 0, sizeof(*s));
 
@@ -194,9 +195,9 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum 
DCTTransformType inverse)
 if (!s->csc2)
 return AVERROR(ENOMEM);
 
-if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) {
+if ((ret = ff_rdft_init(&s->rdft, nbits, inverse == DCT_III)) < 0) {
 av_freep(&s->csc2);
-return -1;
+return ret;
 }
 
 for (i = 0; i < n / 2; i++)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/alac: Avoid unspecific error codes and forward error codes

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:42:06 2018 +0100| [5079eca22a16e91da4c3d7bb1505a894c6ec4dc3] | 
committer: Michael Niedermayer

avcodec/alac: Avoid unspecific error codes and forward error codes

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5079eca22a16e91da4c3d7bb1505a894c6ec4dc3
---

 libavcodec/alac.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 93cf198eea..d6b87db734 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -121,7 +121,7 @@ static int rice_decompress(ALACContext *alac, int32_t 
*output_buffer,
 unsigned int x;
 
 if(get_bits_left(&alac->gb) <= 0)
-return -1;
+return AVERROR_INVALIDDATA;
 
 /* calculate rice param and decode next value */
 k = av_log2((history >> 9) + 3);
@@ -317,7 +317,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame 
*frame, int ch_index,
 if (alac->extra_bits) {
 for (i = 0; i < alac->nb_samples; i++) {
 if(get_bits_left(&alac->gb) <= 0)
-return -1;
+return AVERROR_INVALIDDATA;
 for (ch = 0; ch < channels; ch++)
 alac->extra_bits_buffer[ch][i] = get_bits(&alac->gb, 
alac->extra_bits);
 }
@@ -353,7 +353,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame 
*frame, int ch_index,
 /* not compressed, easy case */
 for (i = 0; i < alac->nb_samples; i++) {
 if(get_bits_left(&alac->gb) <= 0)
-return -1;
+return AVERROR_INVALIDDATA;
 for (ch = 0; ch < channels; ch++) {
 alac->output_samples_buffer[ch][i] =
  get_sbits_long(&alac->gb, alac->sample_size);
@@ -555,9 +555,9 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
 av_log(avctx, AV_LOG_ERROR, "extradata is too small\n");
 return AVERROR_INVALIDDATA;
 }
-if (alac_set_info(alac)) {
+if ((ret = alac_set_info(alac)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "set_info failed\n");
-return -1;
+return ret;
 }
 
 switch (alac->sample_size) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/assenc: Return more specific error codes for ass_encode_frame()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:34:14 2018 +0100| [34f942c6c41f1560800ab64d0da07726dac5f52a] | 
committer: Michael Niedermayer

avcodec/assenc: Return more specific error codes for ass_encode_frame()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34f942c6c41f1560800ab64d0da07726dac5f52a
---

 libavcodec/assenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
index dc4f0ffa97..e54c1d8ec3 100644
--- a/libavcodec/assenc.c
+++ b/libavcodec/assenc.c
@@ -57,7 +57,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
 
 if (sub->rects[i]->type != SUBTITLE_ASS) {
 av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
-return -1;
+return AVERROR(EINVAL);
 }
 
 #if FF_API_ASS_TIMING
@@ -93,7 +93,7 @@ static int ass_encode_frame(AVCodecContext *avctx,
 
 if (len > bufsize-total_len-1) {
 av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n");
-return -1;
+return AVERROR(EINVAL);
 }
 
 total_len += len;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/eatqi: Return more specific error code from tqi_decode_mb()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:57:33 2018 +0100| [eb49d259f42066f7f644231f35fd1128833c3d1c] | 
committer: Michael Niedermayer

avcodec/eatqi: Return more specific error code from tqi_decode_mb()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb49d259f42066f7f644231f35fd1128833c3d1c
---

 libavcodec/eatqi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 1a847a35da..0002d45457 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -83,7 +83,7 @@ static int tqi_decode_mb(TqiContext *t, int16_t (*block)[64])
 if (ret < 0) {
 av_log(t->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",
t->mb_x, t->mb_y);
-return -1;
+return ret;
 }
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/af_crossfeed: Use ff_exp10()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 21:08:06 2018 +0100| [5785e0e9c401e3bb2c5af5096209ba560c9a2c0e] | 
committer: Michael Niedermayer

avfilter/af_crossfeed: Use ff_exp10()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5785e0e9c401e3bb2c5af5096209ba560c9a2c0e
---

 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;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/adpcm: use assert for codec id instead or error return

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:45:25 2018 +0100| [2d9fe6321e320f9cef2a767af30a7b5b2f65d799] | 
committer: Michael Niedermayer

avcodec/adpcm: use assert for codec id instead or error return

A unsupported codec_id is a internal error and should not happen

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d9fe6321e320f9cef2a767af30a7b5b2f65d799
---

 libavcodec/adpcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index cd3bbd33c2..aa9c7c5c4f 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1679,7 +1679,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void 
*data,
 break;
 
 default:
-return -1;
+av_assert0(0); // unsupported codec_id should not happen
 }
 
 if (avpkt->size && bytestream2_tell(&gb) == 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/asvenc: Replace bitstream space check by assert

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:29:34 2018 +0100| [6747a63397596b7c8b096ea396163dd494313a2a] | 
committer: Michael Niedermayer

avcodec/asvenc: Replace bitstream space check by assert

This should never be untrue, if it is, thats a bug

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6747a63397596b7c8b096ea396163dd494313a2a
---

 libavcodec/asvenc.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index c4eca2a13d..3cc94bf91a 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -173,10 +173,7 @@ static inline int encode_mb(ASV1Context *a, int16_t 
block[6][64])
 {
 int i;
 
-if (a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) < 
MAX_MB_SIZE) {
-av_log(a->avctx, AV_LOG_ERROR, "encoded frame too large\n");
-return -1;
-}
+av_assert0(a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) >= 
MAX_MB_SIZE);
 
 if (a->avctx->codec_id == AV_CODEC_ID_ASV1) {
 for (i = 0; i < 6; i++)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/af_biquads: minor simplification by using ff_exp10()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b6695354d9e2da1967e51a76c5a87e1c78c7812
---

 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;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/ac3enc: Use specific error code in validate_float_option()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:39:55 2018 +0100| [c6db2e97dcd246234b958814450d3fd12a5c8c27] | 
committer: Michael Niedermayer

avcodec/ac3enc: Use specific error code in validate_float_option()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6db2e97dcd246234b958814450d3fd12a5c8c27
---

 libavcodec/ac3enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 636ca72050..e7e18af92d 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1800,7 +1800,7 @@ static int validate_float_option(float v, const float 
*v_list, int v_list_size)
 break;
 }
 if (i == v_list_size)
-return -1;
+return AVERROR(EINVAL);
 
 return i;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/vf_tonemap_opencl: Make static tables const

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47c3a10b16f2721c7afa333869aafa8c007fb419
---

 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 },
 };

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/ebur128: Simplify by using log10()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 21:07:09 2018 +0100| [796807022c939dc593aa2a3c0d1a4ad2b3770736] | 
committer: Michael Niedermayer

avfilter/ebur128: Simplify by using log10()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=796807022c939dc593aa2a3c0d1a4ad2b3770736
---

 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)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/indevs: fix upto typo

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 20:45:17 2018 +0100| [b33de557470471fe5d3a07fb441ec3f548f1d50a] | 
committer: Michael Niedermayer

doc/indevs: fix upto typo

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b33de557470471fe5d3a07fb441ec3f548f1d50a
---

 doc/indevs.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 294ffa137c..af3173217f 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -374,7 +374,7 @@ Defaults to @option{false}.
 @item timestamp_align
 Capture start time alignment in seconds. If set to nonzero, input frames are
 dropped till the system timestamp aligns with configured value.
-Alignment difference of upto one frame duration is tolerated.
+Alignment difference of up to one frame duration is tolerated.
 This is useful for maintaining input synchronization across N different
 hardware devices deployed for 'N-way' redundancy. The system time of different
 hardware devices should be synchronized with protocols such as NTP or PTP,

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavcodec/ac3dec.c: Avoid unspecific -1 error code

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:40:34 2018 +0100| [8e1b5ba53839dca3951f9760b390456436ef96d1] | 
committer: Michael Niedermayer

libavcodec/ac3dec.c: Avoid unspecific -1 error code

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e1b5ba53839dca3951f9760b390456436ef96d1
---

 libavcodec/ac3dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 71419458fa..ba731314b4 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -452,7 +452,7 @@ static int decode_exponents(AC3DecodeContext *s,
 prevexp += dexp[i] - 2;
 if (prevexp > 24U) {
 av_log(s->avctx, AV_LOG_ERROR, "exponent %d is out-of-range\n", 
prevexp);
-return -1;
+return AVERROR_INVALIDDATA;
 }
 switch (group_size) {
 case 4: dexps[j++] = prevexp;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/avpacket: Avoid unspecific return -1 for av_grow_packet()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:25:18 2018 +0100| [9520d51e21f9aa5adc807b0b89322bd822b06738] | 
committer: Michael Niedermayer

avcodec/avpacket: Avoid unspecific return -1 for av_grow_packet()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9520d51e21f9aa5adc807b0b89322bd822b06738
---

 libavcodec/avpacket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index e160ad3033..11ac4e80cd 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -112,7 +112,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
 av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
 if ((unsigned)grow_by >
 INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE))
-return -1;
+return AVERROR(ENOMEM);
 
 new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE;
 if (pkt->buf) {
@@ -124,7 +124,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
 } else {
 data_offset = pkt->data - pkt->buf->data;
 if (data_offset > INT_MAX - new_size)
-return -1;
+return AVERROR(ENOMEM);
 }
 
 if (new_size + data_offset > pkt->buf->size) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/binkaudio: Use assert instead of return for use of compile time disabled codecs

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:49:27 2018 +0100| [bb2d8708f7bc463abbf918eb54a815c74d9bb613] | 
committer: Michael Niedermayer

avcodec/binkaudio: Use assert instead of return for use of compile time 
disabled codecs

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb2d8708f7bc463abbf918eb54a815c74d9bb613
---

 libavcodec/binkaudio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index e0f3d14eef..96cf968c66 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -139,7 +139,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 else if (CONFIG_BINKAUDIO_DCT_DECODER)
 ff_dct_init(&s->trans.dct, frame_len_bits, DCT_III);
 else
-return -1;
+av_assert0(0);
 
 s->pkt = av_packet_alloc();
 if (!s->pkt)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/bfi: Provide non NULL context to av_log()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dcb5b7dca2bbaa7e2dfa062c0941f5509c238f4
---

 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];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/acelp_pitch_delay: Minor simplification by using ff_exp10()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=044be48faeadf33d3ec75cad9a9fac4fbd47fe7a
---

 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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/bink: Provide non NULL context to av_log()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b89fc3d01b8ed586acbf69e520f748710c85347f
---

 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

[FFmpeg-cvslog] avcodec/dcaenc: Return specific error code from subband_bufer_alloc()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:55:09 2018 +0100| [8b1099c288ab162f4316a8c1ae269f216520f52d] | 
committer: Michael Niedermayer

avcodec/dcaenc: Return specific error code from subband_bufer_alloc()

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b1099c288ab162f4316a8c1ae269f216520f52d
---

 libavcodec/dcaenc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 4b4ceeff05..34b3e94165 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -136,7 +136,7 @@ static int subband_bufer_alloc(DCAEncContext *c)
(SUBBAND_SAMPLES + DCA_ADPCM_COEFFS),
sizeof(int32_t));
 if (!bufer)
-return -1;
+return AVERROR(ENOMEM);
 
 /* we need a place for DCA_ADPCM_COEFF samples from previous frame
  * to calc prediction coefficients for each subband */
@@ -166,8 +166,8 @@ static int encode_init(AVCodecContext *avctx)
 int i, j, k, min_frame_bits;
 int ret;
 
-if (subband_bufer_alloc(c))
-return AVERROR(ENOMEM);
+if ((ret = subband_bufer_alloc(c)) < 0)
+return ret;
 
 c->fullband_channels = c->channels = avctx->channels;
 c->lfe_channel = (avctx->channels == 3 || avctx->channels == 6);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/aacdec_fixed: Provide context to av_log()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33d1fb06279c1febc64c7426eccd034fc59640ad
---

 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],

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/eacmv: Return more specific error codes and forward error codes

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Dec 31 18:59:49 2018 +0100| [3ee323583993cab68bf9d245906d9778273504fa] | 
committer: Michael Niedermayer

avcodec/eacmv: Return more specific error codes and forward error codes

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ee323583993cab68bf9d245906d9778273504fa
---

 libavcodec/eacmv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index bf4404ce42..6f39d72b88 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -191,12 +191,12 @@ static int cmv_decode_frame(AVCodecContext *avctx,
 if (ret < 0)
 return ret;
 if (size > buf_end - buf - EA_PREAMBLE_SIZE)
-return -1;
+return AVERROR_INVALIDDATA;
 buf += size;
 }
 
-if (av_image_check_size(s->width, s->height, 0, s->avctx))
-return -1;
+if ((ret = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
+return ret;
 
 if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
 return ret;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/imc: Provide non NULL context to av_log()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=052ad4d25540f9e3a4d46beb10a37257a2c38024
---

 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;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/mss2: Provide non NULL context to av_log()

2019-01-01 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9446c5887f99d1e02b836e7e134b833e591ca62b
---

 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;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog