December 2018 - ffmpeg-cvslog

avformat/au: do not use invalid block_align for small bits per sample
by Paul B Mahol 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Dec 23 16:27:45 2018 +0100| [8a8cce078c18050f0905a85997d80bb5c929fa00] | committer: Paul B Mahol avformat/au: do not use invalid block_align for small bits per sample Fixes #5481. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a8cce078c18050f0… --- libavformat/au.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/au.c b/libavformat/au.c index 520824fc12..0b2b7eac15 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -140,7 +140,7 @@ static int au_read_header(AVFormatContext *s) unsigned int tag; AVIOContext *pb = s->pb; unsigned int id, channels, rate; - int bps; + int bps, ba = 0; enum AVCodecID codec; AVStream *st; @@ -178,6 +178,7 @@ static int au_read_header(AVFormatContext *s) } else { const uint8_t bpcss[] = {4, 0, 3, 5}; av_assert0(id >= 23 && id < 23 + 4); + ba = bpcss[id - 23]; bps = bpcss[id - 23]; } } else if (!bps) { @@ -205,7 +206,7 @@ static int au_read_header(AVFormatContext *s) st->codecpar->sample_rate = rate; st->codecpar->bits_per_coded_sample = bps; st->codecpar->bit_rate = channels * rate * bps; - st->codecpar->block_align = FFMAX(bps * st->codecpar->channels / 8, 1); + st->codecpar->block_align = ba ? ba : FFMAX(bps * st->codecpar->channels / 8, 1); if (data_size != AU_UNKNOWN_SIZE) st->duration = (((int64_t)data_size)<<3) / (st->codecpar->channels * (int64_t)bps);

1 0

