[vlc-devel] [PATCH v2 3/3] codec: add a dav1d AV1 decoder module
Steve Lhomme
robux4 at ycbcr.xyz
Thu Nov 8 16:45:34 CET 2018
From: Adrien Maglo <magsoft at videolan.org>
It is using the picture callback API so there's is no copy on output of the decoder.
Co-authored-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
Co-authored-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
configure.ac | 5 +
modules/codec/Makefile.am | 8 +
modules/codec/dav1d.c | 321 ++++++++++++++++++++++++++++++++++++++
3 files changed, 334 insertions(+)
create mode 100644 modules/codec/dav1d.c
diff --git a/configure.ac b/configure.ac
index fa093bbee3..6e28431d81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2622,6 +2622,11 @@ dnl AOM decoder plugin
dnl
PKG_ENABLE_MODULES_VLC([AOM], [], [aom], [experimental AV1 codec (default auto)])
+dnl
+dnl Dav1d decoder plugin
+dnl
+PKG_ENABLE_MODULES_VLC([DAV1D], [], [dav1d], [AV1 decoder (default auto)])
+
dnl
dnl libvpx decoder plugin
dnl
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 4dc2e498d2..760141d1f4 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -580,6 +580,14 @@ libtwolame_plugin_la_LIBADD = $(TWOLAME_LIBS) $(LIBM)
EXTRA_LTLIBRARIES += libtwolame_plugin.la
codec_LTLIBRARIES += $(LTLIBtwolame)
+libdav1d_plugin_la_SOURCES = codec/dav1d.c
+libdav1d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DAV1D_CFLAGS)
+libdav1d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdav1d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libdav1d_plugin_la_LIBADD = $(DAV1D_LIBS)
+EXTRA_LTLIBRARIES += libdav1d_plugin.la
+codec_LTLIBRARIES += $(LTLIBdav1d)
+
### Hardware encoders ###
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
new file mode 100644
index 0000000000..a563e1a90b
--- /dev/null
+++ b/modules/codec/dav1d.c
@@ -0,0 +1,321 @@
+/*****************************************************************************
+ * dav1d.c: dav1d decoder (AV1) module
+ *****************************************************************************
+ * Copyright (C) 2016 VLC authors and VideoLAN
+ *
+ * Authors: Adrien Maglo <magsoft at videolan.org>
+ * Based on aom.c by: Tristan Matthews <tmatth at videolan.org>
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <errno.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_timestamp_helper.h>
+
+#include <dav1d/dav1d.h>
+
+#include "../packetizer/iso_color_tables.h"
+
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int OpenDecoder(vlc_object_t *);
+static void CloseDecoder(vlc_object_t *);
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+
+#define THREAD_FRAMES_TEXT N_("Frames Threads")
+#define THREAD_FRAMES_LONGTEXT N_( "Max number of threads used for frame decoding, default 0=auto" )
+#define THREAD_TILES_TEXT N_("Tiles Threads")
+#define THREAD_TILES_LONGTEXT N_( "Max number of threads used for tile decoding, default 0=auto" )
+
+
+vlc_module_begin ()
+ set_shortname("dav1d")
+ set_description(N_("Dav1d video decoder"))
+ set_capability("video decoder", 10000)
+ set_callbacks(OpenDecoder, CloseDecoder)
+ set_category(CAT_INPUT)
+ set_subcategory(SUBCAT_INPUT_VCODEC)
+
+ add_integer("dav1d-thread-frames", 0,
+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
+ add_integer("dav1d-thread-tiles", 0,
+ THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
+vlc_module_end ()
+
+#define AOM_ERR(this, ctx, msg) aom_err_msg(VLC_OBJECT(this), ctx, msg ": %s (%s)")
+#define AOM_MAX_FRAMES_DEPTH 64
+
+/*****************************************************************************
+ * decoder_sys_t: libaom decoder descriptor
+ *****************************************************************************/
+typedef struct
+{
+ Dav1dSettings s;
+ Dav1dContext *c;
+ timestamp_fifo_t *ts_fifo;
+} decoder_sys_t;
+
+static const struct
+{
+ vlc_fourcc_t i_chroma;
+ enum Dav1dPixelLayout i_chroma_id;
+ uint8_t i_bitdepth;
+} chroma_table[] =
+{
+ {VLC_CODEC_GREY, DAV1D_PIXEL_LAYOUT_I400, 8},
+ {VLC_CODEC_I420, DAV1D_PIXEL_LAYOUT_I420, 8},
+ {VLC_CODEC_I422, DAV1D_PIXEL_LAYOUT_I422, 8},
+ {VLC_CODEC_I444, DAV1D_PIXEL_LAYOUT_I444, 8},
+
+ {VLC_CODEC_I420_10L, DAV1D_PIXEL_LAYOUT_I420, 10},
+ {VLC_CODEC_I422_10L, DAV1D_PIXEL_LAYOUT_I422, 10},
+ {VLC_CODEC_I444_10L, DAV1D_PIXEL_LAYOUT_I444, 10},
+};
+
+static vlc_fourcc_t FindVlcChroma(const Dav1dPicture *img)
+{
+ for (unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++)
+ if (chroma_table[i].i_chroma_id == img->p.layout &&
+ chroma_table[i].i_bitdepth == img->p.bpc)
+ return chroma_table[i].i_chroma;
+
+ return 0;
+}
+
+static int NewPicture(Dav1dPicture *img, void *cookie)
+{
+ decoder_t *dec = cookie;
+
+ video_format_t *v = &dec->fmt_out.video;
+
+ v->i_visible_width = img->p.w;
+ v->i_visible_height = img->p.h;
+ v->i_width = (img->p.w + 0x7F) & ~0x7F;
+ v->i_height = (img->p.h + 0x7F) & ~0x7F;
+
+ if( !v->i_sar_num || !v->i_sar_den )
+ {
+ v->i_sar_num = 1;
+ v->i_sar_den = 1;
+ }
+
+ if(dec->fmt_in.video.primaries == COLOR_PRIMARIES_UNDEF)
+ {
+ v->primaries = iso_23001_8_cp_to_vlc_primaries(img->p.pri);
+ v->transfer = iso_23001_8_tc_to_vlc_xfer(img->p.trc);
+ v->space = iso_23001_8_mc_to_vlc_coeffs(img->p.mtrx);
+ v->b_color_range_full = img->p.fullrange;
+ }
+
+ v->projection_mode = dec->fmt_in.video.projection_mode;
+ v->multiview_mode = dec->fmt_in.video.multiview_mode;
+ v->pose = dec->fmt_in.video.pose;
+ dec->fmt_out.video.i_chroma = dec->fmt_out.i_codec = FindVlcChroma(img);
+
+ if (decoder_UpdateVideoFormat(dec) == VLC_SUCCESS)
+ {
+ picture_t *pic = decoder_NewPicture(dec);
+ if (likely(pic != NULL))
+ {
+ img->data[0] = pic->p[0].p_pixels;
+ img->stride[0] = pic->p[0].i_pitch;
+ img->data[1] = pic->p[1].p_pixels;
+ img->data[2] = pic->p[2].p_pixels;
+ assert(pic->p[1].i_pitch == pic->p[2].i_pitch);
+ img->stride[1] = pic->p[1].i_pitch;
+ img->allocator_data = pic;
+
+ return 0;
+ }
+ }
+ return -1;
+}
+
+static void FreePicture(uint8_t *data, void *allocator_data, void *cookie)
+{
+ picture_t *pic = allocator_data;
+ decoder_t *dec = cookie;
+ VLC_UNUSED(dec);
+ assert( data == pic->p[0].p_pixels );
+ picture_Release(pic);
+}
+
+/****************************************************************************
+ * Flush: clears decoder between seeks
+ ****************************************************************************/
+
+static void FlushDecoder(decoder_t *dec)
+{
+ decoder_sys_t *p_sys = dec->p_sys;
+ dav1d_flush(p_sys->c);
+ timestamp_FifoEmpty(p_sys->ts_fifo);
+}
+
+static void release_block(const uint8_t *buf, void *b)
+{
+ VLC_UNUSED(buf);
+ block_t *block = b;
+ block_Release(block);
+}
+
+/****************************************************************************
+ * Decode: the whole thing
+ ****************************************************************************/
+static int Decode(decoder_t *dec, block_t *block)
+{
+ decoder_sys_t *p_sys = dec->p_sys;
+
+ if (block && block->i_flags & (BLOCK_FLAG_CORRUPTED))
+ {
+ block_Release(block);
+ return VLCDEC_SUCCESS;
+ }
+
+ Dav1dData data;
+ Dav1dData *p_data = NULL;
+
+ if (block)
+ {
+ p_data = &data;
+ if (unlikely(dav1d_data_wrap(&data, block->p_buffer, block->i_buffer,
+ release_block, block) != 0))
+ {
+ block_Release(block);
+ return VLCDEC_ECRITICAL;
+ }
+ }
+
+ Dav1dPicture img = { 0 };
+
+ int i_ret = VLCDEC_SUCCESS;
+ vlc_tick_t pts = block ? (block->i_pts == VLC_TICK_INVALID ? block->i_dts : block->i_pts) : VLC_TICK_INVALID;
+ timestamp_FifoPut(p_sys->ts_fifo, pts);
+ int res;
+ do {
+ res = dav1d_decode(p_sys->c, p_data, &img);
+
+ if (res == 0)
+ {
+ picture_t *pic = img.allocator_data;
+ pic->b_progressive = true; /* codec does not support interlacing */
+ pic->date = timestamp_FifoGet(p_sys->ts_fifo);
+ /* TODO udpate the color primaries and such */
+ picture_Hold(pic);
+ decoder_QueueVideo(dec, pic);
+ dav1d_picture_unref(&img);
+
+ if (p_data && p_data->sz == 0)
+ {
+ p_data = NULL; /* no more data, continue until we get EAGAIN */
+ }
+ }
+ else if (res != -EAGAIN)
+ {
+ msg_Err(dec, "Decoder error %d!", res);
+ i_ret = VLC_EGENERIC;
+ break;
+ }
+ } while (res == 0 || (p_data && p_data->sz != 0));
+
+
+ return i_ret;
+}
+
+/*****************************************************************************
+ * OpenDecoder: probe the decoder
+ *****************************************************************************/
+static int OpenDecoder(vlc_object_t *p_this)
+{
+ decoder_t *dec = (decoder_t *)p_this;
+
+ if (dec->fmt_in.i_codec != VLC_CODEC_AV1)
+ return VLC_EGENERIC;
+
+ decoder_sys_t *p_sys = vlc_obj_malloc(p_this, sizeof(*p_sys));
+ if (!p_sys)
+ return VLC_ENOMEM;
+
+ dav1d_default_settings(&p_sys->s);
+ p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
+ if (p_sys->s.n_tile_threads == 0)
+ p_sys->s.n_tile_threads = VLC_CLIP(vlc_GetCPUCount(), 1, 4);
+ p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
+ if (p_sys->s.n_frame_threads == 0)
+ p_sys->s.n_frame_threads = __MAX(1, vlc_GetCPUCount());
+ p_sys->s.allocator.cookie = dec;
+ p_sys->s.allocator.alloc_picture_callback = NewPicture;
+ p_sys->s.allocator.release_picture_callback = FreePicture;
+
+ p_sys->ts_fifo = timestamp_FifoNew( 32 );
+ if (unlikely(p_sys->ts_fifo == NULL))
+ return VLC_EGENERIC;
+
+ if (dav1d_open(&p_sys->c, &p_sys->s) < 0)
+ {
+ msg_Err(p_this, "Could not open the Dav1d decoder");
+ return VLC_EGENERIC;
+ }
+
+ msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
+ dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
+
+ dec->pf_decode = Decode;
+ dec->pf_flush = FlushDecoder;
+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
+
+ dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
+ dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
+ dec->fmt_out.i_codec = VLC_CODEC_I420;
+ dec->p_sys = p_sys;
+
+ if (dec->fmt_in.video.i_sar_num > 0 && dec->fmt_in.video.i_sar_den > 0) {
+ dec->fmt_out.video.i_sar_num = dec->fmt_in.video.i_sar_num;
+ dec->fmt_out.video.i_sar_den = dec->fmt_in.video.i_sar_den;
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CloseDecoder: decoder destruction
+ *****************************************************************************/
+static void CloseDecoder(vlc_object_t *p_this)
+{
+ decoder_t *dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = dec->p_sys;
+
+ /* Flush decoder */
+ FlushDecoder(dec);
+
+ timestamp_FifoRelease(p_sys->ts_fifo);
+
+ dav1d_close(&p_sys->c);
+}
+
--
2.17.1
More information about the vlc-devel
mailing list