Update to ffmpeg-4.2.
Bulk build tested on amd64 by naddy@ from Brad (maintainer)
This commit is contained in:
ajacoutot
parent
f327d28ab4
commit
889c1ebf1c
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.189 2019/07/09 07:00:52 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.190 2019/08/17 08:23:50 ajacoutot Exp $
|
||||
|
||||
COMMENT= audio/video converter and streamer
|
||||
|
||||
V= 4.1.4
|
||||
V= 4.2
|
||||
DISTNAME= ffmpeg-${V}
|
||||
EPOCH= 0
|
||||
CATEGORIES= graphics multimedia
|
||||
@ -32,6 +32,9 @@ WANTLIB+= pthread sndio speex ssl theoradec theoraenc v4l2
|
||||
WANTLIB+= vorbis vorbisenc vpx x264 x265 xcb xcb-shape xcb-shm
|
||||
WANTLIB+= xcb-xfixes xml2 xvidcore z
|
||||
|
||||
COMPILER= base-clang ports-gcc
|
||||
COMPILER_LANGS= c
|
||||
|
||||
BUILD_DEPENDS= textproc/texi2html \
|
||||
multimedia/frei0r-plugins
|
||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
|
||||
@ -79,7 +82,7 @@ OPTFLAGS+= -Wno-redundant-decls
|
||||
FIX_EXTRACT_PERMISSIONS= Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= simple
|
||||
CONFIGURE_ARGS+= --enable-shared \
|
||||
CONFIGURE_ARGS+=--enable-shared \
|
||||
--arch=${MACHINE_ARCH} \
|
||||
--cc=${CC} \
|
||||
--disable-altivec \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (ffmpeg-4.1.4.tar.xz) = 8fBJqC/PvxVlZOc6OTXX51CJH6sqvzAuc1EE/UBQp+E=
|
||||
SIZE (ffmpeg-4.1.4.tar.xz) = 8896056
|
||||
SHA256 (ffmpeg-4.2.tar.xz) = Aj8QgxqXrZPXmPU6NkDlXNVkq/66gH7L6FJNrE/t7NU=
|
||||
SIZE (ffmpeg-4.2.tar.xz) = 9088756
|
||||
|
||||
@ -1,36 +1,11 @@
|
||||
$OpenBSD: patch-configure,v 1.60 2019/03/14 06:27:55 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure,v 1.61 2019/08/17 08:23:50 ajacoutot Exp $
|
||||
|
||||
- avcodec: libdav1d AV1 decoder wrapper.
|
||||
- section_data_rel_ro: required by NEON support
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ 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_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"
|
||||
@@ -5147,9 +5150,10 @@ case $target_os in
|
||||
@@ -5253,9 +5253,10 @@ case $target_os in
|
||||
;;
|
||||
openbsd|bitrig)
|
||||
disable symver
|
||||
@ -42,7 +17,7 @@ Index: configure
|
||||
SLIB_INSTALL_LINKS=
|
||||
oss_indev_extralibs="-lossaudio"
|
||||
oss_outdev_extralibs="-lossaudio"
|
||||
@@ -5494,7 +5498,7 @@ set_default libdir
|
||||
@@ -5606,7 +5607,7 @@ set_default libdir
|
||||
set_default $PATHS_LIST
|
||||
set_default nm
|
||||
|
||||
@ -51,11 +26,3 @@ Index: configure
|
||||
|
||||
enable_weak_pic() {
|
||||
disabled pic && return
|
||||
@@ -6069,6 +6073,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.2.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
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
$OpenBSD: patch-doc_decoders_texi,v 1.1 2019/05/23 08:51:21 ajacoutot Exp $
|
||||
|
||||
doc: add basic documentation for libdav1d
|
||||
|
||||
Index: doc/decoders.texi
|
||||
--- doc/decoders.texi.orig
|
||||
+++ doc/decoders.texi
|
||||
@@ -47,6 +47,32 @@ top-field-first is assumed
|
||||
|
||||
@end table
|
||||
|
||||
+@section libdav1d
|
||||
+
|
||||
+dav1d AV1 decoder.
|
||||
+
|
||||
+libdav1d allows libavcodec to decode the AOMedia Video 1 (AV1) codec.
|
||||
+Requires the presence of the libdav1d headers and library during configuration.
|
||||
+You need to explicitly configure the build with @code{--enable-libdav1d}.
|
||||
+
|
||||
+@subsection Options
|
||||
+
|
||||
+The following option is supported by the libdav1d wrapper.
|
||||
+
|
||||
+@table @option
|
||||
+
|
||||
+@item framethreads
|
||||
+Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
|
||||
+
|
||||
+@item tilethreads
|
||||
+Set amount of tile threads to use during decoding. The default value is 0 (autodetect).
|
||||
+
|
||||
+@item filmgrain
|
||||
+Apply film grain to the decoded video if present in the bitstream. The default value
|
||||
+is true.
|
||||
+
|
||||
+@end table
|
||||
+
|
||||
@section libdavs2
|
||||
|
||||
AVS2-P2/IEEE1857.4 video decoder wrapper.
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-libavcodec_Makefile,v 1.23 2019/02/25 22:41:34 sthen Exp $
|
||||
|
||||
avcodec: libdav1d AV1 decoder wrapper.
|
||||
|
||||
Index: libavcodec/Makefile
|
||||
--- libavcodec/Makefile.orig
|
||||
+++ 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
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-libavcodec_allcodecs_c,v 1.1 2019/02/25 22:41:34 sthen Exp $
|
||||
|
||||
avcodec: libdav1d AV1 decoder wrapper.
|
||||
|
||||
Index: libavcodec/allcodecs.c
|
||||
--- libavcodec/allcodecs.c.orig
|
||||
+++ 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;
|
||||
@ -1,364 +0,0 @@
|
||||
$OpenBSD: patch-libavcodec_libdav1d_c,v 1.4 2019/05/23 08:51:21 ajacoutot Exp $
|
||||
|
||||
avcodec: libdav1d AV1 decoder wrapper.
|
||||
|
||||
Index: libavcodec/libdav1d.c
|
||||
--- libavcodec/libdav1d.c.orig
|
||||
+++ libavcodec/libdav1d.c
|
||||
@@ -0,0 +1,356 @@
|
||||
+/*
|
||||
+ * 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/mastering_display_metadata.h"
|
||||
+#include "libavutil/imgutils.h"
|
||||
+#include "libavutil/opt.h"
|
||||
+
|
||||
+#include "avcodec.h"
|
||||
+#include "decode.h"
|
||||
+#include "internal.h"
|
||||
+
|
||||
+typedef struct Libdav1dContext {
|
||||
+ AVClass *class;
|
||||
+ Dav1dContext *c;
|
||||
+ AVBufferPool *pool;
|
||||
+ int pool_size;
|
||||
+
|
||||
+ Dav1dData data;
|
||||
+ int tile_threads;
|
||||
+ int frame_threads;
|
||||
+ int apply_grain;
|
||||
+} Libdav1dContext;
|
||||
+
|
||||
+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 void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
|
||||
+{
|
||||
+ AVCodecContext *c = opaque;
|
||||
+
|
||||
+ av_vlog(c, AV_LOG_ERROR, fmt, vl);
|
||||
+}
|
||||
+
|
||||
+static int libdav1d_picture_allocator(Dav1dPicture *p, void *cookie)
|
||||
+{
|
||||
+ Libdav1dContext *dav1d = cookie;
|
||||
+ enum AVPixelFormat format = pix_fmt[p->p.layout][p->seq_hdr->hbd];
|
||||
+ int ret, linesize[4], h = FFALIGN(p->p.h, 128);
|
||||
+ uint8_t *aligned_ptr, *data[4];
|
||||
+ AVBufferRef *buf;
|
||||
+
|
||||
+ ret = av_image_fill_arrays(data, linesize, NULL, format, FFALIGN(p->p.w, 128),
|
||||
+ h, DAV1D_PICTURE_ALIGNMENT);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ if (ret != dav1d->pool_size) {
|
||||
+ av_buffer_pool_uninit(&dav1d->pool);
|
||||
+ // Use twice the amount of required padding bytes for aligned_ptr below.
|
||||
+ dav1d->pool = av_buffer_pool_init(ret + DAV1D_PICTURE_ALIGNMENT * 2, NULL);
|
||||
+ if (!dav1d->pool) {
|
||||
+ dav1d->pool_size = 0;
|
||||
+ return AVERROR(ENOMEM);
|
||||
+ }
|
||||
+ dav1d->pool_size = ret;
|
||||
+ }
|
||||
+ buf = av_buffer_pool_get(dav1d->pool);
|
||||
+ if (!buf)
|
||||
+ return AVERROR(ENOMEM);
|
||||
+
|
||||
+ // libdav1d requires DAV1D_PICTURE_ALIGNMENT aligned buffers, which av_malloc()
|
||||
+ // doesn't guarantee for example when AVX is disabled at configure time.
|
||||
+ // Use the extra DAV1D_PICTURE_ALIGNMENT padding bytes in the buffer to align it
|
||||
+ // if required.
|
||||
+ aligned_ptr = (uint8_t *)FFALIGN((uintptr_t)buf->data, DAV1D_PICTURE_ALIGNMENT);
|
||||
+ ret = av_image_fill_pointers(data, format, h, aligned_ptr, linesize);
|
||||
+ if (ret < 0) {
|
||||
+ av_buffer_unref(&buf);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ p->data[0] = data[0];
|
||||
+ p->data[1] = data[1];
|
||||
+ p->data[2] = data[2];
|
||||
+ p->stride[0] = linesize[0];
|
||||
+ p->stride[1] = linesize[1];
|
||||
+ p->allocator_data = buf;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void libdav1d_picture_release(Dav1dPicture *p, void *cookie)
|
||||
+{
|
||||
+ AVBufferRef *buf = p->allocator_data;
|
||||
+
|
||||
+ av_buffer_unref(&buf);
|
||||
+}
|
||||
+
|
||||
+static av_cold int libdav1d_init(AVCodecContext *c)
|
||||
+{
|
||||
+ Libdav1dContext *dav1d = c->priv_data;
|
||||
+ Dav1dSettings s;
|
||||
+ int threads = (c->thread_count ? c->thread_count : av_cpu_count()) * 3 / 2;
|
||||
+ int res;
|
||||
+
|
||||
+ av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version());
|
||||
+
|
||||
+ dav1d_default_settings(&s);
|
||||
+ s.logger.cookie = c;
|
||||
+ s.logger.callback = libdav1d_log_callback;
|
||||
+ s.allocator.cookie = dav1d;
|
||||
+ s.allocator.alloc_picture_callback = libdav1d_picture_allocator;
|
||||
+ s.allocator.release_picture_callback = libdav1d_picture_release;
|
||||
+ s.apply_grain = dav1d->apply_grain;
|
||||
+
|
||||
+ s.n_tile_threads = dav1d->tile_threads
|
||||
+ ? dav1d->tile_threads
|
||||
+ : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
|
||||
+ s.n_frame_threads = dav1d->frame_threads
|
||||
+ ? dav1d->frame_threads
|
||||
+ : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
|
||||
+ av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
|
||||
+ s.n_frame_threads, s.n_tile_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 int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
|
||||
+{
|
||||
+ Libdav1dContext *dav1d = c->priv_data;
|
||||
+ Dav1dData *data = &dav1d->data;
|
||||
+ Dav1dPicture pic = { 0 }, *p = &pic;
|
||||
+ 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 == AVERROR(EINVAL))
|
||||
+ res = AVERROR_INVALIDDATA;
|
||||
+ if (res != AVERROR(EAGAIN))
|
||||
+ return res;
|
||||
+ }
|
||||
+
|
||||
+ res = dav1d_get_picture(dav1d->c, p);
|
||||
+ if (res < 0) {
|
||||
+ if (res == AVERROR(EINVAL))
|
||||
+ res = AVERROR_INVALIDDATA;
|
||||
+ else if (res == AVERROR(EAGAIN) && c->internal->draining)
|
||||
+ res = AVERROR_EOF;
|
||||
+
|
||||
+ return res;
|
||||
+ }
|
||||
+
|
||||
+ av_assert0(p->data[0] != NULL);
|
||||
+
|
||||
+ // This requires the custom allocator above
|
||||
+ frame->buf[0] = av_buffer_ref(p->allocator_data);
|
||||
+ 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)
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ 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:
|
||||
+ res = AVERROR_INVALIDDATA;
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ if (p->mastering_display) {
|
||||
+ AVMasteringDisplayMetadata *mastering = av_mastering_display_metadata_create_side_data(frame);
|
||||
+ if (!mastering) {
|
||||
+ res = AVERROR(ENOMEM);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ for (int i = 0; i < 3; i++) {
|
||||
+ mastering->display_primaries[i][0] = av_make_q(p->mastering_display->primaries[i][0], 1 << 16);
|
||||
+ mastering->display_primaries[i][1] = av_make_q(p->mastering_display->primaries[i][1], 1 << 16);
|
||||
+ }
|
||||
+ mastering->white_point[0] = av_make_q(p->mastering_display->white_point[0], 1 << 16);
|
||||
+ mastering->white_point[1] = av_make_q(p->mastering_display->white_point[1], 1 << 16);
|
||||
+
|
||||
+ mastering->max_luminance = av_make_q(p->mastering_display->max_luminance, 1 << 8);
|
||||
+ mastering->min_luminance = av_make_q(p->mastering_display->min_luminance, 1 << 14);
|
||||
+
|
||||
+ mastering->has_primaries = 1;
|
||||
+ mastering->has_luminance = 1;
|
||||
+ }
|
||||
+ if (p->content_light) {
|
||||
+ AVContentLightMetadata *light = av_content_light_metadata_create_side_data(frame);
|
||||
+ if (!light) {
|
||||
+ res = AVERROR(ENOMEM);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ light->MaxCLL = p->content_light->max_content_light_level;
|
||||
+ light->MaxFALL = p->content_light->max_frame_average_light_level;
|
||||
+ }
|
||||
+
|
||||
+ res = 0;
|
||||
+fail:
|
||||
+ dav1d_picture_unref(p);
|
||||
+ if (res < 0)
|
||||
+ av_frame_unref(frame);
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+static av_cold int libdav1d_close(AVCodecContext *c)
|
||||
+{
|
||||
+ Libdav1dContext *dav1d = c->priv_data;
|
||||
+
|
||||
+ av_buffer_pool_uninit(&dav1d->pool);
|
||||
+ 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 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
|
||||
+ { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_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",
|
||||
+};
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.35 2019/02/25 22:41:34 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.36 2019/08/17 08:23:50 ajacoutot Exp $
|
||||
@bin bin/ffmpeg
|
||||
@bin bin/ffplay
|
||||
@bin bin/ffprobe
|
||||
@ -70,6 +70,7 @@ include/libavutil/fifo.h
|
||||
include/libavutil/file.h
|
||||
include/libavutil/frame.h
|
||||
include/libavutil/hash.h
|
||||
include/libavutil/hdr_dynamic_metadata.h
|
||||
include/libavutil/hmac.h
|
||||
include/libavutil/hwcontext.h
|
||||
include/libavutil/hwcontext_cuda.h
|
||||
@ -116,6 +117,7 @@ include/libavutil/timecode.h
|
||||
include/libavutil/timestamp.h
|
||||
include/libavutil/tree.h
|
||||
include/libavutil/twofish.h
|
||||
include/libavutil/tx.h
|
||||
include/libavutil/version.h
|
||||
include/libavutil/xtea.h
|
||||
include/libpostproc/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user