From patchwork Tue Mar 28 13:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2195124pzh; Tue, 28 Mar 2023 06:46:23 -0700 (PDT) X-Google-Smtp-Source: AKy350ZBHlVUcNgpR+/wd1HKuWslg8/xa8Xx9Ssii9em4i8ort3Hw19VeJtYmwwBh/K1Bm+Jv7G4 X-Received: by 2002:aa7:d584:0:b0:4fa:ba60:8188 with SMTP id r4-20020aa7d584000000b004faba608188mr15472785edq.8.1680011183366; Tue, 28 Mar 2023 06:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011183; cv=none; d=google.com; s=arc-20160816; b=ON/ccU8rA4ndSlV0uWV0rCeOgmFzTj70L6Wc6Yb1NFygyBcooWjPQSEtm4RpAVF5U3 H075r0hcQ39JiVdWT0Ym5MOgY1QMerDxEk2hl/IIJwLzIep/3kqjzAk4WxkafBmT3F7z OFs2gSjnZAOkf5RHuq6FDqwd7q9RqEUnwd2UKTtPLOmbo7ggBD10lGkiqMUQfCsQK2Xh FahH2/gDZ4gfm6NM3tT2fZMjsxZLXeRvl8Y71VEkyiOolhmYOlui/ytDW4h7rJNuv2XN bwh25cdiq88YlesyaduuJE82wkMr4pcrbzxfenWdn0np9e4yYkkQycD+0rO+8iGRXwI0 2OKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=AuCiqcA/nIW05EhwTp0qwyxEEjYkHKqoUkDjtriF6E8=; b=VMqIR4aCvAcxWwwp3rJ/AvgWjGU6eBxJI07ho16CbJ4dwY0TeY53LBMuPai9Y4NWVO RUKmz03ktIPoeH2FnKoB3JoweHN/UYcZlAGQwOo1F/tj/mSqhb4AuND4D7U7lehMwvuW yhxdLEHjaRJHqU9qvL0viehySAxfpQbA0UgwwqJsCmgYgbH03FaUgZ39mrtghB15M3xM OQVRiKeqm2Aou1rsFcSsjkk4DFxEkXPIplb1h1P1oKq5mK/oRbf1fzzzqsEtQpFHLhjy 7lH2DTEsY3cq96VvRiVq3PGopCiYYSLMU3T5qyDYGpVpdcmBybnACbYXDo+gtzBMZPFy mS2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="SK1/Bz2F"; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u10-20020a05640207ca00b004bb9ff4b733si23623436edy.353.2023.03.28.06.46.16; Tue, 28 Mar 2023 06:46:23 -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=@samsung.com header.s=mail20170921 header.b="SK1/Bz2F"; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93CA168CAD4; Tue, 28 Mar 2023 16:46:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D8BB68C3F7 for ; Tue, 28 Mar 2023 16:46:06 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328134603euoutp02732f3fed7990b8541c4ba3b62886b73d~QmUCEj8J12636926369euoutp02X for ; Tue, 28 Mar 2023 13:46:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328134603euoutp02732f3fed7990b8541c4ba3b62886b73d~QmUCEj8J12636926369euoutp02X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011163; bh=o7d6DIgOaKykZG+8RJr04B7OkY774ZhXqt/Bezeu5cw=; h=From:To:Cc:Subject:Date:References:From; b=SK1/Bz2FcpfvmdQ3NSDuiTyzpXbWk4gml/QvyxGXlhgkyuI6TRFB2SOilFUXv3tfm 8XQDo80HctEahKz2KtUp7lG0l8i00OdYlONE8cTV+KE7HjS7WSTF68DUfYUQq4d4Cn ZPKcG/zILhUA4u2sfFZ24GO8YtM82kzU6MbkkseA= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230328134603eucas1p11cddde569fbc9b5ffdca903926581f74~QmUBtcIy21528415284eucas1p1Y; Tue, 28 Mar 2023 13:46:03 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id D4.1B.10014.A9FE2246; Tue, 28 Mar 2023 14:46:02 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230328134602eucas1p28d1d547d2d0807f1af9493bfa77a5575~QmUBeNQJQ1665716657eucas1p2I; Tue, 28 Mar 2023 13:46:02 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328134602eusmtrp19f88fe777144efc97d2a5769c1f074fe~QmUBds_zB3195831958eusmtrp1M; Tue, 28 Mar 2023 13:46:02 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-51-6422ef9a20a7 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BD.B1.08862.A9FE2246; Tue, 28 Mar 2023 14:46:02 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230328134602eusmtip1ef51172973aefe565e046a7919a82765~QmUBLIURm1948619486eusmtip1j; Tue, 28 Mar 2023 13:46:02 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:45:48 +0200 Message-Id: <20230328134548.1580-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7qz3iulGPSdsbL4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKabi9kL5gnU/H68nqmBsYvol2M nBwSAiYSHacOsnYxcnEICaxglLjz9xk7hPOFUWLP169MEM5nRontz2cyw7ScvnKcDSKxnFHi 7sFfLBBOO5PEooXTwKrYBHQlXn54xARiiwiYSpxs3ssGYjMLaEusu/sdyObgEBZwlbiwjQMk zCKgKnFozUawVl4BK4ltc2exQyzTlJiwZQ4TRFxQ4uTMJywQcW6JdbMusUKMlJdo3jqbGeQG CYG/7BL3Lr+BanaROHD7HlSDsMSr41ug4jISpyf3sIDcICFQLHGo3wHCrJE49CMdosJa4m3j cUaQMDPQCet36UOEHSXm/+5jhqjmk7jxVhDiAD6JSdumQ4V5JTrahCBMFYm+TjGIRimJp8vm QMPPQ+Ll3FbGCYyKs5B8NQvJJ7MQ1i5gZF7FKJ5aWpybnlpsnJdarlecmFtcmpeul5yfu4kR mB5O/zv+dQfjilcf9Q4xMnEwHmKU4GBWEuH9fU0pRYg3JbGyKrUoP76oNCe1+BCjNAeLkjiv tu3JZCGB9MSS1OzU1ILUIpgsEwenVAPTGqtZeSrd5WYpD6T+/J9kYaNVbFS2s6f/VZexwdqN 8rcfNOzT3vnSRMhxoeG3FVLKa9xWB84/v+xG1aqF2rtkmix11iy13eb5mVFByP33s/bv/clh rTx9zyboXl+2X2mpcUZJ/K4PN9tXXZR7ffTd63M3tZ7nCK++cMVX89QOO75bTF++iG45oxb8 +vkCp56rM2t/edWu0BFYWH/oZ4TxHbmn8R6BP132K74yCuf8Et9SERhudD7NK/fg5QDND9ab RaTkvpRK7ZCUYQti65x7Ki2fuVDKddbJGXn58lF7Fz6ZOvOGs88ijjP8bmm8Ptd3f7shM2cf /xbbSVXPlvyt0fHdWaXImXMydOsnhpeNSizFGYmGWsxFxYkAH75DWn4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qz3iulGMx/pGXx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GU03V7IXjBPpuL15fVMDYxfRLsYOTkkBEwkTl85ztbFyMUhJLCU UeL68t+sEAkpiaVLFzFC2MISf651QRW1Mkn8nLSLHSTBJqAr8fLDIyYQW0TAXOLiultgDcwC 2hLr7n4HauDgEBZwlbiwjQMkzCKgKnFozUZmEJtXwEpi29xZ7BDzNSUmbJnDBBEXlDg58wkL RJxbYt2sS6wQI+UlmrfOZp7AyD8LSdksJKkFjEyrGEVSS4tz03OLDfWKE3OLS/PS9ZLzczcx AsN227Gfm3cwznv1Ue8QIxMH4yFGCQ5mJRHe39eUUoR4UxIrq1KL8uOLSnNSiw8xmgLdOpFZ SjQ5Hxg5eSXxhmYGpoYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTCmRJn0K bB8nsVq/UTwZWX41+PzBDSnml7//2rL5z8qD2188e8hpeeXflWOOp0252Urusu3ZKdK94PEP 6+CA992XM4uq7oXueX3X6KRt/IsJD9yznUvcQkX+KzXm+d7PkNp3uYNlr0X2lb875ZqrTv3t Wfaz2upndYyHPEdRQJ32ibwlR/ex7Nm5zPrC78ofr1e3iT1taV63OfN7bbZxiYvrrHfrQy4e s3Q40cu3xeUhf0vCEv7WlVKsW4WdVBq+ruFud+eXuzfloaJQw46OE3qm3juTrv/qPL5NjXXN mdtPZ2lHuaxvFxT5vtD+R69r1o9Tpo927iqseaX9fem5H+dvXv0ZcD1g+sXdLpwLPjQosRRn JBpqMRcVJwIA2qyCmeQCAAA= X-CMS-MailID: 20230328134602eucas1p28d1d547d2d0807f1af9493bfa77a5575 X-Msg-Generator: CA X-RootMTR: 20230328134602eucas1p28d1d547d2d0807f1af9493bfa77a5575 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328134602eucas1p28d1d547d2d0807f1af9493bfa77a5575 References: Subject: [FFmpeg-devel] [PATCH v18 01/10] avcodec/evc: MPEG-5 EVC codec registration 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uU7z+Cb1XEEg Added prerequisites that must be met before providing support for the MPEG-5 EVC codec - Added new entry to codec IDs list - Added new entry to the codec descriptor list - Bumped libavcodec minor version - Added profiles for EVC codec Signed-off-by: Dawid Kozinski --- libavcodec/avcodec.h | 3 +++ libavcodec/codec_desc.c | 8 ++++++++ libavcodec/codec_id.h | 1 + libavcodec/profiles.c | 6 ++++++ libavcodec/profiles.h | 1 + libavcodec/version.h | 2 +- 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 18ca0e2494..1e87acaf4d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1704,6 +1704,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_KLVA_SYNC 0 #define FF_PROFILE_KLVA_ASYNC 1 +#define FF_PROFILE_EVC_BASELINE 0 +#define FF_PROFILE_EVC_MAIN 1 + /** * level * - encoding: Set by user. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index d912704891..e59a1a30ff 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1923,6 +1923,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ViewQuest VQC"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_EVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-5 EVC (Essential Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 64df9699f4..c6c07bd18c 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -320,6 +320,7 @@ enum AVCodecID { AV_CODEC_ID_WBMP, AV_CODEC_ID_MEDIA100, AV_CODEC_ID_VQC, + AV_CODEC_ID_EVC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 545626337c..c646a3f54d 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -194,4 +194,10 @@ const AVProfile ff_arib_caption_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_evc_profiles[] = { + { FF_PROFILE_EVC_BASELINE, "Baseline" }, + { FF_PROFILE_EVC_MAIN, "Main" }, + { FF_PROFILE_UNKNOWN }, +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 1d523992fc..c0eacae5c1 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -74,5 +74,6 @@ extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; extern const AVProfile ff_mjpeg_profiles[]; extern const AVProfile ff_arib_caption_profiles[]; +extern const AVProfile ff_evc_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 7acb261bb3..ecb096f38b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Tue Mar 28 13:46:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2195609pzh; Tue, 28 Mar 2023 06:47:06 -0700 (PDT) X-Google-Smtp-Source: AKy350Ya8G6ZYhPCH+JQWPkTAyt2lq6pJ4NFDw/I3UrWD+kRhA6/RTwquXIO1rCPpSRKDj0CjZEc X-Received: by 2002:a17:906:6897:b0:931:75f5:36db with SMTP id n23-20020a170906689700b0093175f536dbmr15801108ejr.11.1680011226584; Tue, 28 Mar 2023 06:47:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011226; cv=none; d=google.com; s=arc-20160816; b=ahDAWWjt6+EH3fxrzYIz6ucCjtn9SkoPkU6w1x7WTSlaJbHdKEWY9jnzmXE2zUt8Hv Fizh6ub8fREnUUVbk5XYuV8PO0ML1jE3H0fI7RZrwdBFBzOGjNz9wyVmap2cL/DwCsBx wtvq1veulC33uOSYqHMzLVzXpcVhk7YHfMaYexXFR7PhlaV+/U/DzocHuNiY+t/3hv/y LPHgPuZZymdnDGspeDTsFoWIK7IeyWtpWaN04jo84xxVWk9MoguvVlCZQGyFyphagFai //5BOBEk8FC7431dAr31pDAIm0BIJN3nFKgDrB67yswWVa/Btp5+8QYvnJ2Qn6QGXJ/r gDVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=XrhS/m9y89P/5a+HeYczPpxzNF9G7Ei6Hq0GJzD9oNc=; b=Rd8MgdB1bY+Odn5JzS+SDxdVrIzlbcGnOEInQ24hH9Vo999sSPLSK/cZGXt4xlx9nt Xf1fOv620uByrX2Z3ILNingxr12mWEogi7M+avoHr1YuKuh554fCVjjpU1fgLrFWSvuj YBQCdu4rhuI5F4Gme74uBVO8Kh/UF34BpZL4SJkBop1J4yb+4yQZjGO/YiF5CU5yIruU 8fgX3xPqlbUVrECps3gfzMFmiGwqdDkFpFrxaXCooPfLmFotZRpMglAxJ1a9s//ENRcf q+lli+FnhoWoAGUYOcpAL/OUp1UvIFnTMBW9l+l1/3XhtcgL3Ip3lqMvpzfYFw6FX1JD 8H+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=TKz2LImM; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g17-20020a170906521100b008b3b05ca5e1si22616616ejm.375.2023.03.28.06.47.00; Tue, 28 Mar 2023 06:47:06 -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=@samsung.com header.s=mail20170921 header.b=TKz2LImM; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE60B68CB13; Tue, 28 Mar 2023 16:46:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E0B768C4F2 for ; Tue, 28 Mar 2023 16:46:51 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328134650euoutp02a008f238a47eed769ceaef12db161d07~QmUuUWVvw2490224902euoutp02H for ; Tue, 28 Mar 2023 13:46:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328134650euoutp02a008f238a47eed769ceaef12db161d07~QmUuUWVvw2490224902euoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011210; bh=6Feyq1DHhpunev084emAUX2ok1aAgEB7HB44k3A63PE=; h=From:To:Cc:Subject:Date:References:From; b=TKz2LImMhG6N+yE7boKMLdqUPzPCnq2sZYdm1zN7uM1j2L0jXf6Wr3uTnsReZiHhy 7qqojA8F6KdFABCG65OOZMwti18syZV0ez6vpLaXT9WU4K7FHQScOwEhjrLsM8SrJB sxmJII8STwdGuRQL4YzwgWeKK+o/uKeORvYMA8vo= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230328134650eucas1p242c87073b9eb2879b6a80ec60432af15~QmUt7NPhg1735917359eucas1p2E; Tue, 28 Mar 2023 13:46:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id A5.F3.09966.ACFE2246; Tue, 28 Mar 2023 14:46:50 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328134650eucas1p16239b9b4a13a09b2baecdd2012fd01c5~QmUtfyWj32413024130eucas1p1A; Tue, 28 Mar 2023 13:46:50 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230328134650eusmtrp2c5ef3ad3fb69cda8cd899367f3ffcba2~QmUtfL4-11965619656eusmtrp2O; Tue, 28 Mar 2023 13:46:50 +0000 (GMT) X-AuditID: cbfec7f4-d39ff700000026ee-c4-6422efca361c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id BC.D9.09583.9CFE2246; Tue, 28 Mar 2023 14:46:49 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230328134649eusmtip1aa2983df4c3c536fe18601a281d815cd~QmUtBr6ly2776127761eusmtip1R; Tue, 28 Mar 2023 13:46:49 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:46:36 +0200 Message-Id: <20230328134636.234-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87qn3iulGOy8IW7x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGXs/zSXtWDlNeaK/ZM3sTQwXjvG 1MXIySEhYCKx8sYzIJuLQ0hgBaNE68p2ZgjnC6PEwefPoZzPjBJTPi6Ba7k46ysLiC0ksJxR 4tJ3JYiidiaJyedb2EESbAK6Ei8/PAJrEBEwlTjZvJcNxGYW0JZYd/c7mC0sEC2xa1kn2CAW AVWJCXunAfVycPAKWEqcXlsGsUtTYsKWOWBjeAUEJU7OfMICEeeWWDfrEivESHmJ5q2zwQ6V EPjLLnHy3m2oIheJVWc3Qh0tLPHq+BZ2CFtG4v/O+UwguyQEiiUO9TtAmDUSh36kQ1RYS7xt PM4IEmYGOmH9Ln2IsKPEnM+7WSCq+SRuvBWEOIBPYtK26cwQYV6JjjYhCFNFoq9TDKJRSuLp sjlQFR4St/vEJzAqzkLy1Cwkj8xC2LqAkXkVo3hqaXFuemqxUV5quV5xYm5xaV66XnJ+7iZG YHo4/e/4lx2My1991DvEyMTBeIhRgoNZSYT39zWlFCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8 2rYnk4UE0hNLUrNTUwtSi2CyTBycUg1MTNuWq/9UnnQ0S8s1Vmz2yvbujQ5OfrvzQw1Zl+a+ XdAV/zjJbttx/7I7XwJun9r/b3J/F8fLZZs+nA/96RkXdI2LLb5vkherbVzbR7ZnFYeizsur nzjksOp1ilXxorDkUzVKD9lX/9B8oqankvjBy53zoF/PS567x8q4Tr/w/u8vsfp3bdPd2v9W f+auU5sa1M6gduTbVt654V9MD+6+cWza14OfpGQry4LmXFvo9obBZMXvKF2dnTW310fwWPzJ Xqg5713b6u3/S07lPeW/Y8w8R2Cyo4D5rH3Hpni1PKj3WG59Q97tPNeL+EWsq+6Zen+I19mc XFhUwGx8bvLMqdd6L84UeHtKS/P8kVerJimxFGckGmoxFxUnAgAmyCh+fgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7on3yulGPz8ZWHx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GXs/zSXtWDlNeaK/ZM3sTQwXjvG1MXIySEhYCJxcdZXli5GLg4h gaWMElc+HGOFSEhJLF26iBHCFpb4c62LDaKolUni5xeIbjYBXYmXHx6B2SIC5hIX190Ca2AW 0JZYd/c7UAMHh7BApMS/jUEgYRYBVYkJe6exg4R5BSwlTq8tgxivKTFhyxywKbwCghInZz5h gYhzS6ybdYkVYqK8RPPW2cwTGPlnISmbhSS1gJFpFaNIamlxbnpusZFecWJucWleul5yfu4m RmDgbjv2c8sOxpWvPuodYmTiYDzEKMHBrCTC+/uaUooQb0piZVVqUX58UWlOavEhRlOgUycy S4km5wNjJ68k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1Oqgcl2Mf/T EzvlW0+3fNxz3LDtmMPJ9y8fGr5RvM19eHEqk/GVy5+41vnPO14m6vnRrWruoStyVzaa6Mj+ slz4uTJG7OaN46GXJNUWnqzhDD2+9L/0K4craxUt9opmixzf4cTCKRa6XN6clbN8iqX35PmG lhoWZnt0Ta/95N976XFBnJFVt2FCPkMIR03R5GCXd7NdOpK1d0Q9Xfzp6OHuQymfKvK3s7w6 X3TVIKZRZK/gxQue2xqTt/xfd8vh3tWYb8cD3a4rns/VvLI1Uc/hzJWAMsdJnSFNYb+ZwvUn 9qt/lNslsXDrXyGZ9OX3Kv5xsO3PjBR2qUnW0t61ymRK5NLq7TwLJtZ2VnUEJdTIPlRiKc5I NNRiLipOBACPTFan5QIAAA== X-CMS-MailID: 20230328134650eucas1p16239b9b4a13a09b2baecdd2012fd01c5 X-Msg-Generator: CA X-RootMTR: 20230328134650eucas1p16239b9b4a13a09b2baecdd2012fd01c5 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328134650eucas1p16239b9b4a13a09b2baecdd2012fd01c5 References: Subject: [FFmpeg-devel] [PATCH v18 02/10] avcodec/evc_parser: Added parser implementation for EVC format 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p8b66eqz7ZQu - Added constants definitions for EVC parser - Provided NAL units parsing following ISO_IEC_23094-1 - EVC parser registration Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/evc.h | 155 +++++ libavcodec/evc_parser.c | 1270 +++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 1427 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 408ecd1e31..635b936cac 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1157,6 +1157,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o +OBJS-$(CONFIG_EVC_PARSER) += evc_parser.o OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_FTR_PARSER) += ftr_parser.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o diff --git a/libavcodec/evc.h b/libavcodec/evc.h new file mode 100644 index 0000000000..d1fdb4fac6 --- /dev/null +++ b/libavcodec/evc.h @@ -0,0 +1,155 @@ +/* + * EVC definitions and enums + * Copyright (c) 2022 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 + */ + +#ifndef AVCODEC_EVC_H +#define AVCODEC_EVC_H + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +/** + * @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic + * Table 4 - NAL unit type codes and NAL unit type classes + */ +enum EVCNALUnitType { + EVC_NOIDR_NUT = 0, /* Coded slice of a non-IDR picture */ + EVC_IDR_NUT = 1, /* Coded slice of an IDR picture */ + EVC_RSV_VCL_NUT02 = 2, + EVC_RSV_VCL_NUT03 = 3, + EVC_RSV_VCL_NUT04 = 4, + EVC_RSV_VCL_NUT05 = 5, + EVC_RSV_VCL_NUT06 = 6, + EVC_RSV_VCL_NUT07 = 7, + EVC_RSV_VCL_NUT08 = 8, + EVC_RSV_VCL_NUT09 = 9, + EVC_RSV_VCL_NUT10 = 10, + EVC_RSV_VCL_NUT11 = 11, + EVC_RSV_VCL_NUT12 = 12, + EVC_RSV_VCL_NUT13 = 13, + EVC_RSV_VCL_NUT14 = 14, + EVC_RSV_VCL_NUT15 = 15, + EVC_RSV_VCL_NUT16 = 16, + EVC_RSV_VCL_NUT17 = 17, + EVC_RSV_VCL_NUT18 = 18, + EVC_RSV_VCL_NUT19 = 19, + EVC_RSV_VCL_NUT20 = 20, + EVC_RSV_VCL_NUT21 = 21, + EVC_RSV_VCL_NUT22 = 22, + EVC_RSV_VCL_NUT23 = 23, + EVC_SPS_NUT = 24, /* Sequence parameter set */ + EVC_PPS_NUT = 25, /* Picture paremeter set */ + EVC_APS_NUT = 26, /* Adaptation parameter set */ + EVC_FD_NUT = 27, /* Filler data */ + EVC_SEI_NUT = 28, /* Supplemental enhancement information */ + EVC_RSV_NONVCL29 = 29, + EVC_RSV_NONVCL30 = 30, + EVC_RSV_NONVCL31 = 31, + EVC_RSV_NONVCL32 = 32, + EVC_RSV_NONVCL33 = 33, + EVC_RSV_NONVCL34 = 34, + EVC_RSV_NONVCL35 = 35, + EVC_RSV_NONVCL36 = 36, + EVC_RSV_NONVCL37 = 37, + EVC_RSV_NONVCL38 = 38, + EVC_RSV_NONVCL39 = 39, + EVC_RSV_NONVCL40 = 40, + EVC_RSV_NONVCL41 = 41, + EVC_RSV_NONVCL42 = 42, + EVC_RSV_NONVCL43 = 43, + EVC_RSV_NONVCL44 = 44, + EVC_RSV_NONVCL45 = 45, + EVC_RSV_NONVCL46 = 46, + EVC_RSV_NONVCL47 = 47, + EVC_RSV_NONVCL48 = 48, + EVC_RSV_NONVCL49 = 49, + EVC_RSV_NONVCL50 = 50, + EVC_RSV_NONVCL51 = 51, + EVC_RSV_NONVCL52 = 52, + EVC_RSV_NONVCL53 = 53, + EVC_RSV_NONVCL54 = 54, + EVC_RSV_NONVCL55 = 55, + EVC_UNSPEC_NUT56 = 56, + EVC_UNSPEC_NUT57 = 57, + EVC_UNSPEC_NUT58 = 58, + EVC_UNSPEC_NUT59 = 59, + EVC_UNSPEC_NUT60 = 60, + EVC_UNSPEC_NUT61 = 61, + EVC_UNSPEC_NUT62 = 62 +}; + +// slice type +// @see ISO_IEC_23094-1_2020 7.4.5 Slice header semantics +// +enum EVCSliceType { + EVC_SLICE_TYPE_B = 0, + EVC_SLICE_TYPE_P = 1, + EVC_SLICE_TYPE_I = 2 +}; + +enum { + // 7.4.3.2: aps_video_parameter_set_id is u(4). + EVC_MAX_APS_COUNT = 32, + + // 7.4.3.1: sps_seq_parameter_set_id is in [0, 15]. + EVC_MAX_SPS_COUNT = 16, + + // 7.4.3.2: pps_pic_parameter_set_id is in [0, 63]. + EVC_MAX_PPS_COUNT = 64, + + // 7.4.5: slice header slice_pic_parameter_set_id in [0, 63] + EVC_MAX_SH_COUNT = 64, + + // E.3.2: cpb_cnt_minus1[i] is in [0, 31]. + EVC_MAX_CPB_CNT = 32, + + // A.4.1: in table A.1 the highest level allows a MaxLumaPs of 35 651 584. + EVC_MAX_LUMA_PS = 35651584, + + EVC_MAX_NUM_REF_PICS = 21, + + EVC_MAX_NUM_RPLS = 32, + + // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are + // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ + // width are bounded above by sqrt(8 * 35651584) = 16888.2 samples. + EVC_MAX_WIDTH = 16888, + EVC_MAX_HEIGHT = 16888, + + // A.4.1: table A.1 allows at most 22 tile rows for any level. + EVC_MAX_TILE_ROWS = 22, + // A.4.1: table A.1 allows at most 20 tile columns for any level. + EVC_MAX_TILE_COLUMNS = 20, + + // A.4.1: table A.1 allows at most 600 slice segments for any level. + EVC_MAX_SLICE_SEGMENTS = 600, + + // 7.4.7.1: in the worst case (tiles_enabled_flag and + // entropy_coding_sync_enabled_flag are both set), entry points can be + // placed at the beginning of every Ctb row in every tile, giving an + // upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1. + // Only a stream with very high resolution and perverse parameters could + // get near that, though, so set a lower limit here with the maximum + // possible value for 4K video (at most 135 16x16 Ctb rows). + HEVC_MAX_ENTRY_POINT_OFFSETS = EVC_MAX_TILE_COLUMNS * 135, +}; + +#endif // AVCODEC_EVC_H diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..d27f33a637 --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,1270 @@ +/* + * EVC format parser + * + * 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 "libavutil/common.h" +#include "parser.h" +#include "golomb.h" +#include "evc.h" + +#define EVC_MAX_QP_TABLE_SIZE 58 + +#define EXTENDED_SAR 255 +#define NUM_CPB 32 + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// chromaQP table structure to be signalled in SPS +typedef struct ChromaQpTable { + int chroma_qp_table_present_flag; // u(1) + int same_qp_table_for_chroma; // u(1) + int global_offset_flag; // u(1) + int num_points_in_qp_table_minus1[2]; // ue(v) + int delta_qp_in_val_minus1[2][EVC_MAX_QP_TABLE_SIZE]; // u(6) + int delta_qp_out_val[2][EVC_MAX_QP_TABLE_SIZE]; // se(v) +} ChromaQpTable; + +// Hypothetical Reference Decoder (HRD) parameters, part of VUI +typedef struct HRDParameters { + int cpb_cnt_minus1; // ue(v) + int bit_rate_scale; // u(4) + int cpb_size_scale; // u(4) + int bit_rate_value_minus1[NUM_CPB]; // ue(v) + int cpb_size_value_minus1[NUM_CPB]; // ue(v) + int cbr_flag[NUM_CPB]; // u(1) + int initial_cpb_removal_delay_length_minus1; // u(5) + int cpb_removal_delay_length_minus1; // u(5) + int dpb_output_delay_length_minus1; // u(5) + int time_offset_length; // u(5) +} HRDParameters; + +// video usability information (VUI) part of SPS +typedef struct VUIParameters { + int aspect_ratio_info_present_flag; // u(1) + int aspect_ratio_idc; // u(8) + int sar_width; // u(16) + int sar_height; // u(16) + int overscan_info_present_flag; // u(1) + int overscan_appropriate_flag; // u(1) + int video_signal_type_present_flag; // u(1) + int video_format; // u(3) + int video_full_range_flag; // u(1) + int colour_description_present_flag; // u(1) + int colour_primaries; // u(8) + int transfer_characteristics; // u(8) + int matrix_coefficients; // u(8) + int chroma_loc_info_present_flag; // u(1) + int chroma_sample_loc_type_top_field; // ue(v) + int chroma_sample_loc_type_bottom_field; // ue(v) + int neutral_chroma_indication_flag; // u(1) + int field_seq_flag; // u(1) + int timing_info_present_flag; // u(1) + int num_units_in_tick; // u(32) + int time_scale; // u(32) + int fixed_pic_rate_flag; // u(1) + int nal_hrd_parameters_present_flag; // u(1) + int vcl_hrd_parameters_present_flag; // u(1) + int low_delay_hrd_flag; // u(1) + int pic_struct_present_flag; // u(1) + int bitstream_restriction_flag; // u(1) + int motion_vectors_over_pic_boundaries_flag; // u(1) + int max_bytes_per_pic_denom; // ue(v) + int max_bits_per_mb_denom; // ue(v) + int log2_max_mv_length_horizontal; // ue(v) + int log2_max_mv_length_vertical; // ue(v) + int num_reorder_pics; // ue(v) + int max_dec_pic_buffering; // ue(v) + + HRDParameters hrd_parameters; +} VUIParameters; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + struct RefPicListStruct rpls[2][EVC_MAX_NUM_RPLS]; + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + + struct ChromaQpTable chroma_qp_table_struct; + + int vui_parameters_present_flag; // u(1) + + struct VUIParameters vui_parameters; + +} EVCParserSPS; + +typedef struct EVCParserPPS { + int pps_pic_parameter_set_id; // ue(v) + int pps_seq_parameter_set_id; // ue(v) + int num_ref_idx_default_active_minus1[2]; // ue(v) + int additional_lt_poc_lsb_len; // ue(v) + int rpl1_idx_present_flag; // u(1) + int single_tile_in_pic_flag; // u(1) + int num_tile_columns_minus1; // ue(v) + int num_tile_rows_minus1; // ue(v) + int uniform_tile_spacing_flag; // u(1) + int tile_column_width_minus1[EVC_MAX_TILE_ROWS]; // ue(v) + int tile_row_height_minus1[EVC_MAX_TILE_COLUMNS]; // ue(v) + int loop_filter_across_tiles_enabled_flag; // u(1) + int tile_offset_len_minus1; // ue(v) + int tile_id_len_minus1; // ue(v) + int explicit_tile_id_flag; // u(1) + int tile_id_val[EVC_MAX_TILE_ROWS][EVC_MAX_TILE_COLUMNS]; // u(v) + int pic_dra_enabled_flag; // u(1) + int pic_dra_aps_id; // u(5) + int arbitrary_slice_present_flag; // u(1) + int constrained_intra_pred_flag; // u(1) + int cu_qp_delta_enabled_flag; // u(1) + int log2_cu_qp_delta_area_minus6; // ue(v) + +} EVCParserPPS; + +// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.6 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +// u(n) - unsigned integer using n bits. +// When n is "v" in the syntax table, the number of bits varies in a manner dependent on the value of other syntax elements. +typedef struct EVCParserSliceHeader { + int slice_pic_parameter_set_id; // ue(v) + int single_tile_in_slice_flag; // u(1) + int first_tile_id; // u(v) + int arbitrary_slice_flag; // u(1) + int last_tile_id; // u(v) + int num_remaining_tiles_in_slice_minus1; // ue(v) + int delta_tile_id_minus1[EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS]; // ue(v) + + int slice_type; // ue(v) + int no_output_of_prior_pics_flag; // u(1) + int mmvd_group_enable_flag; // u(1) + int slice_alf_enabled_flag; // u(1) + + int slice_alf_luma_aps_id; // u(5) + int slice_alf_map_flag; // u(1) + int slice_alf_chroma_idc; // u(2) + int slice_alf_chroma_aps_id; // u(5) + int slice_alf_chroma_map_flag; // u(1) + int slice_alf_chroma2_aps_id; // u(5) + int slice_alf_chroma2_map_flag; // u(1) + int slice_pic_order_cnt_lsb; // u(v) + + // @note + // Currently the structure does not reflect the entire Slice Header RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSliceHeader; + +// picture order count of the current picture +typedef struct EVCParserPoc { + int PicOrderCntVal; // current picture order count value + int prevPicOrderCntVal; // the picture order count of the previous Tid0 picture + int DocOffset; // the decoding order count of the previous picture +} EVCParserPoc; + +typedef struct EVCParserContext { + ParseContext pc; + EVCParserSPS sps[EVC_MAX_SPS_COUNT]; + EVCParserPPS pps[EVC_MAX_PPS_COUNT]; + EVCParserSliceHeader slice_header[EVC_MAX_PPS_COUNT]; + + int to_read; // number of bytes of NAL Unit that do not fit into the current input data chunk and must be read from the new chunk(s) + int bytes_read; // number of bytes of the current Access Unit that already has been read + + int incomplete_nalu_prefix_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit prefix + int incomplete_nalu_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit (more input data is needed to read complete NAL unit) + + int nuh_temporal_id; // the value of TemporalId (shall be the same for all VCL NAL units of an Access Unit) + + int nalu_prefix_assembled; // the flag is set to when NALU prefix has been assembled from last chunk and current chunk of incoming data + int nalu_type; // the current NALU type + int nalu_size; // the current NALU size + int time_base; + + EVCParserPoc poc; + + int parsed_extradata; + +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// nuh_temporal_id specifies a temporal identifier for the NAL unit +static int get_temporal_id(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int temporal_id = 0; + short t = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + for (int i = 0; i < EVC_NALU_HEADER_SIZE; i++) + t = (t << 8) | p[i]; + + temporal_id = (t >> 6) & 0x0007; + } + + return temporal_id; +} + +// @see ISO_IEC_23094-1 (7.3.7 Reference picture list structure syntax) +static int ref_pic_list_struct(GetBitContext *gb, RefPicListStruct *rpl) +{ + uint32_t delta_poc_st, strp_entry_sign_flag = 0; + rpl->ref_pic_num = get_ue_golomb(gb); + if (rpl->ref_pic_num > 0) { + delta_poc_st = get_ue_golomb(gb); + + rpl->ref_pics[0] = delta_poc_st; + if (rpl->ref_pics[0] != 0) { + strp_entry_sign_flag = get_bits(gb, 1); + + rpl->ref_pics[0] *= 1 - (strp_entry_sign_flag << 1); + } + } + + for (int i = 1; i < rpl->ref_pic_num; ++i) { + delta_poc_st = get_ue_golomb(gb); + if (delta_poc_st != 0) + strp_entry_sign_flag = get_bits(gb, 1); + rpl->ref_pics[i] = rpl->ref_pics[i - 1] + delta_poc_st * (1 - (strp_entry_sign_flag << 1)); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.2 HRD parameters syntax) +static int hrd_parameters(GetBitContext *gb, HRDParameters *hrd) +{ + hrd->cpb_cnt_minus1 = get_ue_golomb(gb); + hrd->bit_rate_scale = get_bits(gb, 4); + hrd->cpb_size_scale = get_bits(gb, 4); + for (int SchedSelIdx = 0; SchedSelIdx <= hrd->cpb_cnt_minus1; SchedSelIdx++) { + hrd->bit_rate_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cpb_size_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cbr_flag[SchedSelIdx] = get_bits(gb, 1); + } + hrd->initial_cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->time_offset_length = get_bits(gb, 5); + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.1 VUI parameters syntax) +static int vui_parameters(GetBitContext *gb, VUIParameters *vui) +{ + vui->aspect_ratio_info_present_flag = get_bits(gb, 1); + if (vui->aspect_ratio_info_present_flag) { + vui->aspect_ratio_idc = get_bits(gb, 8); + if (vui->aspect_ratio_idc == EXTENDED_SAR) { + vui->sar_width = get_bits(gb, 16); + vui->sar_height = get_bits(gb, 16); + } + } + vui->overscan_info_present_flag = get_bits(gb, 1); + if (vui->overscan_info_present_flag) + vui->overscan_appropriate_flag = get_bits(gb, 1); + vui->video_signal_type_present_flag = get_bits(gb, 1); + if (vui->video_signal_type_present_flag) { + vui->video_format = get_bits(gb, 3); + vui->video_full_range_flag = get_bits(gb, 1); + vui->colour_description_present_flag = get_bits(gb, 1); + if (vui->colour_description_present_flag) { + vui->colour_primaries = get_bits(gb, 8); + vui->transfer_characteristics = get_bits(gb, 8); + vui->matrix_coefficients = get_bits(gb, 8); + } + } + vui->chroma_loc_info_present_flag = get_bits(gb, 1); + if (vui->chroma_loc_info_present_flag) { + vui->chroma_sample_loc_type_top_field = get_ue_golomb(gb); + vui->chroma_sample_loc_type_bottom_field = get_ue_golomb(gb); + } + vui->neutral_chroma_indication_flag = get_bits(gb, 1); + + vui->field_seq_flag = get_bits(gb, 1); + + vui->timing_info_present_flag = get_bits(gb, 1); + if (vui->timing_info_present_flag) { + vui->num_units_in_tick = get_bits(gb, 32); + vui->time_scale = get_bits(gb, 32); + vui->fixed_pic_rate_flag = get_bits(gb, 1); + } + vui->nal_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->nal_hrd_parameters_present_flag) + hrd_parameters(gb, &vui->hrd_parameters); + vui->vcl_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->vcl_hrd_parameters_present_flag) + hrd_parameters(gb, &vui->hrd_parameters); + if (vui->nal_hrd_parameters_present_flag || vui->vcl_hrd_parameters_present_flag) + vui->low_delay_hrd_flag = get_bits(gb, 1); + vui->pic_struct_present_flag = get_bits(gb, 1); + vui->bitstream_restriction_flag = get_bits(gb, 1); + if (vui->bitstream_restriction_flag) { + vui->motion_vectors_over_pic_boundaries_flag = get_bits(gb, 1); + vui->max_bytes_per_pic_denom = get_ue_golomb(gb); + vui->max_bits_per_mb_denom = get_ue_golomb(gb); + vui->log2_max_mv_length_horizontal = get_ue_golomb(gb); + vui->log2_max_mv_length_vertical = get_ue_golomb(gb); + vui->num_reorder_pics = get_ue_golomb(gb); + vui->max_dec_pic_buffering = get_ue_golomb(gb); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static EVCParserSPS *parse_sps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + sps = &ev->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if (sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if (sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if (sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if (sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if (sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if (sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if (sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if (sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if (!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if (sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + if (!sps->sps_rpl_flag) + sps->max_num_tid0_ref_pics = get_ue_golomb(&gb); + else { + sps->sps_max_dec_pic_buffering_minus1 = get_ue_golomb(&gb); + sps->long_term_ref_pic_flag = get_bits(&gb, 1); + sps->rpl1_same_as_rpl0_flag = get_bits(&gb, 1); + sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(&gb); + + for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[0][i]); + + if (!sps->rpl1_same_as_rpl0_flag) { + sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(&gb); + for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[1][i]); + } + } + + sps->picture_cropping_flag = get_bits(&gb, 1); + + if (sps->picture_cropping_flag) { + sps->picture_crop_left_offset = get_ue_golomb(&gb); + sps->picture_crop_right_offset = get_ue_golomb(&gb); + sps->picture_crop_top_offset = get_ue_golomb(&gb); + sps->picture_crop_bottom_offset = get_ue_golomb(&gb); + } + + if (sps->chroma_format_idc != 0) { + sps->chroma_qp_table_struct.chroma_qp_table_present_flag = get_bits(&gb, 1); + + if (sps->chroma_qp_table_struct.chroma_qp_table_present_flag) { + sps->chroma_qp_table_struct.same_qp_table_for_chroma = get_bits(&gb, 1); + sps->chroma_qp_table_struct.global_offset_flag = get_bits(&gb, 1); + for (int i = 0; i < (sps->chroma_qp_table_struct.same_qp_table_for_chroma ? 1 : 2); i++) { + sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i] = get_ue_golomb(&gb);; + for (int j = 0; j <= sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i]; j++) { + sps->chroma_qp_table_struct.delta_qp_in_val_minus1[i][j] = get_bits(&gb, 6); + sps->chroma_qp_table_struct.delta_qp_out_val[i][j] = get_se_golomb(&gb); + } + } + } + } + + sps->vui_parameters_present_flag = get_bits(&gb, 1); + if (sps->vui_parameters_present_flag) + vui_parameters(&gb, &(sps->vui_parameters)); + + // @note + // If necessary, add the missing fields to the EVCParserSPS structure + // and then extend parser implementation + + return sps; +} + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +// +// @note +// The current implementation of parse_sps function doesn't handle VUI parameters parsing. +// If it will be needed, parse_sps function could be extended to handle VUI parameters parsing +// to initialize fields of the AVCodecContex i.e. color_primaries, color_trc,color_range +// +static EVCParserPPS *parse_pps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserPPS *pps; + + int pps_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + pps_pic_parameter_set_id = get_ue_golomb(&gb); + if (pps_pic_parameter_set_id > EVC_MAX_PPS_COUNT) + return NULL; + + pps = &ev->pps[pps_pic_parameter_set_id]; + + pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; + + pps->pps_seq_parameter_set_id = get_ue_golomb(&gb); + if (pps->pps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + pps->num_ref_idx_default_active_minus1[0] = get_ue_golomb(&gb); + pps->num_ref_idx_default_active_minus1[1] = get_ue_golomb(&gb); + pps->additional_lt_poc_lsb_len = get_ue_golomb(&gb); + pps->rpl1_idx_present_flag = get_bits(&gb, 1); + pps->single_tile_in_pic_flag = get_bits(&gb, 1); + + if (!pps->single_tile_in_pic_flag) { + pps->num_tile_columns_minus1 = get_ue_golomb(&gb); + pps->num_tile_rows_minus1 = get_ue_golomb(&gb); + pps->uniform_tile_spacing_flag = get_bits(&gb, 1); + + if (!pps->uniform_tile_spacing_flag) { + for (int i = 0; i < pps->num_tile_columns_minus1; i++) + pps->tile_column_width_minus1[i] = get_ue_golomb(&gb); + + for (int i = 0; i < pps->num_tile_rows_minus1; i++) + pps->tile_row_height_minus1[i] = get_ue_golomb(&gb); + } + pps->loop_filter_across_tiles_enabled_flag = get_bits(&gb, 1); + pps->tile_offset_len_minus1 = get_ue_golomb(&gb); + } + + pps->tile_id_len_minus1 = get_ue_golomb(&gb); + pps->explicit_tile_id_flag = get_bits(&gb, 1); + + if (pps->explicit_tile_id_flag) { + for (int i = 0; i <= pps->num_tile_rows_minus1; i++) { + for (int j = 0; j <= pps->num_tile_columns_minus1; j++) + pps->tile_id_val[i][j] = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } + } + + pps->pic_dra_enabled_flag = 0; + pps->pic_dra_enabled_flag = get_bits(&gb, 1); + + if (pps->pic_dra_enabled_flag) + pps->pic_dra_aps_id = get_bits(&gb, 5); + + pps->arbitrary_slice_present_flag = get_bits(&gb, 1); + pps->constrained_intra_pred_flag = get_bits(&gb, 1); + pps->cu_qp_delta_enabled_flag = get_bits(&gb, 1); + + if (pps->cu_qp_delta_enabled_flag) + pps->log2_cu_qp_delta_area_minus6 = get_ue_golomb(&gb); + + return pps; +} + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +static EVCParserSliceHeader *parse_slice_header(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSliceHeader *sh; + EVCParserPPS *pps; + EVCParserSPS *sps; + + int num_tiles_in_slice = 0; + int slice_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + slice_pic_parameter_set_id = get_ue_golomb(&gb); + + if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) + return NULL; + + sh = &ev->slice_header[slice_pic_parameter_set_id]; + pps = &ev->pps[slice_pic_parameter_set_id]; + sps = &ev->sps[slice_pic_parameter_set_id]; + + sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; + + if (!pps->single_tile_in_pic_flag) { + sh->single_tile_in_slice_flag = get_bits(&gb, 1); + sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } else + sh->single_tile_in_slice_flag = 1; + + if (!sh->single_tile_in_slice_flag) { + if (pps->arbitrary_slice_present_flag) + sh->arbitrary_slice_flag = get_bits(&gb, 1); + + if (!sh->arbitrary_slice_flag) + sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + else { + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + for (int i = 0; i < num_tiles_in_slice - 1; ++i) + sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + } + } + + sh->slice_type = get_ue_golomb(&gb); + + if (ev->nalu_type == EVC_IDR_NUT) + sh->no_output_of_prior_pics_flag = get_bits(&gb, 1); + + if (sps->sps_mmvd_flag && ((sh->slice_type == EVC_SLICE_TYPE_B) || (sh->slice_type == EVC_SLICE_TYPE_P))) + sh->mmvd_group_enable_flag = get_bits(&gb, 1); + else + sh->mmvd_group_enable_flag = 0; + + if (sps->sps_alf_flag) { + int ChromaArrayType = sps->chroma_format_idc; + + sh->slice_alf_enabled_flag = get_bits(&gb, 1); + + if (sh->slice_alf_enabled_flag) { + sh->slice_alf_luma_aps_id = get_bits(&gb, 5); + sh->slice_alf_map_flag = get_bits(&gb, 1); + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if ((ChromaArrayType == 1 || ChromaArrayType == 2) && sh->slice_alf_chroma_idc > 0) + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + } + if (ChromaArrayType == 3) { + int sliceChromaAlfEnabledFlag = 0; + int sliceChroma2AlfEnabledFlag = 0; + + if (sh->slice_alf_chroma_idc == 1) { // @see ISO_IEC_23094-1 (7.4.5) + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 0; + } else if (sh->slice_alf_chroma_idc == 2) { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 1; + } else if (sh->slice_alf_chroma_idc == 3) { + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 1; + } else { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 0; + } + + if (!sh->slice_alf_enabled_flag) + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if (sliceChromaAlfEnabledFlag) { + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma_map_flag = get_bits(&gb, 1); + } + + if (sliceChroma2AlfEnabledFlag) { + sh->slice_alf_chroma2_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma2_map_flag = get_bits(&gb, 1); + } + } + } + + if (ev->nalu_type != EVC_IDR_NUT) { + if (sps->sps_pocs_flag) + sh->slice_pic_order_cnt_lsb = get_bits(&gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + } + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +static int parse_nal_unit(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + int tid; + const uint8_t *data = buf; + int data_size = buf_size; + + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + s->key_frame = -1; + + + nalu_size = buf_size; + if (nalu_size <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return AVERROR_INVALIDDATA; + } + + // @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes) + // @see enum EVCNALUnitType in evc.h + nalu_type = get_nalu_type(data, data_size, avctx); + if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + return AVERROR_INVALIDDATA; + } + ev->nalu_type = nalu_type; + + tid = get_temporal_id(data, data_size, avctx); + if (tid < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid); + return AVERROR_INVALIDDATA; + } + ev->nuh_temporal_id = tid; + + if (data_size < nalu_size) { + av_log(avctx, AV_LOG_ERROR, "NAL unit does not fit in the data buffer\n"); + return AVERROR_INVALIDDATA; + } + + data += EVC_NALU_HEADER_SIZE; + data_size -= EVC_NALU_HEADER_SIZE; + + if (nalu_type == EVC_SPS_NUT) { + EVCParserSPS *sps; + int SubGopLength; + + sps = parse_sps(data, nalu_size, ev); + if (!sps) { + av_log(avctx, AV_LOG_ERROR, "SPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + + s->coded_width = sps->pic_width_in_luma_samples; + s->coded_height = sps->pic_height_in_luma_samples; + s->width = sps->pic_width_in_luma_samples - sps->picture_crop_left_offset - sps->picture_crop_right_offset; + s->height = sps->pic_height_in_luma_samples - sps->picture_crop_top_offset - sps->picture_crop_bottom_offset; + + SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + avctx->gop_size = SubGopLength; + + avctx->delay = (sps->sps_max_dec_pic_buffering_minus1) ? sps->sps_max_dec_pic_buffering_minus1 - 1 : SubGopLength + sps->max_num_tid0_ref_pics - 1; + + if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else avctx->profile = FF_PROFILE_EVC_BASELINE; + + ev->time_base = avctx->time_base.den; + + switch (sps->chroma_format_idc) { + case 0: /* YCBCR400_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR400_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_GRAY10LE; + return -1; + case 1: /* YCBCR420_10LE */ + s->format = AV_PIX_FMT_YUV420P10LE; + break; + case 2: /* YCBCR422_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR422_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV422P10LE; + return -1; + case 3: /* YCBCR444_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR444_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV444P10LE; + return -1; + default: + s->format = AV_PIX_FMT_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown supported chroma format\n"); + return -1; + } + } else if (nalu_type == EVC_PPS_NUT) { + EVCParserPPS *pps; + + pps = parse_pps(data, nalu_size, ev); + if (!pps) { + av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + } else if (nalu_type == EVC_SEI_NUT) // Supplemental Enhancement Information + return 0; + else if (nalu_type == EVC_APS_NUT) // Adaptation parameter set + return 0; + else if (nalu_type == EVC_FD_NUT) /* Filler data */ + return 0; + else if (nalu_type == EVC_IDR_NUT || nalu_type == EVC_NOIDR_NUT) { // Coded slice of a IDR or non-IDR picture + EVCParserSliceHeader *sh; + EVCParserSPS *sps; + int slice_pic_parameter_set_id; + + sh = parse_slice_header(data, nalu_size, ev); + if (!sh) { + av_log(avctx, AV_LOG_ERROR, "Slice header parsing error\n"); + return AVERROR_INVALIDDATA; + } + + switch (sh->slice_type) { + case EVC_SLICE_TYPE_B: { + s->pict_type = AV_PICTURE_TYPE_B; + break; + } + case EVC_SLICE_TYPE_P: { + s->pict_type = AV_PICTURE_TYPE_P; + break; + } + case EVC_SLICE_TYPE_I: { + s->pict_type = AV_PICTURE_TYPE_I; + break; + } + default: { + s->pict_type = AV_PICTURE_TYPE_NONE; + } + } + + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + // POC (picture order count of the current picture) derivation + // @see ISO/IEC 23094-1:2020(E) 8.3.1 Decoding process for picture order count + slice_pic_parameter_set_id = sh->slice_pic_parameter_set_id; + sps = &ev->sps[slice_pic_parameter_set_id]; + + if (sps->sps_pocs_flag) { + + int PicOrderCntMsb = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + + if (nalu_type == EVC_IDR_NUT) + PicOrderCntMsb = 0; + else { + int MaxPicOrderCntLsb = 1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + + int prevPicOrderCntLsb = ev->poc.PicOrderCntVal & (MaxPicOrderCntLsb - 1); + int prevPicOrderCntMsb = ev->poc.PicOrderCntVal - prevPicOrderCntLsb; + + + if ((sh->slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && + ((prevPicOrderCntLsb - sh->slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb; + + else if ((sh->slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && + ((sh->slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb; + + else + PicOrderCntMsb = prevPicOrderCntMsb; + } + ev->poc.PicOrderCntVal = PicOrderCntMsb + sh->slice_pic_order_cnt_lsb; + + } else { + if (nalu_type == EVC_IDR_NUT) { + ev->poc.PicOrderCntVal = 0; + ev->poc.DocOffset = -1; + } else { + int SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + if (tid == 0) { + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + SubGopLength; + ev->poc.DocOffset = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + } else { + int ExpectedTemporalId; + int PocOffset; + int prevDocOffset = ev->poc.DocOffset; + + ev->poc.DocOffset = (prevDocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) { + ev->poc.prevPicOrderCntVal += SubGopLength; + ExpectedTemporalId = 0; + } else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + while (tid != ExpectedTemporalId) { + ev->poc.DocOffset = (ev->poc.DocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) + ExpectedTemporalId = 0; + else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + } + PocOffset = (int)(SubGopLength * ((2.0 * ev->poc.DocOffset + 1) / (int)pow(2.0, tid) - 2)); + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + PocOffset; + } + } + } + + s->output_picture_number = ev->poc.PicOrderCntVal; + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + return 0; + } + data += (nalu_size - EVC_NALU_HEADER_SIZE); + data_size -= (nalu_size - EVC_NALU_HEADER_SIZE); + + return 0; +} + +// Reconstruct NAL Unit from incomplete data +// +// Assemble the NALU prefix storing NALU length if it has been split between 2 subsequent buffers (input chunks) incoming to the parser. +// This is the case when the buffer size is not enough for the buffer to store the whole NAL unit prefix. +// In this case, we have to get part of the prefix from the previous buffer and assemble it with the rest from the current buffer. +// Then we'll be able to read NAL unit size. +static int evc_assemble_nalu_prefix(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu_prefix, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) { + if (i < pc->index) + nalu_prefix[i] = pc->buffer[i]; + else + nalu_prefix[i] = data[i - pc->index]; + } + + return 0; +} + +// Reconstruct NALU from incomplete data +// Assemble NALU if it is split between multiple buffers +// +// This is the case when the buffer size is not enough to store the entire NAL unit. +// In this scenario, we must retrieve parts of the NALU from the previous buffers stored in pc->buffer and assemble them with the remainder from the current buffer. +static int evc_assemble_nalu(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu, int nalu_size, + AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of the current NALU and previous NALUs that belong to the current Access Unit. + // + // - previously read bytes are data that came with the previous incoming data chunks. + // + // - pc->buffer contains bytes of the current NALU that have already been read while processing previous chunks of incoming data, + // as well as already read bytes of previous NALUs belonging to the same Access Unit. + // + // - ctx->bytes_read is the index of the the first element of the current NALU int the pc->buffer. + // - The pc->index is the index of the element located right next to the last element of the current NALU in the pc->buffer. + // - The elements of pc->buffer located before ctx->bytes_read index contain previously read NALUs of the current Access Unit. + // + // 2. buf contains the rest of the NAL unit bytestime_base + // + // - ctx->to_read number of bytes to read from buf (the index of the element right next to the last element to read) + + uint8_t *prev_data = pc->buffer + ctx->bytes_read; + int prev_data_size = pc->index - ctx->bytes_read; + + memcpy(nalu, prev_data, prev_data_size); + memcpy(nalu + prev_data_size, data, data_size); + + return 0; +} + +static int end_of_access_unit_found(AVCodecParserContext *s, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + + if (avctx->profile == 0) { // BASELINE profile + if (ctx->nalu_type == EVC_NOIDR_NUT || ctx->nalu_type == EVC_IDR_NUT) + return 1; + } else { // MAIN profile + EVCParserContext *ev = s->priv_data; + if (ctx->nalu_type == EVC_NOIDR_NUT) { + if (ev->poc.PicOrderCntVal != ev->poc.prevPicOrderCntVal) + return 1; + } else if (ctx->nalu_type == EVC_IDR_NUT) + return 1; + } + return 0; +} + +// Find the end of the current frame in the bitstream. +// The end of frame is the end of Access Unit. +// Function returns the position of the first byte of the next frame, or END_NOT_FOUND +static int evc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + + const uint8_t *data = buf; + int data_size = buf_size; + + while (data_size > 0) { + + if (ctx->to_read == 0) { + // Nothing must be read and appended to the data from previous chunks. + // The previous chunk of data provided the complete NALU prefix or provided the complete NALU. + + if (ctx->nalu_prefix_assembled) // NALU prefix has been assembled from previous and current chunks of incoming data + ctx->nalu_prefix_assembled = 0; + else { // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (data_size < EVC_NALU_LENGTH_PREFIX_SIZE) { + ctx->to_read = EVC_NALU_LENGTH_PREFIX_SIZE - data_size; + ctx->incomplete_nalu_prefix_read = 1; + return END_NOT_FOUND; + } + + ctx->nalu_size = read_nal_unit_length(data, data_size, avctx); + ctx->bytes_read += EVC_NALU_LENGTH_PREFIX_SIZE; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + data_size -= EVC_NALU_LENGTH_PREFIX_SIZE; + } + + if (data_size < ctx->nalu_size) { + + ctx->to_read = ctx->nalu_size - data_size; + ctx->incomplete_nalu_read = 1; + return END_NOT_FOUND; + } + + // the entire NALU can be read + if (parse_nal_unit(s, data, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + + data += ctx->nalu_size; + data_size -= ctx->nalu_size; + + ctx->bytes_read += ctx->nalu_size; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->bytes_read; + ctx->bytes_read = 0; + return read_bytes; + } + + // go to the next iteration + continue; + + } else { + // The previous chunk of input data did not contain the complete valid NALU prefix or did not contain the complete NALU. + // + // Missing data must be read from the current data chunk and merged with the data from the previous data chunk + // to assemble a complete NALU or complete NALU prefix. + // + // The data from the previous data chunk are stored in pc->buf + + if (ctx->to_read < data_size) { + + if (ctx->incomplete_nalu_prefix_read == 1) { + + uint8_t nalu_prefix[EVC_NALU_LENGTH_PREFIX_SIZE]; + evc_assemble_nalu_prefix(s, data, data_size, nalu_prefix, avctx); + + ctx->nalu_size = read_nal_unit_length(nalu_prefix, EVC_NALU_LENGTH_PREFIX_SIZE, avctx); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->to_read; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + ctx->incomplete_nalu_prefix_read = 0; + ctx->nalu_prefix_assembled = 1; + + continue; + } + if (ctx->incomplete_nalu_read == 1) { + + uint8_t *nalu = (uint8_t *)av_malloc(ctx->nalu_size); + + // assemble NAL unit using data from previous data chunks (pc->buffer) and the current one (data) + evc_assemble_nalu(s, data, ctx->to_read, nalu, ctx->nalu_size, avctx); + + if (parse_nal_unit(s, nalu, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + av_free(nalu); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->nalu_size; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + ctx->incomplete_nalu_read = 0; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->to_read; + + ctx->to_read = 0; + ctx->bytes_read = 0; + + return read_bytes; + } + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + continue; + } + } else { + // needed more input data to assemble complete valid NAL Unit + ctx->to_read = ctx->to_read - data_size; + return END_NOT_FOUND; + } + } + } + + return END_NOT_FOUND; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) + next = buf_size; + else { + next = evc_find_frame_end(s, buf, buf_size, avctx); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + // poutbuf contains just one Access Unit + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +const AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index d355808018..2c077ec3ae 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -41,6 +41,7 @@ extern const AVCodecParser ff_dvaudio_parser; extern const AVCodecParser ff_dvbsub_parser; extern const AVCodecParser ff_dvdsub_parser; extern const AVCodecParser ff_dvd_nav_parser; +extern const AVCodecParser ff_evc_parser; extern const AVCodecParser ff_flac_parser; extern const AVCodecParser ff_ftr_parser; extern const AVCodecParser ff_g723_1_parser; From patchwork Tue Mar 28 13:47:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40890 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2195833pzh; Tue, 28 Mar 2023 06:47:27 -0700 (PDT) X-Google-Smtp-Source: AKy350adUMffPYW/Lj5aoZ1xFY37LDcw/KAAafavkfNvwAGgyk5cGNxmZZn4iKMKjFBTWSB3OyvV X-Received: by 2002:a17:907:207b:b0:923:6558:84fb with SMTP id qp27-20020a170907207b00b00923655884fbmr15502539ejb.3.1680011247392; Tue, 28 Mar 2023 06:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011247; cv=none; d=google.com; s=arc-20160816; b=B80kKAScLJlJ6ERf3qnGhpUs25dqI3UUriiSeyhYgLzFd31gJimlqkpOdCCNXyow3V abrxBvDUXMfEFNlxoMPcHMq9M225bKMCpmm4OiKO1MfwypH7iPAXZlNR4uBKiUNFVIrW RS7XUSVOiEE04xcihWSIIY1J8TOGFfW+G2aWfAQ+y/pg2js2p+YjNnqcXxP0kZt+2pCx S/UkpAbnuocwkP2jKh5eyr8fUyjrIKSJCxupd/Wj6bsxCjrtO/vTIwnDEYYYOefk1Ovs DiIYpyVURQj0DfiQA6vSWIRXEGF1ZciACcJFlLeOAwVFktzt038XXth/Uh3Dv6sYPbxT 8g9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=YyPEuk/3XpY5xJiBbFhP9aku12gOscwhZ0d2o+9YRag=; b=aF1sn5k60fVzjZgAVm2sozu3+LgB3s74J9SWTzlkZ+NFCcYa6egeJ/GQodtw306CQQ 1lq5pgwQQhgxhondKEMQ5jZtgw4DKxyPnZxLI3x9AI0bRonk0SRz9m8MjqHkITukobAM XTqx9U5gT7HOTrhdg0UuPWMrTIetaKR4F8IKNb79AQlE3XT9rHFVdS/7z6CqZUjYOCwR vH6PpRnys3SsmFt7Cgdh7d4URJBRL/ri79Mk0QDcYwJYXU5FU0pvLhqv/whRlk3zvACD RndioO+KI6AnbioiwjqSWO8Xx9AexpPgPhGhcpc+YSd4WXstTWHSR5KVelyP02lWXBjq K0tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=hUXWQzRA; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb34-20020a170907962200b0093a0ef38401si21574986ejc.94.2023.03.28.06.47.24; Tue, 28 Mar 2023 06:47:27 -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=@samsung.com header.s=mail20170921 header.b=hUXWQzRA; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4E8668CB43; Tue, 28 Mar 2023 16:47:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F0FA68CAB1 for ; Tue, 28 Mar 2023 16:47:16 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230328134714euoutp013d5a9885f23cade7d17582ed4ddd0746~QmVElc3Lz3136031360euoutp01S for ; Tue, 28 Mar 2023 13:47:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230328134714euoutp013d5a9885f23cade7d17582ed4ddd0746~QmVElc3Lz3136031360euoutp01S DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011234; bh=sfP9fXeVQZCnBihkd6bclU660PBiv56rnF5/LGTWUl0=; h=From:To:Cc:Subject:Date:References:From; b=hUXWQzRAGxP/i4XlFA1COgPzR8fSNJMJi479uI3dWezzP1n3pedOZSDz3QdiAZJLf x5eI9On8OxefZPAT+HwmHRKL3baRcpdKoape5jS80rYwfSvPWnMHm2fP5JYgDfc0MB 0/KjxpWBr483DdgF14ilcBVkn2raUQ4MXllE6TyY= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230328134714eucas1p17deb37fbd69c752a8f74ddda5640f294~QmVEZSJfB2633826338eucas1p1V; Tue, 28 Mar 2023 13:47:14 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 47.6B.10014.2EFE2246; Tue, 28 Mar 2023 14:47:14 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328134714eucas1p1bc1401eac8a48cc2dbe5914fdfb33706~QmVEIu4i02415424154eucas1p1f; Tue, 28 Mar 2023 13:47:14 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230328134714eusmtrp29dfd8dc75062fb92bc7338b28b9f8543~QmVEIL-0A1965619656eusmtrp2Q; Tue, 28 Mar 2023 13:47:14 +0000 (GMT) X-AuditID: cbfec7f5-ba1ff7000000271e-66-6422efe20e07 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 52.F9.09583.2EFE2246; Tue, 28 Mar 2023 14:47:14 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230328134714eusmtip16122bb8ae0b3fabf1b21a13dae7588aa~QmVD2AbKr2432524325eusmtip19; Tue, 28 Mar 2023 13:47:13 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:47:01 +0200 Message-Id: <20230328134701.613-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7qP3iulGKx4pGjx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGW0tf9hL/ggWrGzoZGxgbFNsIuR k0NCwETiw6R9rF2MXBxCAisYJebO+c0C4XxhlHixYR87hPOZUeLekaOMXYzsYC2zLCDCyxkl Zq5aCdXQziSx6/ZNNpCxbAK6Ei8/PGICsUUETCVONu8FizMLaEusu/sdzBYWqJPY1rKbBcRm EVCVWN19hxnE5hWwlDiydikTxHmaEhO2zGGCiAtKnJz5hAUizi2xbtYlVoiZ8hLNW2czgxwh IfCTXeLFwy+MEEUuEh/PT4caJCzx6vgWdghbRuL/zvlAcQ4gu1jiUL8DhFkjcehHOkSFtcTb xuOMIGFmoBPW79KHCDtKNF17zQ5RzSdx460gxAF8EpO2TWeGCPNKdLQJQZgqEn2dYhCNUhJP l81hhrA9JHa/6GeawKg4C8lXs5B8Mgth7QJG5lWM4qmlxbnpqcXGeanlesWJucWleel6yfm5 mxiByeH0v+NfdzCuePVR7xAjEwfjIUYJDmYlEd7f15RShHhTEiurUovy44tKc1KLDzFKc7Ao ifNq255MFhJITyxJzU5NLUgtgskycXBKNTBVhETd3bnp/800u9z6f4WWb81viz69pPV5z4Hr 1vZzz3+5O0VTc9WW/S0NG6dMLzv4do98kV1Xy5wb7vZ7v9qb3gpmP+i3Vf7mhwff5eaGTnk1 /WuG1d+HbMc61h/7f2jn/z8XF0d8zcz+P0ezWUG195rluV6pwIenElcm+/Of6b+uxKEqkJV/ Z8oSX9Hy49cPalq8ltzo8/FNjXSR6ZflPh/vF30Rjlx3w6NDqu/flKc+oYd0CsSeTFXaw1LH I7sk4d3FupOLt0i5z9qRueCk3+Pb87awteelCWxpXXxgxd8lnza827y671OMesb319bWLlXM Wg3zM7S/ZrSkr3qdXKI9keHWl5fTNRn1j//eHqDEUpyRaKjFXFScCAAF+VodfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7qP3iulGPSdErT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DLa2v+wF3wQrdjZ0MjYwNgm2MXIziEhYCIxy6KLkYtDSGApo8TS fxuZuhg5gcJSEkuXLmKEsIUl/lzrYoMoamWS2H11HTNIgk1AV+Llh0dgDSIC5hIX190Ca2AW 0JZYd/c7G4gtLFAjsXvKCbAaFgFVidXdd8B6eQUsJY6sXQq1TFNiwpY5TBBxQYmTM5+wQMS5 JdbNusQKMVNeonnrbOYJjPyzkJTNQpJawMi0ilEktbQ4Nz232EivODG3uDQvXS85P3cTIzBo tx37uWUH48pXH/UOMTJxMB5ilOBgVhLh/X1NKUWINyWxsiq1KD++qDQntfgQoynQrROZpUST 84Fxk1cSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwNQVq/VNy9Bn r/Li7e3CP9ZWzj/OpqyvLTSbS1Pm1Nmfaxaret69E2n8v0Z8/adeLv6Y6ccYEpOTZ1bw1+Q6 buTanR2zr9znRe3Jr0Kv4tW5P+bJuxgtzBO19l+oPPO6/KMDjN/7hePvBx9vs1kqI6DPNu90 24ub7cJHIqZ82j35eb8O18ltkTN2p0yU3z2z9ltSsWaryux3Ttopu6fx9dQeNdLbsiToxzmn wnmCYZ5nCqaJPlu22OjUmdWrFy3K/yM28Y3KifB8zQ9HmV9ozrxayFX40dh3woeLW+Kspjfo 2fLwxX2cwr5+5t3e72pH/mk33QoV/Fowc7vGViFXd581PAcP/OI31N5mUbP022olluKMREMt 5qLiRACZZMwo4wIAAA== X-CMS-MailID: 20230328134714eucas1p1bc1401eac8a48cc2dbe5914fdfb33706 X-Msg-Generator: CA X-RootMTR: 20230328134714eucas1p1bc1401eac8a48cc2dbe5914fdfb33706 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328134714eucas1p1bc1401eac8a48cc2dbe5914fdfb33706 References: Subject: [FFmpeg-devel] [PATCH v18 03/10] avformat/evc_muxer: Added muxer to handle writing EVC encoded data into file or output bytestream 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8JFhBSpkI4pE - Provided AVOutputFormat structure describing EVC output format (ff_evc_muxer) - Added documentation for EVC muxer Signed-off-by: Dawid Kozinski --- doc/muxers.texi | 6 ++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 13 +++++++++++++ 4 files changed, 21 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 79dd864182..eee3e7c526 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2120,6 +2120,12 @@ DTS Coherent Acoustics (DCA) audio. Dolby Digital Plus, also known as Enhanced AC-3, audio. +@subsection evc + +MPEG-5 Essential Video Coding (EVC) / EVC / MPEG-5 Part 1 EVC video. + +Extensions: evc + @subsection g722 ITU-T G.722 audio. diff --git a/libavformat/Makefile b/libavformat/Makefile index 048649689b..fafed6d129 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index cb5b69e9cd..203188cb27 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -154,6 +154,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const FFOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const FFOutputFormat ff_evc_muxer; extern const FFOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const FFOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 78fadda967..70d6322c53 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -401,6 +401,19 @@ const FFOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +const FFOutputFormat ff_evc_muxer = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .p.extensions = "evc", + .p.audio_codec = AV_CODEC_ID_NONE, + .p.video_codec = AV_CODEC_ID_EVC, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .p.flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const FFOutputFormat ff_m4v_muxer = { .p.name = "m4v", From patchwork Tue Mar 28 13:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2196783pzh; Tue, 28 Mar 2023 06:48:48 -0700 (PDT) X-Google-Smtp-Source: AKy350aoRP5KNDwInExXL0npsWsGrPzhkd5eQjIdO8Ib1y1mMxfv8HyJicWTjGTxqUXrIuLz9sMD X-Received: by 2002:a17:907:1819:b0:931:dcd4:4ff0 with SMTP id lg25-20020a170907181900b00931dcd44ff0mr19092644ejc.75.1680011328101; Tue, 28 Mar 2023 06:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011328; cv=none; d=google.com; s=arc-20160816; b=wJQvAzZ3G4JsSRjZzbCdV+bSqIaVzGP6VTAePLNSW09KeByIYeOoKxkJx+U+L1NK/7 IiSMDI23MTftOTJTwGSA1ys5foXlcqnCuFMkkRmJC3w7FGmpTdW0clja3nhU3Ob33YeC RhqXzSBYnSbswGv4QKZnlqdrk0z4+06/HZpU+UfgbNTfgPoDK4IMyMoKu2HDeFwIml2Q 4JoXb3pOh/E8d9eYWL8eqN5tx/Sb6OhF8cFg75O4jy9VEGmEMhqzaccDSHuQMLCHAsF3 eHKR5FXiDyi7U8P/6OZphKoXtzhNQl/Cc0IEcUheAMNZBGB7h4ZBpknWezN3XaPI3eFp BKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=xeKg/8alJXarla+UdJzXP1kphYNhBMsimxRK6BqxPKk=; b=Vxkd3vD/xhr4mdgxZkhfrQcmctQh8he5xgmeDNt7vPy3x7fQk7HprxSIt0Gv1VdKNe oBB1+pDL1BWoYgDqJndP3CHsXWnEpPSmu5Qe2DtceLVA0nzcRtNT8QJ7DzPrJQB3Qew+ npi4gt2lsmrSa0E7ZIP0l47aPtVPYzPjCRFV4kaE1l5zIs46aHw57kKTZMPCdzW3F8bs ASKLnVnGH1X+tV5gp9xBO7sS94b7CpwmgW2G4CTnnD0zP8uFtAwUCyq5qnja7sTqm1jj 4LgE7Dn/TQvlNdKtL8HA7STeK9eD765OnDG0lKJ1pgEt473GxkQvlESWS3+B0CF8kSnQ qp/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=F25ieJQv; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x10-20020a1709060eea00b0093dfd2eab9dsi10051805eji.2.2023.03.28.06.48.47; Tue, 28 Mar 2023 06:48:48 -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=@samsung.com header.s=mail20170921 header.b=F25ieJQv; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBDE068CB5E; Tue, 28 Mar 2023 16:48:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2699368CAFA for ; Tue, 28 Mar 2023 16:48:40 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230328134839euoutp01a50a6bd7c844dee7a022ecdb814d66bc~QmWTprQFx3152631526euoutp01n for ; Tue, 28 Mar 2023 13:48:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230328134839euoutp01a50a6bd7c844dee7a022ecdb814d66bc~QmWTprQFx3152631526euoutp01n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011319; bh=GIoD4J0tXxCWhDvkGUSECYeMtB83b+2XBjqG22mbxJE=; h=From:To:Cc:Subject:Date:References:From; b=F25ieJQvta8M5yftpNTYCXwUy1GI238wj2A1KvgbkLzEBAW1Qxg+8Tg2YP9hKA+wy c/W73YRxVdk1yLm6CwLYu1OcA9zne5mUSyyt6EviKTvXMiktbOxXHPfCeJD2k4zabH tT4eOOc2AFCXzkFc+u1UzoOc42pJSNxaP0BBr4Ew= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230328134839eucas1p2a3306728e29b1223408473071940f458~QmWTXRzo-0170301703eucas1p28; Tue, 28 Mar 2023 13:48:39 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 9B.64.09966.730F2246; Tue, 28 Mar 2023 14:48:39 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230328134839eucas1p248ee444f23e53affdac274cdbac1b7ff~QmWTCHbq61735417354eucas1p2H; Tue, 28 Mar 2023 13:48:39 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328134839eusmtrp198416809db044c628c3da403b3c5358e~QmWTBoWel0065100651eusmtrp1K; Tue, 28 Mar 2023 13:48:39 +0000 (GMT) X-AuditID: cbfec7f4-d4fff700000026ee-84-6422f03780a9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 65.32.08862.630F2246; Tue, 28 Mar 2023 14:48:38 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328134838eusmtip235dfded02d14357f82ed2180ee33b442~QmWSq8K-P2572925729eusmtip2a; Tue, 28 Mar 2023 13:48:38 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:48:02 +0200 Message-Id: <20230328134802.1665-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djP87rmH5RSDPZuELL4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDL2zZjGXjBBq2L1ipuMDYw/5LsY OTgkBEwkjpxz72Lk4hASWMEo8WHJKfYuRk4g5wujxKJfSRCJz4wSx6/fAkuANLQcX8EMUbSc UWLyHQ2IonYmiVkbHoMVsQnoSrz88IgJxBYRMJU42byXDcRmFtCWWHf3OxvIZmGBJImPC0VB wiwCqhIbDn0Am8krYCVx+PcrFohdmhITtsxhgogLSpyc+QQqzi2xbtYlVoiR8hLNW2czg9wg IfCTXaL5zw5miCIXia0X17NB2MISr45vgXpARuL05B4WiO+LJQ71O0CYNRKHfqRDVFhLvG08 zggSZgY6Yf0ufYiwo8S3F+uZIar5JG68FYQ4gE9i0rbpUGFeiY42IQhTRaKvUwyiUUri6bI5 UFd5SBxb85JlAqPiLCRfzULyySyEtQsYmVcxiqeWFuempxYb5aWW6xUn5haX5qXrJefnbmIE JobT/45/2cG4/NVHvUOMTByMhxglOJiVRHh/X1NKEeJNSaysSi3Kjy8qzUktPsQozcGiJM6r bXsyWUggPbEkNTs1tSC1CCbLxMEp1cC08HYS05KIOF3unxffm2j8L3u2+e6nqY5ioiELU4yS fm84e1XGfoHf5Zuf5TYJCxiz3qu+5rLnRIhm6vUZT8S+s8+4MEX70bQ3/N9Wz7J4kLLg9/fP SWGs+bHpwn/7txrpd+te01C+lMRpF1l0S/QTz8JmIf2T7MF/NGWjZ/2PCJjG/auT9QLDnBXb dLbs5FAvmyrN0/NTkTm2QGPngYzgozvNpA0+crmvvKnIKrcpalfg3Hl1HOu4qqI+WP468/7j TvaTE+QW/t7lIRsr9EtfR3ItL0/65mdLLRtb9vmy1mwTndntt0BXvapLlmvV5S1/33Ku/RX6 IsBCunH940VdPznkXr2sDN6RvOf7U8dVSizFGYmGWsxFxYkAMRTz33sDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7pmH5RSDLrPWFh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehn7ZkxjL5igVbF6xU3GBsYf8l2MnBwSAiYSLcdXMHcxcnEICSxl lPj/t4kdIiElsXTpIkYIW1jiz7UuNoiiViaJ6zN2gRWxCehKvPzwiAnEFhEwl7i47hZYA7OA tsS6u9/ZQGxhgQSJxe/Xs4DYLAKqEhsOfWAGsXkFrCQO/37FArFAU2LCljlMEHFBiZMzn0DF uSXWzbrECjFTXqJ562zmCYz8s5CUzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMw cLcd+7l5B+O8Vx/1DjEycTAeYpTgYFYS4f19TSlFiDclsbIqtSg/vqg0J7X4EKMp0K0TmaVE k/OBsZNXEm9oZmBqaGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cC02cBg2mVe yysb1jJMsDhjui3l+8V3cklPHM/sED2ZO+lDvkWr1V/eJNcLOsISQbGVk3L3/XnyL077fXBe +39raTXL4OIZa3uL+L4G7F14ZI2GApvJ1pYbXl5bdt67InBl+YpJfp82hT3oVVj9X/ftWdvF MZyvzEv6S69I/crYdDT+8wsel+UdzwomZa1h2Lma5RKjcXeD3BpthQfXr+U8s+Pm5vJ1CVnA nKwc+E5mS8TJrybpM5v3m6Ub7+neLn099PdRnWmT/ncq9G/J2shi9X6LWnH6lZfFB3ukpt82 Z0x/zvf3iPQckwTJjX0eDtmirzYd91v5vctQztsveFXeqrIPzx2bU27xvph1a7+rEktxRqKh FnNRcSIA0upW/eUCAAA= X-CMS-MailID: 20230328134839eucas1p248ee444f23e53affdac274cdbac1b7ff X-Msg-Generator: CA X-RootMTR: 20230328134839eucas1p248ee444f23e53affdac274cdbac1b7ff X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328134839eucas1p248ee444f23e53affdac274cdbac1b7ff References: Subject: [FFmpeg-devel] [PATCH v18 04/10] avformat/evc_demuxer: Added demuxer to handle reading EVC video files 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NPpzL32jE9Jp - Provided AVInputFormat struct describing EVC input format (ff_evc_demuxer) Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/evcdec.c | 121 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 libavformat/evcdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index fafed6d129..d80e5dc6b3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_DEMUXER) += evcdec.o rawdec.o OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 203188cb27..9d7d6a37a1 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -154,6 +154,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const FFOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; extern const FFOutputFormat ff_evc_muxer; extern const FFOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..f73eeb4417 --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,121 @@ +/* + * RAW EVC video demuxer + * + * 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 "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" +#include "libavcodec/evc.h" + +#include "rawdec.h" +#include "avformat.h" + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) // Cannot get bitstream information. Malformed bitstream. + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) // Invalid bitstream size + return 0; + } + + return nalu_len; +} + +static int parse_nal_units(const AVProbeData *p, EVCParserContext *ev) +{ + int nalu_type; + size_t nalu_size; + unsigned char *bits = (unsigned char *)p->buf; + int bytes_to_read = p->buf_size; + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + + nalu_size = read_nal_unit_length(bits, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + bits += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) From patchwork Tue Mar 28 13:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2197491pzh; Tue, 28 Mar 2023 06:49:58 -0700 (PDT) X-Google-Smtp-Source: AKy350YQGOkZ8abkCYkEMCwV1Aq3MiXsuAdOHjnRmvj05kgCPnEYDwwHq7r9X0leq92WlgWwU/cq X-Received: by 2002:a17:906:5589:b0:88a:2e57:9813 with SMTP id y9-20020a170906558900b0088a2e579813mr17478401ejp.33.1680011398685; Tue, 28 Mar 2023 06:49:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011398; cv=none; d=google.com; s=arc-20160816; b=Nx63Glq7AK+23LM81a3EY5gXrYjHsk1yuO4bESFGb83jSJoZcQmVENX8weRPfbg3QW c+QG1qoWxEw43UCZ5s8Lz5lMgAwTQuwsrqs+MVieNfVG5wMA74SE95SrBNPXzU9n8Zu4 X/kXptCQ8XD7ojCphLdA9WsuZMUKQWb9myrPTNdlkJhgTr6MTkh/dnkbE/tov8pcsQ86 X7weksHDxJdDrZZ6LXZWnFptOPSlVBt28i7hLKlJIu5D6c41WxwN325rP6xpZtWWU1Mu XiWv1T/BXAig8gQ5JTKkc9LK+dhgv5/qKY3KcfEqrXTQ8W3a07r6D18rVHW4ITKCs6DP UABQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=cBk7Db1k+WWlCsmwVo269b9cUYHLfh8v/sOpen79w/I=; b=sx9rFrghNY4Rv/6l4lKSWcK+JgRJS5bQB1J4ZyGE6dV/9pdhqUjBtu4/eURRaNtFSE zEXV0UbfJ9KfEFWEX2iPCFkH1EZBWgVjzn/UmSuMq7nuVCfZ3DYykFq4xBh3ZO39ZDfk jJHJVUAFfE1ts+Ma4EiB9Q4W7OoLTYc0BZbjjp5UkBk5vXUTsdvH3EQWHRYuGe2ksJRc 2H1v8kRbuwnm8Od+/kb9LtSngc4TbX85dI1v7E4gEs51xfuMI4bCWo5g/1gw55Fx7T1x p7ykPCO7BiWhWnQSFl9LPheC6pOH0GRITjDpZ1TLr9lsJ0LxXN5rtFDrJ3XeA0ukLnFx dXdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=uXZvCGs1; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i13-20020a170906a28d00b00932dac6402csi26171896ejz.370.2023.03.28.06.49.58; Tue, 28 Mar 2023 06:49:58 -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=@samsung.com header.s=mail20170921 header.b=uXZvCGs1; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3290A68CB79; Tue, 28 Mar 2023 16:49:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CF7968C1DA for ; Tue, 28 Mar 2023 16:49:49 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328134949euoutp02e76f2a9c374b7dccbdb1ae575623798d~QmXUOWCdN2752727527euoutp023 for ; Tue, 28 Mar 2023 13:49:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328134949euoutp02e76f2a9c374b7dccbdb1ae575623798d~QmXUOWCdN2752727527euoutp023 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011389; bh=eb61XYZO89xig2M0t+C7U/+HBajMaerCYsgLznt0mTs=; h=From:To:Cc:Subject:Date:References:From; b=uXZvCGs1E+tW7PCBv6+PcHIPU2GsBFOY8CmZK9Dp1DR4Ffj+rycT0l+SwL+m9h2z5 lEq5aP0Q6DkoHHPjvDWR4oa31fIanW3Z5Ekz/R/7Tyc7+WyOM/fNVtI26BF6s087Ag jiKh6zxwdyd8u7F8Mfx47W8s93Y09kZWkgu/IpDs= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230328134948eucas1p1d818c1dd891239b401ff622cc6ac2abd~QmXTngSVk1571815718eucas1p1p; Tue, 28 Mar 2023 13:49:48 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id CD.FB.10014.C70F2246; Tue, 28 Mar 2023 14:49:48 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328134948eucas1p1ec170b3992293246ccbab88fa2b24797~QmXTVIgpY1366813668eucas1p15; Tue, 28 Mar 2023 13:49:48 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328134948eusmtrp1ecbaf655eeaa392b9d8ccea20158c9ef~QmXTUgOXP0181801818eusmtrp1t; Tue, 28 Mar 2023 13:49:48 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-af-6422f07c663f Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id DA.62.08862.B70F2246; Tue, 28 Mar 2023 14:49:47 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328134947eusmtip2554fe046a5c757674c7a6aa68e5c6911~QmXS8lPi42048320483eusmtip2Y; Tue, 28 Mar 2023 13:49:47 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:49:14 +0200 Message-Id: <20230328134914.1043-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djP87o1H5RSDPYvELb4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDK+bFzHVnDtN2PF9luHGBsY3+1l 7GLk5JAQMJFYveQKkM3FISSwglFi1aNeKOcLo8SG2ztYIJzPjBIHd2xnhWmZNuctO0RiOaPE 9VWfmSCcdiaJY6tPgA1mE9CVePnhEROILSJgKnGyeS8biM0soC2x7u53MFtYIEji9vYF7CA2 i4CqxLWGnSwgNq+AlcSK/x+gtmlKTNgyhwkiLihxcuYTFog4t8S6WZdYIWbKSzRvnc0McoSE wF92iZkH/zBDFLlILFvewQRhC0u8Or6FHcKWkTg9uQdoEAeQXSxxqN8BwqyROPQjHaLCWuJt 43FGkDAz0Anrd+lDhB0lZp3czApRzSdx460gxAF8EpO2TWeGCPNKdLQJQZgqEn2dYhCNUhJP l82BuspDYunUQ4wTGBVnIflqFpJPZiGsXcDIvIpRPLW0ODc9tdg4L7Vcrzgxt7g0L10vOT93 EyMwSZz+d/zrDsYVrz7qHWJk4mA8xCjBwawkwvv7mlKKEG9KYmVValF+fFFpTmrxIUZpDhYl cV5t25PJQgLpiSWp2ampBalFMFkmDk6pBiZv/7zjr3Uzd3a6CZiZiyxY5P7szf49e6vzf59f WXLiv1yH/tkDrE/N9/YlmLAoGM8U0ZW0KBLb2XfPufFr+uw++Swh5XXqzbq9cbE+Ex+8VfFZ 8/TjnvtfYu4oae/OXm0cI6bSE/pte9pCK5td8YyHfHOuMRhciuvr49l+YOGxauXWbFaHM+Eb VjzLDC7eGh/s/2udsYPP7ibtOVP2PbglcmGLtc3EWZseT72k/mhF4zr/04ztBk8yXu8t1L32 5GhvR32KIMsyFYcmkwt1D/yP2h75qlO56uAvc5Wmlekz3atz1f1u82urcTvIcl7kPSBfy6zD ITsndILfizvzJlYtunDjusl6P4OSmdss9yixFGckGmoxFxUnAgBIBLEKgQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xe7o1H5RSDM6qW3y59oXZYuW33ywW 3z6dYXZg9vizaDOLR9+WVYwBTFF6NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkam Svp2NimpOZllqUX6dgl6GV82rmMruPabsWL7rUOMDYzv9jJ2MXJySAiYSEyb85a9i5GLQ0hg KaPEs9M/2CESUhJLly6CKhKW+HOtiw2iqJVJ4viB/2wgCTYBXYmXHx4xgdgiAuYSF9fdAmtg FtCWWHf3O1iNsECAxPvFl8FqWARUJa417GQBsXkFrCRW/P/ACrFAU2LCljlMEHFBiZMzn7BA xLkl1s26xAoxU16ieets5gmM/LOQlM1CklrAyLSKUSS1tDg3PbfYUK84Mbe4NC9dLzk/dxMj MHS3Hfu5eQfjvFcf9Q4xMnEwHmKU4GBWEuH9fU0pRYg3JbGyKrUoP76oNCe1+BCjKdCtE5ml RJPzgdGTVxJvaGZgamhiZmlgamlmrCTO61nQkSgkkJ5YkpqdmlqQWgTTx8TBKdXAxCpzTMJ1 0rOJQT7X2L5ctTxyQfdPbM+dW78jSy5fmSh55LTb2n3/YqWY4l4e8pfwffamp2B7xYyKNu8j md2vulf6t/quyjjLM/XBxZQ+vt232SYyCImveP/RxWnd04uTL/gd//2a1fZ2dua1RfNqbwrW i4U80U0+9F9oC7N4p9u6pFkHZTalppvelit7a3iBqeHSTUYN677agtgFfHpHDf8ZJPIYvvI3 1xdpnbJgw40Lft5Ks6tumS99+ekKa8Ql8dnfP7x5/P8jn+Pv2MiHyYdc/1h+SPH0+r18/qTX F23naGWK5FyvmTKVu+OntUYS/7F9fS8SD9d+35Kyh0f4TJE2u9SCz9u3Fav58ar9dFViKc5I NNRiLipOBAAR+U7O5gIAAA== X-CMS-MailID: 20230328134948eucas1p1ec170b3992293246ccbab88fa2b24797 X-Msg-Generator: CA X-RootMTR: 20230328134948eucas1p1ec170b3992293246ccbab88fa2b24797 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328134948eucas1p1ec170b3992293246ccbab88fa2b24797 References: Subject: [FFmpeg-devel] [PATCH v18 05/10] avcodec/evc_encoder: Provided support for EVC encoder 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ni12pTuVqH1J - Added EVC encoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xeve wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/encoders.texi | 69 +++++ doc/general_contents.texi | 11 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxeve.c | 616 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 702 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index cec001fb16..4b6db91de5 100755 --- a/configure +++ b/configure @@ -291,6 +291,7 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --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-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1862,6 +1863,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3397,6 +3399,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" vapoursynth_demuxer_deps="vapoursynth" @@ -6735,6 +6738,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index af3bd43cbe..45ae61b3fb 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2878,6 +2878,75 @@ ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2 @end example @end table +@section libxeve + +eXtra-fast Essential Video Encoder (XEVE) MPEG-5 EVC encoder wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +This encoder requires the presence of the libxeve headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxeve}. + +@float NOTE +Many libxeve encoder options are mapped to FFmpeg global codec options, +while unique encoder options are provided through private options. +Additionally the xeve-params private options allows one to pass a list +of key=value tuples as accepted by the libxeve @code{parse_xeve_params} function. +@end float + +The xeve project website is at @url{https://github.com/mpeg5/xeve}. + +@subsection Options + +The following options are supported by the libxeve wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +@float NOTE +To reduce the duplication of documentation, only the private options +and some others requiring special attention are documented here. For +the documentation of the undocumented generic options, see +@ref{codec-options,,the Codec Options chapter}. +@end float + +@float NOTE +To get a more accurate and extensive documentation of the libxeve options, +invoke the command @code{xeve_app --help} or consult the libxeve documentation. +@end float + +@table @option +@item b (@emph{bitrate}) +Set target video bitrate in bits/s. +Note that FFmpeg's b option is expressed in bits/s, while xeve's bitrate is in kilobits/s. + +@item bf (@emph{bframes}) +Set the maximum number of B frames (1,3,7,15). + +@item g (@emph{keyint}) +Set the GOP size (I-picture period). + +@item preset (@emph{preset}) +Set the xeve preset. +Set the encoder preset value to determine encoding speed [fast, medium, slow, placebo] + +@item tune (@emph{tune}) +Set the encoder tune parameter [psnr, zerolatency] + +@item profile (@emph{profile}) +Set the encoder profile [0: baselie; 1: main] + +@item crf (@emph{crf}) +Set the quality for constant quality mode. +Constant rate factor <10..49> [default: 32] + +@item qp (@emph{qp}) +Set constant quantization rate control method parameter. +Quantization parameter qp <0..51> [default: 32] + +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section libxvid Xvid MPEG-4 Part 2 encoder wrapper. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 2eeebd847d..31f1793b9e 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -343,6 +343,14 @@ libxavs2 is under the GNU Public License Version 2 or later details), you must upgrade FFmpeg's license to GPL in order to use it. @end float +@section eXtra-fast Essential Video Encoder (XEVE) + +FFmpeg can make use of the XEVE library for EVC video encoding. + +Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for +installing the XEVE library. Then pass @code{--enable-libxeve} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -598,6 +606,7 @@ library: @item raw DTS @tab X @tab X @item raw DTS-HD @tab @tab X @item raw E-AC-3 @tab X @tab X +@item raw EVC @tab X @tab X @item raw FLAC @tab X @tab X @item raw GSM @tab @tab X @item raw H.261 @tab X @tab X @@ -943,6 +952,8 @@ following image formats are supported: @item Electronic Arts TQI video @tab @tab X @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 librariy libxeve @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 635b936cac..53ffdc5bbe 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1130,6 +1130,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 385ee34803..acfade1893 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -814,6 +814,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; #endif extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; +extern const FFCodec ff_libxeve_encoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxeve.c b/libavcodec/libxeve.c new file mode 100644 index 0000000000..c10b7de023 --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,616 @@ +/* + * libxeve encoder + * EVC (MPEG-5 Essential Video Coding) encoding using XEVE MPEG-5 EVC encoder 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/time.h" +#include "libavutil/cpu.h" +#include "libavutil/avstring.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "encode.h" + +#define MAX_BS_BUF (16*1024*1024) + +/** + * Error codes + */ +#define XEVE_PARAM_BAD_NAME -100 +#define XEVE_PARAM_BAD_VALUE -200 + +/** + * Encoder states + * + * STATE_ENCODING - the encoder receives and processes input frames + * STATE_BUMPING - there are no more input frames, however the encoder still processes previously received data + */ +typedef enum State { + STATE_ENCODING, + STATE_BUMPING, +} State; + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + */ +typedef struct XeveContext { + const AVClass *class; + + XEVE id; // XEVE instance identifier + XEVE_CDSC cdsc; // coding parameters i.e profile, width & height of input frame, num of therads, frame rate ... + XEVE_BITB bitb; // bitstream buffer (output) + XEVE_STAT stat; // encoding status (output) + XEVE_IMGB imgb; // image buffer (input) + + State state; // encoder state (skipping, encoding, bumping) + + int profile_id; // encoder profile (main, baseline) + int preset_id; // preset of xeve ( fast, medium, slow, placebo) + int tune_id; // tune of xeve (psnr, zerolatency) + + // variables for rate control modes + int rc_mode; // Rate control mode [ 0(CQP) / 1(ABR) / 2(CRF) ] + int qp; // quantization parameter (QP) [0,51] + int crf; // constant rate factor (CRF) [10,49] + + int hash; // embed picture signature (HASH) for conformance checking in decoding + int sei_info; // embed Supplemental enhancement information while encoding + + int color_format; // input data color format: currently only XEVE_CF_YCBCR420 is supported + + AVDictionary *xeve_params; +} XeveContext; + +/** + * Convert FFmpeg pixel format (AVPixelFormat) to XEVE pre-defined color format + * + * @param[in] av_pix_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * @param[out] xeve_col_fmt XEVE pre-defined color format (@see xeve.h) + * + * @return 0 on success, negative value on failure + */ +static int libxeve_color_fmt(enum AVPixelFormat av_pix_fmt, int *xeve_col_fmt) +{ + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + default: + *xeve_col_fmt = XEVE_CF_UNKNOWN; + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Convert FFmpeg pixel format (AVPixelFormat) into XEVE pre-defined color space + * + * @param[in] px_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * + * @return XEVE pre-defined color space (@see xeve.h) on success, XEVE_CF_UNKNOWN on failure + */ +static int libxeve_color_space(enum AVPixelFormat av_pix_fmt) +{ + /* color space of input image */ + int cs = XEVE_CF_UNKNOWN; + + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + cs = XEVE_CS_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR420, 10, 1); +#else + cs = XEVE_CS_YCBCR420_10LE; +#endif + + break; + default: + cs = XEVE_CF_UNKNOWN; + break; + } + + return cs; +} + +/** + * The function returns a pointer to the object of the XEVE_CDSC type. + * XEVE_CDSC contains all encoder parameters that should be initialized before the encoder is used. + * + * The field values of the XEVE_CDSC structure are populated based on: + * - the corresponding field values of the AvCodecConetxt structure, + * - the xeve encoder specific option values, + * (the full list of options available for xeve encoder is displayed after executing the command ./ffmpeg --help encoder = libxeve) + * + * The order of processing input data and populating the XEVE_CDSC structure + * 1) first, the fields of the AVCodecContext structure corresponding to the provided input options are processed, + * (i.e -pix_fmt yuv420p -s:v 1920x1080 -r 30 -profile:v 0) + * 2) then xeve-specific options added as AVOption to the xeve AVCodec implementation + * (i.e -preset 0) + * + * Keep in mind that, there are options that can be set in different ways. + * In this case, please follow the above-mentioned order of processing. + * The most recent assignments overwrite the previous values. + * + * @param[in] avctx codec context (AVCodecContext) + * @param[out] cdsc contains all Xeve MPEG-5 EVC encoder encoder parameters that should be initialized before the encoder is use + * + * @return 0 on success, negative error code on failure + */ +static int get_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) +{ + XeveContext *xectx = NULL; + int ret; + + xectx = avctx->priv_data; + + /* initialize xeve_param struct with default values */ + ret = xeve_param_default(&cdsc->param); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set_default parameter\n"); + return AVERROR_EXTERNAL; + } + + /* read options from AVCodecContext */ + if (avctx->width > 0) + cdsc->param.w = avctx->width; + + if (avctx->height > 0) + cdsc->param.h = avctx->height; + + if (avctx->framerate.num > 0) { + // fps can be float number, but xeve API doesn't support it + cdsc->param.fps = lrintf(av_q2d(avctx->framerate)); + } + + // GOP size (key-frame interval, I-picture period) + cdsc->param.keyint = avctx->gop_size; // 0: only one I-frame at the first time; 1: every frame is coded in I-frame + + if (avctx->max_b_frames == 0 || avctx->max_b_frames == 1 || avctx->max_b_frames == 3 || + avctx->max_b_frames == 7 || avctx->max_b_frames == 15) // number of b-frames + cdsc->param.bframes = avctx->max_b_frames; + else { + av_log(avctx, AV_LOG_ERROR, "Incorrect value for maximum number of B frames: (%d) \n" + "Acceptable values for bf option (maximum number of B frames) are 0,1,3,7 or 15\n", avctx->max_b_frames); + return AVERROR_INVALIDDATA; + } + + cdsc->param.level_idc = avctx->level; + + if (avctx->rc_buffer_size) // VBV buf size + cdsc->param.vbv_bufsize = (int)(avctx->rc_buffer_size / 1000); + + cdsc->param.rc_type = xectx->rc_mode; + + if (xectx->rc_mode == XEVE_RC_CQP) + cdsc->param.qp = xectx->qp; + else if (xectx->rc_mode == XEVE_RC_ABR) { + if (avctx->bit_rate / 1000 > INT_MAX || avctx->rc_max_rate / 1000 > INT_MAX) { + av_log(avctx, AV_LOG_ERROR, "Not supported bitrate bit_rate and rc_max_rate > %d000\n", INT_MAX); + return AVERROR_INVALIDDATA; + } + cdsc->param.bitrate = (int)(avctx->bit_rate / 1000); + } else if (xectx->rc_mode == XEVE_RC_CRF) + cdsc->param.crf = xectx->crf; + else { + av_log(avctx, AV_LOG_ERROR, "Not supported rate control type: %d\n", xectx->rc_mode); + return AVERROR_INVALIDDATA; + } + + if (avctx->thread_count <= 0) { + int cpu_count = av_cpu_count(); + cdsc->param.threads = (cpu_count < XEVE_MAX_THREADS) ? cpu_count : XEVE_MAX_THREADS; + } else if (avctx->thread_count > XEVE_MAX_THREADS) + cdsc->param.threads = XEVE_MAX_THREADS; + else + cdsc->param.threads = avctx->thread_count; + + + libxeve_color_fmt(avctx->pix_fmt, &xectx->color_format); + + cdsc->param.cs = XEVE_CS_SET(xectx->color_format, cdsc->param.codec_bit_depth, AV_HAVE_BIGENDIAN); + + cdsc->max_bs_buf_size = MAX_BS_BUF; + + ret = xeve_param_ppt(&cdsc->param, xectx->profile_id, xectx->preset_id, xectx->tune_id); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set profile(%d), preset(%d), tune(%d)\n", xectx->profile_id, xectx->preset_id, xectx->tune_id); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * Set XEVE_CFG_SET_USE_PIC_SIGNATURE for encoder + * + * @param[in] logger context + * @param[in] id XEVE encodec instance identifier + * @param[in] ctx the structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + * + * @return 0 on success, negative error code on failure + */ +static int set_extra_config(AVCodecContext *avctx, XEVE id, XeveContext *ctx) +{ + int ret, size; + size = 4; + + // embed SEI messages identifying encoder parameters and command line arguments + // - 0: off\n" + // - 1: emit sei info" + // + // SEI - Supplemental enhancement information contains information + // that is not necessary to decode the samples of coded pictures from VCL NAL units. + // Some SEI message information is required to check bitstream conformance + // and for output timing decoder conformance. + // @see ISO_IEC_23094-1_2020 7.4.3.5 + // @see ISO_IEC_23094-1_2020 Annex D + ret = xeve_config(id, XEVE_CFG_SET_SEI_CMD, &ctx->sei_info, &size); // sei_cmd_info + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for sei command info messages\n"); + return AVERROR_EXTERNAL; + } + + ret = xeve_config(id, XEVE_CFG_SET_USE_PIC_SIGNATURE, &ctx->hash, &size); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for picture signature\n"); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * @brief Switch encoder to bumping mode + * + * @param id XEVE encodec instance identifier + * @return 0 on success, negative error code on failure + */ +static int setup_bumping(XEVE id) +{ + int val = 1; + int size = sizeof(int); + if (XEVE_FAILED(xeve_config(id, XEVE_CFG_SET_FORCE_OUT, (void *)(&val), &size))) + return AVERROR_EXTERNAL; + + return 0; +} + +/** + * @brief Initialize eXtra-fast Essential Video Encoder codec + * Create an encoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_init(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + unsigned char *bs_buf = NULL; + int i; + int shift_h = 0; + int shift_v = 0; + int width_chroma = 0; + int height_chroma = 0; + XEVE_IMGB *imgb = NULL; + int ret = 0; + + XEVE_CDSC *cdsc = &(xectx->cdsc); + + /* allocate bitstream buffer */ + bs_buf = av_malloc(MAX_BS_BUF); + if (bs_buf == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot allocate bitstream buffer\n"); + return AVERROR(ENOMEM); + } + xectx->bitb.addr = bs_buf; + xectx->bitb.bsize = MAX_BS_BUF; + + /* read configurations and set values for created descriptor (XEVE_CDSC) */ + if ((ret = get_conf(avctx, cdsc)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot get configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = xeve_param_check(&cdsc->param)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid configuration\n"); + return AVERROR(EINVAL); + } + + { + AVDictionaryEntry *en = NULL; + while (en = av_dict_get(xectx->xeve_params, "", en, AV_DICT_IGNORE_SUFFIX)) { + if ((ret = xeve_param_parse(&cdsc->param, en->key, en->value)) < 0) { + av_log(avctx, AV_LOG_WARNING, + "Error parsing option '%s = %s'.\n", + en->key, en->value); + } + } + } + + /* create encoder */ + xectx->id = xeve_create(cdsc, NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVE encoder\n"); + return AVERROR_EXTERNAL; + } + + if ((ret = set_extra_config(avctx, xectx->id, xectx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set extra configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to get chroma shift\n"); + return AVERROR(EINVAL); + } + + // Chroma subsampling + // + // YUV format explanation + // shift_h == 1 && shift_v == 1 : YUV420 + // shift_h == 1 && shift_v == 0 : YUV422 + // shift_h == 0 && shift_v == 0 : YUV444 + // + width_chroma = AV_CEIL_RSHIFT(avctx->width, shift_h); + height_chroma = AV_CEIL_RSHIFT(avctx->height, shift_v); + + /* set default values for input image buffer */ + imgb = &xectx->imgb; + imgb->cs = libxeve_color_space(avctx->pix_fmt); + imgb->np = 3; /* only for yuv420p, yuv420ple */ + + for (i = 0; i < imgb->np; i++) + imgb->x[i] = imgb->y[i] = 0; + + imgb->w[0] = imgb->aw[0] = avctx->width; // width luma + imgb->w[1] = imgb->w[2] = imgb->aw[1] = imgb->aw[2] = width_chroma; + imgb->h[0] = imgb->ah[0] = avctx->height; // height luma + imgb->h[1] = imgb->h[2] = imgb->ah[1] = imgb->ah[2] = height_chroma; + + xectx->state = STATE_ENCODING; + + return 0; +} + +/** + * Encode raw data frame into EVC packet + * + * @param[in] avctx codec context + * @param[out] avpkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = avctx->priv_data; + int ret = -1; + + // No more input frames are available but encoder still can have some data in its internal buffer to process + // and some frames to dump. + if (xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + return 0; + } + } + + if (xectx->state == STATE_ENCODING) { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + imgb->ts[XEVE_TS_PTS] = frame->pts; + + /* push image to encoder */ + ret = xeve_push(xectx->id, imgb); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_push() failed\n"); + return AVERROR_EXTERNAL; + } + } + if (xectx->state == STATE_ENCODING || xectx->state == STATE_BUMPING) { + /* encoding */ + ret = xeve_encode(xectx->id, &(xectx->bitb), &(xectx->stat)); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_encode() failed\n"); + return AVERROR_EXTERNAL; + } + + /* store bitstream */ + if (ret == XEVE_OK_OUT_NOT_AVAILABLE) { // Return OK but picture is not available yet + *got_packet = 0; + return 0; + } else if (ret == XEVE_OK) { + int av_pic_type; + + if (xectx->stat.write > 0) { + + ret = ff_get_encode_buffer(avctx, avpkt, xectx->stat.write, 0); + if (ret < 0) + return ret; + + memcpy(avpkt->data, xectx->bitb.addr, xectx->stat.write); + + avpkt->time_base.num = 1; + avpkt->time_base.den = xectx->cdsc.param.fps; + + avpkt->pts = xectx->bitb.ts[XEVE_TS_PTS]; + avpkt->dts = xectx->bitb.ts[XEVE_TS_DTS]; + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return AVERROR_INVALIDDATA; + } + + ff_side_data_set_encoder_stats(avpkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + *got_packet = 1; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return AVERROR_EXTERNAL; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + if (xectx->id) { + xeve_delete(xectx->id); + xectx->id = NULL; + } + + av_free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE +}; + +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption libxeve_options[] = { + { "preset", "Encoding preset for setting encoding speed", OFFSET(preset_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PRESET_MEDIUM }, XEVE_PRESET_DEFAULT, XEVE_PRESET_PLACEBO, VE, "preset" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_DEFAULT }, INT_MIN, INT_MAX, VE, "preset" }, + { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_FAST }, INT_MIN, INT_MAX, VE, "preset" }, + { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_MEDIUM }, INT_MIN, INT_MAX, VE, "preset" }, + { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_SLOW }, INT_MIN, INT_MAX, VE, "preset" }, + { "placebo", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_PLACEBO }, INT_MIN, INT_MAX, VE, "preset" }, + { "tune", "Tuning parameter for special purpose operation", OFFSET(tune_id), AV_OPT_TYPE_INT, { .i64 = XEVE_TUNE_NONE }, XEVE_TUNE_NONE, XEVE_TUNE_PSNR, VE, "tune"}, + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_NONE }, INT_MIN, INT_MAX, VE, "tune" }, + { "zerolatency", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_ZEROLATENCY }, INT_MIN, INT_MAX, VE, "tune" }, + { "psnr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_PSNR }, INT_MIN, INT_MAX, VE, "tune" }, + { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, + { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, + { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "sei_info", "Embed SEI messages identifying encoder parameters and command line arguments", OFFSET(sei_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xeve-params", "Override the xeve configuration using a :-separated list of key=value parameters", OFFSET(xeve_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { NULL } +}; + +static const AVClass libxeve_class = { + .class_name = "libxeve", + .item_name = av_default_item_name, + .option = libxeve_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/** + * libavcodec generic global options, which can be set on all the encoders and decoders + * @see https://www.ffmpeg.org/ffmpeg-codecs.html#Codec-Options + */ +static const FFCodecDefault libxeve_defaults[] = { + { "b", "0" }, // bitrate in terms of kilo-bits per second + { "g", "0" }, // gop_size (key-frame interval 0: only one I-frame at the first time; 1: every frame is coded in I-frame) + { "bf", "15"}, // maximum number of B frames (0: no B-frames, 1,3,7,15) + { "threads", "0"}, // number of threads to be used (0: automatically select the number of threads to set) + { NULL }, +}; + +const FFCodec ff_libxeve_encoder = { + .p.name = "libxeve", + .p.long_name = NULL_IF_CONFIG_SMALL("libxeve MPEG-5 EVC"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxeve_init, + FF_CODEC_ENCODE_CB(libxeve_encode), + .close = libxeve_close, + .priv_data_size = sizeof(XeveContext), + .p.priv_class = &libxeve_class, + .defaults = libxeve_defaults, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxeve", + .p.pix_fmts = supported_pixel_formats, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Tue Mar 28 13:50:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2197893pzh; Tue, 28 Mar 2023 06:50:36 -0700 (PDT) X-Google-Smtp-Source: AKy350Z5w43ShFklJtQEer4tFaK953iEeA1uAicZcZ9sam6XduCoAx/iOc2ASK+gYiUlPw3Zz3Dh X-Received: by 2002:a05:6402:268e:b0:502:ffd:74a0 with SMTP id w14-20020a056402268e00b005020ffd74a0mr17946231edd.2.1680011436042; Tue, 28 Mar 2023 06:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011436; cv=none; d=google.com; s=arc-20160816; b=ry/gwJX94Sp9t6vbEv09Tea98LM6ZngkCX4HtTSn7vVodxcmtJIDxrQtyPzIyzZCGe 7gx+IzOAMAh7J1JlHkjkecen5kqaL7OY4paaSM78KtknAJ2LvwQuEC+f6P6zWog5OPGZ DgqPjZL5tdzTeuRvorSsFrZYcprdZtJ/SbJKHwoPRGDIW4W/5QdlzouICQJQ8w5fiqWp AQ3b/wt3KGDDdIgk0lzL9eL+gIykul/OT3clEDMwPfnkMb2RB1XCmjq3SKAZpbQe70Lf 6JqYdQC3KCNoe5XkvLn6V56enX9MH2lmBH39wLn8sW4iRC4DXbpGH8QoiI/LSP+vIAIK rnqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=CCdo29pAZiSVNac+OXiU4Apgdg1yAX+Fiu945Yjdya0=; b=sNoO+6GRqSzL9vfqXs6r3iv72ro5+7N6X/S1yK1sYdtlHagUiURpoo5Z4z6lbhCcfg rHRqQq4H9mVLxpnS+h6dhjlbsaxmX6jo3owB2K9IYDJarSOLmjCgZonuCqqkdFUOdHo/ hi327Fg7FV408CncCOAUfXIekmVQiETOJHStGGoTumqe/MVRkoGj2kkiwqidWwyDTApM GnO5QTAyv5CyYsExRGESd/2Rs3QJBQgSNyqi9zsvHlAfkMe3omU+UZ9DlnamieMrF5uk yWt4bKbXBy3Qwsf6AgyL0ztoSbsS2QOuBlgA/WXfdHtseaQeeOyqsl43Cx24YE2pGhb6 bBTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=myG5mdW2; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t11-20020a170906a10b00b008c8b1a72efcsi26620232ejy.816.2023.03.28.06.50.35; Tue, 28 Mar 2023 06:50:36 -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=@samsung.com header.s=mail20170921 header.b=myG5mdW2; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DFAE68CB8A; Tue, 28 Mar 2023 16:50:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 333B868CB72 for ; Tue, 28 Mar 2023 16:50:27 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328135026euoutp0248e8a667bb5c8691771de0481612f875~QmX3YnNAd2753227532euoutp02T for ; Tue, 28 Mar 2023 13:50:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328135026euoutp0248e8a667bb5c8691771de0481612f875~QmX3YnNAd2753227532euoutp02T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011426; bh=fYyXz6jh/qqwe2Kljz3RK9m0IMFisxFAHpiVlUf2Lwc=; h=From:To:Cc:Subject:Date:References:From; b=myG5mdW2uwR8M4PG0maIpvIUZjfHCwh+GLhmRluID8zp1lWNsF9kMNTgdVzkRtehJ yNHkuy0+KpBCFNG9GFW+jNoorr5dQgmUjMkHZ4fDMCn8GgUyKMwzAeC76Hd36A9035 jsW5X+iyE+njROSHF5vUtOECTxh2CkW78uV/WgIk= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230328135026eucas1p2fe00a63208726bf03ef04dd2b036f0c6~QmX3GZc4V0715107151eucas1p2A; Tue, 28 Mar 2023 13:50:26 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id F3.84.09503.2A0F2246; Tue, 28 Mar 2023 14:50:26 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328135026eucas1p1abe4dd2289ba01bb018f7b37d1a147a7~QmX2tK8xL2245422454eucas1p1E; Tue, 28 Mar 2023 13:50:26 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328135026eusmtrp1349310be37a4c6e5f81feef23152289c~QmX2sqjRe0181801818eusmtrp1h; Tue, 28 Mar 2023 13:50:26 +0000 (GMT) X-AuditID: cbfec7f2-ea5ff7000000251f-49-6422f0a21575 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 3E.8A.09583.1A0F2246; Tue, 28 Mar 2023 14:50:25 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328135025eusmtip2f06c6dc8b0d1483d222b4fc4fd2f0284~QmX2VNiIi2572925729eusmtip22; Tue, 28 Mar 2023 13:50:25 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:50:07 +0200 Message-Id: <20230328135007.1765-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7qLPiilGLxZLGrx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVc3jCRuWDZFsaKm6fMGxhf1XUx cnBICJhI3PzH3sXIxSEksIJR4vz35SxdjJxAzhdGiVnzVCASnxkl+g4+ZAdJgDQsf7+MFSKx nFHi9cOLbBBOO5PEry9nmUCq2AR0JV5+eARmiwiYSpxs3ssGYjMLaEusu/sdzBYWCJJo7prC CmKzCKhKrJl8AqyeV8BKYlX/bjaIbZoSE7bMgYoLSpyc+YQFIs4tsW7WJVaImfISzVtnM4Mc ISHwlV3i0cHpUKe6SKy9CmMLS7w6vgXKlpE4PbmHBeL/YolD/Q4QZo3EoR/pEBXWEm8bjzOC hJmBTli/Sx8i7Cjx888RRohqPokbbwUhDuCTmLRtOjNEmFeio00IwlSR6OsUg2iUkni6bA4z hO0hMfvLcdYJjIqzkHw1C8knsxDWLmBkXsUonlpanJueWmyYl1quV5yYW1yal66XnJ+7iRGY HE7/O/5pB+PcVx/1DjEycTAeYpTgYFYS4f19TSlFiDclsbIqtSg/vqg0J7X4EKM0B4uSOK+2 7clkIYH0xJLU7NTUgtQimCwTB6dUA1PE6+DtDt8LO6/Z3c3sC6spCzuypOQ1//eX30xXaVb8 rjtz6MCW/lr3ZJ1/gYmJU5bnb/20oUojTXtGkXrg+1m+ExaLht21ShK+y8xwaYV6yvfQhN98 vJtyD7it7pDQFwszaIvfePp3+i35F7JnD9/omiVgJ2aZJPZEs/OXy6/YzE7OY2ffafbzKrG/ Lu15/cifwe9U3E55vgXxjjkckwN2Kj4xuKWTv8K0h/vLLAfpGq9L08rOaa3p4pBQZDQ8eN0s sfyF7sW8wHTuNg7uurnvFmvs1bn05j8nu2BOSkLc3qchktn93H0cy0/bLb//s+RCuHfUv80u k27MZu/JlJnw1tZpzcQ5jR2Hftr/VmIpzkg01GIuKk4EADh/LkF9AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7oLPyilGDQdtLH4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DIub5jIXLBsC2PFzVPmDYyv6roYOTkkBEwklr9fxtrFyMUhJLCU UeLZ229MEAkpiaVLFzFC2MISf651sUEUtTJJPHi7nR0kwSagK/HywyOwBhEBc4mL626BNTAL aEusu/udDcQWFgiQOH7xMVicRUBVYs3kE2D1vAJWEqv6d7NBLNCUmLBlDlRcUOLkzCcsEHFu iXWzLrFCzJSXaN46m3kCI/8sJGWzkKQWMDKtYhRJLS3OTc8tNtIrTswtLs1L10vOz93ECAzc bcd+btnBuPLVR71DjEwcjIcYJTiYlUR4f19TShHiTUmsrEotyo8vKs1JLT7EaAp060RmKdHk fGDs5JXEG5oZmBqamFkamFqaGSuJ83oWdCQKCaQnlqRmp6YWpBbB9DFxcEo1MHE0zZ65MGRO 9tfHemvPxjWtDc6XDnc8NyN3xhHPm9sql32dtT/fc+KBhG/b51yQKXhlHqNs12hlKGT3IWvL 5Fzb9+xqcz92POTamMYaMDGxtpFbPu0rxx7Z8pz3teHigu5//+sEXpO6oMK/YW3u/sKKY9uv /vL9FDnTjXMvj82eLlefL5Fa2UzzOm+wNR846Fb2ofh6lW93yZtPk+zqnZYtZDHI9jt4pFRD ZFJRqGuwicAKy32T9+afvK6yZe/v4vccq4v32Vb9PK+bUa2zQenJX+77J3J7VsveEE4/svb4 ktuCSfK5UknMVyVmtbnY/HKWbn+j8/SNZIylpNQBgU0L7MKscrWmO1jXrLp3VImlOCPRUIu5 qDgRAIMkuablAgAA X-CMS-MailID: 20230328135026eucas1p1abe4dd2289ba01bb018f7b37d1a147a7 X-Msg-Generator: CA X-RootMTR: 20230328135026eucas1p1abe4dd2289ba01bb018f7b37d1a147a7 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328135026eucas1p1abe4dd2289ba01bb018f7b37d1a147a7 References: Subject: [FFmpeg-devel] [PATCH v18 06/10] 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RxHvzGeCZs4C - Added EVC decoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xevd wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/decoders.texi | 24 ++ doc/general_contents.texi | 10 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxevd.c | 488 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 527 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index 4b6db91de5..0b9f1d184a 100755 --- a/configure +++ b/configure @@ -292,6 +292,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] @@ -1863,6 +1864,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3399,6 +3401,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxevd_decoder_deps="libxevd" libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" @@ -6738,6 +6741,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.0" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index 5ba85cf9b1..54720ee8b4 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://github.com/mpeg5/xevd}. + +@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 31f1793b9e..8e08f5ebc3 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -351,6 +351,14 @@ Go to @url{https://github.com/mpeg5/xeve} 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://github.com/mpeg5/xevd} 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 librariy 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 53ffdc5bbe..1c473f3beb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1130,6 +1130,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index acfade1893..a55a06023e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -815,6 +815,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..2e02176606 --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,488 @@ +/* + * 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. +} 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 = av_cpu_count(); + + /* clear XEVS_CDSC structure */ + memset(cdsc, 0, sizeof(XEVD_CDSC)); + + /* init XEVD_CDSC */ + if (avctx->thread_count <= 0) + cdsc->threads = (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : XEVD_MAX_TASK_CNT; + else if (avctx->thread_count > XEVD_MAX_TASK_CNT) + cdsc->threads = XEVD_MAX_TASK_CNT; + else + cdsc->threads = 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 = 0; + XEVD_INFO info; + int ret; + + if (bs_size == XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = 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 = info.nalu_len; + if (len == 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 = AV_PIX_FMT_YUV420P10; + + size = 4; + ret = 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 = 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 = 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 = 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 = 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 = AV_PIX_FMT_GRAY10LE; + break; + case XEVD_CS_YCBCR420_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case XEVD_CS_YCBCR422_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + break; + case XEVD_CS_YCBCR444_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; + } + + // the function returns sps->num_reorder_pics + ret = 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 = (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 != 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] != avctx->width || imgb->h[0] != 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 = 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 = avctx->priv_data; + XEVD_CDSC *cdsc = &(xectx->cdsc); + + /* read configurations and set values for created descriptor (XEVD_CDSC) */ + get_conf(avctx, cdsc); + + /* create decoder */ + xectx->id = xevd_create(&(xectx->cdsc), NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); + return AVERROR_EXTERNAL; + } + + xectx->draining_mode = 0; + + 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 = NULL; + AVPacket *pkt = NULL; + XEVD_IMGB *imgb = NULL; + + int xevd_ret = 0; + int ret = 0; + + xectx = avctx->priv_data; + + pkt = av_packet_alloc(); + if (!pkt) + return AVERROR(ENOMEM); + + // obtain input data + ret = ff_decode_get_packet(avctx, pkt); + if (ret < 0 && ret != AVERROR_EOF) { + av_packet_free(&pkt); + return ret; + } else if(ret == AVERROR_EOF && xectx->draining_mode == 0) { // End of stream situations. Enter draining mode + + frame = NULL; + xectx->draining_mode = 1; + + av_packet_free(&pkt); + + return AVERROR_EOF; + } + + if (pkt->size > 0) { + int bs_read_pos = 0; + XEVD_STAT stat; + XEVD_BITB bitb; + int nalu_size; + + imgb = NULL; + + while(pkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + memset(&stat, 0, sizeof(XEVD_STAT)); + + nalu_size = read_nal_unit_length(pkt->data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + av_packet_free(&pkt); + ret = AVERROR_INVALIDDATA; + return ret; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = pkt->data + bs_read_pos; + bitb.ssize = nalu_size; + + /* main decoding block */ + xevd_ret = xevd_decode(xectx->id, &bitb, &stat); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); + av_packet_free(&pkt); + ret = AVERROR_EXTERNAL; + return ret; + } + + bs_read_pos += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to export stream params\n"); + av_packet_free(&pkt); + return ret; + } + } + if (stat.read != nalu_size) + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n,", nalu_size, stat.read); + if (stat.fnum >= 0) { + // already has a decoded image + if (imgb) { + // 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 = NULL; + } + xevd_ret = xevd_pull(xectx->id, &imgb); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", xevd_ret, stat.fnum); + ret = AVERROR_EXTERNAL; + av_packet_free(&pkt); + + return ret; + } else if (xevd_ret == XEVD_OK_FRM_DELAYED) { + if (imgb) { + // 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 = NULL; + } + av_packet_free(&pkt); + + return AVERROR(EAGAIN); + } + if (imgb) { // got frame + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Image copying error\n"); + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + av_packet_free(&pkt); + + return ret; + } + + // use ff_decode_frame_props() to fill frame properties + ret = ff_decode_frame_props(avctx, frame); + if (ret < 0) { + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + av_packet_free(&pkt); + av_frame_unref(frame); + + return ret; + } + // match timestamps and packet size + ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); + pkt->opaque = NULL; + if (ret < 0) { + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + av_packet_free(&pkt); + av_frame_unref(frame); + + return ret; + } + + frame->pkt_dts = 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 = NULL; + + return 0; + } else + return AVERROR(EAGAIN); + } + } + } else { // decoder draining mode handling + xevd_ret = xevd_pull(xectx->id, &imgb); + if (xevd_ret == XEVD_ERR_UNEXPECTED) // draining process completed + return AVERROR_EOF; + else if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", xevd_ret); + + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + + av_packet_free(&pkt); + + return AVERROR_EXTERNAL; + } + if (imgb) { // got frame + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + av_packet_free(&pkt); + } + + frame->pkt_dts = 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 = NULL; + + return 0; + } + return AVERROR_EOF; + } + return ret; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if (xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + + xectx->draining_mode = 0; + + 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 = { + .class_name = "libxevd", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFCodec ff_libxevd_decoder = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxevd_init, + FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame), + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .p.priv_class = &libxevd_class, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxevd", + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS +}; From patchwork Tue Mar 28 13:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2198702pzh; Tue, 28 Mar 2023 06:51:37 -0700 (PDT) X-Google-Smtp-Source: AKy350YT/BQRsEQ/4rPuk/rNZtXoqME5ba1Q9HJrdd2GGHYPOZa4CD4CfAhoX7K6ArJsNQEdMMDh X-Received: by 2002:a17:907:7f0c:b0:93f:870f:a9e2 with SMTP id qf12-20020a1709077f0c00b0093f870fa9e2mr12445332ejc.16.1680011497611; Tue, 28 Mar 2023 06:51:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011497; cv=none; d=google.com; s=arc-20160816; b=Atms/Co9xghSFy00s2uQY5dD3uExd6I5DY2vxfn4MDw+yCgQrlN7j1qBLdu4m64Av6 wVhJMZE7ZOpsu4M+SsYjFnLpwRcUiRigZldWnlKMJtT94IIZA6HRZUGfVXa4dbX/Y5z+ XS6Z/Sp/IF/xykxK42tWMqO+NZnUn/CIL6rxyFv5e+DcopHnms9ZNIFe9DFnzr9logO5 +x4lDqXBhRk6/V7e0QevGxiK+sKgJT58ELLI5dRkm0teibTrNdnJKDyUSR7ys0uKU2y4 /umtOak9UOU/Swk1nOQ+6oGxx0awJzMH5JJVkH6wmHp9OUEhdXtu+AdNhX4EjQX0YKf0 DRTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=/qQ2tVzX7zwLF+w0re1udFfSfUjTFBE2LP3cTA+KQBE=; b=q49Qjrq+urWZIDKS0Td63VALab8vF3kepQ+iqmHkSgu14aG23I4KZRi+NbMpJEngPP JodKsQkWw6Xzi7IM5S/VDUNuCFOS2asV3BbgBc2Ua+aFpfHHYA8oXKuo/jd3aBxdMwT7 /4h8bwtALR+pYwUBbE8BRBFUmkKay6zOpbkxUbNm+0eSjuVKM6SG+iswh857spAQ3r6T pKLAN47cKNnyxMBHhLJdWULYCDZqR4Nt02QWjf6EH7AgMk7d3oO9Y+pB0iFhcwVZjYP7 R7hNLlFkX0WdQqaPFF0ng+8Jo7Uvyovo2mHuvZ746+xGXceJmQKORney3ChAZdxrnpW/ G7pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=DNb5oAyD; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ba26-20020a0564021ada00b004ab16936ef6si10442865edb.455.2023.03.28.06.51.37; Tue, 28 Mar 2023 06:51: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=@samsung.com header.s=mail20170921 header.b=DNb5oAyD; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 943F068CBA1; Tue, 28 Mar 2023 16:51:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F364068CB7E for ; Tue, 28 Mar 2023 16:51:27 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328135126euoutp02b757105522a79709fd476830fa8e129d~QmYu8eRGR3161431614euoutp02v for ; Tue, 28 Mar 2023 13:51:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328135126euoutp02b757105522a79709fd476830fa8e129d~QmYu8eRGR3161431614euoutp02v DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011486; bh=vN2o3jIJnGu03fp90CImm5NBw24at8JpkzFd0sWmi5U=; h=From:To:Cc:Subject:Date:References:From; b=DNb5oAyDI+qhjJJpIqH4JauB8KpCKpRxAumNizuUg7vh5NTlvgKD2fgchW03YC91c mqXI0cdJoaY44j9GLgEsBM+1/27HSRvup4VjkqniORtqnfdzo0tl7ePhQ016mLqzbt m5aBJU7msBINyKS1F+VQgfjXvwERT2NW2EtPnA3E= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230328135126eucas1p181c2bd94f844a38ccdc6d71a46737342~QmYuuSJ4g0202302023eucas1p13; Tue, 28 Mar 2023 13:51:26 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id E4.15.09966.ED0F2246; Tue, 28 Mar 2023 14:51:26 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328135125eucas1p149f64e3ea642662d18bc2dd314ded8be~QmYuPAIvO0201902019eucas1p1W; Tue, 28 Mar 2023 13:51:25 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230328135125eusmtrp2ef2ac7231e34adc168f1768f0ee4a60c~QmYuOP5Q12170621706eusmtrp2D; Tue, 28 Mar 2023 13:51:25 +0000 (GMT) X-AuditID: cbfec7f4-d39ff700000026ee-11-6422f0de7d41 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BA.B2.08862.DD0F2246; Tue, 28 Mar 2023 14:51:25 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328135125eusmtip258ecdba6e71a33d2097d87fa97246a90~QmYtubtDE2279522795eusmtip28; Tue, 28 Mar 2023 13:51:25 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:51:10 +0200 Message-Id: <20230328135110.676-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7r3PiilGOxcy2bx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGX0dBYXNO5mrHi1YAF7A+ORDsYu Rk4OCQETiX8TlrF0MXJxCAmsYJQ4f+YkE0hCSOALo0T3tyyIxGdGiSl79rB1MXKAdVw6VwoR X84o8fHUcRaIhnYmiXs7AkFsNgFdiZcfHoENEhEwlTjZvJcNxGYW0JZYd/c7mC0sEC9x7/kW dhCbRUBV4sjVnWAX8QpYSpy4+ZIF4jpNiQlb5jBBxAUlTs58AhXnllg36xIrxEx5ieats5lB DpIQ+MkucWzdNKgiF4nt06ZC2cISr45DLJMQkJH4v3M+E8QzxRKH+h0gzBqJQz/SISqsJd42 HmcECTMDnbB+lz5E2FHizdPfzBDVfBI33gpCHMAnMWnbdKgwr0RHmxCEqSLR1ykG0Sgl8XTZ HGYI20PiyId3jBMYFWch+WoWkk9mIaxdwMi8ilE8tbQ4Nz212CgvtVyvODG3uDQvXS85P3cT IzA5nP53/MsOxuWvPuodYmTiYDzEKMHBrCTC+/uaUooQb0piZVVqUX58UWlOavEhRmkOFiVx Xm3bk8lCAumJJanZqakFqUUwWSYOTqkGpmw3Hsu6bo5bPA4CzjOqdYujzGIWLd7NeSsxpV9u 8ml5WYsaa+ef19RnLHrIlfos1/67jfBp5oCvDb0P12kdnMd0etaNVQ8vpGtsq2X9f+ho4nq9 iDRr2VWP9VLX/y75uTHsBadUavL8QinlsO72yyHzOONr8yymPOnfuND4k8GDbZvzPFitmS2/ qNXVVmmssmIuNF0kwd5yqTj8fbqGzt2wwqpdmqISBzvm/Pjbe0xNrornHsuBPVH1jr1C9wTb pttZ10yYG8fpsSevYmvtUrMvR+Ozpnz/VzxHKSN9YnefyWXlxbybAj+LxK8/JRlXapRi1L2w 7c2VhrcZB2qqX5jt35a3/POx31nPxGyVWIozEg21mIuKEwF4R9oQfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7p3PyilGPTPVLb4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJ6OosLGnczVrxasIC9gfFIB2MXIweHhICJxKVzpV2MXBxCAksZ Jaaum8vSxcgJFJeSWLp0ESOELSzx51oXG0RRK5PEx+972EASbAK6Ei8/PGICsUUEzCUurrsF 1sAsoC2x7u53sBphgViJd1MvgMVZBFQljlzdCWbzClhKnLj5EmqZpsSELXOYIOKCEidnPoGK c0usm3WJFWKmvETz1tnMExj5ZyEpm4UktYCRaRWjSGppcW56brGhXnFibnFpXrpecn7uJkZg 4G479nPzDsZ5rz7qHWJk4mA8xCjBwawkwvv7mlKKEG9KYmVValF+fFFpTmrxIUZToFsnMkuJ JucDYyevJN7QzMDU0MTM0sDU0sxYSZzXs6AjUUggPbEkNTs1tSC1CKaPiYNTqoHJ/8ai3BS3 358vzfuyfx7HHb+C/vmc1jo1D4SfpppnFpwoNTsjkFl2c6q5uZSInoDOZcYvItF3Zkt4K9vZ FX74Nkfvj4TpzOKJ510XvZAvOV71RKaxrzNl8wbpf9evLi4Ir9n1YM42Vv3r0jb7vwsaCf8L Zed6d/Itf8aMruMnFrdcPbRT7aT09T9dL+eVbFu29++JAqe3Vtt74ju/Xv1yQcTzZtWbB6Gm X04X7XasjHQ4tUjv7BTNTUK2Rz+KFvv6vGxsnCsv8tzMoS/VjGvdWZMczWV7xAxOZF3r0pLJ cBf/NmezeMjiszI3JzPuvXBpz3zRh9fOMl3VmG614nNhF/eS+8vna/IoP+zc9SGeV4mlOCPR UIu5qDgRAPNXBEHlAgAA X-CMS-MailID: 20230328135125eucas1p149f64e3ea642662d18bc2dd314ded8be X-Msg-Generator: CA X-RootMTR: 20230328135125eucas1p149f64e3ea642662d18bc2dd314ded8be X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328135125eucas1p149f64e3ea642662d18bc2dd314ded8be References: Subject: [FFmpeg-devel] [PATCH v18 07/10] avformat/mov_muxer: Extended MOV muxer to handle EVC video content 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Gl6Z2+UuePKj - Changes in mov_write_video_tag function to handle EVC elementary stream - Provided structure EVCDecoderConfigurationRecord that specifies the decoder configuration information for ISO/IEC 23094-1 video content Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 2 +- libavformat/evc.c | 455 ++++++++++++++++++++++++++++++++++++++++ libavformat/evc.h | 44 ++++ libavformat/isom_tags.c | 2 + libavformat/movenc.c | 33 +++ 5 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index d80e5dc6b3..77e11aef84 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -363,7 +363,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o \ - dovi_isom.o + dovi_isom.o evc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/evc.c b/libavformat/evc.c new file mode 100644 index 0000000000..9a3daba04a --- /dev/null +++ b/libavformat/evc.c @@ -0,0 +1,455 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 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 "libavutil/intreadwrite.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/evc.h" +#include "avformat.h" +#include "avio.h" +#include "evc.h" +#include "avio_internal.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.1 +enum { + SPS_INDEX, + PPS_INDEX, + APS_INDEX, + SEI_INDEX, + NB_ARRAYS +}; + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + // @note + // Currently the structure does not reflect the entire SPS RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of EVCDecoderConfigurationRecord + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCSPS; + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +typedef struct EVCNALUnitArray { + uint8_t array_completeness; // when equal to 1 indicates that all NAL units of the given type are in the following array + uint8_t NAL_unit_type; // indicates the type of the NAL units in the following array + uint16_t numNalus; // indicates the number of NAL units of the indicated type + uint16_t *nalUnitLength; // indicates the length in bytes of the NAL unit + uint8_t **nalUnit; // contains an SPS, PPS, APS or a SEI NAL unit, as specified in ISO/IEC 23094-1 +} EVCNALUnitArray; + +/** + * @brief Specifies the decoder configuration information for ISO/IEC 23094-1 video content. + * @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.2 + * Carriage of network abstraction layer (NAL) unit structured video in the ISO base media file format + */ +typedef struct EVCDecoderConfigurationRecord { + uint8_t configurationVersion; // 8 bits + uint8_t profile_idc; // 8 bits + uint8_t level_idc; // 8 bits + uint32_t toolset_idc_h; // 32 bits + uint32_t toolset_idc_l; // 32 bits + uint8_t chroma_format_idc; // 2 bits + uint8_t bit_depth_luma_minus8; // 3 bits + uint8_t bit_depth_chroma_minus8; // 3 bits + uint16_t pic_width_in_luma_samples; // 16 bits + uint16_t pic_height_in_luma_samples; // 16 bits + uint8_t reserved; // 6 bits '000000'b + uint8_t lengthSizeMinusOne; // 2 bits + uint8_t num_of_arrays; // 8 bits + EVCNALUnitArray arrays[NB_ARRAYS]; +} EVCDecoderConfigurationRecord; + +typedef struct NALU { + int offset; + uint32_t size; +} NALU; + +typedef struct NALUList { + NALU *nalus; + unsigned nalus_array_size; + unsigned nb_nalus; ///< valid entries in nalus +} NALUList; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | bits[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfigurationRecord *evcc) +{ + GetBitContext gb; + int sps_seq_parameter_set_id; + EVCSPS sps; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return 0; + + sps.sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return 0; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps.profile_idc = get_bits(&gb, 8); + + sps.level_idc = get_bits(&gb, 8); + + sps.toolset_idc_h = get_bits(&gb, 32); + sps.toolset_idc_l = get_bits(&gb, 32); + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps.chroma_format_idc = get_ue_golomb(&gb); + + sps.pic_width_in_luma_samples = get_ue_golomb(&gb); + sps.pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps.bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps.bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + evcc->profile_idc = sps.profile_idc; + evcc->level_idc = sps.level_idc; + evcc->toolset_idc_h = sps.toolset_idc_h; + evcc->toolset_idc_l = sps.toolset_idc_l; + evcc->chroma_format_idc = sps.chroma_format_idc; + evcc->bit_depth_luma_minus8 = sps.bit_depth_luma_minus8; + evcc->bit_depth_chroma_minus8 = sps.bit_depth_chroma_minus8; + evcc->pic_width_in_luma_samples = sps.pic_width_in_luma_samples; + evcc->pic_height_in_luma_samples = sps.pic_height_in_luma_samples; + + return 0; +} + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +static int evcc_array_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, + uint8_t nal_type, int ps_array_completeness, + EVCNALUnitArray *array) +{ + int ret; + uint16_t numNalus = array->numNalus; + + ret = av_reallocp_array(&array->nalUnit, numNalus + 1, sizeof(uint8_t *)); + if (ret < 0) + return ret; + + ret = av_reallocp_array(&array->nalUnitLength, numNalus + 1, sizeof(uint16_t)); + if (ret < 0) + return ret; + + array->nalUnit [numNalus] = (uint8_t *)nal_buf; + array->nalUnitLength[numNalus] = nal_size; + array->NAL_unit_type = nal_type; + array->numNalus++; + + /* + * When the sample entry name is 'evc1', the default and mandatory value of + * array_completeness is 1 for arrays of all types of parameter sets, and 0 + * for all other arrays. + */ + if (nal_type == EVC_SPS_NUT || nal_type == EVC_PPS_NUT || nal_type == EVC_APS_NUT) + array->array_completeness = ps_array_completeness; + + return 0; +} + +static void evcc_init(EVCDecoderConfigurationRecord *evcc) +{ + memset(evcc, 0, sizeof(EVCDecoderConfigurationRecord)); + evcc->configurationVersion = 1; + evcc->lengthSizeMinusOne = 3; // 4 bytes +} + +static void evcc_close(EVCDecoderConfigurationRecord *evcc) +{ + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + EVCNALUnitArray *const array = &evcc->arrays[i]; + array->numNalus = 0; + av_freep(&array->nalUnit); + av_freep(&array->nalUnitLength); + } +} + +static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) +{ + uint16_t sps_count; + + av_log(NULL, AV_LOG_TRACE, "configurationVersion: %"PRIu8"\n", + evcc->configurationVersion); + av_log(NULL, AV_LOG_TRACE, "profile_idc: %"PRIu8"\n", + evcc->profile_idc); + av_log(NULL, AV_LOG_TRACE, "level_idc: %"PRIu8"\n", + evcc->level_idc); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_h: %"PRIu32"\n", + evcc->toolset_idc_h); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_l: %"PRIu32"\n", + evcc->toolset_idc_l); + av_log(NULL, AV_LOG_TRACE, "chroma_format_idc: %"PRIu8"\n", + evcc->chroma_format_idc); + av_log(NULL, AV_LOG_TRACE, "bit_depth_luma_minus8: %"PRIu8"\n", + evcc->bit_depth_luma_minus8); + av_log(NULL, AV_LOG_TRACE, "bit_depth_chroma_minus8: %"PRIu8"\n", + evcc->bit_depth_chroma_minus8); + av_log(NULL, AV_LOG_TRACE, "pic_width_in_luma_samples: %"PRIu16"\n", + evcc->pic_width_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "pic_height_in_luma_samples: %"PRIu16"\n", + evcc->pic_height_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "lengthSizeMinusOne: %"PRIu8"\n", + evcc->lengthSizeMinusOne); + av_log(NULL, AV_LOG_TRACE, "num_of_arrays: %"PRIu8"\n", + evcc->num_of_arrays); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if(array->numNalus == 0) + continue; + + av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + i, array->array_completeness); + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + i, array->NAL_unit_type); + av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + i, array->numNalus); + for ( unsigned j = 0; j < array->numNalus; j++) + av_log(NULL, AV_LOG_TRACE, + "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + i, j, array->nalUnitLength[j]); + } + + /* + * We need at least one SPS. + */ + sps_count = evcc->arrays[SPS_INDEX].numNalus; + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + /* unsigned int(8) configurationVersion = 1; */ + avio_w8(pb, evcc->configurationVersion); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->profile_idc); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->level_idc); + + /* unsigned int(32) toolset_idc_h */ + avio_wb32(pb, evcc->toolset_idc_h); + + /* unsigned int(32) toolset_idc_l */ + avio_wb32(pb, evcc->toolset_idc_l); + + /* + * unsigned int(2) chroma_format_idc; + * unsigned int(3) bit_depth_luma_minus8; + * unsigned int(3) bit_depth_chroma_minus8; + */ + avio_w8(pb, evcc->chroma_format_idc << 6 | + evcc->bit_depth_luma_minus8 << 3 | + evcc->bit_depth_chroma_minus8); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_width_in_luma_samples); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_height_in_luma_samples); + + /* + * bit(6) reserved = '111111'b; + * unsigned int(2) chromaFormat; + */ + avio_w8(pb, evcc->lengthSizeMinusOne | 0xfc); + + /* unsigned int(8) numOfArrays; */ + avio_w8(pb, evcc->num_of_arrays); + + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if (!array->numNalus) + continue; + + /* + * bit(1) array_completeness; + * unsigned int(1) reserved = 0; + * unsigned int(6) NAL_unit_type; + */ + avio_w8(pb, array->array_completeness << 7 | + array->NAL_unit_type & 0x3f); + + /* unsigned int(16) numNalus; */ + avio_wb16(pb, array->numNalus); + + for (unsigned j = 0; j < array->numNalus; j++) { + /* unsigned int(16) nalUnitLength; */ + avio_wb16(pb, array->nalUnitLength[j]); + + /* bit(8*nalUnitLength) nalUnit; */ + avio_write(pb, array->nalUnit[j], + array->nalUnitLength[j]); + } + } + + return 0; +} + +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness) +{ + EVCDecoderConfigurationRecord evcc; + int nalu_type; + size_t nalu_size; + int bytes_to_read = size; + unsigned array_index; + + int ret = 0; + + if (size < 8) { + /* We can't write a valid evcC from the provided data */ + return AVERROR_INVALIDDATA; + } else if (*data == 1) { + /* Data is already evcC-formatted */ + avio_write(pb, data, size); + return 0; + } + + evcc_init(&evcc); + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + nalu_size = read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(data, bytes_to_read); + + switch (nalu_type) { + case EVC_SPS_NUT: + array_index = SPS_INDEX; + break; + case EVC_PPS_NUT: + array_index = PPS_INDEX; + break; + case EVC_APS_NUT: + array_index = APS_INDEX; + break; + case EVC_SEI_NUT: + array_index = SEI_INDEX; + break; + default: + break; + } + + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &(evcc.arrays[array_index])); + if (ret < 0) + goto end; + if (evcc.arrays[array_index].numNalus == 1) + evcc.num_of_arrays++; + + if(nalu_type == EVC_SPS_NUT) { + ret = evcc_parse_sps(data, nalu_size, &evcc); + if (ret < 0) + goto end; + } + + data += nalu_size; + bytes_to_read -= nalu_size; + } + + ret = evcc_write(pb, &evcc); + +end: + evcc_close(&evcc); + return ret; +} diff --git a/libavformat/evc.h b/libavformat/evc.h new file mode 100644 index 0000000000..db56275fd8 --- /dev/null +++ b/libavformat/evc.h @@ -0,0 +1,44 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 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 + */ + +#ifndef AVFORMAT_EVC_H +#define AVFORMAT_EVC_H + +#include +#include "libavutil/rational.h" +#include "avio.h" + + + +/** + * Writes EVC sample metadata to the provided AVIOContext. + * + * @param pb pointer to the AVIOContext where the evc sample metadata shall be written + * @param buf input data buffer + * @param size size in bytes of the input data buffer + * @param ps_array_completeness @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + * + * @return 0 in case of success, a negative error code in case of failure + */ +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness); + +#endif // AVFORMAT_EVC_H diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 86c7272525..2a29823b2e 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -147,6 +147,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', '1') }, /* AVC-based Dolby Vision derived from avc1 */ { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', 'v') }, /* AVC-based Dolby Vision derived from avc3 */ + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, /* EVC/MPEG-5 */ + { AV_CODEC_ID_VP8, MKTAG('v', 'p', '0', '8') }, /* VP8 */ { AV_CODEC_ID_VP9, MKTAG('v', 'p', '0', '9') }, /* VP9 */ { AV_CODEC_ID_AV1, MKTAG('a', 'v', '0', '1') }, /* AV1 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 68e7f8222b..94510a4670 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -35,6 +35,7 @@ #include "isom.h" #include "av1.h" #include "avc.h" +#include "evc.h" #include "libavcodec/ac3_parser_internal.h" #include "libavcodec/dnxhddata.h" #include "libavcodec/flac.h" @@ -1455,6 +1456,21 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_evcc_tag(AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "evcC"); + + if (track->tag == MKTAG('e','v','c','1')) + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 1); + else + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 0); + + return update_size(pb, pos); +} + /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { @@ -1704,6 +1720,16 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } +static int mov_get_evc_codec_tag(AVFormatContext *s, MOVTrack *track) +{ + int tag = track->par->codec_tag; + + if (!tag) + tag = MKTAG('e', 'v', 'c', 'i'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1785,6 +1811,8 @@ static unsigned int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mov_get_mpeg2_xdcam_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_H264) tag = mov_get_h264_codec_tag(s, track); + else if (track->par->codec_id == AV_CODEC_ID_EVC) + tag = mov_get_evc_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_DNXHD) tag = mov_get_dnxhd_codec_tag(s, track); else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2352,6 +2380,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex mov_write_avcc_tag(pb, track); if (track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); + } + else if (track->par->codec_id ==AV_CODEC_ID_EVC) { + mov_write_evcc_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VP9) { mov_write_vpcc_tag(mov->fc, pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AV1) { @@ -6123,6 +6154,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_VP9 || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ @@ -7782,6 +7814,7 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'p', '4', 'v') }, From patchwork Tue Mar 28 13:52:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2199391pzh; Tue, 28 Mar 2023 06:52:44 -0700 (PDT) X-Google-Smtp-Source: AKy350bQqjxjridcjoc0T5Mm+qhKja3tgyDujZs2om1x2/uOtnFJx110/+eNr9mDxZOnloIjr6p7 X-Received: by 2002:a17:906:4492:b0:931:d277:78a4 with SMTP id y18-20020a170906449200b00931d27778a4mr16237106ejo.30.1680011564730; Tue, 28 Mar 2023 06:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011564; cv=none; d=google.com; s=arc-20160816; b=vxxjQP19xAdAhuvkomEfPx6vMTLaKh2t3ATt+b3iNnQKhWcAShx4Ovk5kyAaOyYBOw hiHp3n0CiVjWdioz7up45CEZKoDKh+wCNV0E86OyIVJYLMS+HhM5eb4vSqryE1FUjw7E eqvCempwVKsNtKpfCQ1JZ1NT8Gt+Ys9t/hnyLR52fc15xWlTUPS/rAG25xlcjLlB5RyA 96GtDJWljdeiGwhFG1l5Loyl+eVAXGnbtlmjSYg/dFnHMmivRF0OQwHS5u6EhbCu9QZs JrhXkaOIDLdeAjlI8IERRDDyrnio7e/d517A47QN78zoKRQl7nEKfOEEhoXCoSuYg3tH 5jcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=79IdlqlJ8wckoWiO7mK/QOmwEuE9z09a/Y+sNazQRuQ=; b=yDrygAwxU2qAcRpAnTuvSDv/rf7uAD56OkRrki64x+KuIoLvvr5mAGqhsjYXviq9QM J8cz3UKzaJy4l1/r7cNltiy9r4CcbAt9/C7z1nV7+a8QonauU3w4kZq7TIGPqumDcYp+ y96mEVIc19gMF9tpoz09o5YzB2+9jDqf0PHnOYZI5kG5HPzEGLwasLs3PT9Q51xEElyh PVcEzhwzXXhhX3XIHr2NVAr8m4a+JL5E9r5dCeuZXI5aFJPt8UuoXJWGsxwgkEtP7pTs mVUJw2KxJd4O42NJVXuzUOYWJZ6uTuK6m1pRH5tXq4/psPfZgURnw73BhL/ojjPrURHp naeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="bPmhs9/R"; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xi14-20020a170906dace00b0093348ceb372si12762719ejb.742.2023.03.28.06.52.44; Tue, 28 Mar 2023 06:52:44 -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=@samsung.com header.s=mail20170921 header.b="bPmhs9/R"; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A64D468CBCB; Tue, 28 Mar 2023 16:52:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F378168CB88 for ; Tue, 28 Mar 2023 16:52:35 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328135235euoutp024098347023b01433b070e4d1850fc7c6~QmZvRYjyP3161431614euoutp02b for ; Tue, 28 Mar 2023 13:52:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328135235euoutp024098347023b01433b070e4d1850fc7c6~QmZvRYjyP3161431614euoutp02b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011555; bh=sPlP6l6TMINpYAlCLJVvWoStCtQ5R273WDer5RLhcYI=; h=From:To:Cc:Subject:Date:References:From; b=bPmhs9/RUMFvSIjiKwS8aZlG2lbMa6Y4b5F6lX3u0kch4itADjuRQJVrdrNEB1J+m i0XTzo6iEI+F6p3jxGRAkG3f0yk7SY4eRFIibdrZ9U8uN3jFwfvt6lztRELR1pZMFj xn3DUlx/Jbyvk7++BGseO24VLOp7wz/H4wX3vcFs= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230328135235eucas1p29b1bab1d409e9555b381c01c81a31d0d~QmZvHxZdD3225732257eucas1p2d; Tue, 28 Mar 2023 13:52:35 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id F9.55.09966.321F2246; Tue, 28 Mar 2023 14:52:35 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230328135235eucas1p2c6e3c13957d223c2f063c25abab7320d~QmZu3UyO53096730967eucas1p2T; Tue, 28 Mar 2023 13:52:35 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328135235eusmtrp1f1ffe020bd13b605fbe61936e13b44e9~QmZu2t8Zu0353503535eusmtrp1J; Tue, 28 Mar 2023 13:52:35 +0000 (GMT) X-AuditID: cbfec7f4-d39ff700000026ee-13-6422f1235644 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 4D.E2.08862.221F2246; Tue, 28 Mar 2023 14:52:34 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230328135234eusmtip126b4431680930b54854445e9895cbd10~QmZuhpBUz2873528735eusmtip1F; Tue, 28 Mar 2023 13:52:34 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:52:15 +0200 Message-Id: <20230328135215.414-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7rKH5VSDPZeELL4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDJ+XutkKZjGV/Fk1y32BsZXXF2M nBwSAiYS897/Yexi5OIQEljBKLFm3U82COcLo8SW461sIFVCAp8ZJeY3R8J03F08hxmiaDmj RM/1qVAd7UwSsz6/ZQWpYhPQlXj54RETiC0iYCpxsnkv2CRmAW2JdXe/g9nCAskS3XtWMoPY LAKqElc/3QCr5xWwlLi+exILxDZNiQlb5kDFBSVOznwCFeeWWDfrEivETHmJ5q2zwS6SEPjK LtG0/BA7RJGLxOONc6AahCVeHd8CFZeROD25ByjOAWQXSxzqd4AwayQO/UiHqLCWeNt4nBEk zAx0wvpd+hAVjhItH3QgTD6JG28FIfbzSUzaNp0ZIswr0dEmBGGqSPR1ikGMk5J4umwOM4Tt IfFl2jKWCYyKs5A8NQvJI7MQti5gZF7FKJ5aWpybnlpslJdarlecmFtcmpeul5yfu4kRmBxO /zv+ZQfj8lcf9Q4xMnEwHmKU4GBWEuH9fU0pRYg3JbGyKrUoP76oNCe1+BCjNAeLkjivtu3J ZCGB9MSS1OzU1ILUIpgsEwenVANTxN6MtVfWfmnfGDnvaudmHttPv98qpDzdpzJ9b8Cbzx4p 25UjlbV9Yj6IvxE5cMXlULpCxguNtkyN736sCmoSvQJ/rl6yqS/8LlM7jdP8fWqq/5/rWwxW XJ5gFyscvuGDGd/uecU/79l0PtBoll5pWn16k4bzrYc3P65qOr1gm5pmXP5rLqYwJ4EivcDg uwdEl3BOS5iks2l53VllS9POf29ksrwnRQdeyZjpvVFxYeMdn2vKhX4tdl4354V7Hp7suuz1 inubjgZFfd98QPz5KsWDSdp5O/2DEzx+PF75JtdWNrz9yDPW60d/ZoaxxlUkrJS8sfPUYr+f 9pEzXi/xOu/d41Ak91UvoE615ZWUEktxRqKhFnNRcSIAw55IWX0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7rKH5VSDCarWny59oXZYuW33ywW 3z6dYXZg9vizaDOLR9+WVYwBTFF6NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkam Svp2NimpOZllqUX6dgl6GT+vdbIUTOOreLLrFnsD4yuuLkZODgkBE4m7i+cwdzFycQgJLGWU eL73GhtEQkpi6dJFjBC2sMSfa11sEEWtTBJ/Fz0FS7AJ6Eq8/PCICcQWETCXuLjuFlicWUBb Yt3d70ANHBzCAokSbf+LQMIsAqoSVz/dACvnFbCUuL57EgvEfE2JCVvmQMUFJU7OfAIV55ZY N+sSK8RIeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzAoN12 7OfmHYzzXn3UO8TIxMF4iFGCg1lJhPf3NaUUId6UxMqq1KL8+KLSnNTiQ4ymQLdOZJYSTc4H xk1eSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVAOTU/4CWZ2VTNe/ cpsrPvn8ZoJFdHZv689s7WCGUl3RO3xSj313rTZ03fel9MbSe3vqjLedm3W2fIq1/90fccwq 4SEal6cs8uheNktKYv7nrfm7U+axcVzx5RIxiVr14MCSBzz7Qk6sf8cRK/qxJE2paFvMjuqL nXfunDkRd6Q/eVlAbVbCjpkr1is4rp28ru5P25aVNzXO+/sts2hiXJ8TaDnxqLCRQMrEmISj CuzOxt8nPM3+Vp6b/uqVYGSp/78Vm3btqjq4+ZnSxuQfgbVqXlJld4sLy96xP+Y8N+W7aZ3m b9HnacIZP7/e2Lmo5mx7zhJJ2/t2Ra+qd+o+721Zu5khiC12yu/GUy4T7scuVWIpzkg01GIu Kk4EAJCM2IrjAgAA X-CMS-MailID: 20230328135235eucas1p2c6e3c13957d223c2f063c25abab7320d X-Msg-Generator: CA X-RootMTR: 20230328135235eucas1p2c6e3c13957d223c2f063c25abab7320d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328135235eucas1p2c6e3c13957d223c2f063c25abab7320d References: Subject: [FFmpeg-devel] [PATCH v18 08/10] avformat/mov_demuxer: Extended MOV demuxer to handle EVC video content 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E8VkSMUhH8bL - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- libavformat/demux.c | 1 + libavformat/mov.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index b19ab86d08..031d17dab8 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -120,6 +120,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, { "truehd", AV_CODEC_ID_TRUEHD, AVMEDIA_TYPE_AUDIO }, + { "evc", AV_CODEC_ID_EVC, AVMEDIA_TYPE_VIDEO }, { 0 } }; int score; diff --git a/libavformat/mov.c b/libavformat/mov.c index 057fd872b1..3d5c432697 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2647,6 +2647,7 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, case AV_CODEC_ID_VP9: sti->need_parsing = AVSTREAM_PARSE_FULL; break; + case AV_CODEC_ID_EVC: case AV_CODEC_ID_AV1: /* field_order detection of H264 requires parsing */ case AV_CODEC_ID_H264: @@ -9305,7 +9306,7 @@ const AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif,evc", .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mov_probe, .read_header = mov_read_header, From patchwork Tue Mar 28 13:52:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2199811pzh; Tue, 28 Mar 2023 06:53:18 -0700 (PDT) X-Google-Smtp-Source: AKy350YtcDh1YHk34UkMTArET1NysDIBgH5CVIuv562LojwtXgt7T+dTaGoka9Q9rjJHGnOwydu8 X-Received: by 2002:aa7:d806:0:b0:4ac:bcf9:6d6c with SMTP id v6-20020aa7d806000000b004acbcf96d6cmr14314888edq.36.1680011597941; Tue, 28 Mar 2023 06:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011597; cv=none; d=google.com; s=arc-20160816; b=nH3b4uid0K/zZUqp3EUIFOeaXjBksZVAVphHJf2Qwypg7lmqGeoARUI0gIcQgtCHsR JBGJe8TcfyJz2f2SpPLuzw3JKM8AjNzACOf8VsS6Lf4E5stLk56hjFu0u9PTJrJ1P0eo McHD1/bGy+GPq1hc7i0a2H1Tt8bDHLkSHxK6PKswEptTlCgKNuHeM6l2E224I3ipsvEU FALuDsmRxtxs3zZwNKxWYbsHgKIjRcgfJgmjxp0+lGdTvhc+XS4SirZRnnIdx7fpFiaq wMUtUlpcI0CrLcWyBKegr2BYJnpdOQDUsWs8KltiygD/H2n4nVRE7FTDsL1dF/Z0Aenf yaSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=AsaBzBBkCoP4W+MC1zC9p4ZW9iihvhlQjpUpo/GSFDk=; b=o6IdOFb+uCeNw/pH74F4M0QmU3C94eA059fnld1EoSEebXceBBIHBWn0zUKM5bT9ig PrhGC0SRaOLJqBZISRw8D9Q1vpq+ytfDvmdtow19bS8XqVAmqTwq6BuHFGjVXtUv29Ya cKoZoWTE+ulJS8SiypTQbl7YRqvpCgE3m+G5s0NlfJWOxu5yUiIB6gzqZk1M+1egr4ui 8gzbBpN8h8xX2wC+OFmnE4R4l+LU2P/pNCbPbfwgqyNU/3589wspibdpUNHq8axfvoWJ N8QYJ0jw7FAquvGXRn8D3KFP6QsoDmmQJ1+mm04iCRdU/1iWRajNLpsoONMzqOiBQvt0 TSHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mGfoD68p; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y17-20020a50e611000000b00502242d4ea6si12915286edm.75.2023.03.28.06.53.17; Tue, 28 Mar 2023 06:53:17 -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=@samsung.com header.s=mail20170921 header.b=mGfoD68p; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B229468CBEB; Tue, 28 Mar 2023 16:53:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65E0768CBA3 for ; Tue, 28 Mar 2023 16:53:09 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230328135308euoutp02c455cfa641f4ba7333bbbeda40efabba~QmaOXxlz43161531615euoutp02k for ; Tue, 28 Mar 2023 13:53:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230328135308euoutp02c455cfa641f4ba7333bbbeda40efabba~QmaOXxlz43161531615euoutp02k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011588; bh=bMetrsXRK+lb8JYHISSEOfOA5KbZyxPMuuwf9DBZl10=; h=From:To:Cc:Subject:Date:References:From; b=mGfoD68pb/apQBmH1bsJ2x+0x+qfTvxAewSAiw+APGaXopiVi07FBelvOhBNXfeDY doy8ACOS90QxU6QP54khN//z+reEwzQooPcaC+FHWMfOHcD7viYhboUcns4R5qXG+J 7Elr0//JE/zoxTySccqifuVZceXVbLSkwiodaGQk= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230328135308eucas1p10224bdf46218bcce2d92ca155ff3fe3a~QmaOLkBmD2391123911eucas1p1a; Tue, 28 Mar 2023 13:53:08 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 5D.15.09503.441F2246; Tue, 28 Mar 2023 14:53:08 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230328135308eucas1p1e5d30df88aaedd690cce4f43cd1c944e~QmaN667i72234822348eucas1p1C; Tue, 28 Mar 2023 13:53:08 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328135308eusmtrp13d23b9bbae558d246acd6543defafd47~QmaNyUWch0370803708eusmtrp1f; Tue, 28 Mar 2023 13:53:08 +0000 (GMT) X-AuditID: cbfec7f2-e8fff7000000251f-a7-6422f1445ad4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5D.0B.09583.441F2246; Tue, 28 Mar 2023 14:53:08 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328135307eusmtip2c78daf48e7ed02830a31b069ca4e4349~QmaNbtnB33123731237eusmtip2M; Tue, 28 Mar 2023 13:53:07 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:52:56 +0200 Message-Id: <20230328135256.1219-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7ouH5VSDI60qVl8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBkvZr1kKVjAWtFx5hZzA+NUli5G Tg4JAROJ/f9+MHUxcnEICaxglPj6u4kRJCEk8IVRYvlPPYjEZ0aJph2HmWA6Hs+byAaRWA6U OHGRHcJpZ5LYdrGZHaSKTUBX4uWHR2AdIgKmEieb97KB2MwC2hLr7n4Hs4UFHCVm/l4NVsMi oCqxdP4GMJtXwEqi/ctqqPs0JSZsmQMVF5Q4OfMJVJxbYt2sS6wQM+UlmrfOZgY5QkLgK7vE vRXL2SCKXCQWHdrIDGELS7w6voUdwpaROD25B2gQB5BdLHGo3wHCrJE49CMdosJa4m3jcUaQ MDPQCet36UOEHSUeb7jGBFHNJ3HjrSDEAXwSk7ZNZ4YI80p0tAlBmCoSfZ1iEI1SEk+XzYG6 xEPiUud7lgmMirOQfDULySezENYuYGRexSieWlqcm55abJiXWq5XnJhbXJqXrpecn7uJEZge Tv87/mkH49xXH/UOMTJxMB5ilOBgVhLh/X1NKUWINyWxsiq1KD++qDQntfgQozQHi5I4r7bt yWQhgfTEktTs1NSC1CKYLBMHp1QDE1sXA8cG07ztZ7ft/1EQr+5XafpQfpa1nRkn/5/8ns3v TGv8TrSvvXLoWenbFQlKL10Y62PaZWfwHGf4sO1+hLC+uU8rowDv/MjnPEJJtjVTSi4eWrHw pNMyhW07/ILtLPdc3xWRtq3bK/r3uQVyUa9/HHM8LPljl23NwbJPRxmdPgd+yH1zJ1PpnvFB SW77nGiOqui7Gntz3u5MPnXY16r778Xqjcoe995vbeZzn7vmj+eFLaoiMk4b5gkVTz4/QX6H fsAFLvMim2VTis23WKlPdZWqu56x9PvzEt8Tk38Fn5qr0pBYkcAWULLvjsULT+9Sse03LNZd 1v6Q/nOJ4ed7T5uZNjBFpuyNEX96VomlOCPRUIu5qDgRAPGSMKZ+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7ouH5VSDGac4LX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJezHrJUrCAtaLjzC3mBsapLF2MnBwSAiYSj+dNZOti5OIQEljK KLF95WlmiISUxNKlixghbGGJP9e6oIpamSQufdjACpJgE9CVePnhEROILSJgLnFx3S2wBmYB bYl1d7+zgdjCAo4SM3+vBqthEVCVWDp/A5jNK2Al0f5lNdQVmhITtsyBigtKnJz5BCrOLbFu 1iVWiJnyEs1bZzNPYOSfhaRsFpLUAkamVYwiqaXFuem5xUZ6xYm5xaV56XrJ+bmbGIGBu+3Y zy07GFe++qh3iJGJg/EQowQHs5II7+9rSilCvCmJlVWpRfnxRaU5qcWHGE2Bbp3ILCWanA+M nbySeEMzA1NDEzNLA1NLM2MlcV7Pgo5EIYH0xJLU7NTUgtQimD4mDk6pBib9Bw+uGk9adnbx 7cZZ6scnhW75zya/X0v0kEHW3pUBvH61285oCS9c6RfpYVfAfvGa0/0F2ar7glOdawxY7ot1 ZWrybg662psoYc/XJZcsekzqQstcPackdmbdC6qNOwxWisgeKBNbdWnWmq1GcaWJK/f3ndlh cl732fSVU1ZMNTNm2i+Q8VzRIHsLw7RpRyPn/7/043PwnWM6b5KK+R82m3y1zX4iNM3GPOhA T+jrby/ljjx8qR/e4NXY0PlbK6Hj3Q1e5+3ZHU9MXdf6Fqk59P6u57m83kjIw3HSd95Jl8Pe Xdu2T1XZjtsixkDpb/Whx19MZk5J9Su123frncZWqd8ycdZvtXx/9VfbxymxFGckGmoxFxUn AgAS5YCQ5QIAAA== X-CMS-MailID: 20230328135308eucas1p1e5d30df88aaedd690cce4f43cd1c944e X-Msg-Generator: CA X-RootMTR: 20230328135308eucas1p1e5d30df88aaedd690cce4f43cd1c944e X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328135308eucas1p1e5d30df88aaedd690cce4f43cd1c944e References: Subject: [FFmpeg-devel] [PATCH v18 09/10] avcodec/evc: Changes in Changelog file 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c8bpiltNEmdB - Changelog update Signed-off-by: Dawid Kozinski --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index b357f428ab..0cf4c8f461 100644 --- a/Changelog +++ b/Changelog @@ -74,6 +74,8 @@ version 5.1: - remap_opencl filter - added chromakey_cuda filter - added bilateral_cuda filter +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 5.0: @@ -121,7 +123,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer From patchwork Tue Mar 28 13:53:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp2201414pzh; Tue, 28 Mar 2023 06:55:58 -0700 (PDT) X-Google-Smtp-Source: AKy350b2BQKTCV9TseMotPZVAp83Ngt0Lr+YMxhttHu6Jm9ALbXBLHlfePJIP4sQBpx1vtTthG7x X-Received: by 2002:aa7:de92:0:b0:4fb:fd22:29c0 with SMTP id j18-20020aa7de92000000b004fbfd2229c0mr15001535edv.26.1680011758509; Tue, 28 Mar 2023 06:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680011758; cv=none; d=google.com; s=arc-20160816; b=C1tyb2Chc6otRZjjoJQfC+iglOGs7rjp7P90GnPcIdw7tHBl1qekK64DMubRK6kDiN atxGhP0bo84p9TnzPeo3Um+D6l19/A5GTkU1ZGJPRtwPZ9Yn7TIHnBRXwqcEP5+gzxDT DUXLTDXRuQlIPgFPNp7rv98Yaz5RBwa7NoHK7JKUA6Daza+s4RaFts4aJsS04L2MLnDa Pil9qs+t9a4zC5YIBqqMUsJOjw3yS1dO7wABN1RpVhqK3sr8kglEHmSJap8cdRA9ZTCc rRon+ogCqx+H8zG5m0XWtT6cGb7gOnd4j3gZplsrwGHM5iLPOricOKSaFWnXD1fnY9B6 lbeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=8EKgdpv8sDMpOOlbO7gWwjhCpAApdjEGFoIHIGD+Hcw=; b=OBuptcCUzqfmFfGgcVVTJxbQHpszgxz6okiaZI04fGtZ3rX7ODk7Nr8fkyLeduiH8J IUoltSdkyDcAYcI5ajOadXzcrLqTMT+/9xiPsRd8ZiG0mQ+dfrU7f/kuzLBZmSnU0icJ 18dyAO+w05O/KRDaeCxjKmHkXzMVm7FzdlsxQM8ZKMny+VzQNoeJWFiCZYPobMxc44+b x6tHqWyesEJfPCbQ2zwOmipjyFWGKkd9Yt/U8pUFi1gnufYm9XHgcGs7TpzSJKSZVhmQ c6mB/WBvnY1N6kkKZVSa/OzBP6x6J4zEJ541gCbcuy34nRh2CecqsjE/f/LMJ78vQQMw 5hAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=lWWbI7nc; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t1-20020aa7d701000000b00501dcf278b0si20924552edq.271.2023.03.28.06.55.58; Tue, 28 Mar 2023 06:55:58 -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=@samsung.com header.s=mail20170921 header.b=lWWbI7nc; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDE6968C13B; Tue, 28 Mar 2023 16:55:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1228A68CBE8 for ; Tue, 28 Mar 2023 16:55:49 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230328135548euoutp015518d89fd39732cf0f2cb09581add34d~QmcjGUghI0716207162euoutp01_ for ; Tue, 28 Mar 2023 13:55:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230328135548euoutp015518d89fd39732cf0f2cb09581add34d~QmcjGUghI0716207162euoutp01_ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680011748; bh=+wzJiyFqiG0j20zA9XB4jAU+Q4dcfHDGAXn95Awj9PE=; h=From:To:Cc:Subject:Date:References:From; b=lWWbI7ncSspqJ5XQKgqz/4Nj6z51TC/xbcWb08BVc9tlLkLKPmCUjFMNHjxDrOCnm nY2OCK5z57dSxbPGOduVTSMUAZKsaz8D8rJC3tngmIijMEfrEAsYmxUI+pWrZscwVf MYfvWfzkzKAFx2ZET+LFjmsjCieUdlq2sYyUG34s= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230328135548eucas1p227a6aaeee5559a3e1a9bf9db251318ee~Qmci2xDn23140831408eucas1p2c; Tue, 28 Mar 2023 13:55:48 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 2F.C5.09503.4E1F2246; Tue, 28 Mar 2023 14:55:48 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230328135547eucas1p2f49f986e2d55db2bcb820fc81027b0d1~QmcigrWL62817728177eucas1p2L; Tue, 28 Mar 2023 13:55:47 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230328135547eusmtrp1039b8f4cc6fd4cfffe7370f7f4c37dd6~QmcigErtl0556805568eusmtrp1s; Tue, 28 Mar 2023 13:55:47 +0000 (GMT) X-AuditID: cbfec7f2-ea5ff7000000251f-3d-6422f1e46ff7 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 03.9B.09583.3E1F2246; Tue, 28 Mar 2023 14:55:47 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230328135547eusmtip243e594cdcfd72e7cfcf814a3d2c47e6b~QmciJn_lS0064500645eusmtip2D; Tue, 28 Mar 2023 13:55:47 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2023 15:53:23 +0200 Message-Id: <20230328135323.934-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7pPPiqlGHzoFbD4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDIet8QUnOasuHviO1sD41+WLkZO DgkBE4mlDduAbC4OIYEVjBJ/761hhnC+MEr0fLzBCOF8ZpS4ueUCG0zLlWP7oBLLGSVutDSy QjjtTBJNWxcyg1SxCehKvPzwiAnEFhEwlTjZvBesm1lAW2Ld3e9gtrCAmcS9W/2MIDaLgKrE 400HWEFsXgFLiRXf5zFCbNOUmLBlDhNEXFDi5MwnUIdzS6ybdYkVYqa8RPPW2WB3Swh8ZZdY 2NjHDFHkItH54g+ULSzx6vgWdghbRuL05B6gQRxAdrHEoX4HCLNG4tCPdIgKa4m3jccZQcLM QCes36UPEXaUODm3lw2imk/ixltBiAP4JCZtm84MEeaV6GgTgjBVJPo6xSAapSSeLpsDdYmH xJ7FnYwTGBVnIflqFpJPZiGsXcDIvIpRPLW0ODc9tdgwL7Vcrzgxt7g0L10vOT93EyMwPZz+ d/zTDsa5rz7qHWJk4mA8xCjBwawkwvv7mlKKEG9KYmVValF+fFFpTmrxIUZpDhYlcV5t25PJ QgLpiSWp2ampBalFMFkmDk6pBqY6m8Sqg4GfX/YtXFExy1die9fveNF1fyfc724M3rxI7k9l 1Bv5D6szrflMZ/awH/J3lVo+a9WM6UqpPfuOh/yJl9uumy/XvlVeyHdzafq9ie7Mz4xbeLYJ W2hrmb3paEmbWb1lbctmuwUrt4r7H37StnbVsTmRNz66JtvcsDspGbz2Ajs3b7f9vSnWUnef aYUzCaue9DQwr7jAIKCy0VlE8IzZPMmwzVOcNWd3H49apJP36XkLC7de+Z3GD9rezS1bNYpq LN6dZgvnYNr5gMs7rEi37oRTanyCkk9JziMm3XYl7hbV0nzZ/ql/Z0TtO/EmpU/3qvqSKyur fa/xrbhSuvDxr/1G0ko/Jbm5lFiKMxINtZiLihMBiBci8n4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7qPPyqlGPxYZm7x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GU8bokpOM1ZcffEd7YGxr8sXYycHBICJhJXju1j7GLk4hASWMoo senAX2aIhJTE0qWLGCFsYYk/17rYIIpamSSmXPgH1s0moCvx8sMjJhBbRMBc4uK6W2ANzALa EuvufmcDsYUFzCTu3eoHi7MIqEo83nSAFcTmFbCUWPF9HtQCTYkJW+YwQcQFJU7OfAJ1HbfE ulmXWCFmyks0b53NPIGRfxaSsllIUgsYmVYxiqSWFuem5xYb6RUn5haX5qXrJefnbmIEhu22 Yz+37GBc+eqj3iFGJg7GQ4wSHMxKIry/rymlCPGmJFZWpRblxxeV5qQWH2I0Bbp1IrOUaHI+ MHLySuINzQxMDU3MLA1MLc2MlcR5PQs6EoUE0hNLUrNTUwtSi2D6mDg4pRqYZq7dKP4nRyat r0b6aW74D+Mu/oR/0V11jE925r4o4bh+vm6fBLtMf04VZ/KDdQlhszbtEbiw9uLvklurLr65 eHv38lWbniSfa825Z5PCOP12pmKVXipr3tzLLEqfTarWyq4U/bnM0G3Oo20HmO/WMvOc/J0y +V+Oot7BqWqdCQJCXNcZv3jIl6zP4PmZXJO+yqjoqPxjt2IGgY9MiQE3l7LGir7f7TD9evK9 Hl3XSbUfP3ue50qx2K/fo97PKHkw4mj6+/fTHq3v/rjoP88+Yy5u0RUcJw/sYXe1UtbfKqw9 xe7/9eLze42dWVbM7K3gq/n7eoWgsOYp49TWPu5qib3MTxPYDKvy+XiXMwcpsRRnJBpqMRcV JwIAitEoe+QCAAA= X-CMS-MailID: 20230328135547eucas1p2f49f986e2d55db2bcb820fc81027b0d1 X-Msg-Generator: CA X-RootMTR: 20230328135547eucas1p2f49f986e2d55db2bcb820fc81027b0d1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230328135547eucas1p2f49f986e2d55db2bcb820fc81027b0d1 References: Subject: [FFmpeg-devel] [PATCH v18 10/10] Changes in MAINTAINERS file 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ySobo5yUzHcC - MAINTAINERS update Signed-off-by: Dawid Kozinski --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 854ccc3fa4..ce7da9681e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -198,6 +198,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Samsung (Dawid Kozinski) + libxeve.c Samsung (Dawid Kozinski) libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -417,6 +419,7 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc* Samsung (Dawid Kozinski) ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer