November 2019 - ffmpeg-cvslog

avformat/avc: Avoid allocation for small SPS/PPS arrays
by Andreas Rheinhardt 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Nov 27 13:22:08 2019 +0100| [c36a3df67692113af15f7accb006f02956882817] | committer: James Almer avformat/avc: Avoid allocation for small SPS/PPS arrays By using avio_get_dyn_buf() + ffio_free_dyn_buf() instead of avio_close_dyn_buf() + av_free() one can avoid an allocation + copy for small extradata. Furthermore, it simplifies freeing. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c36a3df67692113af… --- libavformat/avc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index a041e84357..7f9d81825b 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "avio.h" #include "avc.h" +#include "avio_internal.h" static const uint8_t *ff_avc_find_startcode_internal(const uint8_t *p, const uint8_t *end) { @@ -109,7 +110,7 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { AVIOContext *sps_pb = NULL, *pps_pb = NULL; uint8_t *buf = NULL, *end, *start = NULL; - uint8_t *sps = NULL, *pps = NULL; + uint8_t *sps, *pps; uint32_t sps_size = 0, pps_size = 0; int ret, nb_sps = 0, nb_pps = 0; @@ -164,8 +165,8 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) buf += size; } - sps_size = avio_close_dyn_buf(sps_pb, &sps); - pps_size = avio_close_dyn_buf(pps_pb, &pps); + sps_size = avio_get_dyn_buf(sps_pb, &sps); + pps_size = avio_get_dyn_buf(pps_pb, &pps); if (sps_size < 6 || !pps_size) { ret = AVERROR_INVALIDDATA; @@ -184,12 +185,8 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_write(pb, pps, pps_size); fail: - if (!sps) - avio_close_dyn_buf(sps_pb, &sps); - if (!pps) - avio_close_dyn_buf(pps_pb, &pps); - av_free(sps); - av_free(pps); + ffio_free_dyn_buf(&sps_pb); + ffio_free_dyn_buf(&pps_pb); av_free(start); return ret;

1 0

avformat/av1: Avoid allocation for small headers
by Andreas Rheinhardt 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Nov 27 13:22:07 2019 +0100| [a31f68fb449eaf6f030ce5633435663f154bb34d] | committer: James Almer avformat/av1: Avoid allocation for small headers By using avio_get_dyn_buf() + ffio_free_dyn_buf() instead of avio_close_dyn_buf() + av_free() one can avoid an allocation + copy for small headers. Furthermore, it simplifies freeing. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a31f68fb449eaf6f0… --- libavformat/av1.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavformat/av1.c b/libavformat/av1.c index 03669dfd2a..132f4e987b 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -326,7 +326,7 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) AV1SequenceParameters seq_params; PutBitContext pbc; uint8_t header[4]; - uint8_t *seq = NULL, *meta = NULL; + uint8_t *seq, *meta; int64_t obu_size; int start_pos, type, temporal_id, spatial_id; int ret, nb_seq = 0, seq_size, meta_size; @@ -376,7 +376,7 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) buf += len; } - seq_size = avio_close_dyn_buf(seq_pb, &seq); + seq_size = avio_get_dyn_buf(seq_pb, &seq); if (!seq_size) { ret = AVERROR_INVALIDDATA; goto fail; @@ -401,17 +401,13 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) avio_write(pb, header, sizeof(header)); avio_write(pb, seq, seq_size); - meta_size = avio_close_dyn_buf(meta_pb, &meta); + meta_size = avio_get_dyn_buf(meta_pb, &meta); if (meta_size) avio_write(pb, meta, meta_size); fail: - if (!seq) - avio_close_dyn_buf(seq_pb, &seq); - if (!meta) - avio_close_dyn_buf(meta_pb, &meta); - av_free(seq); - av_free(meta); + ffio_free_dyn_buf(&seq_pb); + ffio_free_dyn_buf(&meta_pb); return ret; }

1 0

