diff --git a/enable_decoders b/enable_decoders index 0f646a0..48c31d6 100644 --- a/enable_decoders +++ b/enable_decoders @@ -20,6 +20,7 @@ libaom # libaom libaom_av1 # libaom libcelt # celt, opus libcodec2 # codec2 +libdav1d # av1 libgsm # libgsm libopenjpeg # openjpeg libopus # opus diff --git a/ffmpeg-4.1.1.tar.xz b/ffmpeg-4.1.1.tar.xz deleted file mode 100644 index 8b64b92..0000000 --- a/ffmpeg-4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:373749824dfd334d84e55dff406729edfd1606575ee44dd485d97d45ea4d2d86 -size 8893404 diff --git a/ffmpeg-4.1.1.tar.xz.asc b/ffmpeg-4.1.1.tar.xz.asc deleted file mode 100644 index e112b9b..0000000 --- a/ffmpeg-4.1.1.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJcX0XNAAoJELQyLwTWdljYTy8H/AgSHwDf54fj1PURlvHHIbUd -AH41eMe1BbNK6HvcvZMOz7WAwKmjOVyeUs7PscvhnhalzuYC1zMSWpEx2jS5J+KB -t6rkQGNykKVj2ttsJ+xgESvhIOp0/+T2U1ps//DfK5cLC0qV7aTEYEGk+/wMKlRD -iRDW3PaApq1dQwvHU+5OoWxv+8DZahycLBmkfV8qM3Kie3CNwVyO2KZkeAs3b1o6 -IVo+xGsFe00DRqDlRHGX1gt9pWQ74qQTPlhA9kMm/c0lKq4ufLUgeZaC+JPruLxj -qoh/4roXA9qPPHZZraq8qkP2zGIsPeG/bkqJwFryBxBf/1eQ834xEdyCTiFhyZQ= -=R0My ------END PGP SIGNATURE----- diff --git a/ffmpeg-4.1.2.tar.xz b/ffmpeg-4.1.2.tar.xz new file mode 100644 index 0000000..e9295f4 --- /dev/null +++ b/ffmpeg-4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b95f0ae44798ab1434155ac7f81f30a7e9760a02282e4b5898372c22a335347b +size 8892696 diff --git a/ffmpeg-4.1.2.tar.xz.asc b/ffmpeg-4.1.2.tar.xz.asc new file mode 100644 index 0000000..c9a4e43 --- /dev/null +++ b/ffmpeg-4.1.2.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJclXOCAAoJELQyLwTWdljYxqsH/2H8YDvF4JHeEZcFZwR+KcMb +k+6SZf53VIELAaRt28Cdn8dqyWqopxcwY8yFWmCgxXMYNt2rYlPuv7bmq6T1rhiP +2G6iYTu9ldxLHMXUHoCIb8bID/KYOShSS8/XRjxGP1ZSz4kfSh0uEaE/1PjLhabT +D4YC4OLiS7/SY4gzm8d4kcfnZv4ySgL4vyeB2uOkFgiSld5gajQnkZHhgR3TqIv0 +Dcr8mE9KAkZU5cMNxB58EwMsrdKn66d+GtfMs6ZAQO5XfmDiqN+qfD5p3y+64z8m +Tc9SaosmyEuDuthXWCwdUwFgbRVibfn3+V8GN/J1vuM9AEy5C222JX5evdyEN5U= +=Da26 +-----END PGP SIGNATURE----- diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 8d7e0d6..fd06ae8 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Mar 28 09:21:05 UTC 2019 - Bjørn Lie + +- Update to version 4.1.2: + * Updates and bug fixes for codecs, filters and formats. + +------------------------------------------------------------------- +Sun Mar 17 22:38:39 UTC 2019 - Bjørn Lie + +- Add ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch: Backport + dav1d decoder support for aom (av1) codec. Following this, add + conditional pkgconfig(dav1d) BuildRequires and pass conditional + --enable-libdav1d to configure. Also add libdav1d to + enable_decoders. + ------------------------------------------------------------------- Sat Mar 9 11:59:31 UTC 2019 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 6ba93d8..480713c 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -97,7 +97,7 @@ %define _major_version 4 %define _major_expected 5 Name: ffmpeg-4 -Version: 4.1.1 +Version: 4.1.2 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -117,6 +117,8 @@ Patch3: ffmpeg-new-coder-errors.diff Patch4: ffmpeg-codec-choice.diff # from https://github.com/OpenVisualCloud/SVT-AV1/blob/master/ffmpeg_plugin/ Patch5: 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch +# dav1d added https://patchwork.ffmpeg.org/patch/10843/ +Patch6: ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel @@ -137,6 +139,9 @@ BuildRequires: pkgconfig(celt) >= 0.11.0 %if %{with codec2} BuildRequires: pkgconfig(codec2) %endif +%if 0%{?suse_version} >= 1550 +BuildRequires: pkgconfig(dav1d) +%endif BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(fontconfig) >= 2.4.2 BuildRequires: pkgconfig(freetype2) @@ -598,6 +603,9 @@ CFLAGS="%optflags" \ --enable-libcdio \ %if %{with codec2} --enable-libcodec2 \ +%endif +%if 0%{?suse_version} >= 1550 + --enable-libdav1d \ %endif --enable-libdc1394 \ --enable-libdrm \ diff --git a/ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch b/ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch new file mode 100644 index 0000000..abd1664 --- /dev/null +++ b/ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch @@ -0,0 +1,546 @@ +diff --git a/configure b/configure +index 01c3a1011d..e56b925065 100755 +--- a/configure ++++ b/configure +@@ -226,6 +226,7 @@ External library support: + --enable-libcelt enable CELT decoding via libcelt [no] + --enable-libcdio enable audio CD grabbing with libcdio [no] + --enable-libcodec2 enable codec2 en/decoding using libcodec2 [no] ++ --enable-libdav1d enable AV1 decoding via libdav1d [no] + --enable-libdavs2 enable AVS2 decoding via libdavs2 [no] + --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 + and libraw1394 [no] +@@ -1712,6 +1713,7 @@ EXTERNAL_LIBRARY_LIST=" + libcaca + libcelt + libcodec2 ++ libdav1d + libdc1394 + libdrm + libflite +@@ -3088,6 +3090,7 @@ libaom_av1_encoder_select="extract_extradata_bsf" + libcelt_decoder_deps="libcelt" + libcodec2_decoder_deps="libcodec2" + libcodec2_encoder_deps="libcodec2" ++libdav1d_decoder_deps="libdav1d" + libdavs2_decoder_deps="libdavs2" + libfdk_aac_decoder_deps="libfdk_aac" + libfdk_aac_encoder_deps="libfdk_aac" +@@ -6064,6 +6067,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && + die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } + enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas + enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 ++enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.0.1" "dav1d/dav1d.h" dav1d_version + enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open + enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new + enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion +diff --git a/libavcodec/Makefile b/libavcodec/Makefile +index 3e41497e34..8643da8f2b 100644 +--- a/libavcodec/Makefile ++++ b/libavcodec/Makefile +@@ -956,6 +956,7 @@ OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o + OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o + OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o codec2utils.o + OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o codec2utils.o ++OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o + OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o + OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o + OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o +diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c +new file mode 100644 +index 0000000000..873adfda40 +--- /dev/null ++++ b/libavcodec/libdav1d.c +@@ -0,0 +1,270 @@ ++/* ++ * Copyright (c) 2018 Ronald S. Bultje ++ * Copyright (c) 2018 James Almer ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include ++ ++#include "libavutil/avassert.h" ++#include "libavutil/fifo.h" ++#include "libavutil/opt.h" ++ ++#include "avcodec.h" ++#include "decode.h" ++#include "internal.h" ++ ++typedef struct Libdav1dContext { ++ AVClass *class; ++ Dav1dContext *c; ++ ++ AVFifoBuffer *cache; ++ Dav1dData data; ++ int tile_threads; ++} Libdav1dContext; ++ ++static av_cold int libdav1d_init(AVCodecContext *c) ++{ ++ Libdav1dContext *dav1d = c->priv_data; ++ Dav1dSettings s; ++ int res; ++ ++ av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); ++ ++ dav1d_default_settings(&s); ++ s.n_tile_threads = dav1d->tile_threads; ++ s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), 256); ++ ++ dav1d->cache = av_fifo_alloc(8 * sizeof(AVPacket)); ++ if (!dav1d->cache) ++ return AVERROR(ENOMEM); ++ ++ res = dav1d_open(&dav1d->c, &s); ++ if (res < 0) ++ return AVERROR(ENOMEM); ++ ++ return 0; ++} ++ ++static void libdav1d_flush(AVCodecContext *c) ++{ ++ Libdav1dContext *dav1d = c->priv_data; ++ ++ av_fifo_reset(dav1d->cache); ++ dav1d_data_unref(&dav1d->data); ++ dav1d_flush(dav1d->c); ++} ++ ++static int libdav1d_fifo_write(void *src, void *dst, int dst_size) { ++ AVPacket *pkt_dst = dst, *pkt_src = src; ++ ++ av_assert2(dst_size >= sizeof(AVPacket)); ++ ++ pkt_src->buf = NULL; ++ av_packet_free_side_data(pkt_src); ++ *pkt_dst = *pkt_src; ++ ++ return sizeof(AVPacket); ++} ++ ++static void libdav1d_data_free(const uint8_t *data, void *opaque) { ++ AVBufferRef *buf = opaque; ++ ++ av_buffer_unref(&buf); ++} ++ ++static void libdav1d_frame_free(void *opaque, uint8_t *data) { ++ Dav1dPicture p = { 0 }; ++ ++ p.ref = opaque; ++ p.data[0] = (void *) 0x1; // this has to be non-NULL ++ dav1d_picture_unref(&p); ++} ++ ++static const enum AVPixelFormat pix_fmt[][2] = { ++ [DAV1D_PIXEL_LAYOUT_I400] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10 }, ++ [DAV1D_PIXEL_LAYOUT_I420] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10 }, ++ [DAV1D_PIXEL_LAYOUT_I422] = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10 }, ++ [DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10 }, ++}; ++ ++// TODO: Update once 12bit support is added. ++static const int profile[] = { ++ [DAV1D_PIXEL_LAYOUT_I400] = FF_PROFILE_AV1_MAIN, ++ [DAV1D_PIXEL_LAYOUT_I420] = FF_PROFILE_AV1_MAIN, ++ [DAV1D_PIXEL_LAYOUT_I422] = FF_PROFILE_AV1_PROFESSIONAL, ++ [DAV1D_PIXEL_LAYOUT_I444] = FF_PROFILE_AV1_HIGH, ++}; ++ ++static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) ++{ ++ Libdav1dContext *dav1d = c->priv_data; ++ Dav1dData *data = &dav1d->data; ++ AVPacket pkt = { 0 }; ++ Dav1dPicture p = { 0 }; ++ int res; ++ ++ if (!data->sz) { ++ res = ff_decode_get_packet(c, &pkt); ++ if (res < 0 && res != AVERROR_EOF) ++ return res; ++ ++ if (pkt.size) { ++ if (!av_fifo_space(dav1d->cache)) { ++ res = av_fifo_grow(dav1d->cache, 8 * sizeof(pkt)); ++ if (res < 0) { ++ av_packet_unref(&pkt); ++ return res; ++ } ++ } ++ ++ res = dav1d_data_wrap(data, pkt.data, pkt.size, libdav1d_data_free, pkt.buf); ++ if (res < 0) { ++ av_packet_unref(&pkt); ++ return res; ++ } ++ ++ av_fifo_generic_write(dav1d->cache, &pkt, sizeof(pkt), libdav1d_fifo_write); ++ } else { ++ data = NULL; ++ } ++ } ++ ++ res = dav1d_decode(dav1d->c, data, &p); ++ if (res < 0) { ++ if (res == -EINVAL) ++ res = AVERROR_INVALIDDATA; ++ else if (res == -EAGAIN && c->internal->draining) ++ res = AVERROR_EOF; ++ ++ return res; ++ } ++ ++ av_assert0(p.data[0] != NULL); ++ ++ av_fifo_generic_read(dav1d->cache, &pkt, sizeof(pkt), NULL); ++ ++ frame->buf[0] = av_buffer_create(NULL, 0, libdav1d_frame_free, ++ p.ref, AV_BUFFER_FLAG_READONLY); ++ if (!frame->buf[0]) { ++ dav1d_picture_unref(&p); ++ return AVERROR(ENOMEM); ++ } ++ ++ frame->data[0] = p.data[0]; ++ frame->data[1] = p.data[1]; ++ frame->data[2] = p.data[2]; ++ frame->linesize[0] = p.stride[0]; ++ frame->linesize[1] = p.stride[1]; ++ frame->linesize[2] = p.stride[1]; ++ ++ c->profile = profile[p.p.layout]; ++ frame->format = c->pix_fmt = pix_fmt[p.p.layout][p.p.bpc == 10]; ++ frame->width = p.p.w; ++ frame->height = p.p.h; ++ if (c->width != p.p.w || c->height != p.p.h) { ++ res = ff_set_dimensions(c, p.p.w, p.p.h); ++ if (res < 0) ++ return res; ++ } ++ ++ switch (p.p.chr) { ++ case DAV1D_CHR_VERTICAL: ++ frame->chroma_location = c->chroma_sample_location = AVCHROMA_LOC_LEFT; ++ break; ++ case DAV1D_CHR_COLOCATED: ++ frame->chroma_location = c->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; ++ break; ++ } ++ frame->colorspace = c->colorspace = (enum AVColorSpace) p.p.mtrx; ++ frame->color_primaries = c->color_primaries = (enum AVColorPrimaries) p.p.pri; ++ frame->color_trc = c->color_trc = (enum AVColorTransferCharacteristic) p.p.trc; ++ frame->color_range = c->color_range = p.p.fullrange ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; ++ ++ // match timestamps and packet size ++ frame->pts = frame->best_effort_timestamp = pkt.pts; ++#if FF_API_PKT_PTS ++FF_DISABLE_DEPRECATION_WARNINGS ++ frame->pkt_pts = pkt.pts; ++FF_ENABLE_DEPRECATION_WARNINGS ++#endif ++ frame->pkt_dts = pkt.dts; ++ frame->pkt_pos = pkt.pos; ++ frame->pkt_size = pkt.size; ++ frame->pkt_duration = pkt.duration; ++ frame->key_frame = p.p.type == DAV1D_FRAME_TYPE_KEY; ++ ++ switch (p.p.type) { ++ case DAV1D_FRAME_TYPE_KEY: ++ case DAV1D_FRAME_TYPE_INTRA: ++ frame->pict_type = AV_PICTURE_TYPE_I; ++ break; ++ case DAV1D_FRAME_TYPE_INTER: ++ frame->pict_type = AV_PICTURE_TYPE_P; ++ break; ++ case DAV1D_FRAME_TYPE_SWITCH: ++ frame->pict_type = AV_PICTURE_TYPE_SP; ++ break; ++ default: ++ return AVERROR_INVALIDDATA; ++ } ++ ++ return 0; ++} ++ ++static av_cold int libdav1d_close(AVCodecContext *c) ++{ ++ Libdav1dContext *dav1d = c->priv_data; ++ ++ av_fifo_freep(&dav1d->cache); ++ dav1d_data_unref(&dav1d->data); ++ dav1d_close(&dav1d->c); ++ ++ return 0; ++} ++ ++#define OFFSET(x) offsetof(Libdav1dContext, x) ++#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM ++static const AVOption libdav1d_options[] = { ++ { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 64, VD, NULL }, ++ { NULL } ++}; ++ ++static const AVClass libdav1d_class = { ++ .class_name = "libdav1d decoder", ++ .item_name = av_default_item_name, ++ .option = libdav1d_options, ++ .version = LIBAVUTIL_VERSION_INT, ++}; ++ ++AVCodec ff_libdav1d_decoder = { ++ .name = "libdav1d", ++ .long_name = NULL_IF_CONFIG_SMALL("dav1d AV1 decoder by VideoLAN"), ++ .type = AVMEDIA_TYPE_VIDEO, ++ .id = AV_CODEC_ID_AV1, ++ .priv_data_size = sizeof(Libdav1dContext), ++ .init = libdav1d_init, ++ .close = libdav1d_close, ++ .flush = libdav1d_flush, ++ .receive_frame = libdav1d_receive_frame, ++ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS, ++ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | ++ FF_CODEC_CAP_SETS_PKT_DTS, ++ .priv_class = &libdav1d_class, ++ .wrapper_name = "libdav1d", ++}; + +From 752659327d4ac73640781376d214a26765f971f4 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Wed, 14 Nov 2018 10:05:25 -0300 +Subject: [PATCH] avcodec/libdav1d: fix build after a recent API break + +Signed-off-by: James Almer +--- + libavcodec/libdav1d.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c +index 873adfda403..b19aee4e9ed 100644 +--- a/libavcodec/libdav1d.c ++++ b/libavcodec/libdav1d.c +@@ -140,12 +140,18 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) + } + + av_fifo_generic_write(dav1d->cache, &pkt, sizeof(pkt), libdav1d_fifo_write); +- } else { +- data = NULL; + } + } + +- res = dav1d_decode(dav1d->c, data, &p); ++ res = dav1d_send_data(dav1d->c, data); ++ if (res < 0) { ++ if (res == -EINVAL) ++ res = AVERROR_INVALIDDATA; ++ if (res != -EAGAIN) ++ return res; ++ } ++ ++ res = dav1d_get_picture(dav1d->c, &p); + if (res < 0) { + if (res == -EINVAL) + res = AVERROR_INVALIDDATA; + +From cc25529420e3c559fcb4c7a993f112983da7d397 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Sun, 25 Nov 2018 17:28:53 -0300 +Subject: [PATCH] avcodec/libdav1d: update the API usage after upstream changes + +The color fields were moved to another struct, and a way to propagate +timestamps and other input metadata was introduced, so the packet fifo +can be removed. + +Signed-off-by: James Almer +--- + libavcodec/libdav1d.c | 66 ++++++++++++++----------------------------- + 1 file changed, 21 insertions(+), 45 deletions(-) + +diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c +index b19aee4e9ed..d927f11a9e9 100644 +--- a/libavcodec/libdav1d.c ++++ b/libavcodec/libdav1d.c +@@ -22,7 +22,6 @@ + #include + + #include "libavutil/avassert.h" +-#include "libavutil/fifo.h" + #include "libavutil/opt.h" + + #include "avcodec.h" +@@ -33,7 +32,6 @@ typedef struct Libdav1dContext { + AVClass *class; + Dav1dContext *c; + +- AVFifoBuffer *cache; + Dav1dData data; + int tile_threads; + } Libdav1dContext; +@@ -50,10 +48,6 @@ static av_cold int libdav1d_init(AVCodecContext *c) + s.n_tile_threads = dav1d->tile_threads; + s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), 256); + +- dav1d->cache = av_fifo_alloc(8 * sizeof(AVPacket)); +- if (!dav1d->cache) +- return AVERROR(ENOMEM); +- + res = dav1d_open(&dav1d->c, &s); + if (res < 0) + return AVERROR(ENOMEM); +@@ -65,23 +59,10 @@ static void libdav1d_flush(AVCodecContext *c) + { + Libdav1dContext *dav1d = c->priv_data; + +- av_fifo_reset(dav1d->cache); + dav1d_data_unref(&dav1d->data); + dav1d_flush(dav1d->c); + } + +-static int libdav1d_fifo_write(void *src, void *dst, int dst_size) { +- AVPacket *pkt_dst = dst, *pkt_src = src; +- +- av_assert2(dst_size >= sizeof(AVPacket)); +- +- pkt_src->buf = NULL; +- av_packet_free_side_data(pkt_src); +- *pkt_dst = *pkt_src; +- +- return sizeof(AVPacket); +-} +- + static void libdav1d_data_free(const uint8_t *data, void *opaque) { + AVBufferRef *buf = opaque; + +@@ -115,31 +96,29 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) + { + Libdav1dContext *dav1d = c->priv_data; + Dav1dData *data = &dav1d->data; +- AVPacket pkt = { 0 }; + Dav1dPicture p = { 0 }; + int res; + + if (!data->sz) { ++ AVPacket pkt = { 0 }; ++ + res = ff_decode_get_packet(c, &pkt); + if (res < 0 && res != AVERROR_EOF) + return res; + + if (pkt.size) { +- if (!av_fifo_space(dav1d->cache)) { +- res = av_fifo_grow(dav1d->cache, 8 * sizeof(pkt)); +- if (res < 0) { +- av_packet_unref(&pkt); +- return res; +- } +- } +- + res = dav1d_data_wrap(data, pkt.data, pkt.size, libdav1d_data_free, pkt.buf); + if (res < 0) { + av_packet_unref(&pkt); + return res; + } + +- av_fifo_generic_write(dav1d->cache, &pkt, sizeof(pkt), libdav1d_fifo_write); ++ data->m.timestamp = pkt.pts; ++ data->m.offset = pkt.pos; ++ data->m.duration = pkt.duration; ++ ++ pkt.buf = NULL; ++ av_packet_unref(&pkt); + } + } + +@@ -163,8 +142,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) + + av_assert0(p.data[0] != NULL); + +- av_fifo_generic_read(dav1d->cache, &pkt, sizeof(pkt), NULL); +- + frame->buf[0] = av_buffer_create(NULL, 0, libdav1d_frame_free, + p.ref, AV_BUFFER_FLAG_READONLY); + if (!frame->buf[0]) { +@@ -189,7 +166,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) + return res; + } + +- switch (p.p.chr) { ++ switch (p.seq_hdr->chr) { + case DAV1D_CHR_VERTICAL: + frame->chroma_location = c->chroma_sample_location = AVCHROMA_LOC_LEFT; + break; +@@ -197,25 +174,25 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) + frame->chroma_location = c->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; + break; + } +- frame->colorspace = c->colorspace = (enum AVColorSpace) p.p.mtrx; +- frame->color_primaries = c->color_primaries = (enum AVColorPrimaries) p.p.pri; +- frame->color_trc = c->color_trc = (enum AVColorTransferCharacteristic) p.p.trc; +- frame->color_range = c->color_range = p.p.fullrange ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; ++ frame->colorspace = c->colorspace = (enum AVColorSpace) p.seq_hdr->mtrx; ++ frame->color_primaries = c->color_primaries = (enum AVColorPrimaries) p.seq_hdr->pri; ++ frame->color_trc = c->color_trc = (enum AVColorTransferCharacteristic) p.seq_hdr->trc; ++ frame->color_range = c->color_range = p.seq_hdr->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; + + // match timestamps and packet size +- frame->pts = frame->best_effort_timestamp = pkt.pts; ++ frame->pts = frame->best_effort_timestamp = p.m.timestamp; + #if FF_API_PKT_PTS + FF_DISABLE_DEPRECATION_WARNINGS +- frame->pkt_pts = pkt.pts; ++ frame->pkt_pts = p.m.timestamp; + FF_ENABLE_DEPRECATION_WARNINGS + #endif +- frame->pkt_dts = pkt.dts; +- frame->pkt_pos = pkt.pos; +- frame->pkt_size = pkt.size; +- frame->pkt_duration = pkt.duration; +- frame->key_frame = p.p.type == DAV1D_FRAME_TYPE_KEY; ++ frame->pkt_dts = p.m.timestamp; ++ frame->pkt_pos = p.m.offset; ++ frame->pkt_size = p.m.size; ++ frame->pkt_duration = p.m.duration; ++ frame->key_frame = p.frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY; + +- switch (p.p.type) { ++ switch (p.frame_hdr->frame_type) { + case DAV1D_FRAME_TYPE_KEY: + case DAV1D_FRAME_TYPE_INTRA: + frame->pict_type = AV_PICTURE_TYPE_I; +@@ -237,7 +214,6 @@ static av_cold int libdav1d_close(AVCodecContext *c) + { + Libdav1dContext *dav1d = c->priv_data; + +- av_fifo_freep(&dav1d->cache); + dav1d_data_unref(&dav1d->data); + dav1d_close(&dav1d->c); + +--- orig-ffmpeg-4.1.1/libavcodec/allcodecs.c 2019-02-09 21:56:02.000000000 +0100 ++++ ffmpeg-4.1.1/libavcodec/allcodecs.c 2019-03-18 23:27:28.701284908 +0100 +@@ -671,6 +671,7 @@ + extern AVCodec ff_pcm_mulaw_at_decoder; + extern AVCodec ff_qdmc_at_decoder; + extern AVCodec ff_qdm2_at_decoder; ++extern AVCodec ff_libdav1d_decoder; + extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libaom_av1_encoder; + extern AVCodec ff_libcelt_decoder; +