avcodec/qsvenc: Fix Unkown typo
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Dec 28 22:22:54 2018 +0100| [3e461f9d4c759193e64530bac60d57c7ec9ad18b] | committer: Michael Niedermayer avcodec/qsvenc: Fix Unkown typo Reviewed-by: Lou Logan <lou(a)lrcd.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e461f9d4c759193e… --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 70772dc0e2..56a3756357 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1346,7 +1346,7 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, pict_type = AV_PICTURE_TYPE_B; else if (bs->FrameType == MFX_FRAMETYPE_UNKNOWN) { pict_type = AV_PICTURE_TYPE_NONE; - av_log(avctx, AV_LOG_WARNING, "Unkown FrameType, set pict_type to AV_PICTURE_TYPE_NONE.\n"); + av_log(avctx, AV_LOG_WARNING, "Unknown FrameType, set pict_type to AV_PICTURE_TYPE_NONE.\n"); } else { av_log(avctx, AV_LOG_ERROR, "Invalid FrameType:%d.\n", bs->FrameType); return AVERROR_INVALIDDATA;

1 0

avformat/libopenmpt: Fix successfull typo
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Dec 28 22:22:52 2018 +0100| [571af98a5959d72c65a6753eb8e82cde407f4cd0] | committer: Michael Niedermayer avformat/libopenmpt: Fix successfull typo Reviewed-by: Lou Logan <lou(a)lrcd.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=571af98a5959d72c6… --- libavformat/libopenmpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 0fff702a36..a334270847 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -259,7 +259,7 @@ static int read_probe_openmpt(AVProbeData *p) } else { /* The file extension is unknown and we have very few data * bytes available. libopenmpt cannot decide anything here, - * and returning any score > 0 would result in successfull + * and returning any score > 0 would result in successful * probing of random data. */ return 0;

1 0

avcodec/v4l2_m2m: fix cant typo
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Dec 28 22:22:53 2018 +0100| [062bf5639359e183e016bcb795ac10735f83e863] | committer: Michael Niedermayer avcodec/v4l2_m2m: fix cant typo Reviewed-by: Lou Logan <lou(a)lrcd.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=062bf5639359e183e… --- libavcodec/v4l2_m2m.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h index 452bf0d9bc..0d4671beb1 100644 --- a/libavcodec/v4l2_m2m.h +++ b/libavcodec/v4l2_m2m.h @@ -104,7 +104,7 @@ int ff_v4l2_m2m_codec_init(AVCodecContext *avctx); int ff_v4l2_m2m_codec_end(AVCodecContext *avctx); /** - * Reinitializes the V4L2m2mContext when the driver cant continue processing + * Reinitializes the V4L2m2mContext when the driver cannot continue processing * with the capture parameters. * * @param[in] ctx The V4L2m2mContext instantiated by the encoder/decoder. @@ -114,7 +114,7 @@ int ff_v4l2_m2m_codec_end(AVCodecContext *avctx); int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *ctx); /** - * Reinitializes the V4L2m2mContext when the driver cant continue processing + * Reinitializes the V4L2m2mContext when the driver cannot continue processing * with the any of the current V4L2Contexts (ie, changes in output and capture). * * @param[in] ctx The V4L2m2mContext instantiated by the encoder/decoder.

1 0

avcodec/mjpegbdec: Propagate error codes
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Dec 28 22:22:57 2018 +0100| [283e751aefcea4fd84c471c9a076cc886803e0ef] | committer: Michael Niedermayer avcodec/mjpegbdec: Propagate error codes Reviewed-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=283e751aefcea4fd8… --- libavcodec/mjpegbdec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 8583fcb4f9..37d7bb8228 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -87,9 +87,9 @@ read_header: if (dqt_offs) { init_get_bits(&s->gb, buf_ptr+dqt_offs, (buf_end - (buf_ptr+dqt_offs))*8); s->start_code = DQT; - if (ff_mjpeg_decode_dqt(s) < 0 && - (avctx->err_recognition & AV_EF_EXPLODE)) - return AVERROR_INVALIDDATA; + ret = ff_mjpeg_decode_dqt(s); + if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) + return ret; } dht_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "dht is %d and size is %d\n"); @@ -105,8 +105,8 @@ read_header: if (sof_offs) { init_get_bits(&s->gb, buf_ptr+sof_offs, (buf_end - (buf_ptr+sof_offs))*8); s->start_code = SOF0; - if (ff_mjpeg_decode_sof(s) < 0) - return -1; + if ((ret = ff_mjpeg_decode_sof(s)) < 0) + return ret; } sos_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sos is %d and size is %d\n"); @@ -118,9 +118,9 @@ read_header: 8 * FFMIN(field_size, buf_end - buf_ptr - sos_offs)); s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16)); s->start_code = SOS; - if (ff_mjpeg_decode_sos(s, NULL, 0, NULL) < 0 && - (avctx->err_recognition & AV_EF_EXPLODE)) - return AVERROR_INVALIDDATA; + ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL); + if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) + return ret; } if (s->interlaced) {

1 0

avcodec/mjpegbdec: Fix some misplaced {} and spaces
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Dec 28 22:22:56 2018 +0100| [11a8d2ccab1fe165eef4578c048d38731dbe1d6f] | committer: Michael Niedermayer avcodec/mjpegbdec: Fix some misplaced {} and spaces Reviewed-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11a8d2ccab1fe165e… --- libavcodec/mjpegbdec.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index a858707d54..8583fcb4f9 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -70,8 +70,7 @@ read_header: skip_bits(&hgb, 32); /* reserved zeros */ - if (get_bits_long(&hgb, 32) != MKBETAG('m','j','p','g')) - { + if (get_bits_long(&hgb, 32) != MKBETAG('m','j','p','g')) { av_log(avctx, AV_LOG_WARNING, "not mjpeg-b (bad fourcc)\n"); return AVERROR_INVALIDDATA; } @@ -85,19 +84,17 @@ read_header: dqt_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "dqt is %d and size is %d\n"); av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%"PRIx32"\n", dqt_offs); - if (dqt_offs) - { + if (dqt_offs) { init_get_bits(&s->gb, buf_ptr+dqt_offs, (buf_end - (buf_ptr+dqt_offs))*8); s->start_code = DQT; if (ff_mjpeg_decode_dqt(s) < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) - return AVERROR_INVALIDDATA; + return AVERROR_INVALIDDATA; } dht_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "dht is %d and size is %d\n"); av_log(avctx, AV_LOG_DEBUG, "dht offs: 0x%"PRIx32"\n", dht_offs); - if (dht_offs) - { + if (dht_offs) { init_get_bits(&s->gb, buf_ptr+dht_offs, (buf_end - (buf_ptr+dht_offs))*8); s->start_code = DHT; ff_mjpeg_decode_dht(s); @@ -105,8 +102,7 @@ read_header: sof_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sof is %d and size is %d\n"); av_log(avctx, AV_LOG_DEBUG, "sof offs: 0x%"PRIx32"\n", sof_offs); - if (sof_offs) - { + if (sof_offs) { init_get_bits(&s->gb, buf_ptr+sof_offs, (buf_end - (buf_ptr+sof_offs))*8); s->start_code = SOF0; if (ff_mjpeg_decode_sof(s) < 0) @@ -117,25 +113,23 @@ read_header: av_log(avctx, AV_LOG_DEBUG, "sos offs: 0x%"PRIx32"\n", sos_offs); sod_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sof is %d and size is %d\n"); av_log(avctx, AV_LOG_DEBUG, "sod offs: 0x%"PRIx32"\n", sod_offs); - if (sos_offs) - { + if (sos_offs) { init_get_bits(&s->gb, buf_ptr + sos_offs, 8 * FFMIN(field_size, buf_end - buf_ptr - sos_offs)); s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16)); s->start_code = SOS; if (ff_mjpeg_decode_sos(s, NULL, 0, NULL) < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) - return AVERROR_INVALIDDATA; + return AVERROR_INVALIDDATA; } if (s->interlaced) { s->bottom_field ^= 1; /* if not bottom field, do not output image yet */ - if (s->bottom_field != s->interlace_polarity && second_field_offs) - { + if (s->bottom_field != s->interlace_polarity && second_field_offs) { buf_ptr = buf + second_field_offs; goto read_header; - } + } } //XXX FIXME factorize, this looks very similar to the EOI code

1 0

avfilter/vf_chromashift: remove invalid offset
by Paul B Mahol 30 Dec '18

30 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Dec 30 22:31:52 2018 +0100| [3e8f211d868597602fada545ac8bff59c71d3739] | committer: Paul B Mahol avfilter/vf_chromashift: remove invalid offset > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e8f211d868597602… --- libavfilter/vf_chromashift.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index d073256b99..f4ac28ad18 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -358,7 +358,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) s->in = in; if (!s->is_rgbashift) { - av_image_copy_plane(out->data[0] + out->linesize[0], + av_image_copy_plane(out->data[0], out->linesize[0], in->data[0], in->linesize[0], s->linesize[0], s->height[0]);

1 0

avfilter/af_afir: do not over allocate fft buffer
by Paul B Mahol 30 Dec '18

30 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Dec 30 22:08:11 2018 +0100| [ea3a980a610e2517fcb2abe2708166a4b9f6e57d] | committer: Paul B Mahol avfilter/af_afir: do not over allocate fft buffer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea3a980a610e2517f… --- libavfilter/af_afir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 35fa66bad5..73a613f153 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -326,7 +326,7 @@ static int init_segment(AVFilterContext *ctx, AudioFIRSegment *seg, if (!seg->rdft || !seg->irdft) return AVERROR(ENOMEM); - seg->fft_length = part_size * 4 + 1; + seg->fft_length = part_size * 2 + 1; seg->part_size = part_size; seg->block_size = FFALIGN(seg->fft_length, 32); seg->coeff_size = FFALIGN(seg->part_size + 1, 32);

1 0

avformat/concatdec: always allow seeking to start
by Marton Balint 30 Dec '18

30 Dec '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Thu Dec 13 22:13:09 2018 +0100| [7f42276aa91c5fe1ad43f43e58a7645a674a3fda] | committer: Marton Balint avformat/concatdec: always allow seeking to start Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f42276aa91c5fe1a… --- libavformat/concatdec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index bbe13136fa..3ed95a4538 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -692,6 +692,13 @@ static int real_seek(AVFormatContext *avf, int stream, left = 0; right = cat->nb_files; + + /* Always support seek to start */ + if (ts <= 0) + right = 1; + else if (!cat->seekable) + return AVERROR(ESPIPE); /* XXX: can we use it? */ + while (right - left > 1) { int mid = (left + right) / 2; if (ts < cat->files[mid].start_time) @@ -728,8 +735,6 @@ static int concat_seek(AVFormatContext *avf, int stream, AVFormatContext *cur_avf_saved = cat->avf; int ret; - if (!cat->seekable) - return AVERROR(ESPIPE); /* XXX: can we use it? */ if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME)) return AVERROR(ENOSYS); cat->avf = NULL;

1 0

avfilter/af_asetnsamples: fix last frame props
by Marton Balint 30 Dec '18

30 Dec '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Dec 25 22:26:18 2018 +0100| [f9e947845f9ac5ccb84cf5e6f4121ec2e23b9946] | 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> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9e947845f9ac5ccb… --- 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