forked from jengelh/ffmpeg-4
5478d2e6f2
from OpenMandriva to optionally enable runtime enabling of fdkaac/lame/x264/x265 - Enable runtime enabling for fdkaac via --enable-libfdk-aac-dlopen OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=70
318 lines
11 KiB
Diff
318 lines
11 KiB
Diff
Index: ffmpeg-4.1.3/configure
|
|
===================================================================
|
|
--- ffmpeg-4.1.3.orig/configure
|
|
+++ ffmpeg-4.1.3/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
|
|
@@ -3091,6 +3093,7 @@ libaom_av1_encoder_select="extract_extra
|
|
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"
|
|
@@ -6069,6 +6072,7 @@ enabled libcelt && require lib
|
|
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
|
|
Index: ffmpeg-4.1.3/libavcodec/Makefile
|
|
===================================================================
|
|
--- ffmpeg-4.1.3.orig/libavcodec/Makefile
|
|
+++ ffmpeg-4.1.3/libavcodec/Makefile
|
|
@@ -956,6 +956,7 @@ OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)
|
|
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
|
|
Index: ffmpeg-4.1.3/libavcodec/libdav1d.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ ffmpeg-4.1.3/libavcodec/libdav1d.c
|
|
@@ -0,0 +1,252 @@
|
|
+/*
|
|
+ * 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;
|
|
+} 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);
|
|
+
|
|
+ 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[][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;
|
|
+ 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 = 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.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, 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",
|
|
+};
|
|
Index: ffmpeg-4.1.3/libavcodec/allcodecs.c
|
|
===================================================================
|
|
--- ffmpeg-4.1.3.orig/libavcodec/allcodecs.c
|
|
+++ ffmpeg-4.1.3/libavcodec/allcodecs.c
|
|
@@ -671,6 +671,7 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
|
|
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;
|