From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7257E43E81 for ; Fri, 18 Aug 2023 05:44:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2161768C5B0; Fri, 18 Aug 2023 08:44:44 +0300 (EEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 563BB68BE33 for ; Fri, 18 Aug 2023 08:44:37 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230818054434euoutp016432783f8934e7fc81e5ceec38c517a0~8Y-dr45Cj0635106351euoutp01S for ; Fri, 18 Aug 2023 05:44:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230818054434euoutp016432783f8934e7fc81e5ceec38c517a0~8Y-dr45Cj0635106351euoutp01S DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1692337474; bh=SC+o/mSDjogyZKimrREMwN1alaVssdjJzLVgvDDbZcU=; h=From:To:In-Reply-To:Subject:Date:References:From; b=THOB97ijYd5bRi6HEYvZkA7F0aIhmJpZZZLjkWqHspYtWGo2kosDTgNunWSh1wG6g +Zk+hHhRgFTg1bgnII9t3lwnwV7MSXsNIPPrHBRpt5q6oti+XNQu+5QsYXp8yamIMe rHNuBTCfzbecwfDnFQUkdfvLeQ6GvM6R2INrwQOU= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230818054434eucas1p190003f53690812ad4359715b24eed890~8Y-diiMmk2286422864eucas1p10 for ; Fri, 18 Aug 2023 05:44:34 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 9C.42.11320.1450FD46; Fri, 18 Aug 2023 06:44:33 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230818054433eucas1p1bae570956861f01ddd7c93c6a2cef1b0~8Y-cwYxY70772907729eucas1p1t for ; Fri, 18 Aug 2023 05:44:33 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230818054433eusmtrp20e598f8409b7232556634d690ac6ffc0~8Y-cv8peN0302503025eusmtrp2J for ; Fri, 18 Aug 2023 05:44:33 +0000 (GMT) X-AuditID: cbfec7f4-97dff70000022c38-e4-64df05414c36 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BC.E4.10549.1450FD46; Fri, 18 Aug 2023 06:44:33 +0100 (BST) Received: from AMDN5164 (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230818054432eusmtip16abe6b27a476afe8fb43bf5f775f832b~8Y-cbLupx1439114391eusmtip1M for ; Fri, 18 Aug 2023 05:44:32 +0000 (GMT) From: "Dawid Kozinski/Multimedia \(PLT\) /SRPOL/Staff Engineer/Samsung Electronics" To: "'FFmpeg development discussions and patches'" In-Reply-To: <6820e99f-2795-5854-5a3b-a6923ec88537@gmail.com> Date: Fri, 18 Aug 2023 07:44:32 +0200 Message-ID: <029f01d9d197$106cc150$314643f0$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQIDsl9rnjgUsuFijP+mK+WhsT2VNgE/Rk07AdwdxTGvguyuMA== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87qOrPdTDJYtsbH49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4MuZ1XmAq2PeCqeLu2vAGxrb7TF2MHBwSAiYScw5xdTFycQgJ rGCUmL7iExuEM4lJYsHc70wQzkQmibN3J7B0MXKCdTw4voAFIrGcUeLlp61QLW1MErcvL2MF qWITyJN4/HktM4gtIuAj0b1+PVicU8BWYtP+xWC2sECyxLvHq9lBbBYBVYkX7QfB4rwClhJv ljexQNiCEidnPgGzmQX0JJ6dmgVla0ssW/iaGeIiBYmfTyH2igg4SeyZ1cAKUSMiceNRCyPI cRICUzkkHrzYyQTR4CJxrXMBVLOwxKvjW9ghbBmJ/zvnQwOmWOJQvwOEWSNx6Ec6RIW1xNvG 44wQtqPEn6/nWSBK+CRuvBWE2MonMWnbdGaIMK9ER5sQhKki0dcpBtEoJfF02RzmCYxKs5C8 OAvJi7OQvDgLySsLGFlWMYqnlhbnpqcWG+WllusVJ+YWl+al6yXn525iBKaH0/+Of9nBuPzV R71DjEwcjIcYJTiYlUR4LZjupQjxpiRWVqUW5ccXleakFh9ilOZgURLn1bY9mSwkkJ5Ykpqd mlqQWgSTZeLglGpgcoo7u0PaxWP+EZ7F3ovsGatylSoZGE0/zDdZbjap9ZfzfKWM01OOXzaR +C15w2I7r27KYqZbE/OWJj9uz0tzy/lsfqY1Lmb3y6cGX+sv573x4zxWxCtydp3LSWN55ts8 85fL9rtylLQKSu5rsg/wUyrQOD+voWNJePqRHdXMd7Xkb279yHHJ313hir+4av3j+Xecg+/d 4BfsFnMqT7F2P173SFsw5NDKhnW/Pz7bznHZg33B98hZ2e8OMKYwPvzm91awPOla2xnN/oxl wleOLJed0d5ysW5m/2GJZJP2Xcudn/nKveu0/v7FzZTvbPavtwIhq/736D9um69j9HXr5NwH P3tTPpg4dgWvy5VUYinOSDTUYi4qTgQAt8ZXPX4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeLIzCtJLcpLzFFi42I5/e/4XV1H1vspBktWclh8+3SG2YHR48+i zSwBjFF6NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6 GQ07/rEW/LrBWPH51EG2Bsb5sxi7GDk5JARMJB4cX8DSxcjFISSwlFGicd8nZoiElMTSpYug ioQl/lzrYoMoamGSeDl5CTtIgk0gR2Lt7IlMILaIgI9E9/r1rBBFexklpmxZBZbgFLCV2LR/ MSuILSyQKPHlxGQ2EJtFQFXiRftBsDivgKXEm+VNLBC2oMTJmU/AbGYBA4klC38xQdjaEssW voa6TkHi59NlrBCLnST2zGpghagRkbjxqIVxAqPQLCSjZiEZNQvJqFlIWhYwsqxiFEktLc5N zy021CtOzC0uzUvXS87P3cQIjIxtx35u3sE479VHvUOMTByMhxglOJiVRHgtmO6lCPGmJFZW pRblxxeV5qQWH2I0BfptIrOUaHI+MDbzSuINzQxMDU3MLA1MLc2MlcR5PQs6EoUE0hNLUrNT UwtSi2D6mDg4pRqY9nHfOlFrKrd+ed3qa82x3hy6a9pXhsmdnfbhxP/+lnDNGxzb7zvd33lh 7lOjTa0TXqj9btKf8EDhQewKN6+wU6HxDmv/bz7z/Nrs6M6bzpF/GQVLN08WbEt9lSL0Qlld XnhZzZeNqnPdbvUKbM4PNf7At/LEl9sH1crsHR7r5T/++7bk1B/XZsl2TuE93a8jUmWn3nm+ ajrPlR37mpOM1hvmN906qLficr/yda4k5yesQc1PXi+c+n9pg7Z24PrPL03ELbe9/lfE2pmQ /GFdC9PS88fe8p5/+T7/sROzwoXE1rKJjy6ZOjgpHl4wsZfnS9/yzxwzGecu8/6sbeU02ZtX cfbUa9PapY/JvOmZtlCJpTgj0VCLuag4EQB1q3toFQMAAA== X-CMS-MailID: 20230818054433eucas1p1bae570956861f01ddd7c93c6a2cef1b0 X-Msg-Generator: CA X-RootMTR: 20230615114825eucas1p2495afa9fbc31ec087d6d5fe59d656857 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615114825eucas1p2495afa9fbc31ec087d6d5fe59d656857 References: <20230615114817.1905-1-d.kozinski@samsung.com> <6820e99f-2795-5854-5a3b-a6923ec88537@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH v26 5/9] avcodec/evc_decoder: Provided support for EVC decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpeg-devel On Behalf Of James > Almer > Sent: =B6roda, 26 lipca 2023 17:46 > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v26 5/9] avcodec/evc_decoder: Provided > support for EVC decoder > = > On 6/15/2023 8:48 AM, Dawid Kozinski wrote: > > - Added EVC decoder wrapper > > - Changes in project configuration file and libavcodec Makefile > > - Added documentation for xevd wrapper > > > > Signed-off-by: Dawid Kozinski > = > I'm getting > = > [evc @ 000001ee1ba7e960] An invalid frame was output by a decoder. This is a > bug, please report it. > [vist#0:0/evc @ 000001ee1d47f220] Decoding error: Internal bug, should not > have happened > = > With akiyo_cif.evc, so there's something wrong. Done. I've fixed that. The change has been pushed to a new patchset (v27) containing implementations of EVC encoder and decoder wrappers. = The remaining things you mentioned below have also been taken into account. > = > > --- > > configure | 4 + > > doc/decoders.texi | 24 ++ > > doc/general_contents.texi | 10 +- > > libavcodec/Makefile | 1 + > > libavcodec/allcodecs.c | 1 + > > libavcodec/libxevd.c | 479 ++++++++++++++++++++++++++++++++++++++ > > 6 files changed, 518 insertions(+), 1 deletion(-) > > create mode 100644 libavcodec/libxevd.c > > > > diff --git a/configure b/configure > > index e2370a23bb..cae3b666a5 100755 > > --- a/configure > > +++ b/configure > > @@ -293,6 +293,7 @@ External library support: > > --enable-libx264 enable H.264 encoding via x264 [no] > > --enable-libx265 enable HEVC encoding via x265 [no] > > --enable-libxeve enable EVC encoding via libxeve [no] > > + --enable-libxevd enable EVC decoding via libxevd [no] > > --enable-libxavs enable AVS encoding via xavs [no] > > --enable-libxavs2 enable AVS2 encoding via xavs2 [no] > > --enable-libxcb enable X11 grabbing using XCB [autodetect] > > @@ -1904,6 +1905,7 @@ EXTERNAL_LIBRARY_LIST=3D" > > libvorbis > > libvpx > > libwebp > > + libxevd > > libxeve > > libxml2 > > libzimg > > @@ -3460,6 +3462,7 @@ libx265_encoder_deps=3D"libx265" > > libx265_encoder_select=3D"atsc_a53" > > libxavs_encoder_deps=3D"libxavs" > > libxavs2_encoder_deps=3D"libxavs2" > > +libxevd_decoder_deps=3D"libxevd" > > libxeve_encoder_deps=3D"libxeve" > > libxvid_encoder_deps=3D"libxvid" > > libzvbi_teletext_decoder_deps=3D"libzvbi" > > @@ -6835,6 +6838,7 @@ enabled libx265 && require_pkg_config > libx265 x265 x265.h x265_api_get > > require_cpp_condition libx265 x265.h "X265_BUILD >=3D 89" > > enabled libxavs && require libxavs "stdint.h xavs.h" > xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" > > enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >=3D 1.3.0" > "stdint.h xavs2.h" xavs2_api_get > > +enabled libxevd && require_pkg_config libxevd "xevd >=3D 0.4= .1" "xevd.h" > xevd_decode > > enabled libxeve && require_pkg_config libxeve "xeve >=3D 0.4.3" "xeve.h" > xeve_encode > > enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore > > enabled libzimg && require_pkg_config libzimg "zimg >=3D 2.7.0" zimg.h > zimg_get_api_version > > diff --git a/doc/decoders.texi b/doc/decoders.texi index > > 09b8314dd2..6311af229f 100644 > > --- a/doc/decoders.texi > > +++ b/doc/decoders.texi > > @@ -130,6 +130,30 @@ Set amount of frame threads to use during > > decoding. The default value is 0 (auto > > > > @end table > > > > +@section libxevd > > + > > +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. > > + > > +This decoder requires the presence of the libxevd headers and library > > +during configuration. You need to explicitly configure the build with > > +@option{--enable-libxevd}. > > + > > +The xevd project website is at > @url{https://protect2.fireeye.com/v1/url?k=3Db6ce3a07-d7452f31-b6cfb148- > 74fe485cbff1-251589a888281453&q=3D1&e=3D49c754eb-4416-4e31-90e9- > ee8e7d469d1f&u=3Dhttps%3A%2F%2Fgithub.com%2Fmpeg5%2Fxevd%257D. > > + > > +@subsection Options > > + > > +The following options are supported by the libxevd wrapper. > > +The xevd-equivalent options or values are listed in parentheses for easy > migration. > > + > > +To get a more accurate and extensive documentation of the libxevd > > +options, invoke the command @code{xevd_app --help} or consult the libxevd > documentation. > > + > > +@table @option > > +@item threads (@emph{threads}) > > +Force to use a specific number of threads > > + > > +@end table > > + > > @section QSV Decoders > > > > The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, > > HEVC, diff --git a/doc/general_contents.texi > > b/doc/general_contents.texi index c6a997bfd6..8e08f5ebc3 100644 > > --- a/doc/general_contents.texi > > +++ b/doc/general_contents.texi > > @@ -351,6 +351,14 @@ Go to > @url{https://protect2.fireeye.com/v1/url?k=3D76721d6d-17f9085b-76739622- > 74fe485cbff1-6b070a322743d6be&q=3D1&e=3D49c754eb-4416-4e31-90e9- > ee8e7d469d1f&u=3Dhttps%3A%2F%2Fgithub.com%2Fmpeg5%2Fxeve%257D and > follow the instructions for > > installing the XEVE library. Then pass @code{--enable-libxeve} to configure to > > enable it. > > > > +@section eXtra-fast Essential Video Decoder (XEVD) > > + > > +FFmpeg can make use of the XEVD library for EVC video decoding. > > + > > +Go to > > +@url{https://protect2.fireeye.com/v1/url?k=3D3be9a12a-5a62b41c-3be82a65 > > +-74fe485cbff1-6cd6af142a668aff&q=3D1&e=3D49c754eb-4416-4e31-90e9- > ee8e7d469d1f&u=3Dhttps%3A%2F%2Fgithub.com%2Fmpeg5%2Fxevd%257D and > follow the instructions for installing the XEVD library. Then pass @code{-- > enable-libxevd} to configure to enable it. > > + > > @section ZVBI > > > > ZVBI is a VBI decoding library which can be used by FFmpeg to decode > > DVB @@ -953,7 +961,7 @@ following image formats are supported: > > @item Escape 124 @tab @tab X > > @item Escape 130 @tab @tab X > > @item EVC / MPEG-5 Part 1 @tab X @tab X > > - @tab encoding and decoding supported through external library libxeve > > + @tab encoding and decoding supported through external libraries > > + libxeve and libxevd > > @item FFmpeg video codec #1 @tab X @tab X > > @tab lossless codec (fourcc: FFV1) > > @item Flash Screen Video v1 @tab X @tab X diff --git > > a/libavcodec/Makefile b/libavcodec/Makefile index > > 2223e9f46c..d0b8438717 100644 > > --- a/libavcodec/Makefile > > +++ b/libavcodec/Makefile > > @@ -1142,6 +1142,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) +=3D > libx264.o > > OBJS-$(CONFIG_LIBX265_ENCODER) +=3D libx265.o > > OBJS-$(CONFIG_LIBXAVS_ENCODER) +=3D libxavs.o > > OBJS-$(CONFIG_LIBXAVS2_ENCODER) +=3D libxavs2.o > > +OBJS-$(CONFIG_LIBXEVD_DECODER) +=3D libxevd.o > > OBJS-$(CONFIG_LIBXEVE_ENCODER) +=3D libxeve.o > > OBJS-$(CONFIG_LIBXVID_ENCODER) +=3D libxvid.o > > OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) +=3D libzvbi-teletextdec.o > ass.o > > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index > > c317dd6da3..eb0abbb1fd 100644 > > --- a/libavcodec/allcodecs.c > > +++ b/libavcodec/allcodecs.c > > @@ -819,6 +819,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; > > extern const FFCodec ff_libx264rgb_encoder; > > extern FFCodec ff_libx265_encoder; > > extern const FFCodec ff_libxeve_encoder; > > +extern const FFCodec ff_libxevd_decoder; > > extern const FFCodec ff_libxavs_encoder; > > extern const FFCodec ff_libxavs2_encoder; > > extern const FFCodec ff_libxvid_encoder; diff --git > > a/libavcodec/libxevd.c b/libavcodec/libxevd.c new file mode 100644 > > index 0000000000..7c4922d46e > > --- /dev/null > > +++ b/libavcodec/libxevd.c > > @@ -0,0 +1,479 @@ > > +/* > > + * libxevd decoder > > + * EVC (MPEG-5 Essential Video Coding) decoding using XEVD MPEG-5 EVC > > +decoder library > > + * > > + * Copyright (C) 2021 Dawid Kozinski > > + * > > + * 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 > > +#include > > + > > +#include > > + > > +#include "libavutil/internal.h" > > +#include "libavutil/common.h" > > +#include "libavutil/opt.h" > > +#include "libavutil/pixdesc.h" > > +#include "libavutil/pixfmt.h" > > +#include "libavutil/imgutils.h" > > +#include "libavutil/cpu.h" > > + > > +#include "avcodec.h" > > +#include "internal.h" > > +#include "packet_internal.h" > > +#include "codec_internal.h" > > +#include "profiles.h" > > +#include "decode.h" > > + > > +#define XEVD_PARAM_BAD_NAME -1 > > +#define XEVD_PARAM_BAD_VALUE -2 > > + > > +#define EVC_NAL_HEADER_SIZE 2 /* byte */ > > + > > +/** > > + * The structure stores all the states associated with the instance > > +of Xeve MPEG-5 EVC decoder */ typedef struct XevdContext { > > + const AVClass *class; > > + > > + XEVD id; // XEVD instance identifier @see xevd.h > > + XEVD_CDSC cdsc; // decoding parameters @see xevd.h > > + > > + // If end of stream occurs it is required "flushing" (aka draining) the codec, > > + // as the codec might buffer multiple frames or packets internally. > > + int draining_mode; // The flag is set if codec enters draining mode. > > + > > + AVPacket *pkt; > > +} XevdContext; > > + > > +/** > > + * The function populates the XEVD_CDSC structure. > > + * XEVD_CDSC contains all decoder parameters that should be initialized > before its use. > > + * > > + * @param[in] avctx codec context > > + * @param[out] cdsc contains all decoder parameters that should be > > +initialized before its use > > + * > > + */ > > +static void get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) { > > + int cpu_count =3D av_cpu_count(); > > + > > + /* clear XEVS_CDSC structure */ > > + memset(cdsc, 0, sizeof(XEVD_CDSC)); > > + > > + /* init XEVD_CDSC */ > > + if (avctx->thread_count <=3D 0) > > + cdsc->threads =3D (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : > XEVD_MAX_TASK_CNT; > > + else if (avctx->thread_count > XEVD_MAX_TASK_CNT) > > + cdsc->threads =3D XEVD_MAX_TASK_CNT; > > + else > > + cdsc->threads =3D avctx->thread_count; } > > + > > +/** > > + * Read NAL unit length > > + * @param bs input data (bitstream) > > + * @return the length of NAL unit on success, 0 value on failure */ > > +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, > > +AVCodecContext *avctx) { > > + uint32_t len =3D 0; > > + XEVD_INFO info; > > + int ret; > > + > > + if (bs_size =3D=3D XEVD_NAL_UNIT_LENGTH_BYTE) { > > + ret =3D xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); > > + return 0; > > + } > > + len =3D info.nalu_len; > > + if (len =3D=3D 0) { > > + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", > bs_size); > > + return 0; > > + } > > + } > > + > > + return len; > > +} > > + > > +/** > > + * @param[in] xectx the structure that stores all the state > > +associated with the instance of Xeve MPEG-5 EVC decoder > > + * @param[out] avctx codec context > > + * @return 0 on success, negative value on failure */ static int > > +export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) > > +{ > > + int ret; > > + int size; > > + int color_space; > > + > > + avctx->pix_fmt =3D AV_PIX_FMT_YUV420P10; > > + > > + size =3D 4; > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_CODED_WIDTH, &avctx- > >coded_width, &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_width\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_CODED_HEIGHT, &avctx- > >coded_height, &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_height\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_WIDTH, &avctx->width, > &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get width\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_HEIGHT, &avctx->height, > &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get height\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_COLOR_SPACE, > &color_space, &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get color_space\n"); > > + return AVERROR_EXTERNAL; > > + } > > + switch(color_space) { > > + case XEVD_CS_YCBCR400_10LE: > > + avctx->pix_fmt =3D AV_PIX_FMT_GRAY10LE; > > + break; > > + case XEVD_CS_YCBCR420_10LE: > > + avctx->pix_fmt =3D AV_PIX_FMT_YUV420P10LE; > > + break; > > + case XEVD_CS_YCBCR422_10LE: > > + avctx->pix_fmt =3D AV_PIX_FMT_YUV422P10LE; > > + break; > > + case XEVD_CS_YCBCR444_10LE: > > + avctx->pix_fmt =3D AV_PIX_FMT_YUV444P10LE; > > + break; > > + default: > > + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); > > + avctx->pix_fmt =3D AV_PIX_FMT_NONE; > > + return AVERROR_INVALIDDATA; > > + } > > + > > + // the function returns sps->num_reorder_pics > > + ret =3D xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, > &avctx->max_b_frames, &size); > > + if (XEVD_FAILED(ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + avctx->has_b_frames =3D (avctx->max_b_frames) ? 1 : 0; > > + > > + return 0; > > +} > > + > > +/** > > + * @brief Copy image in imgb to frame. > > + * > > + * @param avctx codec context > > + * @param[in] imgb > > + * @param[out] frame > > + * @return 0 on success, negative value on failure */ static int > > +libxevd_image_copy(struct AVCodecContext *avctx, XEVD_IMGB *imgb, > > +struct AVFrame *frame) { > > + int ret; > > + if (imgb->cs !=3D XEVD_CS_YCBCR420_10LE) { > > + av_log(avctx, AV_LOG_ERROR, "Not supported pixel format: %s\n", > av_get_pix_fmt_name(avctx->pix_fmt)); > > + return AVERROR_INVALIDDATA; > > + } > > + > > + if (imgb->w[0] !=3D avctx->width || imgb->h[0] !=3D avctx->height)= { // stream > resolution changed > > + if (ff_set_dimensions(avctx, imgb->w[0], imgb->h[0]) < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Cannot set new dimension\n"); > > + return AVERROR_INVALIDDATA; > > + } > > + } > > + > > + if (ret =3D ff_get_buffer(avctx, frame, 0) < 0) > > + return ret; > > + > > + av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a, > > + imgb->s, avctx->pix_fmt, > > + imgb->w[0], imgb->h[0]); > > + > > + return 0; > > +} > > + > > +/** > > + * Initialize decoder > > + * Create a decoder instance and allocate all the needed resources > > + * > > + * @param avctx codec context > > + * @return 0 on success, negative error code on failure */ static > > +av_cold int libxevd_init(AVCodecContext *avctx) { > > + XevdContext *xectx =3D avctx->priv_data; > > + XEVD_CDSC *cdsc =3D &(xectx->cdsc); > > + > > + /* read configurations and set values for created descriptor (XEVD_CDSC) > */ > > + get_conf(avctx, cdsc); > > + > > + /* create decoder */ > > + xectx->id =3D xevd_create(&(xectx->cdsc), NULL); > > + if (xectx->id =3D=3D NULL) { > > + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); > > + return AVERROR_EXTERNAL; > > + } > > + > > + xectx->draining_mode =3D 0; > > + xectx->pkt =3D av_packet_alloc(); > > + > > + return 0; > > +} > > + > > +/** > > + * Decode frame with decoupled packet/frame dataflow > > + * > > + * @param avctx codec context > > + * @param[out] frame decoded frame > > + * > > + * @return 0 on success, negative error code on failure > > + */ > > +static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame > > +*frame) { > > + XevdContext *xectx =3D avctx->priv_data; > > + AVPacket *pkt =3D xectx->pkt; > > + XEVD_IMGB *imgb =3D NULL; > > + > > + int xevd_ret =3D 0; > > + int ret =3D 0; > > + > > + if (!pkt) > > + return AVERROR(ENOMEM); > > + > > + // obtain input data > > + ret =3D ff_decode_get_packet(avctx, pkt); > > + if (ret < 0 && ret !=3D AVERROR_EOF) { > > + av_packet_unref(pkt); > > + > > + return ret; > > + } else if(ret =3D=3D AVERROR_EOF && xectx->draining_mode =3D=3D 0)= { // > > + End of stream situations. Enter draining mode > > + > > + xectx->draining_mode =3D 1; > > + av_packet_unref(pkt); > > + > > + return 0; > > + } > > + > > + if (pkt->size > 0) { > > + int bs_read_pos =3D 0; > > + XEVD_STAT stat; > > + XEVD_BITB bitb; > > + int nalu_size; > > + > > + imgb =3D NULL; > > + > > + while(pkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { > > + memset(&stat, 0, sizeof(XEVD_STAT)); > > + > > + nalu_size =3D read_nal_unit_length(pkt->data + bs_read_pos, > XEVD_NAL_UNIT_LENGTH_BYTE, avctx); > > + if (nalu_size =3D=3D 0) { > > + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); > > + av_packet_unref(pkt); > > + ret =3D AVERROR_INVALIDDATA; > > + > > + return ret; > > + } > > + bs_read_pos +=3D XEVD_NAL_UNIT_LENGTH_BYTE; > > + > > + bitb.addr =3D pkt->data + bs_read_pos; > > + bitb.ssize =3D nalu_size; > > + > > + /* main decoding block */ > > + xevd_ret =3D xevd_decode(xectx->id, &bitb, &stat); > > + if (XEVD_FAILED(xevd_ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); > > + av_packet_unref(pkt); > > + ret =3D AVERROR_EXTERNAL; > > + > > + return ret; > > + } > > + > > + bs_read_pos +=3D nalu_size; > > + > > + if (stat.nalu_type =3D=3D XEVD_NUT_SPS) { // EVC stream parameters > changed > > + if ((ret =3D export_stream_params(xectx, avctx)) !=3D = 0) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to export stream > params\n"); > > + av_packet_unref(pkt); > > + > > + return ret; > > + } > > + } > > + if (stat.read !=3D nalu_size) > > + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, > read:%d)\n,", nalu_size, stat.read); > > + if (stat.fnum >=3D 0) { > > + > > + xevd_ret =3D xevd_pull(xectx->id, &imgb); // The > > + function returns a valid image only if the return code is XEVD_OK > > + > > + if (XEVD_FAILED(xevd_ret)) { > > + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image > (xevd error code: %d, frame#=3D%d)\n", xevd_ret, stat.fnum); > > + ret =3D AVERROR_EXTERNAL; > > + av_packet_unref(pkt); > > + > > + return ret; > > + } else if (xevd_ret =3D=3D XEVD_OK_FRM_DELAYED) { > > + av_packet_unref(pkt); > = > Was the packet fully consumed here? As in, is bs_read_pos =3D=3D pkt->siz= e at this > point? If not, you're dropping NALUs that should be passed to libxevd. > = > > + > > + return AVERROR(EAGAIN); > > + } else { // XEVD_OK > > + if (!imgb) { > > + av_packet_unref(pkt); > = > Same question here. And I assume this would happen with > XEVD_OK_OUT_NOT_AVAILABLE? > = > > + > > + return AVERROR(EAGAIN); > > + } > > + > > + // got frame > > + ret =3D libxevd_image_copy(avctx, imgb, frame); > > + if(ret < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Image copying > > + error\n"); > > + > > + imgb->release(imgb); > > + imgb =3D NULL; > > + > > + av_packet_unref(pkt); > > + > > + return ret; > > + } > > + > > + // use ff_decode_frame_props() to fill frame properties > > + ret =3D ff_decode_frame_props(avctx, frame); > = > ff_get_buffer() calls this, so it's not needed. > You however set the decoder as FF_CODEC_CAP_SETS_FRAME_PROPS, so > ff_decode_frame_props_pkt() is not being called to fetch props from the last > packet. > = > You probably need a FIFO of packet props and use that to fill frame props as you > return them. It's a pity you can't propagate an opaque pointer to xevd_decode() > and get it back in xevd_pull(). That would simplify things a lot. > = > > + if (ret < 0) { > > + imgb->release(imgb); > > + imgb =3D NULL; > > + > > + av_packet_unref(pkt); > > + av_frame_unref(frame); > > + > > + return ret; > > + } > > + > > + frame->pkt_dts =3D pkt->dts; > > + > > + // xevd_pull uses pool of objects of type XEVD_IMGB. > > + // The pool size is equal MAX_PB_SIZE (26), so release object when > it is no more needed > > + imgb->release(imgb); > > + imgb =3D NULL; > > + > > + av_packet_unref(pkt); > = > Again, were all the NALUs in the packet passed to libxevd? > = > > + return 0; > > + } > > + } > > + } > > + } else { // decoder draining mode handling > > + > > + xevd_ret =3D xevd_pull(xectx->id, &imgb); > > + > > + if (xevd_ret =3D=3D XEVD_ERR_UNEXPECTED) { // draining process completed > > + av_log(avctx, AV_LOG_DEBUG, "Draining process completed\n"); > > + av_packet_unref(pkt); > > + > > + return AVERROR_EOF; > > + } else if (XEVD_FAILED(xevd_ret)) { // handle all other errors > > + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd > error code: %d)\n", xevd_ret); > > + av_packet_unref(pkt); > > + > > + return AVERROR_EXTERNAL; > > + } else { // XEVD_OK > > + if (!imgb) { > > + av_packet_unref(pkt); > > + > > + return AVERROR_EXTERNAL; > > + } > > + // got frame > > + ret =3D libxevd_image_copy(avctx, imgb, frame); > > + if(ret < 0) { > > + imgb->release(imgb); > > + imgb =3D NULL; > > + > > + av_packet_unref(pkt); > > + > > + return ret; > > + } > > + > > + frame->pkt_dts =3D pkt->dts; > > + > > + av_packet_unref(pkt); > > + > > + // xevd_pull uses pool of objects of type XEVD_IMGB. > > + // The pool size is equal MAX_PB_SIZE (26), so release object when it is > no more needed > > + imgb->release(imgb); > > + imgb =3D NULL; > > + > > + return 0; > > + } > > + } > > + > > + return ret; > > +} > > + > > +/** > > + * Destroy decoder > > + * > > + * @param avctx codec context > > + * @return 0 on success > > + */ > > +static av_cold int libxevd_close(AVCodecContext *avctx) { > > + XevdContext *xectx =3D avctx->priv_data; > > + if (xectx->id) { > > + xevd_delete(xectx->id); > > + xectx->id =3D NULL; > > + } > > + > > + xectx->draining_mode =3D 0; > > + av_packet_free(&xectx->pkt); > > + > > + return 0; > > +} > > + > > +#define OFFSET(x) offsetof(XevdContext, x) #define VD > > +AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM > > + > > +static const AVClass libxevd_class =3D { > > + .class_name =3D "libxevd", > > + .item_name =3D av_default_item_name, > > + .version =3D LIBAVUTIL_VERSION_INT, > > +}; > > + > > +const FFCodec ff_libxevd_decoder =3D { > > + .p.name =3D "evc", > > + .p.long_name =3D NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essenti= al > Video Coding (EVC)"), > > + .p.type =3D AVMEDIA_TYPE_VIDEO, > > + .p.id =3D AV_CODEC_ID_EVC, > > + .init =3D libxevd_init, > > + FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame), > > + .close =3D libxevd_close, > > + .priv_data_size =3D sizeof(XevdContext), > > + .p.priv_class =3D &libxevd_class, > > + .p.capabilities =3D AV_CODEC_CAP_DELAY | > AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING, > > + .p.profiles =3D NULL_IF_CONFIG_SMALL(ff_evc_profiles), > > + .p.wrapper_name =3D "libxevd", > > + .caps_internal =3D FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | > FF_CODEC_CAP_SETS_FRAME_PROPS > > +}; > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://protect2.fireeye.com/v1/url?k=3D6cd54358-0d5e566e-6cd4c817- > 74fe485cbff1-e18dc94cc35fe766&q=3D1&e=3D49c754eb-4416-4e31-90e9- > ee8e7d469d1f&u=3Dhttps%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp > eg-devel > = > To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org > with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".