avformat/apetag: Avoid allocation for small tags
by Andreas Rheinhardt 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Nov 27 13:22:06 2019 +0100| [67ce9e0463e170179ece4abc33be716282a0202b] | committer: James Almer avformat/apetag: Avoid allocation for small tags By using avio_get_dyn_buf() + ffio_free_dyn_buf() instead of avio_close_dyn_buf() + av_free() one can avoid an allocation + copy for small tags. Furthermore, it simplifies freeing. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67ce9e0463e170179… --- libavformat/apetag.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 8cb3f4a23a..4e19f49bf1 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -186,11 +186,11 @@ int ff_ape_write_tag(AVFormatContext *s) { AVDictionaryEntry *e = NULL; int size, ret, count = 0; - AVIOContext *dyn_bc = NULL; - uint8_t *dyn_buf = NULL; + AVIOContext *dyn_bc; + uint8_t *dyn_buf; if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0) - goto end; + return ret; ff_standardize_creation_time(s); while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) { @@ -211,7 +211,7 @@ int ff_ape_write_tag(AVFormatContext *s) if (!count) goto end; - size = avio_close_dyn_buf(dyn_bc, &dyn_buf); + size = avio_get_dyn_buf(dyn_bc, &dyn_buf); if (size <= 0) goto end; size += APE_TAG_FOOTER_BYTES; @@ -239,9 +239,7 @@ int ff_ape_write_tag(AVFormatContext *s) ffio_fill(s->pb, 0, 8); // reserved end: - if (dyn_bc && !dyn_buf) - avio_close_dyn_buf(dyn_bc, &dyn_buf); - av_freep(&dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return ret; }

1 0

avformat/aviobuf: Avoid allocating buffer when using dynamic buffer
by Andreas Rheinhardt 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Nov 27 13:22:05 2019 +0100| [163bb9ac0af495a5cb95441bdb5c02170440d28c] | committer: James Almer avformat/aviobuf: Avoid allocating buffer when using dynamic buffer Up until now, using a dynamic buffer entailed at least three allocations: One for the AVIOContext, one for the AVIOContext's opaque (which, among other things, contains the small write buffer), and one for the big buffer that is independently allocated that is returned when calling avio_close_dyn_buf(). It is possible to avoid the third allocation if one doesn't use a packetized dynamic buffer, if all the data written so far fit into the write buffer and if one does not require the actual (big) buffer to have an indefinite lifetime. This is done by making avio_get_dyn_buf() return a pointer to the data in the write buffer if nothing has been written to the main buffer yet. The dynamic buffer will then be freed using ffio_free_dynamic_buffer (which needed to be modified not to call avio_close_dyn_buf() internally). So a typical use-case like: size = avio_close_dyn_buf(dyn_pb, &buf); do something with buf av_free(buf); can be converted to: size = avio_get_dyn_buf(dyn_pb, &buf); do something with buf ffio_free_dynamic_buffer(&dyn_pb); In more complex scenarios this can simplify freeing as well, because it is now clear that freeing always has to be performed via ffio_free_dynamic_buffer(). Of course, in case this saves an allocation it also saves a memcpy. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=163bb9ac0af495a5c… --- libavformat/aviobuf.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2dfce8af8b..70e1d2ca10 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1443,14 +1443,19 @@ int avio_get_dyn_buf(AVIOContext *s, uint8_t **pbuffer) { DynBuffer *d; - if (!s) { + if (!s || s->error) { *pbuffer = NULL; return 0; } + d = s->opaque; + + if (!d->size) { + *pbuffer = d->io_buffer; + return FFMAX(s->buf_ptr, s->buf_ptr_max) - s->buffer; + } avio_flush(s); - d = s->opaque; *pbuffer = d->buffer; return d->size; @@ -1488,12 +1493,15 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) void ffio_free_dyn_buf(AVIOContext **s) { - uint8_t *tmp; + DynBuffer *d; + if (!*s) return; - avio_close_dyn_buf(*s, &tmp); - av_free(tmp); - *s = NULL; + + d = (*s)->opaque; + av_free(d->buffer); + av_free(d); + avio_context_free(s); } static int null_buf_write(void *opaque, uint8_t *buf, int buf_size)

1 0

avfilter/vf_libvmaf: Check for av_frame_alloc failure
by Limin Wang 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Wed Nov 20 23:24:22 2019 +0800| [8aa143eaa89cff7a72e2e9c80eb7fbac3b77e5be] | committer: Michael Niedermayer avfilter/vf_libvmaf: Check for av_frame_alloc failure Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8aa143eaa89cff7a7… --- libavfilter/vf_libvmaf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index ed3a383709..14c3216b3a 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -235,6 +235,9 @@ static av_cold int init(AVFilterContext *ctx) s->gref = av_frame_alloc(); s->gmain = av_frame_alloc(); + if (!s->gref || !s->gmain) + return AVERROR(ENOMEM); + s->error = 0; s->vmaf_thread_created = 0;

1 0

avformat/flacenc: Add const to ff_flac_write_header() parameter
by Andreas Rheinhardt 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Nov 27 08:48:56 2019 +0100| [df912bbc5f9cffa56341382a92aff739755f6d60] | committer: Michael Niedermayer avformat/flacenc: Add const to ff_flac_write_header() parameter The extradata is not changed at all. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df912bbc5f9cffa56… --- libavformat/flacenc.h | 2 +- libavformat/flacenc_header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index d5d53a5dcb..b308d0d021 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -26,7 +26,7 @@ #include "libavcodec/bytestream.h" #include "avformat.h" -int ff_flac_write_header(AVIOContext *pb, uint8_t *extradata, +int ff_flac_write_header(AVIOContext *pb, const uint8_t *extradata, int extradata_size, int last_block); int ff_flac_is_native_layout(uint64_t channel_layout); diff --git a/libavformat/flacenc_header.c b/libavformat/flacenc_header.c index 61833cc8b9..aba22a59d8 100644 --- a/libavformat/flacenc_header.c +++ b/libavformat/flacenc_header.c @@ -26,7 +26,7 @@ #include "avformat.h" #include "flacenc.h" -int ff_flac_write_header(AVIOContext *pb, uint8_t *extradata, +int ff_flac_write_header(AVIOContext *pb, const uint8_t *extradata, int extradata_size, int last_block) { uint8_t header[8] = {

1 0

avcodec/vp8: fix multiple ff_thread_finish_setup() calls
by Zhao Zhili 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Thu Nov 14 12:29:55 2019 +0800| [ed5cdf3d5a7eae4e9f399520989c157cfb50fa51] | committer: Michael Niedermayer avcodec/vp8: fix multiple ff_thread_finish_setup() calls webp decoder doesn't set update_thread_context field $ ffmpeg -i rgb_q80.webp -f null - [webp @ 0x7ffbd5823200] Multiple ff_thread_finish_setup() calls Reviewed-by: Peter Ross <pross(a)xvid.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed5cdf3d5a7eae4e9… --- libavcodec/vp8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index eb51d1f3c9..b4deb3ed67 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2715,7 +2715,8 @@ int vp78_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->next_framep[VP56_FRAME_CURRENT] = curframe; - ff_thread_finish_setup(avctx); + if (avctx->codec->update_thread_context) + ff_thread_finish_setup(avctx); if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, avpkt->data, avpkt->size);

1 0

avfilter/vf_colorconstancy: av_frame_free(&in) in case of error or direct flag is false
by Limin Wang 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Wed Nov 27 18:46:51 2019 +0800| [3a6ec10d904f5f9d38900a79281000ca1d0a0747] | committer: Michael Niedermayer avfilter/vf_colorconstancy: av_frame_free(&in) in case of error or direct flag is false Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> 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=3a6ec10d904f5f9d3… --- libavfilter/vf_colorconstancy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index cc081e957f..9917d8993e 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -682,13 +682,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterLink *outlink = ctx->outputs[0]; AVFrame *out; int ret; + int direct = 0; ret = illumination_estimation(ctx, in); if (ret) { + av_frame_free(&in); return ret; } if (av_frame_is_writable(in)) { + direct = 1; out = in; } else { out = ff_get_video_buffer(outlink, outlink->w, outlink->h); @@ -700,6 +703,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } chromatic_adaptation(ctx, in, out); + if (!direct) + av_frame_free(&in); + return ff_filter_frame(outlink, out); }

1 0

lavc/qsvenc: Fix some code indentations
by Linjie Fu 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Tue Nov 26 11:53:16 2019 +0800| [df625057af9b646742b3b7ff558dd18d52cc8b4d] | committer: Zhong Li lavc/qsvenc: Fix some code indentations Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df625057af9b64674… --- libavcodec/qsvenc.c | 8 ++++---- libavcodec/qsvenc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 1bc5600061..4f103b9ff6 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -764,10 +764,10 @@ FF_ENABLE_DEPRECATION_WARNINGS #if QSV_HAVE_EXT_VP9_PARAM if (avctx->codec_id == AV_CODEC_ID_VP9) { - q->extvp9param.Header.BufferId = MFX_EXTBUFF_VP9_PARAM; - q->extvp9param.Header.BufferSz = sizeof(q->extvp9param); - q->extvp9param.WriteIVFHeaders = MFX_CODINGOPTION_OFF; - q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extvp9param; + q->extvp9param.Header.BufferId = MFX_EXTBUFF_VP9_PARAM; + q->extvp9param.Header.BufferSz = sizeof(q->extvp9param); + q->extvp9param.WriteIVFHeaders = MFX_CODINGOPTION_OFF; + q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extvp9param; } #endif diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index a3e9357865..ee35582075 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -125,7 +125,7 @@ typedef struct QSVEncContext { mfxExtMultiFrameControl extmfc; #endif #if QSV_HAVE_EXT_VP9_PARAM - mfxExtVP9Param extvp9param; + mfxExtVP9Param extvp9param; #endif mfxExtOpaqueSurfaceAlloc opaque_alloc;

1 0

doc/encoder: add the missing qsv encoders
by Zhong Li 28 Nov '19

28 Nov '19

ffmpeg | branch: master | Zhong Li <zhongli_dev(a)126.com> | Wed Nov 27 07:04:23 2019 +0000| [1b831bc72975d621b8821849d05357e6afafc229] | committer: Zhong Li doc/encoder: add the missing qsv encoders Reviewed-by: Gyan Doshi <ffmpeg(a)gyani.pro> Signed-off-by: Zhong Li <zhongli_dev(a)126.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b831bc72975d621b… --- doc/encoders.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 6b02c7798d..4ee518a124 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2776,7 +2776,7 @@ recommended value) and do not set a size constraint. @section QSV encoders -The family of Intel QuickSync Video encoders (MPEG-2, H.264 and HEVC) +The family of Intel QuickSync Video encoders (MPEG-2, H.264, HEVC, JPEG/MJPEG and VP9) The ratecontrol method is selected as follows:

1 0