From patchwork Wed Apr 5 07:00:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167029pzb; Wed, 5 Apr 2023 00:01:12 -0700 (PDT) X-Google-Smtp-Source: AKy350bhIAmnU5Wu3ayjeIIY9CvDgg9yZOBNutp5YFgrbWFvmC9oONWrFu1++pQ4DarX1qgO7r3U X-Received: by 2002:a05:6402:510b:b0:4fb:223a:76e7 with SMTP id m11-20020a056402510b00b004fb223a76e7mr585127edd.18.1680678072596; Wed, 05 Apr 2023 00:01:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678072; cv=none; d=google.com; s=arc-20160816; b=I/V+iJjbbQc6lkQLX7jvFx1hUSo8w5anIxGTtGNx5u+KIv90xSsO9a7K9dLrks4F5w Kdb/6Jv1e76BJUW4chUl0r6/5pUmK3atrVMglPtZ81epY0TEByGVFDXOYvtLtqoG0KqO bxeqgQAm8cePAXf6iRYOFEAoEQ5EEdblscaPlpf3Axty6jgNplouJ0owN16UMvdD7VFl iI0DN6BzWZdudESBrAHcIW+pDtFIqXY72V6KLNho/d/15EInMqfSQ0ckx9vTYHHrrlae naI9fsvP3oQsFXB8qOSRN5Ty2Rh0PzUfeoBtjc0KQL+Brsb7DjrnmjD4nLSgkk189U31 dD6w== 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=ws/8JOQwyr9qFe0UKkPj21mobxvwZ1bJbK+7xbQUOZs=; b=oZfYPqkdI0D1dwFRygMMGgNt0YRWZexMT2SxM0YONS7x3MuJT/We+/92j++JNpV/0j tdBzhG4Mo/0IV11Gx98QpbBiwAMxPI4tnoSIoxomGnGw6onb+vO1ttI0+tELfK/4kb+7 RdMzxDSsJCFiwVI8HICKUsLuUHpuF8n3nGhxC3eGOvpOTOk4CRoSeEKHTnYpzeVPv3Nt SkC6wwQSXKj4Bri64Klq6gksVpo6arFZjgRcuWDywUE5CeZm8cPlyBk5ciN0O4TbPyVC fxieSvqaRSzp3cuiwSjHAQXNtSeNUeWztRq5NJbMyDxD0AkMf+6sjPsok+BPnPMDmvKH CPag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=FNbeDau4; 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 v9-20020aa7d649000000b004af6a815065si2573376edr.592.2023.04.05.00.01.11; Wed, 05 Apr 2023 00:01:12 -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=FNbeDau4; 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 D417A68BA58; Wed, 5 Apr 2023 10:01:07 +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 BD90968B851 for ; Wed, 5 Apr 2023 10:01:01 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070059euoutp023fc91eed2c3bd4f5d5b22f261abca96d~S98pBxpDv1991619916euoutp02H for ; Wed, 5 Apr 2023 07:00:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070059euoutp023fc91eed2c3bd4f5d5b22f261abca96d~S98pBxpDv1991619916euoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678059; bh=gG0AXIOQTmcA+MeXwa4gwJZPHRBfcrLVsKFzmJTNQGs=; h=From:To:Cc:Subject:Date:References:From; b=FNbeDau4v3MSKvglrWN/XAtwAuR0i35bVTShappNX8i4fgYGYBxF/caiMV83+sinS 2X6IRyxZDLUzgXCic4vxnsKc1lZHKA522Fs2PHrCO3DiB9egox/eduwxPkV8dvW5xP Z+DFSU22M9kGH1HMZfTLeWGI3UfvugO87ibBnWFs= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230405070058eucas1p27c8f6081154514922a231963753cddeb~S98o2F-de0748407484eucas1p2X; Wed, 5 Apr 2023 07:00:58 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 80.8B.09966.AAC1D246; Wed, 5 Apr 2023 08:00:58 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070058eucas1p12d0d91ffb803c47ed10089879221dd8a~S98ofIyiM2891328913eucas1p1u; Wed, 5 Apr 2023 07:00:58 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070058eusmtrp1582d3a5b602cd11a65760d27618c0e5e~S98oeqb2L1036610366eusmtrp1V; Wed, 5 Apr 2023 07:00:58 +0000 (GMT) X-AuditID: cbfec7f4-d39ff700000026ee-3c-642d1caa4c1a Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 1A.8C.09583.AAC1D246; Wed, 5 Apr 2023 08:00:58 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070058eusmtip2d5c1e45f95f015a6bf6fe226fc35bf9b~S98oJ9hSd2658226582eusmtip21; Wed, 5 Apr 2023 07:00:58 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:00:49 +0200 Message-Id: <20230405070049.881-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+NgFnrBIsWRmVeSWpSXmKPExsWy7djP87qrZHRTDM626Ft8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBk/P59iKpgnU3Fz8yX2BsYvol2M nBwSAiYSc7tnsXQxcnEICaxglDi4fTETSEJI4AujxJH3chD2Z0aJtytFYBo+v/0L1bCcUaL9 yUI2CKeVSeJ6y0VWkCo2AV2Jlx8egU0SETCVONm8lw3EZhbQllh39zuYLSzgKnH52TqwGhYB VYnmJ3/Yuxg5OHgFLCVaziVBLNOUmLBlDlgJr4CgxMmZT1gg4twS62ZdYoUYKS/RvHU2M8gN EgI/2SVaDsxnhyhykZjwby4ThC0s8er4Fqi4jMTpyT0sILskBIolDvU7QJg1Eod+pENUWEu8 bTzOCBJmBjph/S59iApHiYYmIwiTT+LGW0GI/XwSk7ZNZ4YI80p0tAlBmCoSfZ1iEOOkJJ4u m8MMYXtI/L74lW0Co+IsJE/NQvLILIStCxiZVzGKp5YW56anFhvlpZbrFSfmFpfmpesl5+du YgQmhtP/jn/Zwbj81Ue9Q4xMHIyHGCU4mJVEeFW7tFKEeFMSK6tSi/Lji0pzUosPMUpzsCiJ 82rbnkwWEkhPLEnNTk0tSC2CyTJxcEo1MHFpph17oB5g6rhn18HHHtz75lxaUVq+5/TVqCvt jOrarnOLKtM+XQ67co27d/7/6/ZW9S4V1b7P5pXcXfZbaM03hT3nWwLUpnBo2ZnwS0tPnvVm YglbUsvqSK7PSblv+7XrlKoOMD6Y/eq0vdKr6dFi2iH/pL2Wvi+bu6iZp1aWNe1SkTfnPrMb L3q281RrMJxn5S05tef7jYwNoctbt9o8COS9IL5KqOLOa/+3+i+X3tp0rnn7OfXkXk9R1/pu wegbr9Qr5+iFrL/BmXHoTVpsZ923Iodq4cueE0LWPZjDxPXVQ04o6M8k218RbZG7Ne02Fy5o eh0cX3ylvTnoT8xVucxQ/ekffk2sVn/8SomlOCPRUIu5qDgRAC7D6dp7AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xe7qrZHRTDOZME7X4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJ+fj7FVDBPpuLm5kvsDYxfRLsYOTkkBEwkPr/9ywJiCwksZZTY fZAdIi4lsXTpIkYIW1jiz7Uuti5GLqCaZiaJ9WtvgDWwCehKvPzwiAnEFhEwl7i47hZYA7OA tsS6u9/ZQGxhAVeJy8/WgdWwCKhKND/5A7SAg4NXwFKi5VwSxHxNiQlb5oCV8AoISpyc+YQF Is4tsW7WJVaIkfISzVtnM09g5J+FpGwWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsY gUG77djPLTsYV776qHeIkYmD8RCjBAezkgivapdWihBvSmJlVWpRfnxRaU5q8SFGU6BTJzJL iSbnA+MmryTe0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qByXeRTOiC Q9+z3+Ytu1Cfslf1hXoBe9y7mzfnNcYu8IziW5r55bHcWUt5JoPV2y6GnTc/62jnaHMh+8qy XZ5v0j6EVho3N6dXx/v+nNGx4OfasGfLeWQcWuaX/TZtPnTpZadsuJ/qK/8DAr4b3iQEB+4+ 1SmmsIzDI+mTpAf/9mus/yW/Nd1d8sNMJdBi2hUHq5oC+6oqM4PXwU9NT/89kix83/b4favw xDVX3k+3TttUafj2jk7P1WuZK1NPfZM6x7kn6rHep6ePH2gfe21lYlDm1pP0yfZxsuntCMtD kVtc0uJ2BH9esyklVWXCBV6Pk8oGx0xZJ1kc+RivlO0+j3Ft6st91q8U80pe/thlpcRSnJFo qMVcVJwIAHLcPVTjAgAA X-CMS-MailID: 20230405070058eucas1p12d0d91ffb803c47ed10089879221dd8a X-Msg-Generator: CA X-RootMTR: 20230405070058eucas1p12d0d91ffb803c47ed10089879221dd8a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070058eucas1p12d0d91ffb803c47ed10089879221dd8a References: Subject: [FFmpeg-devel] [PATCH v19 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: 6w/hk1IDcQ+l 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 1e91b9cb53..ffc07af862 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1707,6 +1707,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 efdcb59bc9..06454849c7 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 230d5fa13e..35947dad28 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 9 -#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 Wed Apr 5 07:01:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167196pzb; Wed, 5 Apr 2023 00:01:28 -0700 (PDT) X-Google-Smtp-Source: AKy350Y/tSWU4AzqC2Gzqmap6ynBNEx8rF3osWmz/RInwVFmUopfjkQIBsnmgTcFCXikB9oK3pNx X-Received: by 2002:a05:6402:3cd:b0:4fa:ecdc:e44b with SMTP id t13-20020a05640203cd00b004faecdce44bmr967467edw.24.1680678088147; Wed, 05 Apr 2023 00:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678088; cv=none; d=google.com; s=arc-20160816; b=jDwdCMJduOS084sfF7xZdsnmOnnn9XlEZQ+aGq3jGel0CfUwekBaAq6UEYjIotT/QU 4i9zgR2ZCfuap5nKudOFo9l1EHrxGV9DpV4EDQYumNVXqMx6zjqlDpQRsNa+AgH+vmjv EQ07GoTowfHgdfhUUDD17qMw22sf2EoGFCwBiRqVlDmzSkuSkoSOYUBhdSyHDhYCXuVi n5tXGgtzpO9aSe59uArHSSKshjMsMEYZwmYtWcpuYxJWVVuxxrn8shvxgBgvIjgJU+Zm jpbFN58PeHp+a3+jiwmGs2RJWw4ls/8E7ZcalZ5O8rnASZhFuPm1EpQWRo7JsN+yZ0vQ baIA== 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=8yNq0ncUMyAtFf/XJO+fKdZKMR08Hu9lEz7H0R4hxLk=; b=doNWNoOTFDcrzCpGlpQyqPrc31VHtzAm4cVV3PPsf5xNaIzyC00n0ep5iGHhl5JrWO BL0VHMsyNI9yIFvp/odb0ka5/QGXAe/3JfReuXAkE5a8Nbi5uCLT0xH087sWrUigg4p+ TWExWu+3BVrdBSvHk4ti75nuOpIz5wSUGCeybso+SvXrlkqiJLBk2PXMYeVJdAHYJ/8B oQV7OZZfeTLZ1zeO6PUg7ZRpYMdq4l6BdnrhhZ6UYRaZRFvFT3m94pnnyCEyetuVK68t /zRNd/V3zvWoVHX6oLJETSaQNUDp3Cm8CmlfoPKeSVKVaS3vt9GWSzBwoVJqbrojtSUA qdfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=PeKkrJO7; 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-20020a05640203cb00b004fd23c0fceasi185085edw.545.2023.04.05.00.01.27; Wed, 05 Apr 2023 00:01:28 -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=PeKkrJO7; 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 1C4B768BABF; Wed, 5 Apr 2023 10:01:24 +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 D6CDF68BAA0 for ; Wed, 5 Apr 2023 10:01:17 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070117euoutp02a662cda7d953562bbcfcb69db65323e8~S986IBIaz2370623706euoutp02E for ; Wed, 5 Apr 2023 07:01:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070117euoutp02a662cda7d953562bbcfcb69db65323e8~S986IBIaz2370623706euoutp02E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678077; bh=pWzuz0fJc+LFjWz0kCXG4X3CulkK5jCkaKmuU56+oaM=; h=From:To:Cc:Subject:Date:References:From; b=PeKkrJO70GZb/px9F8d5nhQZhnJVjuTeMTTJ1lJ5AXIUzCZKGKPcCvm8EdBm8MloQ ZSISxDM9KH8xzByhBO2z8rx6oTjOJ3JgxbVdrVR6HE9EMvgXK/R3S7vMYHwzbXil1i Bay8Ky5DRo0xcxhUqZtOgjMzHb7s4e344svTUOIY= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070117eucas1p1cd33e6fc9c921d33e0bf53207abc5966~S9854sDGs2894728947eucas1p1N; Wed, 5 Apr 2023 07:01:17 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 21.CE.09503.DBC1D246; Wed, 5 Apr 2023 08:01:17 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070116eucas1p1a67949049d39e7ac1ed374b2a70a51ea~S985pHImZ2881428814eucas1p1V; Wed, 5 Apr 2023 07:01:16 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230405070116eusmtrp2082a3b339dd332974c6e8ce7d7ba0197~S985of8c32231022310eusmtrp2Q; Wed, 5 Apr 2023 07:01:16 +0000 (GMT) X-AuditID: cbfec7f2-e8fff7000000251f-bd-642d1cbdf53e Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 74.34.08862.CBC1D246; Wed, 5 Apr 2023 08:01:16 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230405070116eusmtip10d20edd1ec2820c718bb747dca7fed31~S985PkAki2968129681eusmtip1Z; Wed, 5 Apr 2023 07:01:16 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:01:09 +0200 Message-Id: <20230405070109.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+NgFnrLIsWRmVeSWpSXmKPExsWy7djP87p7ZXRTDOY+Z7b4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDL27JrBXnDqBXPF5b5v7A2M/ZeZ uhg5OSQETCR+nv/P3MXIxSEksIJR4uyulawQzhdGibk3TrBAOJ8ZJY6segXkcIC1PHrjCRFf zihx/OUGqKJWJok5Bx8zgsxlE9CVePnhEdgOEQFTiZPNe9lAbGYBbYl1d7+D2cIC0RKfpzeD 2SwCqhIfG+8zg9i8AlYSG182sULcpykxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1NtgP EgJ/2SWufvgDVeQicWPJLTYIW1ji1fEt7BC2jMT/nfOZIL4pljjU7wBh1kgc+pEOUWEt8bbx OCNImBnohPW79CHCjhKTLy5gg6jmk7jxVhDiAD6JSdumM0OEeSU62oQgTBWJvk4xiEYpiafL 5jBD2B4Se16dZJvAqDgLyVezkHwyC2HtAkbmVYziqaXFuempxYZ5qeV6xYm5xaV56XrJ+bmb GIEp4vS/4592MM599VHvECMTB+MhRgkOZiURXtUurRQh3pTEyqrUovz4otKc1OJDjNIcLEri vNq2J5OFBNITS1KzU1MLUotgskwcnFINTD1rSj5eW+DyctkK0+o502Ivntxj5SI9az/rgQ/s sbODXWNr5V1jF2xmrcpuvDZtqVhtnWUz71n9dnszc7dtmmf3az5sut++9N/DjvWZFhyyjWt1 Ozdt789jfeFxT8Fi+6TLm7j0ZH3eB725oer5e1bTr5a3S19bzKoX/iq9wHHB+oW8K/hvXr7h JcM+0e+U2svipVc9NmTt9Z0aeTTf6fdO5v3mlQeCeUoCzl+LKYs4XvCKX98xZHWhck/ll2ev lr449Dx2YayhJzc/V4+hNve71c9quF6Z59nw5T/V9GJ/bcD9UehG57rs2cv1zn8/sisp2e82 x8+DZ+8Iz9YrKpeQm8Jq9KRDSvJoZuUfISWW4oxEQy3mouJEAK4gtmuAAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7p7ZHRTDF5+0bf4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DL27JrBXnDqBXPF5b5v7A2M/ZeZuhg5OCQETCQevfHsYuTiEBJY yiix6t8J1i5GTqC4lMTSpYsYIWxhiT/XutggipqZJPZP38IEkmAT0JV4+eERmC0iYC5xcd0t sAZmAW2JdXe/s4HYwgKREuv/TwazWQRUJT423mcGsXkFrCQ2vmyCWqYpMWHLHCaIuKDEyZlP WCDi3BLrZl1ihZgpL9G8dTbzBEb+WUjKZiFJLWBkWsUoklpanJueW2yoV5yYW1yal66XnJ+7 iREYutuO/dy8g3Heq496hxiZOBgPMUpwMCuJ8Kp2aaUI8aYkVlalFuXHF5XmpBYfYjQFunUi s5Rocj4wevJK4g3NDEwNTcwsDUwtzYyVxHk9CzoShQTSE0tSs1NTC1KLYPqYODilGpji9c+f X3FVcFliywcL84eFjpxpGh5dHLvaZx751Lxm7sMG6ak5TZ8D7gneNp/vvujowmO/LjbIX/Nb H1GaKLzGpZorSsuJtWrN733sIZ9P2zFOOfZCvGS3j/6tB9o8DDrCIU1nP/cw136s/c85R6zd clHS1KveKsZy99+FxOwu00teNmuilfy3nZsFdi2Sdw1OPTKv68Bk5qUpitUle+Sn8yUUzudi vuXTdevuSsUrbFN7+B0yonqS+z8/OCMe9u7Fzy2n9ry4GbLIwfaXxc2brxx/Mwon6qkekumV Ob3sWInNgn4nzbLrTpYLpWK03DOEftXc/Ju3SGPytz9uj/nC3ootZn+X9E5w2e01U6WVWIoz Eg21mIuKEwEXxc185gIAAA== X-CMS-MailID: 20230405070116eucas1p1a67949049d39e7ac1ed374b2a70a51ea X-Msg-Generator: CA X-RootMTR: 20230405070116eucas1p1a67949049d39e7ac1ed374b2a70a51ea X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070116eucas1p1a67949049d39e7ac1ed374b2a70a51ea References: Subject: [FFmpeg-devel] [PATCH v19 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: 96l0d5EaJzJ6 - 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 | 1344 +++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 1501 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aa10fbfcf8..b07fabc3aa 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1159,6 +1159,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..36730485fd --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,1344 @@ +/* + * 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_type(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + + const uint8_t *data = buf; + int data_size = buf_size; + + 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; + + return 0; +} + +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; + + switch(nalu_type) { + case 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; + + if (sps->vui_parameters_present_flag) { + if (sps->vui_parameters.timing_info_present_flag) { + int64_t num = sps->vui_parameters.num_units_in_tick; + int64_t den = sps->vui_parameters.time_scale; + if (num != 0 && den != 0) + av_reduce(&avctx->framerate.den, &avctx->framerate.num, num, den, 1 << 30); + } + } + + 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; + } + break; + } + case 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; + } + break; + } + case EVC_SEI_NUT: // Supplemental Enhancement Information + case EVC_APS_NUT: // Adaptation parameter set + case EVC_FD_NUT: // Filler data + break; + case EVC_IDR_NUT: // Coded slice of a IDR or non-IDR picture + case EVC_NOIDR_NUT: { + 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; + + break; + } + } + + return 0; +} + +static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + const uint8_t *data = buf; + int data_size = buf_size; + int bytes_read = 0; + int nalu_size = 0; + + while (data_size > 0) { + + // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (data_size < EVC_NALU_LENGTH_PREFIX_SIZE) + return END_NOT_FOUND; + + nalu_size = read_nal_unit_length(data, data_size, avctx); + bytes_read += EVC_NALU_LENGTH_PREFIX_SIZE; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + data_size -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (data_size < nalu_size) + return END_NOT_FOUND; + + if (parse_nal_unit(s, data, nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + + data += nalu_size; + data_size -= nalu_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_type(s, data, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit type 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_type(s, nalu, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit type 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; + } + } + + parse_nal_units(s, buf, buf_size, avctx); + + // 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 Wed Apr 5 07:01:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167283pzb; Wed, 5 Apr 2023 00:01:40 -0700 (PDT) X-Google-Smtp-Source: AKy350a+oPGpYminl6CRCVe3zKjlXcAX8+phA5lUYeswBfwRoUgE40MbLwK33vwQcWCz+EWwZL7z X-Received: by 2002:a17:906:3742:b0:91f:6679:5581 with SMTP id e2-20020a170906374200b0091f66795581mr1522195ejc.21.1680678100481; Wed, 05 Apr 2023 00:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678100; cv=none; d=google.com; s=arc-20160816; b=U7SIp2sen/GVrpWtNPWorRYj8CCu+IlNUzjL31Gij+EMqxYPy/DYgueTGB062A4VTs 6jzNAnfxrSwVJB2Fj+U7tCX3sHQLEQ/C4EpXtOYXiAW2EQpNCNYtf9GQDRvuMDrPL4OJ OjawwpzulYXGhEg+nIO0eoqSPC26Rq3SWfEPRq+dloSHrAl3aBWcoCGMdwl4B7u+evSj iClsS6M+hDvRCcyqnOXlTdOUFyBQXQ2mOedbvkOM13vhmX2hxShCdMe0ewmRVzm4z/V4 x2LiWMG3fey9CpmMKu5oWQoLpB4TryvxviPhvOc+Rm9UDVe7Bfn5v6kko1KxXp96/bCa dVzg== 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=DPKNKtMQGVYEFV7w9lNnpeCZvu03tTzcc8t18uW4cwBEcP6mbzve5fVXGVHkGGdPwn JPFlNFmg9QLXc3Tk+CNJiaQNfkYxnmEnEMW0/M6NYttcdpq70PUkGCs7JPKeGAQPLsJa bUWZG4UZxDVjX5zQtJLN5onh51dDPQK2FWDJYwahPDcNWP0DciBnbxZuIi6xFs4uPtF8 zewSmcK5a2wSWkMZ8opPqIl2fRA6Jtj0p9zLZb2CVpouOhZzZ07tZdqHl50enac7L1UE wOcCoEsJ4qwCbRXD99Qju9a2rnYZNyMrXQiPOqu+l6FupIXXOBdAATT3y9zA65M/SglO qv7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qY3Og6fN; 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 kq3-20020a170906abc300b0093a0e786128si1030682ejb.175.2023.04.05.00.01.40; Wed, 05 Apr 2023 00:01:40 -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=qY3Og6fN; 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 3165968BAF5; Wed, 5 Apr 2023 10:01:36 +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 B17C8680C04 for ; Wed, 5 Apr 2023 10:01:34 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070134euoutp02717cdbfb60442c69bec3fc5536f423d7~S99JwEcLt2323423234euoutp02b for ; Wed, 5 Apr 2023 07:01:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070134euoutp02717cdbfb60442c69bec3fc5536f423d7~S99JwEcLt2323423234euoutp02b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678094; bh=sfP9fXeVQZCnBihkd6bclU660PBiv56rnF5/LGTWUl0=; h=From:To:Cc:Subject:Date:References:From; b=qY3Og6fN3uxyt+XdpPedhEF0HN2ExfREWLFjWECgiYdESk1KFgDc3C/DfAMEQF5so /PIGv5MTp0WX+kybQ7v3BbElryfXTWeMKdn7PhJ3fJ5V9xTqj2RdogkL7eF5tqdIOr LBBZD8DrE9K2Z1gTwD948vhE9qcvyrFHV+9UEcGI= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070133eucas1p13b6130a119c8d2e61351d74d06745dbb~S99Jl12ZN2251322513eucas1p1F; Wed, 5 Apr 2023 07:01:33 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id B4.AB.09966.DCC1D246; Wed, 5 Apr 2023 08:01:33 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230405070133eucas1p24e0aced263e1d877f7dde7ab4a893843~S99JP-Jt63104831048eucas1p2G; Wed, 5 Apr 2023 07:01:33 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230405070133eusmtrp2734cd59377ae637e270a4cf52d8ca4df~S99JPYnEr2231022310eusmtrp2B; Wed, 5 Apr 2023 07:01:33 +0000 (GMT) X-AuditID: cbfec7f4-d39ff700000026ee-d7-642d1ccd181c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id B3.AC.09583.DCC1D246; Wed, 5 Apr 2023 08:01:33 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230405070133eusmtip178350dd9bca2ef896cf403cae0893737~S99I9bVAi2971629716eusmtip1k; Wed, 5 Apr 2023 07:01:33 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:01:25 +0200 Message-Id: <20230405070125.685-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87pnZXRTDJa3WVp8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBlt7X/YCz6IVuxsaGRsYGwT7GLk 5JAQMJH4uXQ3SxcjF4eQwApGiU+HrrNDOF8YJZ4cuQ/lfGaU+LF1JhtMy8b5s6FaljNKfD22 gQ3CaWWSuH7hBCtIFZuArsTLD4+YQGwRAVOJk817wbqZBbQl1t39DmYLC9RJTJt1HayGRUBV 4vi97YxdjBwcvAKWEjM+6kEs05SYsGUOWAmvgKDEyZlPWCDi3BLrZl1ihRgpL9G8dTYzyA0S Aj/ZJa6sPswGMkdCwEWiv8sYol5Y4tXxLewQtozE/53zmSBKiiUO9TtAmDUSh36kQ1RYS7xt PA52DDPQBet36UNUOEqs3aQFYfJJ3HgrCLGeT2LStunMEGFeiY42IQhTRaKvUwxinJTE02Vz mCFsD4n9U76yTmBUnIXkp1lI/piFsHUBI/MqRvHU0uLc9NRio7zUcr3ixNzi0rx0veT83E2M wNRw+t/xLzsYl7/6qHeIkYmD8RCjBAezkgivapdWihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe bduTyUIC6YklqdmpqQWpRTBZJg5OqQYm/ZbXv6asnDmzc+pCs/0Kydozlsupp5sfeJux231v QsAP3a5dWp1RWooHys9uLtUpOsWxhDd/b+OmD/u2Tj+6dv3r1iB/LZsHFzfP15gf82pP2tsE fncDLXlR7WfZbqf0dNxkN3ELmug8LZHS9Tl9hkVruofa5YUbmOqOJRStDD81v824VJcl71fU HHanpYt+WRX9YXoZ+Wmzlc6iA6/ap0gxvfi69devp1FLn5se3LhXdMmXs1LNjNO0t8yPNTlS /Ug2i72pqcE+x0ml7u/sUylV2cfvRHr271MxCk7TLuvaF9k8aTLHt526X16tslG5vnJvzoun pQviGz+9fS1hNKk3hsm3OTxhUyqjIMsdJZbijERDLeai4kQA3LCy+nwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xu7pnZXRTDJouKVl8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehlt7X/YCz6IVuxsaGRsYGwT7GLk5JAQMJHYOH82C4gtJLCUUeLV Fx2IuJTE0qWLGCFsYYk/17rYuhi5gGqamSS29P4AS7AJ6Eq8/PCICcQWETCXuLjuFlicWUBb Yt3d70ANHBzCAjUSG2/Kg4RZBFQljt/bzggS5hWwlJjxUQ9ivKbEhC1zwKbwCghKnJz5hAUi zi2xbtYlVoiJ8hLNW2czT2Dkn4WkbBaS1AJGplWMIqmlxbnpucVGesWJucWleel6yfm5mxiB Ibvt2M8tOxhXvvqod4iRiYPxEKMEB7OSCK9ql1aKEG9KYmVValF+fFFpTmrxIUZToFMnMkuJ JucDoyavJN7QzMDU0MTM0sDU0sxYSZzXs6AjUUggPbEkNTs1tSC1CKaPiYNTqoHJpCp25bvK lfdnB16pOpbFsO2txNF9f59VXCrxjIj5GO4ytd3m/x0Wlrv+a//XHbLT0jN9q6Io6GgnE3Dl sptqAsdZns5QmbSqoAUPvXhlnS+/vHMyYOrVeM9SFafav5HLjRu+be34ufHOL868/4JbZlXO dX3xp8Pru2ho78l9p1eEt98Rnbt1UpLKx4tndkvz3rm42OxR86KMb7YPctRYZnQ0pE3a6Kqm nNystnDt9bdNp8u+q4jdmKN3YoPC1pxZd561PDBq3FHD+aOUq6p4wh8dCc0U9xJjsdoOyeoV UXuKA7TEAjLOhO3Z52Pe8XyWRebB07Wdi2SdVZVZ4uTO7ff5lZj0ZNZxyfthum+UWIozEg21 mIuKEwGUnC+i4gIAAA== X-CMS-MailID: 20230405070133eucas1p24e0aced263e1d877f7dde7ab4a893843 X-Msg-Generator: CA X-RootMTR: 20230405070133eucas1p24e0aced263e1d877f7dde7ab4a893843 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070133eucas1p24e0aced263e1d877f7dde7ab4a893843 References: Subject: [FFmpeg-devel] [PATCH v19 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: DxauEpFZ+JgB - 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 Wed Apr 5 07:01:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167498pzb; Wed, 5 Apr 2023 00:02:01 -0700 (PDT) X-Google-Smtp-Source: AKy350aGm/yr+NapEs7cm+Brwpwdbl1+iaeCHxMYILJoEOvsiNesRUSJDTaNskTRB9yN1jRyYq4T X-Received: by 2002:a17:906:658:b0:947:bf71:a54f with SMTP id t24-20020a170906065800b00947bf71a54fmr1884559ejb.52.1680678121114; Wed, 05 Apr 2023 00:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678121; cv=none; d=google.com; s=arc-20160816; b=AKblpuNwdcMyNycCY5aF1tHCF4aFWU5F+p9rrVrj5yI6X9Q5uqPMWposAeiq0+gsNv CzP5DCRABgZUiKnCHlrsfGUGBDs1YGUYZILGBIWKtUGZG8opQ1MGRgLFhdMfPbl59otE K+mEGH3yOomg4dFy4djBGpHibgJWDOuMYEjIggmeWTgAOGVhDo1lpWhQpyKRTOV5gTDq saw3qEQUB/0Ua9tC5rfPYFa6DSeOo0USMtznfjEAds79HfLSFu4qtbM0V+Z4kdCfLZqA TvZlyOz5YYqqgWmOAH3dsx4kimmUfD2KGexSLtnAv2ynU6TYO8onIH9CSZhBFnM2x6x/ MpPw== 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=fKE6MQh4WUlsp3Jw5pcPHxpap0ZW2W/syQjPeFUgx15NvY/BgpUstW4GFQINSoRX+c kPMyMMbjk4NxjmRCP1+H+81nvSwJA0cxHld+oO+QI1fWfwlwZUkBqYFJmhogt1gYxS1c aNIBpQuJFTa+jmoEOLfW//a3pAZKrECTRmUvs803/Wgxbcc+RVaeXPz8pfHiAK7KkwVh iVkI4VA+MHoImxMJBp+4VdhHwhXPpavVGI5Axm7oKGD3pw3QGtGIB89SVdXGbNA43uCQ Bf8Ki2M9+UGIG3yB2HOeSY0WAmQ6kutpJOcunGkXTyMWCqjZpf9T9r+anKHl11DyyvsY GbDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="JFqL8/al"; 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 gy19-20020a170906f25300b0093b854a4922si805537ejb.486.2023.04.05.00.02.00; Wed, 05 Apr 2023 00:02:01 -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="JFqL8/al"; 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 4E07368BB41; Wed, 5 Apr 2023 10:01:58 +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 8A48968B60B for ; Wed, 5 Apr 2023 10:01:51 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070151euoutp02d3ea51fc26a931211b7a92252735abb2~S99ZiXC8q1991319913euoutp02W for ; Wed, 5 Apr 2023 07:01:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070151euoutp02d3ea51fc26a931211b7a92252735abb2~S99ZiXC8q1991319913euoutp02W DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678111; bh=GIoD4J0tXxCWhDvkGUSECYeMtB83b+2XBjqG22mbxJE=; h=From:To:Cc:Subject:Date:References:From; b=JFqL8/alPQatPQxrwb+5s49pjCUDpgBGzdcIiqRP0Re2PLTiBiqzhHmsN42PIPN5m GIcdeMOeoUS2F+MZB3bhB7M7rfzW9ZyIXkekpR7I2vgVjCb8UgRCMnMQNBEhvco68V kcVCq0+UB5ABSVRHIW+PRkMTZUY2EiaFbq/ehBIE= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070150eucas1p1e4937f62c24e8412cd8dbc02569f128a~S99ZYVb9H2252622526eucas1p1Y; Wed, 5 Apr 2023 07:01:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 6A.73.10014.EDC1D246; Wed, 5 Apr 2023 08:01:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070150eucas1p10af66e5e2858c2c404caff227d657a78~S99ZBwl-K2699626996eucas1p17; Wed, 5 Apr 2023 07:01:50 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070150eusmtrp124ac69cc96147c283ef20488e2243730~S99ZBBbgW1083210832eusmtrp1l; Wed, 5 Apr 2023 07:01:50 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-cf-642d1cdee1f4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C0.54.08862.EDC1D246; Wed, 5 Apr 2023 08:01:50 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070150eusmtip247a240f4c3c2fc9a9878c7ab47d30c17~S99Yuezjx2825728257eusmtip2i; Wed, 5 Apr 2023 07:01:50 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:01:42 +0200 Message-Id: <20230405070142.1922-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87r3ZHRTDH6tMrT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDL2zZjGXjBBq2L1ipuMDYw/5LsY OTkkBEwktqzoZQOxhQRWMEp8akntYuQCsr8wSvQ/eMYE4XxmlHjSuJ0JpuPemhZ2iMRyRomG qWsYIZxWJomlt6ewg1SxCehKvPzwCKxDRMBU4mTzXrAdzALaEuvufgezhQWSJLrvvGEFsVkE VCXedX1hBLF5Bawk/s1+ArVNU2LCljlMEHFBiZMzn7BAxLkl1s26xAoxU16ieetsZpAjJAR+ sku8XPweqIEDyHGRuDibFaJeWOLV8S3sELaMxOnJPSwQJcUSh/odIMwaiUM/0iEqrCXeNh5n BAkzA12wfpc+RNhR4uS+K6wQ1XwSN94KQuznk5i0bTozRJhXoqNNCMJUkejrFINolJJ4umwO M4TtIfHs6Xr2CYyKs5A8NQvJI7MQ1i5gZF7FKJ5aWpybnlpsnJdarlecmFtcmpeul5yfu4kR mBxO/zv+dQfjilcf9Q4xMnEwHmKU4GBWEuFV7dJKEeJNSaysSi3Kjy8qzUktPsQozcGiJM6r bXsyWUggPbEkNTs1tSC1CCbLxMEp1cCULq0wkyl2ZUrqlL9BB8vfWMzbdq2++rKq70cVgUyN OYsCqlxjHn6+mPD5Yk5lRXvfn9vK0tFfLfMddOoP3zP7r2y18pZAJ8Phq0rxB9ZknkyZ+3Dr NN7/fot2512MrJ65sG53R1PZ/bczXzHlezG7vHar04hPZnUMDp7vHbfrzgPDtl9vZZb+6b5s cDIz4uYrkWXWK6e+uuccey7k2WKzea/Vfx3gd7HT9TP8yGZ1xei05d2e7jpbzTNrHBIX6DKu Wn1607+a9epTmY5uOKi7IGMd94OD9fuj+zq49v74xXHFat6iiHm96WJsC8saJCJT9he/k1va clTWap3hRCtJW4ULlvwPdqdO/fbsXEKZEktxRqKhFnNRcSIA6jGJIn0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7r3ZHRTDGY/lrX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DL2zZjGXjBBq2L1ipuMDYw/5LsYOTkkBEwk7q1pYe9i5OIQEljK KHF2yx8miISUxNKlixghbGGJP9e62CCKmpkkFv9oYgNJsAnoSrz88AisQUTAXOLiultgDcwC 2hLr7n4HqxEWSJBY9n0zO4jNIqAq8a7rC1gNr4CVxL/ZT6CWaUpM2DKHCSIuKHFy5hMWiDi3 xLpZl1ghZspLNG+dzTyBkX8WkrJZSFILGJlWMYqklhbnpucWG+oVJ+YWl+al6yXn525iBAbu tmM/N+9gnPfqo94hRiYOxkOMEhzMSiK8ql1aKUK8KYmVValF+fFFpTmpxYcYTYFuncgsJZqc D4ydvJJ4QzMDU0MTM0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGJoHrxWb71C+/ 8qk74Lb50eQ/otKeYbVrHzjbhsfsKxFt/ZD+yZ81f9XpLNvXYoVZO8UM5y1c8Vb9bM3TPgbJ yzXLT58M3mB7agN7NculUrnZ4YvO+Ie/Mb7OpdK+ffZm+d+M19dEB1yZ9bB1VTxf3Yzp4Xzh /hMEGib73Fykf5NpidK9RfO/Hem58eBo4L4bam5qr5/+KZaYoPX7mPyDmTNveHv9eDb9jte1 QO1nv/c4zbr2Ofz0rVrFp891GXk+zD8+e5WfjnDW5swLtk+v1Nzfy7KKzfbTWfa5HSx3D5jx 91zOf8K/wUJhW8wrnocsi73ezck/c2ZRplTG1qBn4Q0ijTIuka923xFSdtCLylqnxFKckWio xVxUnAgAnOite+UCAAA= X-CMS-MailID: 20230405070150eucas1p10af66e5e2858c2c404caff227d657a78 X-Msg-Generator: CA X-RootMTR: 20230405070150eucas1p10af66e5e2858c2c404caff227d657a78 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070150eucas1p10af66e5e2858c2c404caff227d657a78 References: Subject: [FFmpeg-devel] [PATCH v19 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: rn5e2iSnl2rb - 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 Wed Apr 5 07:01:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167593pzb; Wed, 5 Apr 2023 00:02:12 -0700 (PDT) X-Google-Smtp-Source: AKy350YKXtjgz0c03BKZaWBylYfc0juu0pxOnHsRLGEIDid8gMQAVAF35RQvJ/qAl2r1rUYYt9I6 X-Received: by 2002:a17:906:c0cf:b0:930:a3a1:bede with SMTP id bn15-20020a170906c0cf00b00930a3a1bedemr2098512ejb.50.1680678132177; Wed, 05 Apr 2023 00:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678132; cv=none; d=google.com; s=arc-20160816; b=AXEx9k6zQneJ9dIigRlEpASYlvGOh1WRuAxkZDEtLZdkEorWyACePEseauJia6Ic60 6ECKxjQJeYeYjbVdwXgOymVbfqH7WW29AC8x4sP0weNnLL4w3DxhZunpQEhUlz946vo8 sZpwDP2ggm4hed2MmImgYKSOdD6Wa8uNr8rX9PMVuh9E2g14HK2WXOE60M/b4JoyDRDB Kr/M9wjme2Q3GEDGYX/mHPlMCdA5Wn9R8KU3Bu3g1MFcAP2P5+jpm5HjH5Zg1/RN8afq +siEv4gAV/JXMTjxPCvWdCGbhpfsQyDl6GNhabBX7LFZe/nDrBpNFF0YkNn7WKWrtbnP XBFA== 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=rBAkfpAw/L563nY6ZVwAszJfD7QQP3pqqn4D1dc1EGw=; b=srZv0NVWkK5CmXQZpXxQ7xon83naXjCYl2fBdby2ehkqi5TLGdTxbU2mEVcKvOwGrr N/09oz/ruFJQ/WT97N4lXfom5+D3LLStBERDQV93yq7FXD/ibGSxmESCHTqZBv465vgw ULoJfiJ4EijBqQSKhb+uoqJkEbX+/Q8pVuB4Mnm7tyHuj/EjE73GNv55cyFjVJhoTNhM jiYDsFvN35OYFrg1ifBPHMWt16a0CFa4BPuwy2QM6z2i7n1JFmERuWzKeIQztoD3338H Rg4sc09e+y3SjaiuxkYuorMMfVu0rDNPzgcILoaM2bYXTBEiZqCf4EB2+4r7/ApTfpCU rxjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=beU1C+87; 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 p7-20020a056402044700b005022a765778si627269edw.460.2023.04.05.00.02.11; Wed, 05 Apr 2023 00:02:12 -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=beU1C+87; 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 55D7168BB83; Wed, 5 Apr 2023 10:02:08 +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 33D3468B81D for ; Wed, 5 Apr 2023 10:02:07 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070206euoutp0220abe9245bf2e81cc34b8e47bdae888d~S99oBgKpD2368323683euoutp02V for ; Wed, 5 Apr 2023 07:02:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070206euoutp0220abe9245bf2e81cc34b8e47bdae888d~S99oBgKpD2368323683euoutp02V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678126; bh=lCeMTX4VC25WX80rpiDjZUYAQhoihTug7Upr7Tku9f4=; h=From:To:Cc:Subject:Date:References:From; b=beU1C+87HZFXPfDexBQ4DjhQWGsoZ7JOOucnvPg9MJaoYbzawsW+Bo7niaP8sC02N d0prZ+lyvJhiR7831XhQ/lFrFgx1ORRfHfoqs530sgUPmdMTTHUcDgqB8iBUqBM5hf iNRPmE/pU6og+6F24+4Bmic+VSiT+L2FKdAj4Eqs= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070206eucas1p1d736f1bebdce40303ffd7c40b4e42f54~S99n3bB6B2894928949eucas1p1K; Wed, 5 Apr 2023 07:02:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 4A.EE.09503.EEC1D246; Wed, 5 Apr 2023 08:02:06 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230405070206eucas1p2cda311bd533c5f9acbdb130b95b74be3~S99nlnw1u3128731287eucas1p2o; Wed, 5 Apr 2023 07:02:06 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070206eusmtrp1bbc3b23a5a30a2c7307a1c685e09d5b6~S99ndk8U-1083210832eusmtrp1R; Wed, 5 Apr 2023 07:02:06 +0000 (GMT) X-AuditID: cbfec7f2-6a84ca800000251f-63-642d1cee4c1e Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 8A.BC.09583.DEC1D246; Wed, 5 Apr 2023 08:02:05 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230405070205eusmtip1e729bac0bd91ed901f402aa13c4e42fa~S99nGLheh3077030770eusmtip1d; Wed, 5 Apr 2023 07:02:05 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:01:58 +0200 Message-Id: <20230405070158.1175-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djP87rvZHRTDDb/l7D4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKm9yxlLrj6m7Hi5F37Bsa3exm7 GDk5JARMJCZems7excjFISSwglGi8d46KOcLo8TlU0+ZIJzPjBKnL7xjh2l5vv4/G0RiOaPE j6W7WCCcViaJO9P/MINUsQnoSrz88IgJxBYRMJU42byXDcRmFtCWWHf3O5gtLBAkMXfZMrAa FgFViUn/H4P18gpYScy+u4IJYpumxIQtc5gg4oISJ2c+YYGIc0usm3WJFWKmvETz1tnMIEdI CPxkl/g76z9Us4vE6lm7mCFsYYlXx7dAvSAjcXpyD9AgDiC7WOJQvwOEWSNx6Ec6RIW1xNvG 44wgYWagE9bv0oeocJT4dZsJwuSTuPFWEGI/n8SkbdOZIcK8Eh1tQhCmikRfpxjEOCmJp8vm QB3iIXHvTSv7BEbFWUiemoXkkVkIWxcwMq9iFE8tLc5NTy02zEst1ytOzC0uzUvXS87P3cQI TBCn/x3/tINx7quPeocYmTgYDzFKcDArifCqdmmlCPGmJFZWpRblxxeV5qQWH2KU5mBREufV tj2ZLCSQnliSmp2aWpBaBJNl4uCUamAqE+P52HsjQ+MKh2xaYMG/Gt2Y8NCyewc2T2qLrNl2 3ZV5q+Q5wfOyggxTLJT2VGxhWm6zMW+BoeUqreqcmZPPVxx6MLfnRH5QWkHQp5JZbF7bV8of bX6zTUPLQ1lXyL1cKsx06zztWYkn7XOOpD6eV5Y+f3HiUq5pu7dtjNm7PuB03sRItvDGF1X+ 6teWbdylVfnh8sszXJV7D706l1/I6MXVURL1iWVN6Ic5nR6rt52KKVM4fO0b3+M1fJ+uzvvJ 9k4p0kFhZWbOV12R2qAAY0etrBbRezuln9emHtL+nFYwpdoy6uKcy19Pf57Ouoi1TKLu0609 37fM93FVlHiu+uzazrS2zCfuH4vks02UWIozEg21mIuKEwH6Wf8/fwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7pvZXRTDC58t7L4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DKm9yxlLrj6m7Hi5F37Bsa3exm7GDk5JARMJJ6v/8/WxcjFISSw lFFiwrFuqISUxNKli6BsYYk/17qgipqZJPav3sMCkmAT0JV4+eERE4gtImAucXHdLbAGZgFt iXV3v7OB2MICARK/Nq9gBbFZBFQlJv1/zAxi8wpYScy+u4IJYoGmxIQtc5gg4oISJ2c+YYGI c0usm3WJFWKmvETz1tnMExj5ZyEpm4UktYCRaRWjSGppcW56brGRXnFibnFpXrpecn7uJkZg 6G479nPLDsaVrz7qHWJk4mA8xCjBwawkwqvapZUixJuSWFmVWpQfX1Sak1p8iNEU6NaJzFKi yfnA6MkriTc0MzA1NDGzNDC1NDNWEuf1LOhIFBJITyxJzU5NLUgtgulj4uCUamCaf/A/79S+ pfmyOZ907yQnu1/MVrGePE1++XNZsTmnZyxxSV+hr50ks3GfdMbEY5qvUlvv7fF4Mz/vktyP q9IiSsnvxJIPyL4+fXJR6p/Mv7d/XGZY2LJDLcmvlmmWgdnZFYozQqbsZpq+/kj79o5Ve47P jxLxVloTn/q0Yq7zgevqtXFepWn3fki+i7AN6HsSyWTX4qJQ099W7P2rr2vf2xnCWowHT7al MpaJTvNYl3Wg7zv77JgcA5tzrwN6WJ6mb2Q/GuordZD76lZt4+D9sX+l5dnN76+LUViQGvts W6bV2Trhrh9L9FNW9L8I/3f0l9vX2txlHUltZT/s7whePrzYS9mrm11futfigpgSS3FGoqEW c1FxIgAYgdT15gIAAA== X-CMS-MailID: 20230405070206eucas1p2cda311bd533c5f9acbdb130b95b74be3 X-Msg-Generator: CA X-RootMTR: 20230405070206eucas1p2cda311bd533c5f9acbdb130b95b74be3 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070206eucas1p2cda311bd533c5f9acbdb130b95b74be3 References: Subject: [FFmpeg-devel] [PATCH v19 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: oLtSf2M6aho0 - 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 6e363eb470..0b46a8cb93 100755 --- a/configure +++ b/configure @@ -292,6 +292,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] @@ -1864,6 +1865,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3404,6 +3406,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" @@ -6743,6 +6746,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.3" "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 3cb6fc1ce7..39a3fceaba 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2883,6 +2883,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..c6a997bfd6 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 library 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 b07fabc3aa..7a9f42590f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1132,6 +1132,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 797fe39486..001d136d36 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -815,6 +815,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 Wed Apr 5 07:02: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: 40990 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167739pzb; Wed, 5 Apr 2023 00:02:28 -0700 (PDT) X-Google-Smtp-Source: AKy350aPp3vv6Rb8WVFsoaSdR9sKkK9fX68/WkSbMokdXBRRZbgmx7V70obznmdf8vObu17HXU0c X-Received: by 2002:a17:906:b7d5:b0:889:5686:486a with SMTP id fy21-20020a170906b7d500b008895686486amr1807792ejb.30.1680678148382; Wed, 05 Apr 2023 00:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678148; cv=none; d=google.com; s=arc-20160816; b=1Kl3TOHK6MXx6nSdbHKFM/tcsUhJ4+z+Fd2ix63ngzl9FAptuTXdIKWkomogV1rSXn 2QSsHdMZI5LLgfGv0D9KsG9c3I1IAFJQhkJgbDBFc2AndKZxIGQsJCxOJJXyzBF4/CTp BWtu8EpWpKkrBwkbNlumWg9ADLe0kqrjkZL8tKUyi7kLaU6TDjCsjqNLPQTtfqQfy9Xk quOkF1JA6wphRr3tNGULcXMQKiiGt80s0M+1AXoHXAFfI8+waZBC+WF3jI1udSlURHXn qNl1DMuGjerdN1hRkf/vj3mnYRP9ksl/+fhm9uwPT8faOfbqMV2Sh9Gu1271eT45QlOR WS9w== 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=+wyLj0q1K4REVJj1nRAYoXv3ypcnAIHm9ShBrPLjQEE=; b=i3OQLqkUQVC+yPjaJQ4QX0T4OoxNjHRqDtkxO+aph7l3od+0mLBvBTc+9ImrKxqtP2 C8ThBAJiIcg9c80p7B6p6qoXITNol9a3MQnI3tDzE2c80gJiGk2q7KQg+5PJ/0QXOare h3jMco9OwmU5ogk4A+HZOjQppEPjfuu2sB59v0jDOiVEpeENPYzrmDRRA7DozbO1lebZ 7Ns0FKL99Rxdqrxj1bbvlQrIxIZWc6GJoRhcqIDVL4Xa7VWthI6dRuqxkq4Zs+U55lL9 3kgF1FdYpcCAu6JGfC0FkLe+J82Xl+CWi7twv2ZJwhmyA7x6MmE6DSCah3kYZdbqdsdu hFwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=GEKxhkaf; 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 g24-20020a056402181800b0049e34ecef4asi876531edy.5.2023.04.05.00.02.28; Wed, 05 Apr 2023 00:02:28 -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=GEKxhkaf; 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 50DA968A084; Wed, 5 Apr 2023 10:02:25 +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 BDA0168B851 for ; Wed, 5 Apr 2023 10:02:23 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070222euoutp017fe22b04e32e26e93c0242680173149a~S992hHZbl2460424604euoutp01d for ; Wed, 5 Apr 2023 07:02:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230405070222euoutp017fe22b04e32e26e93c0242680173149a~S992hHZbl2460424604euoutp01d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678142; bh=ouTWz2gTRzO6/GjUZYLTo+1tJHT6922VWdARAo73R+M=; h=From:To:Cc:Subject:Date:References:From; b=GEKxhkafcH6XnrkwS0st2cHp44SP2AyqY8ZZtWDoMxn9LALq8dnw9idtEEkPxlrmc cvh7pmQFlcQ8+jfsx2er08bGksQBC9ROpbqhpQm61IKlcP9lcLzbkbtiVuK8uw6uw9 FHoG1Xqb6/G5PLJ+/EuHCFBr+40LkjJuViihAx14= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070222eucas1p1ed5298d081437eaa328446f552f973f4~S992T8pQ62257222572eucas1p1I; Wed, 5 Apr 2023 07:02:22 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id E1.A3.10014.DFC1D246; Wed, 5 Apr 2023 08:02:21 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070221eucas1p12bcb98fade7f62073fe1a3a38c8d238a~S992ButhH2251322513eucas1p1P; Wed, 5 Apr 2023 07:02:21 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070221eusmtrp197613546ac6a984a3a369d718a8325a4~S992BCmpJ1145611456eusmtrp1B; Wed, 5 Apr 2023 07:02:21 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-51-642d1cfdc292 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6D.64.08862.DFC1D246; Wed, 5 Apr 2023 08:02:21 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070221eusmtip2bae268564dbcebbb376173fcdf590aae~S991sx3mL2658226582eusmtip2E; Wed, 5 Apr 2023 07:02:21 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:02:14 +0200 Message-Id: <20230405070214.1479-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7p/ZXRTDJ78t7D4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKOX/IoOLiGsWLHhHVMDYzra7oY OTkkBEwktm2+wtrFyMUhJLCCUWL7473MEM4XRoljvUsZIZzPjBJtN46zwrS8W7oCqmo5o8TV 5w3sEE4rk8Smo4uYQarYBHQlXn54xARiiwiYSpxs3ssGYjMLaEusu/sdzBYWCJK4/v43UA0H B4uAqsSidQkgYV4BK4npTy8xQSzTlJiwZQ4TRFxQ4uTMJywQcW6JdbMusUKMlJdo3job7CAJ gb/sEj3bp0M1u0hMXXGREcIWlnh1fAs7hC0jcXpyDwvIXgmBYolD/Q4QZo3EoR/pEBXWEm8b jzOChJmBTli/Sx8i7Chx6+0BVohqPokbbwUhDuCTmLRtOjNEmFeio00IwlSR6OsUg2iUkni6 bA5UhYfEkyUSExgVZyF5ahaSR2YhbF3AyLyKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMj MDmc/nf86w7GFa8+6h1iZOJgPMQowcGsJMKr2qWVIsSbklhZlVqUH19UmpNafIhRmoNFSZxX 2/ZkspBAemJJanZqakFqEUyWiYNTqoFpa9HX29+m1aua72Z52zbnZs2uo98vcHlqGZqbZdxY I761b6ZTN1NS4Zy9a/dzGJ0PuL1sy0zN82u+KSwVurRq3+KIHIe/b4/emJmj4vxPMWOiW0fN 930THEQWq1anZDs1KfxfuD55tWdAScO7uHvPFaYcKdNS+/SaaZufjMVDs6QXSf4fzRitH7+c 8DLjznwm7kUz8ufeP+aSHBZq4OTwqy+hTuB/6IuwKP1plzd48lzIiC478UY5cuqn3KojCWoi 5kdEOc1t99+3UDoWFXfzdYfUy0IT0dLcVbLTPT/V8un7rc00SFtrmlh8rjV+yal5c+N77ry7 vivI61aB/X2dZVknj+WorXbgTY33mqKoxFKckWioxVxUnAgAJD0Ky30DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7p/ZXRTDA4eVLX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DKOX/IoOLiGsWLHhHVMDYzra7oYOTkkBEwk3i1dwdzFyMUhJLCU UaL1XRMrREJKYunSRYwQtrDEn2tdbBBFzUwSHS8PMYMk2AR0JV5+eMQEYosImEtcXHcLrIFZ QFti3d3vbCC2sECAROv8ZvYuRg4OFgFViUXrEkDCvAJWEtOfXmKCmK8pMWHLHCaIuKDEyZlP WCDi3BLrZl1ihRgpL9G8dTbzBEb+WUjKZiFJLWBkWsUoklpanJueW2yoV5yYW1yal66XnJ+7 iREYttuO/dy8g3Heq496hxiZOBgPMUpwMCuJ8Kp2aaUI8aYkVlalFuXHF5XmpBYfYjQFOnUi s5Rocj4wcvJK4g3NDEwNTcwsDUwtzYyVxHk9CzoShQTSE0tSs1NTC1KLYPqYODilGpiSbNh8 pu35t8VzqcrUoyEntH4w8CU665f/TrpxaJba0pbKd206vScsDq8JyJ82V23ugUbxbl72yydz 3xRztm65Jqq6bHK1+Cf/pAv5j27mp2iUntQ7p7XvLdtEoz2fY9rairvKTmYc05QoCPHTPPpD 58fvIuNe603LE2tMTq5bNbf7jXPpwnSj56wvc9xer0jWmvtzUddHm7nLbZZJ/i2wMrGNEp3I 0XnyR1Ug1x67gyklGSb+B9aYr/m7c+YU7U12O585HTdyNb//RmT/swf3EmwUu6/Kpe/xn3Yk XPFE7m7HbbbMLLvWfUmf1P37WtoKMZ3U0DWqCh5drkECsruli1cUrvbcNmNrqpTak3IlluKM REMt5qLiRAA+yiCZ5AIAAA== X-CMS-MailID: 20230405070221eucas1p12bcb98fade7f62073fe1a3a38c8d238a X-Msg-Generator: CA X-RootMTR: 20230405070221eucas1p12bcb98fade7f62073fe1a3a38c8d238a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070221eucas1p12bcb98fade7f62073fe1a3a38c8d238a References: Subject: [FFmpeg-devel] [PATCH v19 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: g9Xq2kf0GfcM - 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 | 479 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index 0b46a8cb93..86b95fe50b 100755 --- a/configure +++ b/configure @@ -293,6 +293,7 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxeve enable EVC encoding via libxeve [no] + --enable-libxevd enable EVC decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1865,6 +1866,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3406,6 +3408,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" @@ -6746,6 +6749,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.1" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "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 09b8314dd2..6311af229f 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -130,6 +130,30 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://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 c6a997bfd6..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 library libxeve + @tab encoding and decoding supported through external libraries libxeve and libxevd @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7a9f42590f..9ed28b485b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1132,6 +1132,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 001d136d36..f666b5c0cd 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -816,6 +816,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; extern const FFCodec ff_libxeve_encoder; +extern const FFCodec ff_libxevd_decoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c new file mode 100644 index 0000000000..7c4922d46e --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,479 @@ +/* + * libxevd decoder + * EVC (MPEG-5 Essential Video Coding) decoding using XEVD MPEG-5 EVC decoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/imgutils.h" +#include "libavutil/cpu.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "decode.h" + +#define XEVD_PARAM_BAD_NAME -1 +#define XEVD_PARAM_BAD_VALUE -2 + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder + */ +typedef struct XevdContext { + const AVClass *class; + + XEVD id; // XEVD instance identifier @see xevd.h + XEVD_CDSC cdsc; // decoding parameters @see xevd.h + + // If end of stream occurs it is required "flushing" (aka draining) the codec, + // as the codec might buffer multiple frames or packets internally. + int draining_mode; // The flag is set if codec enters draining mode. + + AVPacket *pkt; +} XevdContext; + +/** + * The function populates the XEVD_CDSC structure. + * XEVD_CDSC contains all decoder parameters that should be initialized before its use. + * + * @param[in] avctx codec context + * @param[out] cdsc contains all decoder parameters that should be initialized before its use + * + */ +static void get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) +{ + int cpu_count = 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; + xectx->pkt = av_packet_alloc(); + + return 0; +} + +/** + * Decode frame with decoupled packet/frame dataflow + * + * @param avctx codec context + * @param[out] frame decoded frame + * + * @return 0 on success, negative error code on failure + */ +static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + XevdContext *xectx = avctx->priv_data; + AVPacket *pkt = xectx->pkt; + XEVD_IMGB *imgb = NULL; + + int xevd_ret = 0; + int ret = 0; + + if (!pkt) + return AVERROR(ENOMEM); + + // obtain input data + ret = ff_decode_get_packet(avctx, pkt); + if (ret < 0 && ret != AVERROR_EOF) { + av_packet_unref(pkt); + + return ret; + } else if(ret == AVERROR_EOF && xectx->draining_mode == 0) { // End of stream situations. Enter draining mode + + xectx->draining_mode = 1; + av_packet_unref(pkt); + + return 0; + } + + 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_unref(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_unref(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_unref(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) { + + xevd_ret = xevd_pull(xectx->id, &imgb); // The function returns a valid image only if the return code is XEVD_OK + + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", xevd_ret, stat.fnum); + ret = AVERROR_EXTERNAL; + av_packet_unref(pkt); + + return ret; + } else if (xevd_ret == XEVD_OK_FRM_DELAYED) { + av_packet_unref(pkt); + + return AVERROR(EAGAIN); + } else { // XEVD_OK + if (!imgb) { + av_packet_unref(pkt); + + return AVERROR(EAGAIN); + } + + // got frame + ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Image copying error\n"); + + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + + return ret; + } + + // use ff_decode_frame_props() to fill frame properties + ret = ff_decode_frame_props(avctx, frame); + if (ret < 0) { + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(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; + + av_packet_unref(pkt); + return 0; + } + } + } + } else { // decoder draining mode handling + + xevd_ret = xevd_pull(xectx->id, &imgb); + + if (xevd_ret == XEVD_ERR_UNEXPECTED) { // draining process completed + av_log(avctx, AV_LOG_DEBUG, "Draining process completed\n"); + av_packet_unref(pkt); + + return AVERROR_EOF; + } else if (XEVD_FAILED(xevd_ret)) { // handle all other errors + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", xevd_ret); + av_packet_unref(pkt); + + return AVERROR_EXTERNAL; + } else { // XEVD_OK + if (!imgb) { + av_packet_unref(pkt); + + return AVERROR_EXTERNAL; + } + // got frame + ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + + return ret; + } + + frame->pkt_dts = pkt->dts; + + av_packet_unref(pkt); + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + + return 0; + } + } + + return ret; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if (xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + + xectx->draining_mode = 0; + av_packet_free(&xectx->pkt); + + return 0; +} + +#define OFFSET(x) offsetof(XevdContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + +static const AVClass libxevd_class = { + .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 Wed Apr 5 07:02:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167859pzb; Wed, 5 Apr 2023 00:02:42 -0700 (PDT) X-Google-Smtp-Source: AKy350aMnlqf72HirX5paFuzx0ije4XnTBjnrdLuSmmcWyLEQxxUR9bNoxbWbKteBZgpgw9f3N1p X-Received: by 2002:aa7:cfd5:0:b0:4fd:29e6:701b with SMTP id r21-20020aa7cfd5000000b004fd29e6701bmr793387edy.38.1680678162357; Wed, 05 Apr 2023 00:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678162; cv=none; d=google.com; s=arc-20160816; b=f+fKQe3ooiTLjemiGkF1Z7syaRyhcshjXImHD9aHR64n3sP45vaQ3dQCGVF981KK1K KUABk19wsVdcBg9o+74+v+bawQeTRMkAjrOl2Ab/FkBg8TMXQ1ZiSWgVM+XgiYdYrup3 IrcqlHXqU2YOs1oXLObFPIwbPT+RA9TFId/KxpVVPywURx8/dldGMXpYkHYbzfje2oGa LBZ4dArNsBRvpdTO2zepXuwdD4gAqipRXE48JHZUoYx5lxhCUiTBubFgLwctoKhF86Xv Onk4VT14iZNH/Ek2YCy909W3v8aDD6CWHckG1IdovO0cUdXr46gIA81PKDlcZiFrU1C2 IEEQ== 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=m7fPlXjjUrtPFkEzTCqpiXzCEcvHY3Mx/Ef6uSe6zgk=; b=a7vGcFrJnT82re5Vox89sI5XvNoQGxJe4YCgOHH7HgkYYb8xsaK3GHaXWwOMK/AFFx FvSbGXlWEcQRrpF/+vm7/k8EytyEa+z3hKaE3OKrBVdCVMh6lyag6XGYZwWyNj3o0A73 oUGuDahrKRAjUQR4dLQf54xh4FdeD4tsuLjOS7viMpR/n49pBlbFVTa8Fj3YxSV9bjdp wJbB/LQ+/DLpSDPnRklyNM6NIQEJi5eZ3x2QihK9NsBFbKebJuf8ao7ih7YcxeaJHNUu 6Eug5ODOFoZaRdDAdRSyKUiDPwf8dsPyukayf4MdhvZpel2zw1HUlfCECYialhVScgpD LxEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=m9SZXknN; 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 a18-20020a50ff12000000b00501dd8e9f9dsi4637746edu.370.2023.04.05.00.02.41; Wed, 05 Apr 2023 00:02:42 -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=m9SZXknN; 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 4E44468BBDD; Wed, 5 Apr 2023 10:02:39 +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 98EE968BBAF for ; Wed, 5 Apr 2023 10:02:37 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070237euoutp020866b9384669932ab1535411dffa3c05~S9_EU6wuq2098620986euoutp029 for ; Wed, 5 Apr 2023 07:02:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070237euoutp020866b9384669932ab1535411dffa3c05~S9_EU6wuq2098620986euoutp029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678157; bh=9tyyuyeMh0/JzLE4VJxNP8FmHNTyCFkA5oV0cva+3eE=; h=From:To:Cc:Subject:Date:References:From; b=m9SZXknNt/X+f9RN4ZMTPhqFceDoWC+qZkpo/rCmTMR1Cli6bA/EC6Qn/g9wM3jvG QAt/ssZY5IGAY9FSo9Lvv7wc5ElCbhGSGVwZghLQvKMekmJZcuXpEB+3hbLcTuPd4K 2lCMVMPJhy+LwnFhSoTiv9y4YbrL3rgemWyK30U0= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070236eucas1p15a7e751ceb9bc5c2e2d5e2c0474dd811~S9_EHFiic0750507505eucas1p1Y; Wed, 5 Apr 2023 07:02:36 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id EA.0F.09503.C0D1D246; Wed, 5 Apr 2023 08:02:36 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070236eucas1p1f36492c660c787a3879c34657f6f1bd6~S9_DzGmh90748207482eucas1p1a; Wed, 5 Apr 2023 07:02:36 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070236eusmtrp1bcd08b4ddf021a7e5161164e45543a2b~S9_Dygwze1135011350eusmtrp1w; Wed, 5 Apr 2023 07:02:36 +0000 (GMT) X-AuditID: cbfec7f2-ea5ff7000000251f-e1-642d1d0cd609 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C4.74.08862.C0D1D246; Wed, 5 Apr 2023 08:02:36 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070236eusmtip2ac102c2ff7f2408cf507e3f92d203858~S9_Detkjo2897828978eusmtip2M; Wed, 5 Apr 2023 07:02:36 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:02:29 +0200 Message-Id: <20230405070229.1894-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7o8sropBrdP61p8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBk/991lLWjczVhx9uENpgbGIx2M XYycHBICJhKTZzYB2VwcQgIrGCX+trdCOV8YJX6+PcMO4XxmlHh5YQUbTMuK3z9YIRLLGSVu 370G1dLKJLHqQDszSBWbgK7Eyw+PmEBsEQFTiZPNe8G6mQW0Jdbd/Q5kc3AIC8RL/F+jCBJm EVCV2HFpLthNvAJWEhu2NLJDLNOUmLBlDhNEXFDi5MwnLBBxbol1sy6xQoyUl2jeOpsZIv6V XWL7O3eQ8RICLhI/H5RDhIUlXh3fAjVSRuL05B4WiJJiiUP9DhBmjcShH+kQFdYSbxuPM4KE mYEOWL9LHyLsKPFr00SoRj6JG28FIdbzSUzaNp0ZIswr0dEmBGGqSPR1ikE0Skk8XTYH6kAP iSXdZ9kmMCrOQvLTLCR/zEJYu4CReRWjeGppcW56arFhXmq5XnFibnFpXrpecn7uJkZgejj9 7/inHYxzX33UO8TIxMF4iFGCg1lJhFe1SytFiDclsbIqtSg/vqg0J7X4EKM0B4uSOK+27clk IYH0xJLU7NTUgtQimCwTB6dUA5PaQ9mVlklrL8btXnv22ta5Z15c/nJD1PX0RrGOd7ZM5zwy pvsaeB6r1NyfddaXK77rbmjWHTENGXtX7bp4l9txV6bMO7zjyZGcFZc6+Hr3LhRPTd57pGLj Z0a285bznDPfFkX1d6wQsL46V6eokCcw31XZ5aDr3cPL3tnkv12ifqDocE7gF//gdN4z5nqy EktslDSnvMjeLhDzek3XREn2y8qGJlMz5FY2PpCfOJc31iuKbxvXwUvCx4wOcOaVyf364WjZ NfXJ6Zf3Aw5J6e0w8GvWUp6w7EBVlFxQH9fNrZ/ClLIP9Fp+TJzC5HFJK+RVvVzKWbMFn4ue 8P29UVO0xsmgUTLkmsndKyfXMiixFGckGmoxFxUnAgDAjEVQfgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xe7o8sropBhf/SFh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehk/991lLWjczVhx9uENpgbGIx2MXYycHBICJhIrfv9g7WLk4hAS WMoocfvpfyaIhJTE0qWLoIqEJf5c62KDKGpmkmh5NpUNJMEmoCvx8sMjsAYRAXOJi+tugTUw C2hLrLv7HaxGWCBWYs+Ju2A1LAKqEjsuzQWr4RWwktiwpZEdYoGmxIQtc5gg4oISJ2c+YYGI c0usm3WJFWKmvETz1tnMExj5ZyEpm4UktYCRaRWjSGppcW56brGhXnFibnFpXrpecn7uJkZg 8G479nPzDsZ5rz7qHWJk4mA8xCjBwawkwqvapZUixJuSWFmVWpQfX1Sak1p8iNEU6NaJzFKi yfnA+MkriTc0MzA1NDGzNDC1NDNWEuf1LOhIFBJITyxJzU5NLUgtgulj4uCUamCq2C5pYM1Y VJF8SfDd6SyJyEsTJK/G9sd93XI7vOfA7t8lzo0BUuK6MW2rOYQi/qWZ5FXHuPceuX7BWtf3 97lTRgHMOg/SEmzZFL1X60dvdn254ND7EwoiZuXXnibfWavbrF3X6OAtkXddU3RmVf2tY6qO GXWFMz7nBJuwTU+WnS1t9/Sx1pTi5TXbfuarMeUdfOr+wo+DVW/xA3a98nm9jUqOXh3iUtLi azadszv9qTEt73nsmknVLyanv+sVFMmrd6x+OKflMmPwjlsNNbkCkj5tLBHBzi8kf7ypzlN8 whaXKZvR+blCyOzp3ocsnBO1Hp48yJ2o0KavcWte/kwnkQoGubwfx9Ybs5gpsRRnJBpqMRcV JwIAbYDO1ecCAAA= X-CMS-MailID: 20230405070236eucas1p1f36492c660c787a3879c34657f6f1bd6 X-Msg-Generator: CA X-RootMTR: 20230405070236eucas1p1f36492c660c787a3879c34657f6f1bd6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070236eucas1p1f36492c660c787a3879c34657f6f1bd6 References: Subject: [FFmpeg-devel] [PATCH v19 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: 6Ae7K5yPazBk - 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 c370922c7d..87b0484ed5 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 Wed Apr 5 07:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp167965pzb; Wed, 5 Apr 2023 00:02:57 -0700 (PDT) X-Google-Smtp-Source: AKy350avCo5E8r5sPaWIzGXMbZ0MhL27nO/xl8FP43VWOlt8hzk/fseuMN6p/PTrBkK/eTDBO7+A X-Received: by 2002:a17:906:99ce:b0:921:d539:1a3a with SMTP id s14-20020a17090699ce00b00921d5391a3amr2006605ejn.58.1680678177087; Wed, 05 Apr 2023 00:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678177; cv=none; d=google.com; s=arc-20160816; b=i8uX+E9O7am2CzUkBTGxucu3VA9+x606tyIleLzCigeeHGV2ZkwLDrva6dnFc/yJLo vS5AQ6gpCIuSDaXjadRqFGpzYSZeWT395B50/jVZTtQMkAZnuKBbjrdlvk4aHNiKsUMG crhkcIvSGXitMq3Ov0CzAK/+yTyTF1PWgERIBErcogqXLaJTsfVFdOABhYXOy8n5J0pO 7yrX4L0qg5mKZYPJORQrKfrLrY+guV3nI83LXg5tyvuoJNHsUBhcARJHknhgXthUTrZN Gn+f6xut0R6HQliFkdcrmlgCxr08KFbc0XDrK+JbvdltCLlpikowAKP8wfn8mX5+nNmv D8Yg== 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=OzzzpqX4n2zgzhZLdrGphl7Tc/EP3JvXHxcYfOkDtiNh8S6VWDHuiPstDT/7Vh5mLD NBErTUOpEhr7tHs44o1PCmi1YmDfLjG2z9wu3UBJrqG/WHzd7fvcRQnniyrzeAE8hekW 6+jfhy7onldFuDWh/ZkVS9etpCbEI8u1yKBWnEpvuvIi50h//KdpxqP8mvx9KWo4aXom +A4QaoQbqG2PK8B+1kFnxYKZqGqOuF1W4Xc8nxvheRNK0Tz3y4ojmTTsznJrF3pHheXu JDe7wzUTJkTLaCtwDDjX/XKv6aj0hHmiSEtezRDQP10YymP9imYqFCXKHoIdtsoLfrHh Q6Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=CBU+RGkM; 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 m19-20020a1709061ed300b008e3da5c56f4si16041ejj.485.2023.04.05.00.02.56; Wed, 05 Apr 2023 00:02:57 -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=CBU+RGkM; 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 694FF68BBC6; Wed, 5 Apr 2023 10:02:54 +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 7A83D68BB5A for ; Wed, 5 Apr 2023 10:02:53 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070252euoutp01d3f4c8ea0fab4e159cfcd2e7e5787f4b~S9_TITsJj2634726347euoutp01E for ; Wed, 5 Apr 2023 07:02:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230405070252euoutp01d3f4c8ea0fab4e159cfcd2e7e5787f4b~S9_TITsJj2634726347euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678172; bh=sPlP6l6TMINpYAlCLJVvWoStCtQ5R273WDer5RLhcYI=; h=From:To:Cc:Subject:Date:References:From; b=CBU+RGkMw2oC4kXo40+gdT2Cwlm7lAq431bTd+cUw/y2vxICnW9nZW9FGCD7we8Wc HgYoVUxTvh6Q8Loyfy1KMS93sn6WCWotxUvAf0OoPNV1CFWRAI0IQOx13pMuTRZKLb SsxNNQI67fRZnArW9VQgJ7YdoviVfDCUyPHkhuB8= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230405070252eucas1p13c01bdef3b219bd5414d4b1332c525cf~S9_S6p9ks0298302983eucas1p1W; Wed, 5 Apr 2023 07:02:52 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id FD.1F.09503.C1D1D246; Wed, 5 Apr 2023 08:02:52 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070252eucas1p1c9f0bf86ef215229f01047a4e4844640~S9_SqKh270300803008eucas1p10; Wed, 5 Apr 2023 07:02:52 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230405070252eusmtrp2a3a7d475beef06241cdbc815add57125~S9_Spprjw2285622856eusmtrp2Z; Wed, 5 Apr 2023 07:02:52 +0000 (GMT) X-AuditID: cbfec7f2-e8fff7000000251f-20-642d1d1cbdd4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id AD.74.08862.C1D1D246; Wed, 5 Apr 2023 08:02:52 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070252eusmtip21ed15525e874f321187af85ee7702288~S9_SR2PqP3172031720eusmtip2b; Wed, 5 Apr 2023 07:02:51 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:02:43 +0200 Message-Id: <20230405070244.1934-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7oysropBltfqVl8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBk/r3WyFEzjq3iy6xZ7A+Mrri5G Tg4JAROJ46ensXcxcnEICaxglGi+/oINwvnCKPHoVTcrhPOZUWLHwytMMC0fD91jgkgsZ5Q4 fvskI4TTyiTxvHE+G0gVm4CuxMsPj8A6RARMJU427wWLMwtoS6y7+x3MFhZIlmjcv4MZxGYR UJXYMLOLEcTmFbCSOLXgEwvENk2JCVvmMEHEBSVOznwCFeeWWDfrEivETHmJ5q2zmUGOkBD4 yi5xc9MrqCIXiVnbr7NC2MISr45vYYewZST+75wPNJQDyC6WONTvAGHWSBz6kQ5RYS3xtvE4 I0iYGeiE9bv0IcKOEg3/DzNCVPNJ3HgrCHEAn8SkbdOZIcK8Eh1tQhCmikRfpxhEo5TE02Vz mCFsD4lFx24wTWBUnIXkq1lIPpmFsHYBI/MqRvHU0uLc9NRiw7zUcr3ixNzi0rx0veT83E2M wARx+t/xTzsY5776qHeIkYmD8RCjBAezkgivapdWihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe bduTyUIC6YklqdmpqQWpRTBZJg5OqQamRRuedi2vZJvNZS5nlS7n+4sr/emyeX19GQ7ixtHX OFPOHM+5miBcohk+2aHip9OjiK9T/Rl0LXbdUsuYvPNw7ZNld98dlLwmvUY+sKwqx3lyCvPB 3VuPB5zax/Lef8uxhXEXlDaau7nxOuVf+ZKk3353+tsTUpOEb4WVycndebbZqmSur+2RuK/z DiS7njzn8fonb410zEk+ZpZL3r+qZ645ZDGx5azXwgk/3bln6616Whd8rHHt3Yu+8Wv4zrx5 Yqb6uDU2M/aL7Ct27f0xvcvb+A4sn57Q4jqdTcpmUfpFH8lLNd8657s0sek9n7iiO05R6VPD yu8SzpPZgr/5hrW8mKCycsGCaxcYp+j0KbEUZyQaajEXFScCAMF4pSd/AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7oysropBg1TRSy+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoPZui/NKSVIWM/OISW6VoQwsjPUNLCz0jE0s9Q2PzWCsj UyV9O5uU1JzMstQifbsEvYyf1zpZCqbxVTzZdYu9gfEVVxcjJ4eEgInEx0P3mLoYuTiEBJYy SizYdYkJIiElsXTpIkYIW1jiz7UuNoiiZiaJg4cPs4Ak2AR0JV5+eATWICJgLnFx3S2wBmYB bYl1d7+zgdjCAokSk97OZwexWQRUJTbM7AKr4RWwkji14BMLxAJNiQlb5jBBxAUlTs58AhXn llg36xIrxEx5ieats5knMPLPQlI2C0lqASPTKkaR1NLi3PTcYkO94sTc4tK8dL3k/NxNjMDA 3Xbs5+YdjPNefdQ7xMjEwXiIUYKDWUmEV7VLK0WINyWxsiq1KD++qDQntfgQoynQrROZpUST 84Gxk1cSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwGTxUa8l5ueU VVtFfjmnawsckfoeMEt4s/41pl7xM6t/yC2xnOgtpXPs8qOcRQUW4bPVlqxJWjbHX/2HiXZX pVuJj0w7z5Ow5okaM1MKDrf97eE+P7PzgADHRl2b6AOXl//bHRfcwu4zr1lE6NR71ZcL+Deq P7kT1HaubMYWuQO+f5ZyVKsda/LISKv/vszAQ3HxleNTRXIabOoj7wV6RK2fZxi15ol+WMWt Y3fEGS8ftl7d2n58p1RZp+a2Qy1fF3yOqVv+85HK6nhJuS2e1UnlCnPeqy902d6sOb+9/4Yb x4WASZzqBb/W1RgmCNXPLLVllmvkqbMwmi4hGbnS+6v75XChDofzKz/FRx19qMRSnJFoqMVc VJwIABUNjc3lAgAA X-CMS-MailID: 20230405070252eucas1p1c9f0bf86ef215229f01047a4e4844640 X-Msg-Generator: CA X-RootMTR: 20230405070252eucas1p1c9f0bf86ef215229f01047a4e4844640 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070252eucas1p1c9f0bf86ef215229f01047a4e4844640 References: Subject: [FFmpeg-devel] [PATCH v19 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: 4KdTv1gypm8m - 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 Wed Apr 5 07:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp168139pzb; Wed, 5 Apr 2023 00:03:13 -0700 (PDT) X-Google-Smtp-Source: AKy350a176a/CMpuj8/W2EcLc1Odc4Eass9ByiJRWyAmjavEgg1ZBcfIga32PjWsH1xb1/MT23w3 X-Received: by 2002:a17:906:d1c8:b0:949:5db4:7888 with SMTP id bs8-20020a170906d1c800b009495db47888mr1369251ejb.27.1680678193781; Wed, 05 Apr 2023 00:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678193; cv=none; d=google.com; s=arc-20160816; b=pxI+uhxjm5fva2LVr6bzbKJ018cYqMLf8U9RuAaQ8oiK9V49N77lspc8nPSGEW6vd0 CcBnIljD4xAkOgkYORQjIMbVxSxZ/poxLtylASJCllEqADh9cpxKwhRPtne4hrdPaPUt U9iVPr/t52e6c0Ps+R+sYuuMmjYwcM0hKK5E3v3b7nuwobKFf4KpTdy5KbSP/AxOqEga lmAz5ZR5GAKlfUxZzTylR75cBu60+44+yIt2dOBXfmWHR2A3cvRV+KmR1DDwCvk5DneL P6/T9sOG/z7SaLrHzWRj/tlNPkjk41nZUurrFFI7xMPu28N68Z2IZaAS9ceKRhEIdHNC xl5w== 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=p5LKgKotsPHBOgdTyoW17PAUV6hk2d5Qt2raeURyR2c=; b=MJ9qM6VJ2L9SmGhgYKVCpmF9eZ75ajsngUwzcItjozzOpZsAhKOU+T8BgrZ6bPSvG3 1KoMr7lBDDw5hluPaC0VITXPE304+TFRABRYQ0fKlUHkbOnnB23Vn30/c6p2hWLV355L PShixCabaLOgdzBBurWhw0erV2GRdbavA7kUqYYoPypIOcPTCI7Yjm+aihrx+jRRb00I j5sp6img2nJDH/jb5B79DbM1ltItOfp3g0A7x3eQMZ7ss/rHeShCGUfYF2oJPL2IS+SU ODSEgJKFjzGbGr0L/BEwuoFkAM8n2klp1ozaveLA2bP65XVg1Omn1DObIdoqfZV5CQSq Hjdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=PcSWDHtt; 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 w24-20020aa7da58000000b004c0da1cf02dsi511810eds.105.2023.04.05.00.03.13; Wed, 05 Apr 2023 00:03:13 -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=PcSWDHtt; 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 7D90768BC08; Wed, 5 Apr 2023 10:03:11 +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 CEC7668A084 for ; Wed, 5 Apr 2023 10:03:09 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070309euoutp026892481d98559ecabf95def70c022f9a~S9_iSJ4aE2370823708euoutp02n for ; Wed, 5 Apr 2023 07:03:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070309euoutp026892481d98559ecabf95def70c022f9a~S9_iSJ4aE2370823708euoutp02n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678189; bh=oaE2PGrDEtopKbCdZxSR/xfEQy1Ca6DqpBeiuiVJsaU=; h=From:To:Cc:Subject:Date:References:From; b=PcSWDHttchdr2XVQ5SRb1OfS0OeXALAaPC3YLc0N3HEG1MIGsdM1IiaE2mU57kUPX A/J7DnCfa/hBUxUKWLnFJlj/x803hG5/XX7/m4qX6i4tioU/kLtf4x0bSQxVvx8QwS YIgUdLmgKJyH5FsyJ7HgH1kbUTHnR6Wi9wgwY1rs= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230405070309eucas1p24b6703f79dd2e929afdc9d3c1dd9a706~S9_iHBsgG0273102731eucas1p2W; Wed, 5 Apr 2023 07:03:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 75.D3.10014.C2D1D246; Wed, 5 Apr 2023 08:03:08 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230405070308eucas1p2ae98188f3386f0c7140c4a563e894faa~S9_hyO4Ek3128731287eucas1p2r; Wed, 5 Apr 2023 07:03:08 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230405070308eusmtrp208f5e3f86a28891b60a995657916c4d6~S9_hxqWwI2341123411eusmtrp2C; Wed, 5 Apr 2023 07:03:08 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-fd-642d1d2c8e84 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id DE.84.08862.C2D1D246; Wed, 5 Apr 2023 08:03:08 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070308eusmtip2e7a90cfac26f8c65322e11d249af8422~S9_hdH5rj2898728987eusmtip2u; Wed, 5 Apr 2023 07:03:08 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:03:00 +0200 Message-Id: <20230405070300.1486-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7o6sropBu9fWVh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBlz+yQLFrBWdFwWbGCcytLFyMkh IWAicepMH1sXIxeHkMAKRol3D3ewQjhfGCVmfL/BDuF8ZpQ40d/JDtPS/egZM0RiOaPE1W9v oJxWJokXH/aDVbEJ6Eq8/PCICcQWETCVONm8lw3EZhbQllh39zuYLSzgKDF91yKwehYBVYme vWfA4rwCVhJrPs9khdimKTFhyxwmiLigxMmZT6AO55ZYN+sSK8RMeYnmrbPBjpAQ+Mou0f7p MlSzi8TZlkaoBmGJV8e3QL0gI/F/53ygoRxAdrHEoX4HCLNG4tCPdIgKa4m3jccZQcLMQCes 36UPEXaUON/SAdXIJ3HjrSDEAXwSk7ZNZ4YI80p0tAlBmCoSfZ1iEI1SEk+XzWGGsD0kVn+c xTyBUXEWkq9mIflkFsLaBYzMqxjFU0uLc9NTi43zUsv1ihNzi0vz0vWS83M3MQKTw+l/x7/u YFzx6qPeIUYmDsZDjBIczEoivKpdWilCvCmJlVWpRfnxRaU5qcWHGKU5WJTEebVtTyYLCaQn lqRmp6YWpBbBZJk4OKUamDLX/GdVE7/9RWGPWK+BYNTjB6v0Sn7KOIfb737ycupv6VSZ686N sinaYZoST5j23pJcc5Vh+irf4ytXyRWXN6Ukvfj4lfuw9guNlijxr1XZ0UlLBZ53Lp6YsTKA zWUJr7Q665usx/kPP4TIh/gK797+aobgi2UzH9neWHTIfl1X9y/v+evSxTftv8P7ib/D6bRk 9V2Wa9+ebTNcqS79deIf3z23rtTkBFml3rzaW2TseMD55fUil99OyQ72/+766VzcH3AvSVL6 rQvLv+JLieZfPu2fkS13rlDmz2JJSXG5/w69W+dYlUavDJPJ+zu3z0hvi4j4FQtpU41Ph6Ty 3EuU/jI7K+at+JBq6ezXp8RSnJFoqMVcVJwIAB+6KcN9AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xe7o6sropBvM/K1l8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehlz+yQLFrBWdFwWbGCcytLFyMkhIWAi0f3oGXMXIxeHkMBSRokr B09CJaQkli5dxAhhC0v8udbFBmILCTQzScxtqgWx2QR0JV5+eMQEYosImEtcXHcLrJ5ZQFti 3d3vYPXCAo4S03ctYgexWQRUJXr2ngGL8wpYSaz5PJMVYr6mxIQtc5gg4oISJ2c+gbqBW2Ld rEusEDPlJZq3zmaewMg/C0nZLCSpBYxMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJDdtux n5t3MM579VHvECMTB+MhRgkOZiURXtUurRQh3pTEyqrUovz4otKc1OJDjKZAt05klhJNzgdG TV5JvKGZgamhiZmlgamlmbGSOK9nQUeikEB6YklqdmpqQWoRTB8TB6dUA1PUcXb1KRP+7jJM +St24mHztws3DOfOjtOw/bpXuH7O8YIquRfsqxxl59TqugVfWZDkVbQz0D3ZRt5469SPT14e 0PWesnhJOk/2me/JDIGlM8yCFBX/Rb0p2WJZ860mMzzdjMtw8i4F9nKvo8yhgWuaSg9/aZvU Gm8meO/JJblt8+9KrTsb+H5lo7NC6QOGc3z6PMb/LayaJlkH7hDXvi12vOOr7K4om/XnPR/G fL36W4HdN+zWqlWKt3o/vzXIdIy4vPtZM8cN1Tn+rufKQ335li93kY7fMLuwMqlRNPdD+u7g NMOTom/f7xN4PC9V4fiaHQcFS7YZtJzZcS6OtUHAf+2Ue8+TZx5IVi1Rm6zEUpyRaKjFXFSc CABSSeyq4gIAAA== X-CMS-MailID: 20230405070308eucas1p2ae98188f3386f0c7140c4a563e894faa X-Msg-Generator: CA X-RootMTR: 20230405070308eucas1p2ae98188f3386f0c7140c4a563e894faa X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070308eucas1p2ae98188f3386f0c7140c4a563e894faa References: Subject: [FFmpeg-devel] [PATCH v19 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: 7ibEpDNg22ug - Changelog update Signed-off-by: Dawid Kozinski --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index a40f32c23f..9a588bcaa7 100644 --- a/Changelog +++ b/Changelog @@ -75,6 +75,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: @@ -122,7 +124,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer From patchwork Wed Apr 5 07:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp168329pzb; Wed, 5 Apr 2023 00:03:37 -0700 (PDT) X-Google-Smtp-Source: AKy350aKtAGcUEaPKChcZM/r9u4tDtb6e1+rMFdqoNG0A7IlqbSYSPbvXd6JzDFFurmgKiByWUYq X-Received: by 2002:a17:906:ccdd:b0:93f:82cb:fe42 with SMTP id ot29-20020a170906ccdd00b0093f82cbfe42mr2193122ejb.58.1680678216987; Wed, 05 Apr 2023 00:03:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680678216; cv=none; d=google.com; s=arc-20160816; b=02dP/6tiyWXgOlWsPL1WNeZlW5uUrUw/sdVoZfqfezihQ1W1pjWaFkSbnZR6gDdDe0 jJeAQzGNlo840LSjGpopsGnqwP1twCJJDS13aSVmd8zxzn2DwtVmZCjbSTdCWXuLTgo1 LLsZ7N+l8GjdhYPzrorwZg4w9dz5Lys0bQcNc5cLvixApH1kFn9KkJcDAIfh/CawE/PJ /hEm8/vnTqV3g15pivkNt9A+nluQ9SEPWK55QKW+OGS8UgVei8cWRPHyeF9jGy7eptix X/OcXu9leylVEftqgfrOcOzye2/1dG/RyqkBIps9sJ4Ki83fo42fJ+B4OQAHl/Q5mlwP EpGg== 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=pi1Wxp1cgNeu9tnJ0DecXmcYetMxVmMfJZiOkooX6mihEnKu6GZWXxH/WHoHmLFquR 05fKrqAYby+yLfZf5XKrH5YwpiTxP8RdZ9K9qSuXnGG5NHtHD1mFs+oYCUou97ykXrZX T17roh0wTeuAhbbQSJNBFghUlyfbpi6Y8mf222tN+UaDaeyHewdxkk3/bNW2Jy8GIabK xMK1++qKbbuDtGMhs/52J05qtG/oMrnHNk5QH+0g4d83ScBh+lnDvMniGTuAHVbKPFvQ fB6uFB7HWv2eSTp73XNqndJNSU071/ZKUkjhwxd2BSo60+g1lP89GxBn0DEbyzXZw+RL KlXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mtj7KE2U; 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 20-20020a170906309400b00922177e6cf7si12207564ejv.364.2023.04.05.00.03.36; Wed, 05 Apr 2023 00:03: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=mtj7KE2U; 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 8585368BBF7; Wed, 5 Apr 2023 10:03: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 4097868B851 for ; Wed, 5 Apr 2023 10:03:28 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230405070327euoutp0233602e8d57dd2c241fcf48e939d47834~S9_zmIP8U2323423234euoutp027 for ; Wed, 5 Apr 2023 07:03:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230405070327euoutp0233602e8d57dd2c241fcf48e939d47834~S9_zmIP8U2323423234euoutp027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1680678207; bh=+wzJiyFqiG0j20zA9XB4jAU+Q4dcfHDGAXn95Awj9PE=; h=From:To:Cc:Subject:Date:References:From; b=mtj7KE2ULk7hXoEUFOLDYIyrMnF2Uqy949NEMTauz/VQt8r3lzMgtqEosIo2ZuEzH 4iMnCcTmm3Wkd2CYt3dXqf332iuan6w43kfFAN4W4n8Sf9YLhNRjjCvRbHkY3jQuTp t9u7xkTFLCaXZnhdtQFCIGMDxfJb/9AnLbxFS20E= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230405070327eucas1p2aad1cbf0929ae533d55ff2dc165339f6~S9_zb4ROZ2831328313eucas1p2q; Wed, 5 Apr 2023 07:03:27 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 4B.E3.10014.F3D1D246; Wed, 5 Apr 2023 08:03:27 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230405070327eucas1p11db52e0615145c3d0c3adabbb2661754~S9_zIbopo0301203012eucas1p1U; Wed, 5 Apr 2023 07:03:27 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230405070327eusmtrp16bf89929240678a9963cef711abfa714~S9_zH8mQt1135011350eusmtrp1B; Wed, 5 Apr 2023 07:03:27 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-53-642d1d3fad81 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 29.94.08862.F3D1D246; Wed, 5 Apr 2023 08:03:27 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230405070326eusmtip2dbc7d4c3d50776d6e803ce0e00e506be~S9_yzd5LR2898728987eusmtip23; Wed, 5 Apr 2023 07:03:26 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 5 Apr 2023 09:03:16 +0200 Message-Id: <20230405070316.1007-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djPc7r2sropBsveyVt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBmPW2IKTnNW3D3xna2B8S9LFyMH h4SAicSt+85djFwcQgIrGCXmNe5ih3C+MEqsefSPsYuRE8j5zCjx+YIjiA3ScH3ZN0aIouWM Eh+mLofqaGWS6PxzmAWkik1AV+Llh0dMILaIgKnEyea9bCA2s4C2xLq738FsYQFniY2X3rOD 2CwCqhJ/G9+A2bwCVhJbF95ihtimKTFhyxwmiLigxMmZT1gg4twS62ZdYoWYKS/RvHU2M8gR EgJf2SWefJjOBFHkIrHy0BuoQcISr45vYYewZSROT+6B+r9Y4lC/A4RZI3HoRzpEhbXE28bj jCBhZqAT1u/Shwg7SvRfALkSpJpP4sZbQYgD+CQmbZvODBHmlehoE4IwVST6OsUgGqUkni6b A3WJh8TefftZJzAqzkLy1Swkn8xCWLuAkXkVo3hqaXFuemqxcV5quV5xYm5xaV66XnJ+7iZG YGo4/e/41x2MK1591DvEyMTBeIhRgoNZSYRXtUsrRYg3JbGyKrUoP76oNCe1+BCjNAeLkjiv tu3JZCGB9MSS1OzU1ILUIpgsEwenVAMTuyv7lu6se1OWSpnrbcwvdNTUPep+/GlDxB63/yed 7D37PoQuW+O44LS5ldEJto/Lv8bdk+rxYmnsbQ/n3XF4G58tc8exNy//fN20QSX83vWe3su6 f6I3VwuK7otqt3lRvJL3q42I/A5Poy8R05PmvNY0UpCTUdX7e5HVpXJJoc8DiyDd1V8vRx60 ZNthf2mB5ESHdQcO3XxtrbX03qw0je8ur7cEzpM4fXtP6CWO6UfTGMp3cT/5fcG1mWX5XQFv xdsbgqZr5L9LfHJIq2nZulnvvzBdDEnbYqaRtn1/6J2r0UVdxRctDddxu2t+27PvTETA7Dqb nxXul9KuxLd0XL/cEee5vzrhkNe3FS0eSizFGYmGWsxFxYkARqIPhnwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7r2sropBlOn8Fh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehmPW2IKTnNW3D3xna2B8S9LFyMnh4SAicT1Zd8Yuxi5OIQEljJK NDfOYoNISEksXbqIEcIWlvhzrYsNoqiZSWLCht1gRWwCuhIvPzxiArFFBMwlLq67BdbALKAt se7ud7AaYQFniY2X3rOD2CwCqhJ/G9+A2bwCVhJbF95ihligKTFhyxwmiLigxMmZT6Cu45ZY N+sSK8RMeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzAsN12 7OfmHYzzXn3UO8TIxMF4iFGCg1lJhFe1SytFiDclsbIqtSg/vqg0J7X4EKMp0K0TmaVEk/OB kZNXEm9oZmBqaGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cAUavpHPnWPfoeE t92vm34bni3a/eDyxdmORXFW+7eyPzM5ua1q4dYE+TzXjS0qXOc1q768c/L9dehbzfaCro+b pgi/NmpolrZSbTn58MLjO9m/LmpppHNx8etzckRtmFbBoNW9RPj4uZWfFxQlhntuFO/76FcU 8IKhQsX93lHjVS+NcyYnfb0h9/P69wP53+JSD+ptvBPJU9fCo3Flo7Hzoq+8LrfbOWQftn/j Kw3vsmw9NN+x7evDfF7Ju52XGSaVPg9/+z/p3PpApYcd1j8v1T8pVcya/9zcfvudl08LLp8I 2hu6f5aJ0GcP9ucMQssv1GUacUz/V8PW31vP/lB2znyBTlm9rdIt6jKRSh5KLMUZiYZazEXF iQBosHds5AIAAA== X-CMS-MailID: 20230405070327eucas1p11db52e0615145c3d0c3adabbb2661754 X-Msg-Generator: CA X-RootMTR: 20230405070327eucas1p11db52e0615145c3d0c3adabbb2661754 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230405070327eucas1p11db52e0615145c3d0c3adabbb2661754 References: Subject: [FFmpeg-devel] [PATCH v19 10/10] avcodec/evc: 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: Eo5ERmsfob6K - 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