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

avcodec/assenc: Return more specific error codes for ass_encode_frame()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | 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 <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34f942c6c41f15608… --- 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;

1 0

avcodec/asvenc: Replace bitstream space check by assert
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | 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 <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6747a63397596b7c8… --- 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++)

1 0

avcodec/avpacket: Avoid unspecific return -1 for av_grow_packet()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | 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 <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9520d51e21f9aa5ad… --- 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) {

1 0

avcodec/bitstream: Return specific error codes when building vlc tables
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | 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 <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=057328b29d749d03a… --- 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<<buf[j].bits)) { \ @@ -314,7 +314,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, "init_vlc\n", buf[j].code, i); \ if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ av_free(buf); \ - return -1; \ + return AVERROR(EINVAL); \ } \ if (flags & INIT_VLC_LE) \ buf[j].code = bitswap_32(buf[j].code); \

1 0

avcodec/aacps: Return more specific error codes.
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 18:16:52 2018 +0100| [5d9a69167cb1736ba6f866580e7ab31c2d81a022] | committer: Michael Niedermayer avcodec/aacps: Return more specific error codes. 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=5d9a69167cb1736ba… --- 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)

1 0

swscale/yuv2rgb: Return a more specific error code from ff_yuv2rgb_c_init_tables()
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | 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 <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe17f9b956838e76e… --- 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; }

1 0

avcodec/4xm: Fix returned error codes
by Michael Niedermayer 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 31 18:11:44 2018 +0100| [07607a1db879d0d96e2c91e1354bc4e425937d3a] | committer: Michael Niedermayer avcodec/4xm: Fix returned error codes 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=07607a1db879d0d96… --- 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);

1 0

avfilter/af_asetnsamples: fix last frame props
by Marton Balint 01 Jan '19

01 Jan '19

ffmpeg | branch: release/4.1 | Marton Balint <cus(a)passwd.hu> | 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 <cus(a)passwd.hu> (cherry picked from commit f9e947845f9ac5ccb84cf5e6f4121ec2e23b9946) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddc284300eb09b516… --- 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,

1 0

configure: bump year
by James Almer 01 Jan '19

01 Jan '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | 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=3209d7b3930bab554… --- 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 <<EOF #define FFMPEG_CONFIG_H #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)" #define FFMPEG_LICENSE "$(c_escape $license)" -#define CONFIG_THIS_YEAR 2018 +#define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "$(eval c_escape $datadir)" #define AVCONV_DATADIR "$(eval c_escape $datadir)" #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"

1 0

avfilter/af_adelay: allow setting delays in seconds
by Paul B Mahol 01 Jan '19

01 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | 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=35a8179149c1995c4… --- 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) {

1 0