multimedia/ffmpeg: backport dav1d support

If both AOM and DAV1D are enabled FFmpeg defaults to libaom-av1,
so libdav1d needs to be selected explicitly. For example,

$ mpv --vd=libdav1d, --ytdl-format='bestvideo[vcodec=av01.0.05M.08]+bestaudio' \
    'https://www.youtube.com/playlist?list=PLyqf6gJt7KuHBmeVzZteZUlNUQAVLwrZS'

2 files changed, 331 insertions, 1 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 179d4ff36d79..90455e4811b0 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -27,7 +27,7 @@ NOPRECIOUSMAKEVARS=	yes # ARCH
 
 PORTSCOUT=	limit:^4\.
 
-OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ASS BEIGNET BS2B CACA CDIO CELT CHROMAPRINT CODEC2 DAVS2 DC1394 \
+OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ASS BEIGNET BS2B CACA CDIO CELT CHROMAPRINT CODEC2 DAV1D DAVS2 DC1394 \
 		DEBUG DOCS DRM FDK_AAC FLITE FONTCONFIG \
 		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KLVANC KVAZAAR LADSPA \
 		LAME LENSFUN LIBBLURAY LIBRSVG2 LIBXML2 LV2 MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL \
@@ -84,6 +84,7 @@ BEIGNET_DESC=	DRM/VAAPI to OpenCL mapping for i965 + Beignet
 BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
 CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
 CODEC2_DESC=	Codec 2 audio encoding/decoding via libcodec2
+DAV1D_DESC=	AV1 video decoding via libdav1d
 DAVS2_DESC=	AVS2 decoding via libdavs2
 DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 DRM_DESC=	KMS grabbing using libdrm
@@ -170,6 +171,10 @@ CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
 CODEC2_LIB_DEPENDS=	libcodec2.so:audio/codec2
 CODEC2_CONFIGURE_ENABLE=	libcodec2
 
+# dav1d
+DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
+DAV1D_CONFIGURE_ENABLE=	libdav1d
+
 # davs2
 DAVS2_LIB_DEPENDS=	libdavs2.so:multimedia/davs2
 DAVS2_CONFIGURE_ENABLE=	libdavs2
diff --git a/multimedia/ffmpeg/files/patch-dav1d b/multimedia/ffmpeg/files/patch-dav1d
new file mode 100644
index 000000000000..abd089160a22
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-dav1d
@@ -0,0 +1,325 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/beaa350e24
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/752659327d
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/cc25529420
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/53ca505acc
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3cd275bcde
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0fca2f60da
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e695b0beba
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0e833f615b
+
+--- configure.orig	2018-11-05 23:22:33 UTC
++++ 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
+@@ -3090,6 +3092,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"
+@@ -6068,6 +6071,7 @@ enabled libcelt           && require libcelt celt/celt
+                                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
+--- doc/general.texi.orig	2018-11-05 23:22:25 UTC
++++ doc/general.texi
+@@ -758,8 +758,8 @@ following image formats are supported:
+ @item Autodesk Animator Flic video  @tab     @tab  X
+ @item Autodesk RLE           @tab     @tab  X
+     @tab fourcc: AASC
+-@item AV1                    @tab     @tab  E
+-    @tab Supported through external library libaom
++@item AV1                    @tab  E  @tab  E
++    @tab Supported through external libraries libaom and libdav1d
+ @item Avid 1:1 10-bit RGB Packer  @tab  X  @tab  X
+     @tab fourcc: AVrp
+ @item AVS (Audio Video Standard) video  @tab     @tab  X
+--- libavcodec/Makefile.orig	2018-11-05 23:22:25 UTC
++++ libavcodec/Makefile
+@@ -956,6 +956,7 @@ OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)         += libaomenc
+ 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
+--- libavcodec/allcodecs.c.orig	2018-11-05 23:22:25 UTC
++++ libavcodec/allcodecs.c
+@@ -676,6 +676,7 @@ extern AVCodec ff_libaom_av1_encoder;
+ extern AVCodec ff_libcelt_decoder;
+ extern AVCodec ff_libcodec2_encoder;
+ extern AVCodec ff_libcodec2_decoder;
++extern AVCodec ff_libdav1d_decoder;
+ extern AVCodec ff_libdavs2_decoder;
+ extern AVCodec ff_libfdk_aac_encoder;
+ extern AVCodec ff_libfdk_aac_decoder;
+--- libavcodec/libdav1d.c.orig	2018-12-16 07:22:28 UTC
++++ libavcodec/libdav1d.c
+@@ -0,0 +1,246 @@
++/*
++ * Copyright (c) 2018 Ronald S. Bultje <rsbultje gmail com>
++ * Copyright (c) 2018 James Almer <jamrial gmail com>
++ *
++ * 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 <dav1d/dav1d.h>
++
++#include "libavutil/avassert.h"
++#include "libavutil/opt.h"
++
++#include "avcodec.h"
++#include "decode.h"
++#include "internal.h"
++
++typedef struct Libdav1dContext {
++    AVClass *class;
++    Dav1dContext *c;
++
++    Dav1dData data;
++    int tile_threads;
++    int apply_grain;
++} 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.apply_grain = dav1d->apply_grain;
++    s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS);
++
++    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;
++
++    dav1d_data_unref(&dav1d->data);
++    dav1d_flush(dav1d->c);
++}
++
++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[][3] = {
++    [DAV1D_PIXEL_LAYOUT_I400] = { AV_PIX_FMT_GRAY8,   AV_PIX_FMT_GRAY10,    AV_PIX_FMT_GRAY12 },
++    [DAV1D_PIXEL_LAYOUT_I420] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P12 },
++    [DAV1D_PIXEL_LAYOUT_I422] = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12 },
++    [DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12 },
++};
++
++static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
++{
++    Libdav1dContext *dav1d = c->priv_data;
++    Dav1dData *data = &dav1d->data;
++    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) {
++            res = dav1d_data_wrap(data, pkt.data, pkt.size, libdav1d_data_free, pkt.buf);
++            if (res < 0) {
++                av_packet_unref(&pkt);
++                return res;
++            }
++
++            data->m.timestamp = pkt.pts;
++            data->m.offset = pkt.pos;
++            data->m.duration = pkt.duration;
++
++            pkt.buf = NULL;
++            av_packet_unref(&pkt);
++        }
++    }
++
++    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);
++
++    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 = p.seq_hdr->profile;
++    frame->format = c->pix_fmt = pix_fmt[p.p.layout][p.seq_hdr->hbd];
++    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.seq_hdr->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.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 = p.m.timestamp;
++#if FF_API_PKT_PTS
++FF_DISABLE_DEPRECATION_WARNINGS
++    frame->pkt_pts = p.m.timestamp;
++FF_ENABLE_DEPRECATION_WARNINGS
++#endif
++    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.frame_hdr->frame_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;
++
++    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, DAV1D_MAX_TILE_THREADS, VD },
++    { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VD },
++    { 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_SETS_PKT_DTS,
++    .priv_class     = &libdav1d_class,
++    .wrapper_name   = "libdav1d",
++};