May 2018 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avcodec/cbs: use av_fast_malloc in case of unit write buffer overflow
by James Almer 02 May '18

02 May '18

Use it instead of av_reallocp, as the contents of the existing buffer are ultimately discarded. Signed-off-by: James Almer <jamrial(a)gmail.com> --- Barely any speed gain in most cases, but realloc of this data is nonetheless unnecessary. libavcodec/cbs_h2645.c | 13 +++++++------ libavcodec/cbs_h2645.h | 2 +- libavcodec/cbs_mpeg2.c | 13 +++++++------ libavcodec/cbs_mpeg2.h | 2 +- libavcodec/cbs_vp9.c | 15 ++++++++------- libavcodec/cbs_vp9.h | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 64a1a2d1ee..ccb4e5190c 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1235,19 +1235,20 @@ static int cbs_h2645_write_nal_unit(CodedBitstreamContext *ctx, CodedBitstreamH2645Context *priv = ctx->priv_data; enum AVCodecID codec_id = ctx->codec->codec_id; PutBitContext pbc; + size_t write_buffer_size; int err; if (!priv->write_buffer) { // Initial write buffer size is 1MB. - priv->write_buffer_size = 1024 * 1024; + write_buffer_size = 1024 * 1024; reallocate_and_try_again: - err = av_reallocp(&priv->write_buffer, priv->write_buffer_size); - if (err < 0) { + av_fast_malloc(&priv->write_buffer, &priv->write_buffer_size, write_buffer_size); + if (!priv->write_buffer) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a " "sufficiently large write buffer (last attempt " - "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size); - return err; + "%"SIZE_SPECIFIER" bytes).\n", write_buffer_size); + return AVERROR(ENOMEM); } } @@ -1260,7 +1261,7 @@ static int cbs_h2645_write_nal_unit(CodedBitstreamContext *ctx, if (err == AVERROR(ENOSPC)) { // Overflow. - priv->write_buffer_size *= 2; + write_buffer_size = priv->write_buffer_size * 2; goto reallocate_and_try_again; } // Overflow but we didn't notice. diff --git a/libavcodec/cbs_h2645.h b/libavcodec/cbs_h2645.h index f4cf65bdde..29630ea7b5 100644 --- a/libavcodec/cbs_h2645.h +++ b/libavcodec/cbs_h2645.h @@ -36,7 +36,7 @@ typedef struct CodedBitstreamH2645Context { // Write buffer uint8_t *write_buffer; - size_t write_buffer_size; + unsigned write_buffer_size; } CodedBitstreamH2645Context; diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 0df4234b12..c081a63737 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -298,19 +298,20 @@ static int cbs_mpeg2_write_unit(CodedBitstreamContext *ctx, { CodedBitstreamMPEG2Context *priv = ctx->priv_data; PutBitContext pbc; + size_t write_buffer_size; int err; if (!priv->write_buffer) { // Initial write buffer size is 1MB. - priv->write_buffer_size = 1024 * 1024; + write_buffer_size = 1024 * 1024; reallocate_and_try_again: - err = av_reallocp(&priv->write_buffer, priv->write_buffer_size); - if (err < 0) { + av_fast_malloc(&priv->write_buffer, &priv->write_buffer_size, write_buffer_size); + if (!priv->write_buffer) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a " "sufficiently large write buffer (last attempt " - "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size); - return err; + "%"SIZE_SPECIFIER" bytes).\n", write_buffer_size); + return AVERROR(ENOMEM); } } @@ -323,7 +324,7 @@ static int cbs_mpeg2_write_unit(CodedBitstreamContext *ctx, if (err == AVERROR(ENOSPC)) { // Overflow. - priv->write_buffer_size *= 2; + write_buffer_size = priv->write_buffer_size * 2; goto reallocate_and_try_again; } if (err < 0) { diff --git a/libavcodec/cbs_mpeg2.h b/libavcodec/cbs_mpeg2.h index 92caa99dc1..824e15b524 100644 --- a/libavcodec/cbs_mpeg2.h +++ b/libavcodec/cbs_mpeg2.h @@ -222,7 +222,7 @@ typedef struct CodedBitstreamMPEG2Context { // Write buffer. uint8_t *write_buffer; - size_t write_buffer_size; + unsigned write_buffer_size; } CodedBitstreamMPEG2Context; diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 7498be4b73..05bf2da66b 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -514,19 +514,20 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx, CodedBitstreamVP9Context *priv = ctx->priv_data; VP9RawFrame *frame = unit->content; PutBitContext pbc; + size_t write_buffer_size; int err; if (!priv->write_buffer) { // Initial write buffer size is 1MB. - priv->write_buffer_size = 1024 * 1024; + write_buffer_size = 1024 * 1024; reallocate_and_try_again: - err = av_reallocp(&priv->write_buffer, priv->write_buffer_size); - if (err < 0) { + av_fast_malloc(&priv->write_buffer, &priv->write_buffer_size, write_buffer_size); + if (!priv->write_buffer) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a " "sufficiently large write buffer (last attempt " - "%zu bytes).\n", priv->write_buffer_size); - return err; + "%"SIZE_SPECIFIER" bytes).\n", write_buffer_size); + return AVERROR(ENOMEM); } } @@ -534,7 +535,7 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx, err = cbs_vp9_write_frame(ctx, &pbc, frame); if (err == AVERROR(ENOSPC)) { - priv->write_buffer_size *= 2; + write_buffer_size = priv->write_buffer_size * 2; goto reallocate_and_try_again; } if (err < 0) @@ -550,7 +551,7 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx, if (frame->data) { if (unit->data_size + frame->data_size > priv->write_buffer_size) { - priv->write_buffer_size *= 2; + write_buffer_size = priv->write_buffer_size * 2; goto reallocate_and_try_again; } diff --git a/libavcodec/cbs_vp9.h b/libavcodec/cbs_vp9.h index 5b99c90c2e..b517e4345a 100644 --- a/libavcodec/cbs_vp9.h +++ b/libavcodec/cbs_vp9.h @@ -194,7 +194,7 @@ typedef struct CodedBitstreamVP9Context { // Write buffer. uint8_t *write_buffer; - size_t write_buffer_size; + unsigned write_buffer_size; } CodedBitstreamVP9Context; -- 2.17.0

1 0

[PATCH 1/6] cbs: Fragment/unit data is always reference counted
by Mark Thompson 02 May '18

02 May '18

Make this clear in the documentation and add some asserts to ensure that it is always true. --- As suggested earlier :) libavcodec/cbs.c | 18 ++++++++++++------ libavcodec/cbs.h | 10 ++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index d81b4e03f7..0d6ffe8824 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -140,26 +140,30 @@ static int cbs_read_fragment_content(CodedBitstreamContext *ctx, int err, i, j; for (i = 0; i < frag->nb_units; i++) { + CodedBitstreamUnit *unit = &frag->units[i]; + if (ctx->decompose_unit_types) { for (j = 0; j < ctx->nb_decompose_unit_types; j++) { - if (ctx->decompose_unit_types[j] == frag->units[i].type) + if (ctx->decompose_unit_types[j] == unit->type) break; } if (j >= ctx->nb_decompose_unit_types) continue; } - av_buffer_unref(&frag->units[i].content_ref); - frag->units[i].content = NULL; + av_buffer_unref(&unit->content_ref); + unit->content = NULL; + + av_assert0(unit->data && unit->data_ref); - err = ctx->codec->read_unit(ctx, &frag->units[i]); + err = ctx->codec->read_unit(ctx, unit); if (err == AVERROR(ENOSYS)) { av_log(ctx->log_ctx, AV_LOG_VERBOSE, "Decomposition unimplemented for unit %d " - "(type %"PRIu32").\n", i, frag->units[i].type); + "(type %"PRIu32").\n", i, unit->type); } else if (err < 0) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to read unit %d " - "(type %"PRIu32").\n", i, frag->units[i].type); + "(type %"PRIu32").\n", i, unit->type); return err; } } @@ -277,6 +281,7 @@ int ff_cbs_write_fragment_data(CodedBitstreamContext *ctx, "(type %"PRIu32").\n", i, unit->type); return err; } + av_assert0(unit->data && unit->data_ref); } av_buffer_unref(&frag->data_ref); @@ -287,6 +292,7 @@ int ff_cbs_write_fragment_data(CodedBitstreamContext *ctx, av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to assemble fragment.\n"); return err; } + av_assert0(frag->data && frag->data_ref); return 0; } diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 402eb39e00..487358afaf 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -84,8 +84,9 @@ typedef struct CodedBitstreamUnit { */ size_t data_bit_padding; /** - * If data is reference counted, a reference to the buffer containing - * data. Null if data is not reference counted. + * A reference to the buffer containing data. + * + * Must be set if data is not NULL. */ AVBufferRef *data_ref; @@ -130,8 +131,9 @@ typedef struct CodedBitstreamFragment { */ size_t data_bit_padding; /** - * If data is reference counted, a reference to the buffer containing - * data. Null if data is not reference counted. + * A reference to the buffer containing data. + * + * Must be set if data is not NULL. */ AVBufferRef *data_ref; -- 2.16.3

3 15

[PATCH] fate: add aresample check to tests that needs it
by Paul B Mahol 01 May '18

01 May '18

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- For single FATE box and for now single test. --- tests/Makefile | 4 ++++ tests/fate/avformat.mak | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 6074ac748e..9286e079df 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -72,6 +72,10 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) +ENCDECF = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \ + $(firstword $(3))_FILTER) + DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index a12f9ccc71..5326b6236a 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -42,7 +42,7 @@ FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi FATE_LAVF-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg -FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox +FATE_LAVF-$(call ENCDECF, PCM_S16LE, SOX, ARESAMPLE) += sox FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sunrast FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga -- 2.11.0

