From patchwork Mon Jul 16 07:21:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9734 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2026360jad; Mon, 16 Jul 2018 00:52:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe80DQaXGTT2kigXm0V9CX1lPoC4rZIM0MwU/ywU0kUQtvuIYFs9if1edBCxD+Rf+WoBBNU X-Received: by 2002:a1c:d946:: with SMTP id q67-v6mr8915688wmg.156.1531727557821; Mon, 16 Jul 2018 00:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531727557; cv=none; d=google.com; s=arc-20160816; b=XSHfERZXW7Bu/4tClukOYDtLRCEYWXOyC422e3i7WHUhpZ0fvwtU9RjzBi5k+6hSLl r0miFr0z+PfJvKon/AJOMiO+KXhTQfuJxZ7egVNUpx1TJkA+5vy4VBAmCzqbmMmbmsgx Fcrv7wKJmbIbcGEepWw/TZTtrTBKLonGQkVXRqJAD0QwV6dj8Q8WdkEME2k+jvBqwqjX MePPoIriRLFd/uJkWKY2Gy6hIboOh+hWRGATL7O9LfUnHKKT0m+5pTgIJZIFeR0eV+1D lFu6LNbrkbuYswViInUpfcstWsLR0A29mVhhVPaEGxBLUOdqT9Sl+ImEji3jRcjdrEVE /u1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=PrUiOcv++xbHS8Mt4UgXJfnd+e8xu6NmC4LR2gQsm3I=; b=zbsy4Arpk6YL/hc5q6yeTHQBiqbcVqeYfhdJCVIlQdacSPcdUb9XGBE9EDu1V1oDgn jPHeQaDHkYvsX2DFRnurQNhRy2j6NboDWZbE8g7BfZoPQx1kwY4gYcmxeJtCuHkDaCkm Xhw3/IiWty0X6iul6cfTfy7ubIovxdg67SUP+38eVMJ1WeUKssJT9XacmiX1dwTSYmw+ thERCjbBRTFnvMEnMQr6+sq9ZeAhQz8yzoNLEyZr6E5RZ4AYvhkpUviajrieyBIyJP15 OcGRnYHzU7qlwjCaMWob8r3qZcVooR+cK29pOTK9pVMNfsh6gaizMa/hz0hRiBM1AWmo kjiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b="H/+AOX1R"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p12-v6si22067618wrd.67.2018.07.16.00.52.37; Mon, 16 Jul 2018 00:52:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b="H/+AOX1R"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAA2568A667; Mon, 16 Jul 2018 10:52:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6D1D68A617 for ; Mon, 16 Jul 2018 10:52:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=gRJINUEPPGsHEfDfyS rGNmuxJ9ZtgOuZPB8AxZtxHFM=; b=H/+AOX1R9Fn1bxaxsXKH1z3C68D7iuVfGH 1j2eB71jycdZnXa7TJ06j7SU2bP/Hw8X0hP/Xkan1mAiuDwOdiORPAzpUaYwWIrB 0szNtmNt1eIZaqVo2x+CPu9mLEihbARNxtSXqnd41KJ69832ilpgfBhGkFwic9dY Mbg++CVsU= Received: from localhost.localdomain (unknown [223.71.83.101]) by smtp3 (Coremail) with SMTP id DcmowAB3v69nR0xb9S_0Cw--.59638S5; Mon, 16 Jul 2018 15:21:12 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jul 2018 15:21:09 +0800 Message-Id: <1531725669-24563-4-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531725669-24563-2-git-send-email-hwrenx@126.com> References: <1531725669-24563-2-git-send-email-hwrenx@126.com> X-CM-TRANSID: DcmowAB3v69nR0xb9S_0Cw--.59638S5 X-Coremail-Antispam: 1Uf129KBjvJXoW3tF4DGr1xXrW3Xr4kCr15Jwb_yoWDAFyfpF W7Cr98JF1UJ3Z3ArZ7Ar1rtay5G3ykWa18Kw4Ivr10934FkFyjqrs2yFy3u3Z2vFWq9343 Za1kKa4Uur1DKaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b0fO7UUUUU= X-Originating-IP: [223.71.83.101] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZwiF6VpD57NfcgAAsj Subject: [FFmpeg-devel] [PATCH v9 3/3] lavc, doc, configure: add avs2 video decoder wrapper X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- Changelog | 1 + configure | 4 ++ doc/decoders.texi | 6 ++ doc/general.texi | 14 ++++ libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libdavs2.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 204 insertions(+) create mode 100644 libavcodec/libdavs2.c diff --git a/Changelog b/Changelog index d8e2811..ec65f43 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,7 @@ version : - adeclip filter - libtensorflow backend for DNN based filters like srcnn - vc1 decoder is now bit-exact +- AVS2 video decoder via libdavs2 version 4.0: diff --git a/configure b/configure index 0e8e8a6..845b13b 100755 --- a/configure +++ b/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-libdavs2 enable AVS2 decoding via libdavs2 [no] --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [no] --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] @@ -1638,6 +1639,7 @@ EXTERNAL_LIBRARY_GPL_LIST=" avisynth frei0r libcdio + libdavs2 librubberband libvidstab libx264 @@ -3048,6 +3050,7 @@ libaom_av1_encoder_deps="libaom" libcelt_decoder_deps="libcelt" libcodec2_decoder_deps="libcodec2" libcodec2_encoder_deps="libcodec2" +libdavs2_decoder_deps="libdavs2" libfdk_aac_decoder_deps="libfdk_aac" libfdk_aac_encoder_deps="libfdk_aac" libfdk_aac_encoder_select="audio_frame_queue" @@ -6001,6 +6004,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && 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 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 enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || diff --git a/doc/decoders.texi b/doc/decoders.texi index 8f07bc1..9439b7b 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -47,6 +47,12 @@ top-field-first is assumed @end table +@section libdavs2 + +AVS2/IEEE 1857.4 video decoder wrapper. + +This decoder allows libavcodec to decode AVS2 streams with davs2 library. + @c man end VIDEO DECODERS @chapter Audio Decoders diff --git a/doc/general.texi b/doc/general.texi index 8c3a04b..cd725bb 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -17,6 +17,20 @@ for more formats. None of them are used by default, their use has to be explicitly requested by passing the appropriate flags to @command{./configure}. +@section libdavs2 + +FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding. + +Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for +installing the library. Then pass @code{--enable-libdavs2} to configure to +enable it. + +@float NOTE +libdavs2 is under the GNU Public License Version 2 or later +(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for +details), you must upgrade FFmpeg's license to GPL in order to use it. +@end float + @section Alliance for Open Media libaom FFmpeg can make use of the libaom library for AV1 decoding. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6b6d6de..5135b97 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -944,6 +944,7 @@ OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o 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_LIBDAVS2_DECODER) += libdavs2.o OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 90d170b..a59b601 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -667,6 +667,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_libdavs2_decoder; extern AVCodec ff_libfdk_aac_encoder; extern AVCodec ff_libfdk_aac_decoder; extern AVCodec ff_libgsm_encoder; diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c new file mode 100644 index 0000000..12db1f9 --- /dev/null +++ b/libavcodec/libdavs2.c @@ -0,0 +1,177 @@ +/* + * AVS2 decoding using the davs2 library + * + * Copyright (C) 2018 Yiqun Xu, + * Falei Luo, + * Huiwen Ren, + * + * 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 "libavutil/avassert.h" +#include "libavutil/common.h" +#include "libavutil/avutil.h" +#include "avcodec.h" +#include "libavutil/imgutils.h" +#include "internal.h" + +#include "davs2.h" + +typedef struct DAVS2Context { + void *decoder; + + AVFrame *frame; + davs2_param_t param; // decoding parameters + davs2_packet_t packet; // input bitstream + + int decoded_frames; + + davs2_picture_t out_frame; // output data, frame data + davs2_seq_info_t headerset; // output data, sequence header + +}DAVS2Context; + +static av_cold int davs2_init(AVCodecContext *avctx) +{ + DAVS2Context *cad = avctx->priv_data; + + /* init the decoder */ + cad->param.threads = avctx->thread_count; + cad->param.info_level = 0; + cad->decoder = davs2_decoder_open(&cad->param); + + if (!cad->decoder) { + av_log(avctx, AV_LOG_ERROR, "decoder created error."); + return AVERROR(EINVAL); + } + + av_log(avctx, AV_LOG_VERBOSE, "decoder created. %p\n", cad->decoder); + return 0; +} + +static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, + davs2_seq_info_t *headerset, int ret_type, AVFrame *frame) +{ + DAVS2Context *cad = avctx->priv_data; + int bytes_per_sample = pic->bytes_per_sample; + int plane = 0; + int line = 0; + + if (!headerset) + return 0; + + if (!pic || ret_type == DAVS2_GOT_HEADER) { + avctx->width = headerset->width; + avctx->height = headerset->height; + avctx->pix_fmt = headerset->output_bit_depth == 10 ? + AV_PIX_FMT_YUV420P10 : AV_PIX_FMT_YUV420P; + + avctx->framerate = av_d2q(headerset->frame_rate,4096); + return 0; + } + + for (plane = 0; plane < 3; ++plane) { + int size_line = pic->widths[plane] * bytes_per_sample; + frame->buf[plane] = av_buffer_alloc(size_line * pic->lines[plane]); + + if (!frame->buf[plane]){ + av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n"); + return AVERROR(EINVAL); + } + + frame->data[plane] = frame->buf[plane]->data; + frame->linesize[plane] = pic->widths[plane]; + + for (line = 0; line < pic->lines[plane]; ++line) + memcpy(frame->data[plane] + line * size_line, + pic->planes[plane] + line * pic->strides[plane], + pic->widths[plane] * bytes_per_sample); + } + + frame->width = cad->headerset.width; + frame->height = cad->headerset.height; + frame->pts = cad->out_frame.pts; + frame->pict_type = pic->type; + frame->format = avctx->pix_fmt; + + cad->decoded_frames++; + return 1; +} + +static av_cold int davs2_end(AVCodecContext *avctx) +{ + DAVS2Context *cad = avctx->priv_data; + + /* close the decoder */ + if (cad->decoder) { + davs2_decoder_close(cad->decoder); + cad->decoder = NULL; + } + + return 0; +} + +static int davs2_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + DAVS2Context *cad = avctx->priv_data; + int buf_size = avpkt->size; + uint8_t *buf_ptr = avpkt->data; + AVFrame *frame = data; + int ret = DAVS2_DEFAULT; + + if (!buf_size) { + return 0; + } + + cad->packet.data = buf_ptr; + cad->packet.len = buf_size; + cad->packet.pts = avpkt->pts; + cad->packet.dts = avpkt->dts; + + ret = davs2_decoder_send_packet(cad->decoder, &cad->packet); + + + if (ret == DAVS2_ERROR) { + av_log(avctx, AV_LOG_ERROR, "Decoder error: can't read packet\n"); + return AVERROR(EINVAL); + } + + ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame); + + if (ret != DAVS2_DEFAULT) { + *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame); + davs2_decoder_frame_unref(cad->decoder, &cad->out_frame); + } + + return buf_size; +} + +AVCodec ff_libdavs2_decoder = { + .name = "libdavs2", + .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_AVS2, + .priv_data_size = sizeof(DAVS2Context), + .init = davs2_init, + .close = davs2_end, + .decode = davs2_decode_frame, + .capabilities = AV_CODEC_CAP_DELAY,//AV_CODEC_CAP_DR1 | + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE }, + .wrapper_name = "libdavs2", +};