From patchwork Tue May 29 02:53:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9148 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2588123jad; Mon, 28 May 2018 19:53:18 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIJWHrzKfJJgymNC94vdoziEKPPTrFaUCOKmcmGxQe3287jxfakMeLgDXn2WiDnEcLKSdWr X-Received: by 2002:a1c:c86:: with SMTP id 128-v6mr9106493wmm.18.1527562398717; Mon, 28 May 2018 19:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527562398; cv=none; d=google.com; s=arc-20160816; b=LUVHNks0V0EYL5QgchaPB9t5GPXLONrPo6fhXcqc73q/dKlgshwyht4TbIbaLTTUnO ikTXWv6m4xaZp7EGjrDpdCl4Axctq6/GJU4mL605DTuYgYaCnS3cSIIVpHiTooER4pD5 2qfs8H6xB855YZF6Ra2aUoC1bdDIEZ4AJETJpXdBXrgR8D9EbZkoLISXH6oNAEvprn+4 zpMLIUrr/2L3ksjNNQassXfEL18ubpaUfzq8K8kjE2IOKxFsXvK9v4hB+Ex730RYVlwm YidBURFz+Ba76OeYHzWnL7TrExyoq/ThiIjShMVIjbrzX3uvk+tyA2vltk+wvWw4ejEc SXUA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=KhT5O1m3LeIb0/oeFREnYnFhoNn/5JIO97cvK/7P9PY=; b=sMCc4RP1cR3s5//pbxpZinsfVUPitvQ6ydyQtUQ9QNS6fXjZIIExi2ZLrDiKVhUtEG 5h+uH9p7j7GtnKgLaK4sRsc7uMexlo2Pfrx23rJVazHq++DL2hvF+3AYhAoX3C1TQyX+ rRCu0ED104t1l9BoLf5oPEQe/VCaDbY7WyA0qTJ8UQwTQrGaV/tz/VITosMXKru90iYt 8a4hMsyUHYoKl14D1h0HWWQ0fz4HaLgdPUSbsyQyrQecFskyFaQsLtb4XJyEr9AOjLsH oZkWjHXHV2UQFpVYgdax+STM2eH0ko/+lv2G9s0qtg8R9YhFTrE4vS/J2De3r2loYDiD xq4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=CxzAmCTB; 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 y51-v6si27811709wrc.147.2018.05.28.19.53.17; Mon, 28 May 2018 19:53:18 -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=CxzAmCTB; 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 2EC95689C4C; Tue, 29 May 2018 05:52:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-112.126.com (m15-112.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22108689A49 for ; Tue, 29 May 2018 05:52:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=bUQWePYp1ZwCWSF+c4 DoeSAdV1VOIql/oLto7nVElj4=; b=CxzAmCTBJWUTL1Y/PEwu7bycXpnTkmMU5N XtlSbiRXv2MUPXESxMusiXI5nuKqQCqO/JjyW24rHNQQwvRymMu+Iuap9bGPGfRv XrKAcHUfpHvnTafjrfkWTdk1vcwhWWTdGp1O0nQagTJO74uL9YadV9RNQJmh1GAJ ixUFS1WEo= Received: from localhost.localdomain (unknown [223.71.83.120]) by smtp2 (Coremail) with SMTP id DMmowAC3AaaRwAxb6qp+Bw--.49340S3; Tue, 29 May 2018 10:53:05 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 May 2018 10:53:05 +0800 Message-Id: <1527562385-4590-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DMmowAC3AaaRwAxb6qp+Bw--.49340S3 X-Coremail-Antispam: 1Uf129KBjvJXoW3tF4DKFWrtryfKw45ur1kGrg_yoWDZw4kpF 43Ar9xJF1UJ3Z3Ar4xJr1FyayrGrWkWa18K3y2vry0g34rZryjqrn7tFyrCas29FWqya47 ZF4DKFyUuw1UK3DanT9S1TB71UUUUbJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b42-5UUUUU= X-Originating-IP: [223.71.83.120] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiDxFV6VpD5cTMeAAAsu Subject: [FFmpeg-devel] [PATCH 2/3] lavc, doc, configure: add avs2 decoder via libdavs2 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/general.texi | 8 ++ libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libdavs2.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 222 insertions(+) create mode 100644 libavcodec/libdavs2.c diff --git a/Changelog b/Changelog index 3d25564..ce1f97c 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ version : - aderivative and aintegral audio filters - pal75bars and pal100bars video filter sources - support mbedTLS based TLS +- AVS2 video decoder via libdavs2 version 4.0: diff --git a/configure b/configure index 09ff0c5..e2ac9f6 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] @@ -1636,6 +1637,7 @@ EXTERNAL_LIBRARY_GPL_LIST=" avisynth frei0r libcdio + libdavs2 librubberband libvidstab libx264 @@ -3042,6 +3044,7 @@ libaom_av1_encoder_deps="libaom" libcelt_decoder_deps="libcelt" libcodec2_decoder_deps="libcodec2" libcodec2_encoder_deps="libcodec2" +libdavs2_decoder_deps="libdavs2 gpl" libfdk_aac_decoder_deps="libfdk_aac" libfdk_aac_encoder_deps="libfdk_aac" libfdk_aac_encoder_select="audio_frame_queue" @@ -5992,6 +5995,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.2.34" davs2.h davs2_decoder_decode 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/general.texi b/doc/general.texi index 2583006..d3c1503 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -17,6 +17,14 @@ 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 libdavs2 library for AVS2 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. + @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 3ab071a..2a845f1 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 7b7a8c7..6103081 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -705,6 +705,7 @@ extern AVCodec ff_libx264_encoder; extern AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder; extern AVCodec ff_libxavs_encoder; +extern AVCodec ff_libdavs2_decoder; extern AVCodec ff_libxvid_encoder; extern AVCodec ff_libzvbi_teletext_decoder; diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c new file mode 100644 index 0000000..ef222cf --- /dev/null +++ b/libavcodec/libdavs2.c @@ -0,0 +1,207 @@ +/* + * 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 + +typedef struct DAVS2Context { + AVCodecContext *avctx; + + 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 int ff_davs2_init(AVCodecContext *avctx) +{ + DAVS2Context *cad = avctx->priv_data; + + /* init the decoder */ + cad->param.threads = 0; + cad->param.i_info_level = 0; + cad->decoder = davs2_decoder_open(&cad->param); + avctx->flags |= AV_CODEC_FLAG_TRUNCATED; + + av_log(avctx, AV_LOG_VERBOSE, "decoder created. 0x%p\n", cad->decoder); + return 0; +} + +/* --------------------------------------------------------------------------- + */ +static int DumpFrames(AVCodecContext *avctx, davs2_picture_t *pic, davs2_seq_info_t *headerset, AVFrame *frm) +{ + DAVS2Context *cad = avctx->priv_data; + avctx->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (!headerset) + return 0; + + if (!pic || pic->ret_type == DAVS2_GOT_HEADER) { + avctx->width = headerset->horizontal_size; + avctx->height = headerset->vertical_size; + avctx->pix_fmt = (headerset->output_bitdepth == 10 ? AV_PIX_FMT_YUV420P10 : AV_PIX_FMT_YUV420P); + + AVRational r = av_d2q(headerset->frame_rate,4096); + avctx->framerate.num = r.num; + avctx->framerate.den = r.den; + return 0; + } + + const int bytes_per_sample = pic->bytes_per_sample; + + for (int i = 0; i < 3; ++i) { + int size_plane = pic->width[i] * pic->lines[i] * bytes_per_sample; + frm->buf[i] = av_buffer_alloc(size_plane); + frm->data[i] = frm->buf[i]->data; + frm->linesize[i] = pic->width[i] * bytes_per_sample; + if(!frm->buf[i] || !frm->data[i] || !frm->linesize[i]){ + av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n"); + return AVERROR(EINVAL); + } + memcpy(frm->data[i], pic->planes[i], size_plane); + } + + frm->width = cad->headerset.horizontal_size; + frm->height = cad->headerset.vertical_size; + frm->pts = cad->out_frame.pts; + frm->pict_type = pic->type; + frm->format = avctx->pix_fmt; + + cad->decoded_frames++; + return 1; +} + +static int ff_davs2_end(AVCodecContext *avctx) +{ + DAVS2Context *cad = avctx->priv_data; + + /* close the decoder */ + if (cad->decoder) { + davs2_decoder_close(cad->decoder); + av_log(avctx, AV_LOG_VERBOSE, "decoder destroyed. 0x%p; frames %d\n", cad->decoder, cad->decoded_frames); + 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; + const uint8_t *buf_ptr = avpkt->data; + AVFrame *frm = data; + int ret = 0; + + *got_frame = 0; + cad->frame = frm; + avctx->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (buf_size == 0) { + cad->packet.data = buf_ptr; + cad->packet.len = buf_size; + cad->packet.pts = avpkt->pts; + cad->packet.dts = avpkt->dts; + + for (;;) { + ret = davs2_decoder_flush(cad->decoder, &cad->headerset, &cad->out_frame); + + if (ret < 0) + return 0; + + if (cad->out_frame.ret_type != DAVS2_DEFAULT) { + *got_frame = DumpFrames(avctx, &cad->out_frame, &cad->headerset, frm); + davs2_decoder_frame_unref(cad->decoder, &cad->out_frame); + } + if(*got_frame == 1) + break; + } + return 0; + } else { + for(; buf_size > 0;) { + int len = buf_size; // for API-3, pass all data in + + cad->packet.marker = 0; + cad->packet.data = buf_ptr; + cad->packet.len = len; + cad->packet.pts = avpkt->pts; + cad->packet.dts = avpkt->dts; + + len = davs2_decoder_decode(cad->decoder, &cad->packet, &cad->headerset, &cad->out_frame); + + if (cad->out_frame.ret_type != DAVS2_DEFAULT) { + *got_frame = DumpFrames(avctx, &cad->out_frame, &cad->headerset, frm); + davs2_decoder_frame_unref(cad->decoder, &cad->out_frame); + } + + if (len < 0) { + av_log(avctx, AV_LOG_ERROR, "A decoder error counted\n"); + if (cad->decoder) { + davs2_decoder_close(cad->decoder); + av_log(avctx, AV_LOG_VERBOSE, "decoder destroyed. 0x%p; frames %d\n", cad->decoder, cad->decoded_frames); + cad->decoder = NULL; + } + return AVERROR(EINVAL); + } + + buf_ptr += len; + buf_size -= len; + + if(*got_frame == 1) + break; + } + } + + buf_size = (buf_ptr - avpkt->data); + + 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 = ff_davs2_init, + .close = ff_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 }, +};