From 0cb809d1aa6ad708f856139a87e60a67a532cc2c Mon Sep 17 00:00:00 2001 From: zalaare Date: Fri, 23 Nov 2018 12:36:40 -0500 Subject: [PATCH] ffmpeg: enable AV1 decode support via libdav1d * backport libdav1d patch * latest patch from https://github.com/FFmpeg/FFmpeg/commit/752659327d4ac73640781376d214a26765f971f4#diff-c93f936c9a5658d0397dc9d432244f4a --- packages/multimedia/ffmpeg/package.mk | 3 +- .../ffmpeg-99.1008-dav1d-enable-av1.patch | 337 ++++++++++++++++++ 2 files changed, 339 insertions(+), 1 deletion(-) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-99.1008-dav1d-enable-av1.patch diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 368bd8d128..5263af4d1f 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -9,7 +9,7 @@ PKG_SHA256="f25559d4b803321483b28ac9b513671200bdc8e3531c02f0affdd622846a9c5e" PKG_LICENSE="LGPLv2.1+" PKG_SITE="https://ffmpeg.org" PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 openssl speex" +PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 openssl speex dav1d" PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." PKG_BUILD_FLAGS="-gold" @@ -171,6 +171,7 @@ configure_target() { --disable-libmp3lame \ --disable-libopenjpeg \ --disable-librtmp \ + --enable-libdav1d \ --enable-libspeex \ --disable-libtheora \ --disable-libvo-amrwbenc \ diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1008-dav1d-enable-av1.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1008-dav1d-enable-av1.patch new file mode 100644 index 0000000000..bc0ac268c2 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1008-dav1d-enable-av1.patch @@ -0,0 +1,337 @@ +diff -Nur a/configure b/configure +--- a/configure 2018-11-23 12:03:27.041287929 -0500 ++++ b/configure 2018-11-23 12:08:52.945786916 -0500 +@@ -226,6 +226,7 @@ + --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-libdc1394 enable IIDC-1394 grabbing using libdc1394 + and libraw1394 [no] + --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] +@@ -1700,6 +1701,7 @@ + libcaca + libcelt + libcodec2 ++ libdav1d + libdc1394 + libdrm + libflite +@@ -3062,6 +3064,7 @@ + libcelt_decoder_deps="libcelt" + libcodec2_decoder_deps="libcodec2" + libcodec2_encoder_deps="libcodec2" ++libdav1d_decoder_deps="libdav1d" + libfdk_aac_decoder_deps="libfdk_aac" + libfdk_aac_encoder_deps="libfdk_aac" + libfdk_aac_encoder_select="audio_frame_queue" +@@ -6003,6 +6006,7 @@ + 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 libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new + enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion + enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || +diff -Nur a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c +--- a/libavcodec/allcodecs.c 2018-11-23 12:03:27.041287929 -0500 ++++ b/libavcodec/allcodecs.c 2018-11-23 12:11:08.584268221 -0500 +@@ -670,6 +670,7 @@ + extern AVCodec ff_libcelt_decoder; + extern AVCodec ff_libcodec2_encoder; + extern AVCodec ff_libcodec2_decoder; ++extern AVCodec ff_libdav1d_decoder; + extern AVCodec ff_libfdk_aac_encoder; + extern AVCodec ff_libfdk_aac_decoder; + extern AVCodec ff_libgsm_encoder; +diff -Nur a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c +--- a/libavcodec/libdav1d.c 1969-12-31 19:00:00.000000000 -0500 ++++ b/libavcodec/libdav1d.c 2018-11-23 12:33:35.820468086 -0500 +@@ -0,0 +1,276 @@ ++/* ++ * 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); ++ } ++ } ++ ++ 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; ++ 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", ++}; +diff -Nur a/libavcodec/Makefile b/libavcodec/Makefile +--- a/libavcodec/Makefile 2018-11-23 12:03:27.041287929 -0500 ++++ b/libavcodec/Makefile 2018-11-23 12:10:28.676717867 -0500 +@@ -954,6 +954,7 @@ + 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_LIBFDK_AAC_DECODER) += libfdk-aacdec.o + OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o + OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o