2 1

[PATCH 1/2] avdevice/decklink_dec: do not copy video data
by Marton Balint 01 May '18

01 May '18

Create a buffer from the data instead and use the buffer destructor to free the DeckLink frame. This avoids a memcpy of the frame data. Signed-off-by: Marton Balint <cus(a)passwd.hu> --- libavdevice/decklink_dec.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index e97a4402ea..10535dc388 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -98,6 +98,14 @@ static VANCLineNumber vanc_line_numbers[] = { {bmdModeUnknown, 0, -1, -1, -1} }; +extern "C" { +static void decklink_object_free(void *opaque, uint8_t *data) +{ + IUnknown *obj = (class IUnknown *)opaque; + obj->Release(); +} +} + static int get_vanc_line_idx(BMDDisplayMode mode) { unsigned int i; @@ -797,6 +805,10 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( } } + pkt.buf = av_buffer_create(pkt.data, pkt.size, decklink_object_free, videoFrame, 0); + if (pkt.buf) + videoFrame->AddRef(); + if (avpacket_queue_put(&ctx->queue, &pkt) < 0) { ++ctx->dropped; } -- 2.13.6

2 4

[PATCH] avformat/yuv4mpegdec: use generic code for seeking
by Paul B Mahol 01 May '18

01 May '18

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavformat/yuv4mpegdec.c | 23 ++++---------------- tests/ref/seek/lavf-yuv4mpeg | 52 ++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 47 deletions(-) diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index 8662a42a4c..cf6da2a2ef 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -306,28 +306,13 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) return s->pb->eof_reached ? AVERROR_EOF : AVERROR(EIO); } pkt->stream_index = 0; - pkt->pts = (off - s->internal->data_offset) / s->packet_size; + pkt->pos = off; + pkt->dts = pkt->pts = (off - s->internal->data_offset) / s->packet_size; + pkt->flags |= AV_PKT_FLAG_KEY; pkt->duration = 1; return 0; } -static int yuv4_read_seek(AVFormatContext *s, int stream_index, - int64_t pts, int flags) -{ - AVStream *st = s->streams[0]; - int64_t pos; - - pos = av_rescale_rnd(pts * s->packet_size, - st->time_base.num, - st->time_base.den * s->packet_size, - (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP); - pos *= s->packet_size; - - if (avio_seek(s->pb, pos + s->internal->data_offset, SEEK_SET) < 0) - return -1; - return 0; -} - static int yuv4_probe(AVProbeData *pd) { /* check file header */ @@ -343,6 +328,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = { .read_probe = yuv4_probe, .read_header = yuv4_read_header, .read_packet = yuv4_read_packet, - .read_seek = yuv4_read_seek, .extensions = "y4m", + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/tests/ref/seek/lavf-yuv4mpeg b/tests/ref/seek/lavf-yuv4mpeg index 15d4d8c8c1..0f85ea5a46 100644 --- a/tests/ref/seek/lavf-yuv4mpeg +++ b/tests/ref/seek/lavf-yuv4mpeg @@ -1,48 +1,44 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 -ret:-1 st:-1 flags:0 ts:-1.000000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size:152064 +ret: 0 st:-1 flags:0 ts:-1.000000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size:152064 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3041458 size:152064 ret:-1 st: 0 flags:1 ts:-0.320000 -ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 0.120000 pts: 0.120000 pos: 456274 size:152064 +ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1368688 size:152064 ret:-1 st: 0 flags:1 ts:-0.760000 -ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 0.120000 pts: 0.120000 pos: 456274 size:152064 +ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size:152064 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 0.080000 pts: 0.080000 pos: 304204 size:152064 -ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.080000 pts: 0.080000 pos: 304204 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 +ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2433178 size:152064 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size:152064 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 0.080000 pts: 0.080000 pos: 304204 size:152064 -ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 0.080000 pts: 0.080000 pos: 304204 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 +ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 760408 size:152064 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size:152064 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 0.080000 pts: 0.080000 pos: 304204 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3345598 size:152064 ret:-1 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 dts: 0.120000 pts: 0.120000 pos: 456274 size:152064 +ret:-1 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3649738 size:152064 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1824898 size:152064 ret:-1 st:-1 flags:1 ts:-0.645825 -- 2.11.0

2 3