From patchwork Mon Oct 24 07:38:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2079906pzb; Mon, 24 Oct 2022 00:39:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6TVQEIl0c4dhAoByjWnM3l659Vu3CqvUlaAqTB6xOD7reb+ZVzoevWRWd914I1k9Fuv8jK X-Received: by 2002:aa7:cb59:0:b0:461:7378:7be0 with SMTP id w25-20020aa7cb59000000b0046173787be0mr10456739edt.60.1666597143843; Mon, 24 Oct 2022 00:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597143; cv=none; d=google.com; s=arc-20160816; b=JbtGJZH93S0gD7DGVeqJg5+CkIZMGN6wFsNkB87X1u5CXyLAsaY1KWq566TQ7iE5Yr 1SYLROERWa6t/RtPp02+l7fjxN3hyPZGJRoLPV2XsA0oWkagu3BFb478FCeeoGD3W9a5 seSNqk3PQ1mjbd+7dsUKfeRXEOAxu9zxksUlj+bDdMriCc/DuIkql2/urQxs49CGgGt/ u6gaBdkLbEya4On9CjlGx6gkHIzylrixBMeraxB82p+Lvt/dqYWzLMNT/uLz1zM1Gesu mEKZ3H/gCRsxc3lTObRzvJQXuQG8GS9DXxzfBE2XB1eSLSCs25kQ4GHDg/ERNAtf6UYk pnVw== 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=UadspaobQ8lKSHyEU9bg1ntKUw+Z5E+gBwpwdgckRLY=; b=o0ZZ/ue69L3vGRBrxs7XHzlgSXW3Z/gGwpfL6tc4ZigJkRwahLFBMdYMMpi9MF/Au9 issHZ5vMTMRDTQ7UCqs2tqZlLk841d1mQt95ddwUR8NLthKtm5oAtAYZ1hsb0NCdv5CB u8pV91qaEpDoKdq3ZCVqwdQz7A0skA0G2xbiW33wti1Fx5IIbrevfJw9j/9HMMxOA768 zVImugZsHAYaxRWI354HPPvBNKnvtdxjAzatCcQMl5JE/JlUuUcaqWOmsjVKm/oUgMTM Lt5DA9Xay0h46Prlg1flDltc5rQxnVKIrIPVI4ZN0u6okFCCenEXsCXJXDegok8gcJFX mujQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=VKp5s0oZ; 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 cr17-20020a170906d55100b00791994dfb9esi20246838ejc.491.2022.10.24.00.39.03; Mon, 24 Oct 2022 00:39:03 -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=VKp5s0oZ; 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 4373D68BD68; Mon, 24 Oct 2022 10:38:59 +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 5806C68BC3B for ; Mon, 24 Oct 2022 10:38:53 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221024073850euoutp01a047628211f00f6dd83b3c2618c9f79f~g8UKjmBaO0434604346euoutp01m for ; Mon, 24 Oct 2022 07:38:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221024073850euoutp01a047628211f00f6dd83b3c2618c9f79f~g8UKjmBaO0434604346euoutp01m DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597130; bh=cMY33JX5baQkrmbt4RdoX7IRznaqjfKqs3Evydpck5Q=; h=From:To:Cc:Subject:Date:References:From; b=VKp5s0oZeFEcznx/xUrzaaQZG5aBz2D9y3+gsatoq35F5xN9lW/BUELj8lN/Fh6c3 POSseAkU2mLV/0HruVer6FdcfjSNMYYS85ytKcQYwwgEWocIEqe4reMtxBh8uJzUtZ ycHfqN58hDy2UQv4c5WpBku5rv1x4uVnxFNDSX0E= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024073850eucas1p21ce9296f2c00880153b55e4f294c1034~g8UKPsNrW2275322753eucas1p2K; Mon, 24 Oct 2022 07:38:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 99.B9.19378.A0146536; Mon, 24 Oct 2022 08:38:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024073849eucas1p1c5a416b42d8a14376bc8ff3011a560b8~g8UJ6ab2A0322603226eucas1p1R; Mon, 24 Oct 2022 07:38:49 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221024073849eusmtrp11a951c652bd5f25b909f69610accf77e~g8UJ5bfMJ1606816068eusmtrp1t; Mon, 24 Oct 2022 07:38:49 +0000 (GMT) X-AuditID: cbfec7f5-a35ff70000014bb2-5c-6356410aee86 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 6E.C4.10862.90146536; Mon, 24 Oct 2022 08:38:49 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024073849eusmtip1994544881c4f38f30b02de980257a41e~g8UJnS4e50236002360eusmtip1I; Mon, 24 Oct 2022 07:38:49 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:38:40 +0200 Message-Id: <20221024073840.1344-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87pcjmHJBpsbeS2+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsEroyZT/+zFFyRrriz+C5zA+Mt0S5G Tg4JAROJ+VvfMnUxcnEICaxglHi6dTozhPOFUWJWx0RWCOczo8Sppu3sMC2bV/dBJZYzSpz9 f4QNwmlnklh7YxUTSBWbgK7Eyw+PwGwRAVOJk8172UBsZgFtiXV3vwPZHBzCAs4SU34LgIRZ BFQlvqy6xAJi8wpYSSy+1sEIsUxTYsKWOUwQcUGJkzOfsEDEuSXWzbrECjFSXqJ562ywsyUE vrJLNOy4ywRR5CLR8+841NXCEq+Ob4GyZSROT+5hAblBQqBY4lC/A4RZI3HoRzpEhbXE28bj jCBhZqAT1u/Sh6hwlJi6tATC5JO48VYQYj+fxKRtoGADCfNKdLQJQZgqEn2dYhDjpCSeLpvD DGF7SPybcop5AqPiLCRPzULyyCyErQsYmVcxiqeWFuempxYb56WW6xUn5haX5qXrJefnbmIE JofT/45/3cG44tVHvUOMTByMhxglOJiVRHhZngQnC/GmJFZWpRblxxeV5qQWH2KU5mBREudl m6GVLCSQnliSmp2aWpBaBJNl4uCUamBK+DdNavbCZraPJd4Fq5Yv+6ZpIjfhD++5rr9LlutN 8vN/liDB8bGuXvTPzlcrqvx+ax/cuZ2bgcVPoULMtj37zt7Fe+aGqIezH7ZpcVyx9/U1uaAK /z8bQ0+F33ff+LKpK4cjhO/bzTcz1J+0d1jteex40WneQ9G3G2/lOuxOMBbdLXVcsWB2gF+R mv7VXW0nEl5Oj1RINV60YquF4Pc56+oedTEvmVvdcFBv6lkftfqAI1VzNY0m9st9XxIl5l3J IOltstvkmFxD8b5rEtESn7KjHhS80t7y6SDfj5/qx04/n5BfkBevKxmRMXHP4tqftnkt5978 6+vNmNkRfzc3aK5uaidbz+qZVXzNHw4qsRRnJBpqMRcVJwIAlu0o/X0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7qcjmHJBjP7zSy+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoPZui/NKSVIWM/OISW6VoQwsjPUNLCz0jE0s9Q2PzWCsj UyV9O5uU1JzMstQifbsEvYyZT/+zFFyRrriz+C5zA+Mt0S5GTg4JAROJzav7WEFsIYGljBKr d4lAxKUkli5dxAhhC0v8udbF1sXIBVTTyiSx9fk7JpAEm4CuxMsPj8BsEQFziYvrboE1MAto S6y7+x2ogYNDWMBZYspvAZAwi4CqxJdVl1hAbF4BK4nF1zqg5mtKTNgyhwkiLihxcuYTFog4 t8S6WZdYIUbKSzRvnc08gZF/FpKyWUhSCxiZVjGKpJYW56bnFhvpFSfmFpfmpesl5+duYgQG 7bZjP7fsYFz56qPeIUYmDsZDjBIczEoivCxPgpOFeFMSK6tSi/Lji0pzUosPMZoC3TqRWUo0 OR8YN3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUxJl9dNdvuo kyFp9Xm21GW+fZIMV0tre+TkZNKuZl3U/xg3I61S7X1myOaII5zGK5bo8eRGPp7j/+ifyhHT HtVHKTyaod+5/+du1xR9MsPRXEHBsqm+TeH0q+rK9FXecQe2pgndzH3osShnf111yoyPWakL 3mx+/8k9aytnqaOZdmb4n9ZXfBqyTlOiuSSmKCf8z6y6ZbSsc8VOaQbvrK/p4o9/fHYs/tz8 mukAY6z19Kgpsxzd9124wKR4Y9KkiX0r1pX2NiX03gz6dCRQUnJPUXuQEx/32Yntskdz57Tm vWjd6G22I1ujsidJfxuHVPvZ47/VXzGZbaxiXvlB5TrTbNd5/x79sN434/HLZ0osxRmJhlrM RcWJADTHGwLjAgAA X-CMS-MailID: 20221024073849eucas1p1c5a416b42d8a14376bc8ff3011a560b8 X-Msg-Generator: CA X-RootMTR: 20221024073849eucas1p1c5a416b42d8a14376bc8ff3011a560b8 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024073849eucas1p1c5a416b42d8a14376bc8ff3011a560b8 References: Subject: [FFmpeg-devel] [PATCH v14 1/9] 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: DllBm2knY5L2 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 3edd8e2636..de2b1d1d50 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1668,6 +1668,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 24a0433dba..357e17d82c 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 f436a2b624..b887a3788f 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 7af7fbeb13..a31244e0db 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -181,4 +181,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 41a19aa9ad..cf92b5f126 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -72,5 +72,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 f8abc803b6..86ac0f3871 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 51 +#define LIBAVCODEC_VERSION_MINOR 52 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Mon Oct 24 07:39:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080084pzb; Mon, 24 Oct 2022 00:39:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7dbOTifiGjo/w/dqkX7Ond3oH3yW7+yVnp+7fChd/hTq+TQ0kYigPZ/ZHy4jSGpmzWvucF X-Received: by 2002:a05:6402:3592:b0:45c:fb8a:c57d with SMTP id y18-20020a056402359200b0045cfb8ac57dmr29994355edc.290.1666597166986; Mon, 24 Oct 2022 00:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597166; cv=none; d=google.com; s=arc-20160816; b=OcLGNo7T/cxyQEUOBKoqkvfLMUr8rKPymshCPkfRSKjmHyHNFXN36h7T4ldHZnn7Bu CRxwy3CqvmlCRwUkOLIOS/xzQjgXYbCBGvo0/f9O9RJT7KmffVVC7v/TfVpM6DBYYLjh LREhGCv28+MER0GoMtbIaJ89FbaH4ydjqri3V9Lbtrh2QMCatqAKbnoKJcADi7Ohxhoi yfrfIMGlo8qt+RPg7HiEFdEj6yDrRkbr0cq7u2fXazBtfafkyBcUOWYb1Ii4kEKcEgzz um4U3UYEaKw7h+okAV6kcwuuOa0LoqfcArFSGgOfrnQkgHgsgwD05yqcmARc7qI7WbRT vRug== 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=/lv/eOybPtnxIgXYhBMc4H9LJVPLQ9SyHRbUfg/kLd0=; b=UfEBZ9aAXMw8cGUGwFYAr/IaReuTAMZb/ah1NGKwp5KVjLwS5Vf71JQyxOT+RFMtQ2 u3o+ZE+Ch/Cy7SuwuGkj0M+DIz8EqgwApJekisKRbqm2wpcJOqtaQMcZ+bv+Ne6hD+nZ N4WQSKYDdb6sZ64OkcYPo+C2Ol283ziy93a2SRpWT57YLyg6fg9vaHI/AwkvarSfeFat J+rnE+A+I0SEIBtD0Su8zaNmciud8DyeiJeew/hwJVvnka6Hw2X7fo94isezTZtOzlqq B/hqAkXJ8K4v1h1W867l+Mn2SFJJLRPo3ArHkz91I7qL6Ln2oSz4BBBoeee1q8E44rU6 hSFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="n/7AvtH3"; 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 p11-20020a056402500b00b0045cca8f9a0asi30775602eda.580.2022.10.24.00.39.26; Mon, 24 Oct 2022 00:39:26 -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="n/7AvtH3"; 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 8A1E068BD85; Mon, 24 Oct 2022 10:39: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 B11FB68BD19 for ; Mon, 24 Oct 2022 10:39:17 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024073916euoutp027e8e8ea3c026f3428bf9a8c31dcf5006~g8UirE4zj1436114361euoutp02J for ; Mon, 24 Oct 2022 07:39:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024073916euoutp027e8e8ea3c026f3428bf9a8c31dcf5006~g8UirE4zj1436114361euoutp02J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597156; bh=3QYLPY10PPCj93Xh+mSkEKeZsmobMy1x7YUoj7YxtQQ=; h=From:To:Cc:Subject:Date:References:From; b=n/7AvtH3eorPanTPWYab1w37bNqil2UcofM1AhIoFTkQL3xzayMCtb3Ocs2Ve4/76 xajnD8zW5fVtpz55gQd7egmqUxUYRvJhg0ENQdiEzMZznFbJ17GK2ejuEGsizFGQW0 Mg5q5xiBHhl6gKbGCfhziEimlsZtrQCmkfhpRwWA= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024073916eucas1p2c30dec45e54d740c630409d78925cc42~g8UiTcEWT1834318343eucas1p2x; Mon, 24 Oct 2022 07:39:16 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 27.D8.07817.32146536; Mon, 24 Oct 2022 08:39:15 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024073915eucas1p1510e61281393d78f6adfaaa91640a637~g8UhtNHwv2571325713eucas1p1U; Mon, 24 Oct 2022 07:39:15 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024073915eusmtrp2a414627f72cd2e74f0ebcd3fc0bdbc7f~g8UhsjD8o3167031670eusmtrp2P; Mon, 24 Oct 2022 07:39:15 +0000 (GMT) X-AuditID: cbfec7f4-8abff70000011e89-53-635641230318 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 24.E4.10862.32146536; Mon, 24 Oct 2022 08:39:15 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024073915eusmtip172febc06ee2eb3f95f804e7bf971a479~g8UhVGhoe0455704557eusmtip1K; Mon, 24 Oct 2022 07:39:15 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:39:05 +0200 Message-Id: <20221024073905.656-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+NgFnrLIsWRmVeSWpSXmKPExsWy7djP87rKjmHJBtsO2lh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBnPLp1gK5gwjanixPZlTA2Maw8z djFyckgImEh8236ZqYuRi0NIYAWjxKaJh1khnC+MEsd2PGODcD4zSlzYvIgdpmXXzQaoluWM Ep9ePWOGcNqZJF6dvgk2mE1AV+Llh0dMILaIgKnEyea9bCA2s4C2xLq738FsYYFIieZTDcwg NouAqsS0GfeBbA4OXgFLifnN0hDLNCUmbJkDNoZXQFDi5MwnLBBxbol1sy6xQoyUl2jeOhvs BgmBv+wSt3ctZYMocpE49vIXVIOwxKvjW6A+kJH4v3M+E8guCYFiiUP9DhBmjcShH+kQFdYS bxuPM4KEmYFOWL9LHyLsKLHgzVx2iGo+iRtvBSEO4JOYtG06M0SYV6KjTQjCVJHo6xSDaJSS eLpsDjOE7SExd9o01gmMirOQfDULySezENYuYGRexSieWlqcm55abJSXWq5XnJhbXJqXrpec n7uJEZgiTv87/mUH4/JXH/UOMTJxMB5ilOBgVhLhZXkSnCzEm5JYWZValB9fVJqTWnyIUZqD RUmcl22GVrKQQHpiSWp2ampBahFMlomDU6qBiU2kdoG3hsAk3XvJynwZkzi3PIxj7TSw2v/m W/X1I/+uMJ+W31Sw45rUjB+LP8Uetq/Oll350WmGs4y+PssF1aV3NK9nbDw4V9t/fcuZ4Nf+ kQp7/b5VCyqH7uoJmbqxfW3VWQ0BiayJqq0f52TI1fh9cA0p+1DOZ/PqWY7rqY5gMb/df07J vtiz7vrSzy7l7x8fMrHgjJSZFtz4/ebq95v8Zp4y+jvn39WeyN8f+6RPfF615tbMCZkN2mm5 BcenO09Vu/Vl3b8pE+ZuNZrmx7lSrWXL8tkb+Q7zr9OSfXCsiDFco36/8kaHhvaXSb/vqK2c eFY70ux3/qSq3Lupc0QmS4d9VZT7bXaO5ffisCQlluKMREMt5qLiRAD8deukgAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7rKjmHJBsvniVt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehnPLp1gK5gwjanixPZlTA2Maw8zdjFyckgImEjsutnA1MXIxSEk sJRR4sSp+0wQCSmJpUsXQRUJS/y51sUGUdTKJPF30QRWkASbgK7Eyw+PwBpEBMwlLq67BdbA LKAtse7udzYQW1ggXGLCtSdg9SwCqhLTZtxn7mLk4OAVsJSY3ywNMV9TYsKWOWBjeAUEJU7O fMICEeeWWDfrEivESHmJ5q2zmScw8s9CUjYLSWoBI9MqRpHU0uLc9NxiI73ixNzi0rx0veT8 3E2MwNDdduznlh2MK1991DvEyMTBeIhRgoNZSYSX5UlwshBvSmJlVWpRfnxRaU5q8SFGU6BT JzJLiSbnA6MnryTe0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qByT32 5RLLZ7bT+MOYfjEfkYsI7qtw0jzxZq222IJIu+1F07dVd3RcmcrfeWn3jMmxLy8Vb5y3Mn+e 2zM2rikFCUUTRTSOTrjGK2rc/O7w0XpRrkAm65onnW87Q2c/aRE66e5z/EYHw8KjPB+fmWzi vxH+ft3m89sFzz+ctarg4P3ypL/vfCTCbB/fn6jdJvT6rJbSvOZfa3TEZBoj4vOcvx270D3f W/KNofu7RR7vCn+Jnnkgce9b8faVi7vLuc3W5W9rcNu9kkFFsOD7KQeX8tvJTw9c7c33M78k 2vJ/FYdg3+KkaVN79mSFH6sJjg4rVF/ro/Uz30CkYXLEwaSX585nGhxrYv6avoK98t7GQCWW 4oxEQy3mouJEAMyz9YXmAgAA X-CMS-MailID: 20221024073915eucas1p1510e61281393d78f6adfaaa91640a637 X-Msg-Generator: CA X-RootMTR: 20221024073915eucas1p1510e61281393d78f6adfaaa91640a637 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024073915eucas1p1510e61281393d78f6adfaaa91640a637 References: Subject: [FFmpeg-devel] [PATCH v14 2/9] 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: 5eKOrMbJEDbI Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/evc.h | 155 +++++++++ libavcodec/evc_parser.c | 740 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 897 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7761620de7..ee276ebefb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1137,6 +1137,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..b3e648796c --- /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_NAL_UNIT_LENGTH_BYTE (4) /* byte */ +#define EVC_NAL_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..ab0b199b59 --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,740 @@ +/* + * 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" + +// 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 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) + 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) + + // @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 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 + +} 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) + + // @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; + +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 is_avc; + int nal_length_size; + int to_read; + int incomplete_nalu_prefix_read; // The flag is set to 1 when an incomplete NAL unit prefix has been read + +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NAL_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_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; i++) + t = (t << 8) | p[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 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); + } + + // @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; + 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]; + + 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); + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +/** + * Parse NAL units of found picture and decode some basic information. + * + * @param s parser context. + * @param avctx codec context. + * @param buf buffer with field/frame data. + * @param buf_size size of the buffer. + */ +static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + s->key_frame = -1; + + nalu_size = read_nal_unit_length(buf, buf_size, avctx); + if (nalu_size <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return AVERROR_INVALIDDATA; + } + + buf += EVC_NAL_UNIT_LENGTH_BYTE; + buf_size -= EVC_NAL_UNIT_LENGTH_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) + // @see enum EVCNALUnitType in evc.h + nalu_type = get_nalu_type(buf, buf_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; + } + + buf += EVC_NAL_HEADER_SIZE; + buf_size -= EVC_NAL_HEADER_SIZE; + + if (nalu_type == EVC_SPS_NUT) { + EVCParserSPS *sps; + + sps = parse_sps(buf, buf_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; + s->height = sps->pic_height_in_luma_samples; + + if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else avctx->profile = FF_PROFILE_EVC_BASELINE; + + switch (sps->chroma_format_idc) { + case 0: /* YCBCR400_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR400_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_GRAY10LE; + return -1; + case 1: /* YCBCR420_10LE */ + s->format = AV_PIX_FMT_YUV420P10LE; + break; + case 2: /* YCBCR422_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR422_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV422P10LE; + return -1; + case 3: /* YCBCR444_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR444_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV444P10LE; + return -1; + default: + s->format = AV_PIX_FMT_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown supported chroma format\n"); + return -1; + } + } else if (nalu_type == EVC_PPS_NUT) { + EVCParserPPS *pps; + + pps = parse_pps(buf, buf_size, ev); + if (!pps) { + av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + } else if (nalu_type == EVC_SEI_NUT) // Supplemental Enhancement Information + return 0; + else if (nalu_type == EVC_IDR_NUT || nalu_type == EVC_NOIDR_NUT) { // Coded slice of a IDR or non-IDR picture + EVCParserSliceHeader *sh; + + sh = parse_slice_header(buf, buf_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; + } else { + av_log(avctx, AV_LOG_ERROR, "Unknown NAL unit type: %d\n", nalu_type); + return 0; + } + + return 0; +} + +/** + * Find the end of the current frame in the bitstream. + * @return 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 *ev = s->priv_data; + + if (!ev->to_read) { + int nal_unit_size = 0; + int next = END_NOT_FOUND; + + // This is the case when buffer size is not enough for buffer to store NAL unit length + if (buf_size < EVC_NAL_UNIT_LENGTH_BYTE) { + ev->to_read = EVC_NAL_UNIT_LENGTH_BYTE; + ev->nal_length_size = buf_size; + ev->incomplete_nalu_prefix_read = 1; + + return END_NOT_FOUND; + } + + nal_unit_size = read_nal_unit_length(buf, buf_size, avctx); + ev->nal_length_size = EVC_NAL_UNIT_LENGTH_BYTE; + + next = nal_unit_size + EVC_NAL_UNIT_LENGTH_BYTE; + ev->to_read = next; + if (next < buf_size) + return next; + else + return END_NOT_FOUND; + } else if (ev->to_read > buf_size) + return END_NOT_FOUND; + else { + if (ev->incomplete_nalu_prefix_read == 1) { + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + uint8_t nalu_len[EVC_NAL_UNIT_LENGTH_BYTE] = {0}; + int nal_unit_size = 0; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit prefix bytes is equal 1 + // + // ---------- + // pc->buffer -> conatins already read bytes + // ---------- + // __ pc->index == 1 + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0x00 | 0x3C | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; i++) { + if (i < pc->index) + nalu_len[i] = pc->buffer[i]; + else + nalu_len[i] = buf[i - pc->index]; + } + + // ---------- + // nalu_len + // ---------- + // --------------------------------- + // | 0 | 1 | 2 | 3 | + // --------------------------------- + // | 0x00 | 0x00 | 0x00 | 0x3C | + // --------------------------------- + // | NALU LENGTH | + // --------------------------------- + // NAL Unit lenght = 60 (0x0000003C) + + nal_unit_size = read_nal_unit_length(nalu_len, EVC_NAL_UNIT_LENGTH_BYTE, avctx); + + ev->to_read = nal_unit_size + EVC_NAL_UNIT_LENGTH_BYTE - pc->index; + + ev->incomplete_nalu_prefix_read = 0; + + if (ev->to_read > buf_size) + return END_NOT_FOUND; + else + return ev->to_read; + } + return ev->to_read; + } + + return END_NOT_FOUND; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + + ev->nal_length_size = EVC_NAL_UNIT_LENGTH_BYTE; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +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; + int is_dummy_buf = !buf_size; + const uint8_t *dummy_buf = buf; + + 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; + ev->to_read -= buf_size; + return buf_size; + } + } + + is_dummy_buf &= (dummy_buf == buf); + + if (!is_dummy_buf) { + if (parse_nal_units(s, buf, buf_size, avctx) == AVERROR_INVALIDDATA) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + // poutbuf contains just one NAL unit + *poutbuf = buf; + *poutbuf_size = buf_size; + ev->to_read -= next; + + return next; +} + +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 Mon Oct 24 07:39:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080302pzb; Mon, 24 Oct 2022 00:39:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5qvuTl48fgIYN65zt7w9kOwGKl92wZ9zXtAd427JYjhL9EvGwQpwZGa4ooCwZRSUuCoDKU X-Received: by 2002:a17:907:86a2:b0:791:910e:cce4 with SMTP id qa34-20020a17090786a200b00791910ecce4mr26795173ejc.36.1666597189016; Mon, 24 Oct 2022 00:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597189; cv=none; d=google.com; s=arc-20160816; b=pQxrwyjctuFkeWsvvKvb3oS0Yneg+wPES0jqarPxJOms73dUfNEynzG8f/q6LPo3iU Twe2IzrhtMjGOmODMy0Nkq0oV3wk0ts8gdsPjzS6ewAYk29cXXhxNbkgew02kS6WxEC/ 6+RjdqDzRhpagG4x4+praJt8l//G+FhT8S3XM7MoOCr68gDyLKw+rPpP1cAyJy+YxE63 fxiSDqoHZ3GMm3Ud8Np6AQOqoYx3Gx0hFMTQhuSteFOYRN0mzmWtTtMp50gyiDw+5Egj HdQPb2DjcbRoFtO/Vb/uQeK6fw7bmt4msG5L9tog5GKL8dd4nRYc95BYYnCCF86myF4f +FHQ== 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=Md0oh9KdrAFQu4RbojVfUtV5frjbnTXIk+FphK/8Pt8=; b=kri7sErCx+EcmCYV7154kdUv/HQHWSe23jIIhapAqUF1qlwND46Uyb1Rd21vc5QdSH v6Ku1EC4OUEGRqGjOCSpvl/x5/U3sLKf2ySOI2OWYFbiw3bAZp8tjMv+Fz+mU6+HwGjo cO4t/R7O9F8nTZh1l2V7pjnV0t5IXhZJO8x8aczzwILEmIyX3seX9UTX2mgqtrq+NZwq 0RYOucPreCvAJPDCT62KnijrF6Yd0c84vx9Ce6m3fLJI6ckfNvLHSQ+FOlx9n5V8m14Q z8YaTw5TQsSSzohXxobnE4E0Q7P0vuKKlu9xKl8/dlxBKrLWac1ChxLWmMVcHmmIcwXj OwFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ZR2lXxSY; 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 m4-20020a1709062b8400b0078d4b605b71si23281764ejg.338.2022.10.24.00.39.48; Mon, 24 Oct 2022 00:39:49 -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=ZR2lXxSY; 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 9627068BD97; Mon, 24 Oct 2022 10:39:46 +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 AFEF268BD8B for ; Mon, 24 Oct 2022 10:39:40 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024073940euoutp0203e8bd99e18ddf0fe765d9cb3c860a35~g8U4pJTX91614016140euoutp02f for ; Mon, 24 Oct 2022 07:39:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024073940euoutp0203e8bd99e18ddf0fe765d9cb3c860a35~g8U4pJTX91614016140euoutp02f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597180; bh=IUAlz7Sdhmp/tMAFLsktY0MvHaXURWWb6i+XXes9sy0=; h=From:To:Cc:Subject:Date:References:From; b=ZR2lXxSYjHFuFw+tcChFVu1nBwAwHQra4c/IQTrZEgOvu8hBxwZvnba45kvu12k51 8UVhYq0a3auGsEHDbmZ0kN+vhgWB23PF4Fb80SH4dkHiGNa8XgbH6Sk9iGioyxh95R WOMhol6sve6VfrYkxrg/4am61gm+IIoUIaRUEWJc= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024073939eucas1p2cf0ed319af6b17afb83dc62c8e0f7200~g8U4dPekK1618216182eucas1p2k; Mon, 24 Oct 2022 07:39:39 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 16.F0.29727.B3146536; Mon, 24 Oct 2022 08:39:39 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024073939eucas1p13817f88990a8f466014c4deef1a112ab~g8U4IQfL_0456804568eucas1p17; Mon, 24 Oct 2022 07:39:39 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024073939eusmtrp20d2132f4c15c08365b7cbbc262f5844c~g8U4Hmnzg3167031670eusmtrp2E; Mon, 24 Oct 2022 07:39:39 +0000 (GMT) X-AuditID: cbfec7f2-21dff7000001741f-72-6356413b813b Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1A.5F.07473.B3146536; Mon, 24 Oct 2022 08:39:39 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024073939eusmtip13c7f3d887c5ad9f04a1d14efceba8518~g8U3ze-TX0509305093eusmtip1C; Mon, 24 Oct 2022 07:39:39 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:39:30 +0200 Message-Id: <20221024073930.85-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7rWjmHJBr07zSy+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsErozO6fkFr0QrXnQcZGxg/C3QxcjB ISFgIrFsfVkXIxeHkMAKRolzbz8yQThfGCUOnnnCCuF8ZpR4MesMYxcjJ1jHm4edUFXLGSV+ TX7BBuG0M0n0du4Fq2IT0JV4+eERE4gtImAqcbJ5LxuIzSygLbHu7ncwW1igRuLqnQMsIDaL gKrEzOXbwHp5BSwkGg52sUJs05SYsGUOE0RcUOLkzCcsEHFuiXWzLrFCzJSXaN46mxnkCAmB j+wSb3b9YYcocpG4ebgTapCwxKvjW6DiMhL/d85nggRAscShfgcIs0bi0I90iApribeNxxlB wsxAJ6zfpQ8RdpR4M3EuC0Q1n8SNt4IQB/BJTNo2nRkizCvR0SYEYapI9HWKQTRKSTxdNocZ wvaQOLPzAvsERsVZSL6aheSTWQhrFzAyr2IUTy0tzk1PLTbMSy3XK07MLS7NS9dLzs/dxAhM Dqf/Hf+0g3Huq496hxiZOBgPMUpwMCuJ8LI8CU4W4k1JrKxKLcqPLyrNSS0+xCjNwaIkzss2 QytZSCA9sSQ1OzW1ILUIJsvEwSnVwJSxPLL1+GdvmecnNuvItyVu3zTxoM1ZIevwdzm+QjyJ YZ9eGPIIt0zvn3hXYfnat4vbK4NPJzI/Ku1bHsZ/k/NIiFin5UKPaMGEI+IXXr/ij2Nw3J93 u/2MH2uhhNox4SbHBxceHFk4OaC+8OQWHkbjJdqSzD86tTTet9uUH7y32r5h91GPPdJh9Ypy dq+OZclOspJb8uHv3OZ0LnmG1ZUVbn6B8c6vuj7+0JthUe3xsc4s0XfjJr1sg4Wce9fG32JY 4NbbbRN0zMVw0/LfYfoOTcYHPy82ZGM89fX1gUY9l0P/xZIXp1f9zeTyFWmacnPfrSjprwV3 Fqekhr8++vyH3MW4nrLHOxefOcXZoMRSnJFoqMVcVJwIAEMX2Gp9AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7rWjmHJBi8uyVp8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehmd0/MLXolWvOg4yNjA+Fugi5GTQ0LAROLNw06mLkYuDiGBpYwS l188YYJISEksXbqIEcIWlvhzrYsNoqiVSeLXofNgCTYBXYmXHx6BNYgImEtcXHcLLM4soC2x 7u53NhBbWKBK4tXTG2A1LAKqEjOXbwOr4RWwkGg42MUKsUBTYsKWOUwQcUGJkzOfsEDEuSXW zbrECjFTXqJ562zmCYz8s5CUzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwbLcd +7l5B+O8Vx/1DjEycTAeYpTgYFYS4WV5EpwsxJuSWFmVWpQfX1Sak1p8iNEU6NaJzFKiyfnA yMkriTc0MzA1NDGzNDC1NDNWEuf1LOhIFBJITyxJzU5NLUgtgulj4uCUamA6NO/b1MeC9qs7 1ztmGSh+vHLWWNrx9P2stT4v+FjiVRIeBoXUHXXkVYhdfGm/P4NX4f3WB8cEdp6JfvNS0dS/ L74hOeag2janet5XYaKTz2efElXO5DvEYXSgMmfDL90/Ea7mscu1OG0+Lr7NIc9wz0oogJ+5 fma8Xnh6/T1hY+ZLmh6yzV4BU1YyvvzbPfve1+jt8xJSWx2mxp75V6w8/XzA0yu1fy3YL3K/ 4/KriOXiPpTVrvply4seUZP++4e15N5vEbqlu321y2Jrf8Nl/xp3ue9tj2yyd/gy7eqya6Wd 5/t+3duT5+oaGV/pdiz2koVnfMnKCRtlVmkuyDOp1jn42cNxWdLmHRbfGJRYijMSDbWYi4oT Ad+zOJfkAgAA X-CMS-MailID: 20221024073939eucas1p13817f88990a8f466014c4deef1a112ab X-Msg-Generator: CA X-RootMTR: 20221024073939eucas1p13817f88990a8f466014c4deef1a112ab X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024073939eucas1p13817f88990a8f466014c4deef1a112ab References: Subject: [FFmpeg-devel] [PATCH v14 3/9] 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: 2iFAHT6CEwaa - 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 4edbb22b00..244b5acf7d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2126,6 +2126,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 d7f198bf39..a14a759c1f 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 47c419a009..615d2bc3b1 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -150,6 +150,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const AVOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 267fce252d..b7b2aff453 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -401,6 +401,19 @@ const AVOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +AVOutputFormat ff_evc_muxer = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .extensions = "evc", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_EVC, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const AVOutputFormat ff_m4v_muxer = { .name = "m4v", From patchwork Mon Oct 24 07:39:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080338pzb; Mon, 24 Oct 2022 00:40:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zbPqWgaDpWTBRp6lr9ceaXiiCIzBuELzPbbDVnhk9HzBkQ9+DSU/GUUWnPh4A6W+7p8YS X-Received: by 2002:a17:906:ef8c:b0:7a4:a4b4:9fcf with SMTP id ze12-20020a170906ef8c00b007a4a4b49fcfmr6007872ejb.727.1666597205923; Mon, 24 Oct 2022 00:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597205; cv=none; d=google.com; s=arc-20160816; b=hMIFr8W6QZfUrHM+9GwAESkmQtofcdYLviwil4QhbfC3sPGQHQsbGYrnh6+xoWr2/J Bw9ZndlhlXO/1aW8K2L1bzdMsdJaJIfh1kaWhk9/jJvEWllRcd1qU4FxzQFcu0bC1huv 42whn+vba/3dyy2sBRt1zNEr+bsHlAi5oguR4cIGcdEy+DGhWodnHidSP6xq7mUKwWZV HbFaD+gDfzYw5ZyWDdrYhZF+0Br0Db26DuUNFBOeg9TrlGODo7PynNsDTP2irE03URaq FeKvsafiL6vCRF3Sr0lbK41tpMext+qbUO6QCz14ChwoP3fGqYxYVEghye/xxEbTdW1a o8hw== 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=I8qOndhlUb/X/aGreetL7TQlY/khVpkdwfGKbetJn2Y=; b=qlSOtNs5y4xPIlqFPaawpaw572yxALUScw465hu5mA+zcoIIaN06oFnGyQd9fDK70X avzbj6DUiSRPsyoBfUnGAlVTciAC6IiEw8JD4YsDtru8lEaANr1beeM9bvpRXJ5PXUq3 WHj6KdB3JcG0nCUHhg2FuOWPaTfMCltVwEpgAv+egB4DPkmAJFNA1Btus/FOGJTESyY+ TnXxn/Yb3hXWS/cw2uYVi+FNcKFeYie4t49/VOXK3R/l+FZ7DY6Zmz2JXvP/zLW1Rqfz 7gYs6dJ4b9UBH9k1257zN6IHH/wOfmIpuXJl03BPKOLvAmYe21/zhfkttyfvFf8lRqla oxtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=rHGWSu5l; 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 he19-20020a1709073d9300b007a858ead526si1948668ejc.730.2022.10.24.00.40.04; Mon, 24 Oct 2022 00:40:05 -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=rHGWSu5l; 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 A6EFD68BDA7; Mon, 24 Oct 2022 10:40:02 +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 76CC868BD63 for ; Mon, 24 Oct 2022 10:40:01 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074000euoutp0288cdcebdfbcffe01f576e74721c277f2~g8VMAgxzE1454414544euoutp02g for ; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024074000euoutp0288cdcebdfbcffe01f576e74721c277f2~g8VMAgxzE1454414544euoutp02g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597200; bh=NnlhAE8EQ9TqQjdG3v3TjYkbxpX0gkMebq4PXivsg1Y=; h=From:To:Cc:Subject:Date:References:From; b=rHGWSu5lacaN3YswTkmBrTEDaq/8/5yFTtwmorkOAgs1a2eGQ0m3xOxeExZ6PXtBL geq7Or76FJjhqHbrlhAnggICXna3fLlTGagRYvHe4JPIgxv/4O56n6DsFf7KPtXS+m xv+nKx5m4dOfY4WAJRdp+LUFhFDQ+xttCa9QvcZQ= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024074000eucas1p2fc25e98e422f862fe6fb2e143d7f6367~g8VLwMiL_3148431484eucas1p2_; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id FB.01.29727.05146536; Mon, 24 Oct 2022 08:40:00 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf~g8VLdI5a_0119401194eucas1p2v; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221024074000eusmtrp1d6ccefad2e807e1df4f34a0fde566848~g8VLcWo7S1676416764eusmtrp1p; Mon, 24 Oct 2022 07:40:00 +0000 (GMT) X-AuditID: cbfec7f2-21dff7000001741f-be-63564150f154 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 53.15.10862.05146536; Mon, 24 Oct 2022 08:40:00 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024074000eusmtip1b9ff2f67e2a8f39d1836b0448d5ea89d~g8VLKPoDv0164801648eusmtip1g; Mon, 24 Oct 2022 07:39:59 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:39:50 +0200 Message-Id: <20221024073950.1309-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7oBjmHJBhP7lS2+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsErozd3VvZCuZoVexf/ZmtgfGjfBcj J4eEgInExmXNjF2MXBxCAisYJfYvmMoE4XxhlHjzdh6U85lRYsq1bcwwLddW72WGSCxnlPh6 axobhNPOJPHp7XUmkCo2AV2Jlx8egdkiAqYSJ5v3soHYzALaEuvufgezhQUSJC5f/cUOYrMI qEo8ersXzOYVsJJYt+IaG8Q2TYkJW+YwQcQFJU7OfMICEeeWWDfrEivETHmJ5q2zwS6SEPjL LvHvyCWoZheJaV/boBqEJV4d38IOYctInJ7cAxTnALKLJQ71O0CYNRKHfqRDVFhLvG08zggS ZgY6Yf0ufYiwo8TNr6uYIar5JG68FYQ4gE9i0rbpUGFeiY42IQhTRaKvUwyiUUri6bI50AD0 kFh18wHTBEbFWUi+moXkk1kIaxcwMq9iFE8tLc5NTy02zEst1ytOzC0uzUvXS87P3cQITBCn /x3/tINx7quPeocYmTgYDzFKcDArifCyPAlOFuJNSaysSi3Kjy8qzUktPsQozcGiJM7LNkMr WUggPbEkNTs1tSC1CCbLxMEp1cCk8nwx+27bO+93njPR5TmsejasNr5H8Jtx5FZr59+rr7RV TrcK4TjP1xN3xny+a35Oi2usYXCduCLTI7lJO07Hq/Bd1pO/3dg5SefFZxaHnUvYHYp25ZwV KL/4iPPCBYkPWQ3tPybGmDQZPV0397LD4/j5R3W6Lu+z81xpxneJe9kDoQ5dGTk130myJgGv r1f4KLFO5TuUarZYo8u5oVz+b7STwcp9Lvsv80gHvi4TqWv/qid7IMxFL5jBgiH1Jbu4stda OwbOrWun5KWeU9X8la8n8sJYO7P7xpkob1HWg+1q6z+2lu9PmZ6b8ObeBWf5iv7mOwaOLOYh lwTXZz9Yas81Ie9w76JZbbZCSizFGYmGWsxFxYkAnQzGGX8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7oBjmHJBrf2CFh8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehm7u7eyFczRqti/+jNbA+NH+S5GTg4JAROJa6v3MncxcnEICSxl lDg3axoTREJKYunSRYwQtrDEn2tdbCC2kEArk8TB2cwgNpuArsTLD4/A6kUEzCUurrsFVs8s oC2x7u53sHphgTiJ7e/aWUBsFgFViUdv97KD2LwCVhLrVlxjg5ivKTFhyxwmiLigxMmZT1gg 4twS62ZdYoWYKS/RvHU28wRG/llIymYhSS1gZFrFKJJaWpybnltspFecmFtcmpeul5yfu4kR GLbbjv3csoNx5auPeocYmTgYDzFKcDArifCyPAlOFuJNSaysSi3Kjy8qzUktPsRoCnTrRGYp 0eR8YOTklcQbmhmYGpqYWRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUwCUVfO/Sw fM3kVI/L17q9rMP3BCtZ+Ggscb+kcziD8eoOToV0rVVPPm60XLBF1W7/lcbnh1vSm9bFHeV5 5JW3+W7iVsU0sZgnZ0OPvC+5p+lzk2fjnqv/P1x9Mv3EyUafj68u/9/sJ7ygYNKdSUYm+h0u AQEz4h3c65YruPHZrujltvf83dP2sPbjlAlzP/Iyiqsmuc2Ie3y/9AvL1cO87JaG9WYz5r7a dSl08Y+KPLn7bZ0vUw97J9VOk1OZ3KBa82Lag5rZB5I/RZrHPn/aM+/dLXbXCUszFTXmyLzN 7D1s07rJztzPbtK53afeSXHV/E+7eW9R567TZ/SOZ2av+n+o580uq06zi0ohtw6salBiKc5I NNRiLipOBACCJqyb5AIAAA== X-CMS-MailID: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf X-Msg-Generator: CA X-RootMTR: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074000eucas1p29bb1697efdf44ff3b2292098683e0ddf References: Subject: [FFmpeg-devel] [PATCH v14 4/9] 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: gepSKKOCZA/6 - Provided AVInputFormat structure describing EVC input format (ff_evc_demuxer) Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/evcdec.c | 124 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 libavformat/evcdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index a14a759c1f..af175d2097 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 615d2bc3b1..e4cc112b90 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -150,6 +150,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat 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..ffb7449c4d --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,124 @@ +/* + * 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_NAL_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_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for(int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while(bytes_to_read > EVC_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, EVC_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_NAL_UNIT_LENGTH_BYTE; + + 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 Mon Oct 24 07:40:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080478pzb; Mon, 24 Oct 2022 00:40:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XQSMhH/gnOdlj2LiXndBsGRILj/Qa0MxnivtGAUrcF3f9DgD9syiWs2C/4kn7yGJJfXih X-Received: by 2002:a17:906:ee81:b0:77e:829a:76e9 with SMTP id wt1-20020a170906ee8100b0077e829a76e9mr27544389ejb.207.1666597228716; Mon, 24 Oct 2022 00:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597228; cv=none; d=google.com; s=arc-20160816; b=wGqQVyeP7NFIiR5xccrBO0Dxsy+X9wPbofZO/dVSB7VWOj+IgaLBoQSbOeNgVVvdpg 44pQwi5V3wu0RcN18tSydYQ/Lp/muAZVf+WGCfN45kWUnv6yLj5D4Jfdw3FNcBD67to8 FwtFNP84EyHwrv5gW+hLG8j6QVdxjBwLA74sOukyQZvAoVfdCduM5WlXSUXCLlGYj+FZ u0qRu8xXXOvm1WRDNgULu4W1w1mBbfkiLmFot2k6VvjKXBYK8mzjGDPbKbZ+imjdGVP2 sUgJgq9GZgmzkNQ6evG1zMtgNstTK901OPeiw/4+P6HeKgubRiKen1IFzMbgYiuuM4dg HIEg== 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=GtGkZdxTWZ75zHVDrJ77etYvM0p3ovpTXybd73npnV8=; b=aCISoBhBYR29Y0ie4qynJfZVenbyY35lcw0O+IZWi+5pJbbSTeSmmhA+C/FB3LpXWo 2WAKXxNoPkR06pkOI31bfY7lAvQ2Sd6/RqabmaGMmSIT8comVBW90UfNBpn/6bSC5kYb poxBugoSfog0us5CWDzBaq1N1pdNBENjD+cOqBEtO2FYN4FXOA8/JjAQue6TiD5747Ha ugeGTcjX4pRH6zHjXdbyiPTswDTb7Z+cafZYgmtr+B0yyJ5sD14TCCQeY9zI6u6xfrfI kXBvl4QPMoxJmFXrakftOaTDNQMFYmCRV2REM1Z2OQGmmsTlBCwuAZ3bDfTJqQEHa8Wj 0nsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ARqqlTZu; 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 n15-20020a1709062bcf00b0078e1e77f443si23560460ejg.418.2022.10.24.00.40.28; Mon, 24 Oct 2022 00:40: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=ARqqlTZu; 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 C64C568BDB2; Mon, 24 Oct 2022 10:40: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 E8A9D68BC3C for ; Mon, 24 Oct 2022 10:40:24 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074024euoutp01a8e89694aca22a0eebcec42dd5b6586f~g8Vh5Ju0E0356703567euoutp01e for ; Mon, 24 Oct 2022 07:40:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221024074024euoutp01a8e89694aca22a0eebcec42dd5b6586f~g8Vh5Ju0E0356703567euoutp01e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597224; bh=QisZqey0dD9jdyk5cLd6uL7j2XElZ4QS8qMmSbF7UvE=; h=From:To:Cc:Subject:Date:References:From; b=ARqqlTZuFJcK9jH/rQOHnv66XP8BzB+Y6X/rBaFwmLHl83eRAmEykNGGHLQOaCLVb PvQ3yBq5fNRbqz+kW6yyjczWWYolpt450HaUyjshD/E6x2MDwP8rqKvioFOucxnuJ1 w7sF2Y+WP8myWQbiOo24oCw66na6+eRDKVAiwAlw= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024074024eucas1p21eefcd69e5811fbbd8f5a02c57d42e22~g8VhrAX062093820938eucas1p2w; Mon, 24 Oct 2022 07:40:24 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id D4.19.07817.86146536; Mon, 24 Oct 2022 08:40:24 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221024074023eucas1p2ae54a7ba727feac9d67de32380dff3ca~g8VhUPSd23145731457eucas1p2Q; Mon, 24 Oct 2022 07:40:23 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024074023eusmtrp2c0f154c3da93f1a4ff2893afe48f2492~g8VhTfRUR3223032230eusmtrp2b; Mon, 24 Oct 2022 07:40:23 +0000 (GMT) X-AuditID: cbfec7f4-893ff70000011e89-63-6356416868c7 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 3F.7F.07473.76146536; Mon, 24 Oct 2022 08:40:23 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024074023eusmtip142c3e075b76c1212548d49dbfeaa65fa~g8Vg9_Jhi0044800448eusmtip1Z; Mon, 24 Oct 2022 07:40:23 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:40:14 +0200 Message-Id: <20221024074014.694-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+NgFnrHIsWRmVeSWpSXmKPExsWy7djPc7oZjmHJBvsWs1l8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBkrzm1gLTj3m7Hies9sxgbGN3sZ uxg5OSQETCRePT/L3sXIxSEksIJRYm/TfzYI5wujxPKGDhYI5zOjRN+9M3AtO07PZYZILGeU +Lq+jwnCaWeS2PHjBhNIFZuArsTLD4/AbBEBU4mTzXvZQGxmAW2JdXe/g9nCAgES/778BpvK IqAqsWvibTCbV8BSYveLJVDbNCUmbJnDBBEXlDg58wkLRJxbYt2sS6wQM+UlmrfOBrtIQuAv u8TqiUdYIYpcJH53n4CyhSVeHd/CDmHLSPzfOR9oKAeQXSxxqN8BwqyROPQjHaLCWuJt43FG kDAz0Anrd+lDhB0l2nadgWrkk7jxVhDiAD6JSdumM0OEeSU62oQgTBWJvk4xiEYpiafL5jBD 2B4SjZu6GCcwKs5C8tUsJJ/MQli7gJF5FaN4amlxbnpqsVFearlecWJucWleul5yfu4mRmCS OP3v+JcdjMtffdQ7xMjEwXiIUYKDWUmEl+VJcLIQb0piZVVqUX58UWlOavEhRmkOFiVxXrYZ WslCAumJJanZqakFqUUwWSYOTqkGJon81LDPmWrnXtwN1vs44yTH7uidVfytNvqNVseXrimY XeQxgfPS1TKB872/PiiIJ5xNbwnTXHFSo+tU9sKWZRIr3vge0NU1Ox/04ada88pnxhmruCes /m/V+nT5FM09YWsjAos+vr4heNh6kSvbsY6gDsftiguffMjqqq2Yd/7T3NvbhaSee03a8Oy1 bVdRRfod926NhftMntlsqliXXnY42N1b8J9k1/Gtpy/5qR+Vsr7u4u8/55TQmaMbPDY6vFY0 PRb00XCaxrc3rYt3ZK9XP/fpz/myyeevsjcIFx7UUp5SHZf/jUV9ocs68ZI8p5bZ5/3+rZjF v2r7tJ+sgW+7FBbvsAqenb3hHJeoXpASS3FGoqEWc1FxIgCsTKUngQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xu7rpjmHJBtN3a1t8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehkrzm1gLTj3m7Hies9sxgbGN3sZuxg5OSQETCR2nJ7L3MXIxSEk sJRR4n7PUTaIhJTE0qWLoIqEJf5c62KDKGplkjj04wYLSIJNQFfi5YdHTCC2iIC5xMV1t8Aa mAW0Jdbd/Q42SFjAT+LfhsdgNSwCqhK7Jt4Gq+EVsJTY/WIJ1AJNiQlb5jBBxAUlTs58wgIR 55ZYN+sSK8RMeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzA 4N127OfmHYzzXn3UO8TIxMF4iFGCg1lJhJflSXCyEG9KYmVValF+fFFpTmrxIUZToFsnMkuJ JucD4yevJN7QzMDU0MTM0sDU0sxYSZzXs6AjUUggPbEkNTs1tSC1CKaPiYNTqoHJnWPdg0tP Tu0I916+Y/ahqmk7Zq/mZK71OrxZM7Hr3MkdGY/+rnywNd09UsqR+eVizXmXlhayRK+X8jfa 7PeH68R/+3uKr790C/V8NjHfmjh7X+DeJ+umTxH6YXBjy5+Nxb+5DfeUzrq76BhnTW/63ucM 4h+ivsTrx3Ns1MieMrMs4eicR8r/69U1/989dn3llD9qE0qZLSMC1ZtmNZXsuTdVZcY5bq+f 7Ytt2nh+5/mWPxfhLpvcPSl0f6X5D1OPwsud+99827nBaXLSWYfXPzyfFVye1rbrYeolRQWO prTliaHP/y9hzTuwJoVDRHTX1r6YqZ4HE1s7N52yPckT+fvzUa+6tKBatxJFjSuPTymxFGck GmoxFxUnAgANmex55wIAAA== X-CMS-MailID: 20221024074023eucas1p2ae54a7ba727feac9d67de32380dff3ca X-Msg-Generator: CA X-RootMTR: 20221024074023eucas1p2ae54a7ba727feac9d67de32380dff3ca X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074023eucas1p2ae54a7ba727feac9d67de32380dff3ca References: Subject: [FFmpeg-devel] [PATCH v14 5/9] 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: /HUnU6yimgjp - 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 | 615 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 701 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index c5a466657f..fdb9adcf87 100755 --- a/configure +++ b/configure @@ -291,6 +291,7 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] + --enable-libxeve enable EVC encoding via libxeve [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1876,6 +1877,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3411,6 +3413,7 @@ libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" 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" @@ -6744,6 +6747,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 70" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index 53dd02fd28..0ccf2b2757 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2894,6 +2894,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 8399fcb6b7..21e700ee34 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 @@ -595,6 +603,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 @@ -934,6 +943,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 ee276ebefb..1b5b56c428 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1110,6 +1110,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 4f1d66cb0c..d322681e06 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -808,6 +808,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..38d70a1d2f --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,615 @@ +/* + * 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 = (int)(((float)avctx->framerate.num / avctx->framerate.den) + 0.5); + } + + if (avctx->gop_size >= 0) // 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; + } + + if (avctx->level >= 0) + 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] pkt 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[0] = frame->pts; + imgb->ts[1] = 0; + + /* 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->pts = xectx->bitb.ts[0]; + avpkt->dts = xectx->bitb.ts[1]; + + 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 Mon Oct 24 07:40:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080611pzb; Mon, 24 Oct 2022 00:40:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6EbjdS2DPUfpHyuNL6JvdGBKCT4zRCm7thNfulT/gTtjClKjyk6/E06iE6i+3cBJjWoKb7 X-Received: by 2002:a05:6402:3988:b0:44e:6f08:ddfb with SMTP id fk8-20020a056402398800b0044e6f08ddfbmr29185416edb.89.1666597256436; Mon, 24 Oct 2022 00:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597256; cv=none; d=google.com; s=arc-20160816; b=vDelD5YI9jZpaX+qY4toJwYi2CKlsRgjG4/7G5CuND8hveyw+DRBXoD/joHRYup/Ve Q2u9ru+n6WZqkcrphAn7mPlV7JYrFBwZy2frUupvwSIXUQRb9cvcLLLVyogtak+//NIC gEmGdlAtki7xlKHcS707nPCy2sblK99oZmckgOJgxTFDQNHZCRB11v2Kzi7DAVvRrSPW AlFnqzqqNWy9pkr2JyJs99D/vTOXdvYtzcuC/nrt3V3WlPE5jUS+RcoWWvvxiS2dNLa5 pGdlKC2qTflwCv130FisXlECytxnd0Zr2XDU7Zhz6s+g6qJLMiggVV11oLi7x7bGvelD Xo+A== 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=oJRb1tD+5hXlLALEtW+c2WcnF+1B6ahR96mcqQgjoVE=; b=vj/A293fIs74ViGP66KWud+hJV6fSbcobxewLtyzt3f+dZ39EQZT11zhYtbdRIme44 7cblCPDGIEha7CyxDm/OXks0UdFz9enqf3py7gN4kzC2BNZoBx1oTFjdcmADzAUR6YuS 2r8jiPJsTZnmkc/rfj/EkQ0IYDvOGOgyesR0lxUjxlpUEEasV3eZOgCyeymSv895RBZ4 Qv+FNgnpgW5QV18+yVhR86QjFz17p5RbV0t9PrCDL57GZepNZvTyqazMUTI1Jxvv+CcP cFt3Vts8ZOvC4WsehxFPc7E73JHQS4c4NA+KU6JqaC/TvQevEw8XktsPfC7UGITKgmAK cdXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=hJEcEZZP; 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 b23-20020aa7d497000000b004619867344csi4646174edr.0.2022.10.24.00.40.55; Mon, 24 Oct 2022 00:40:56 -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=hJEcEZZP; 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 B335D68BD8A; Mon, 24 Oct 2022 10:40:53 +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 704FB68BB0D for ; Mon, 24 Oct 2022 10:40:47 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074046euoutp02fa71f3e4cc6f33c3d2ee17484efcdb39~g8V2354X71878618786euoutp02P for ; Mon, 24 Oct 2022 07:40:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024074046euoutp02fa71f3e4cc6f33c3d2ee17484efcdb39~g8V2354X71878618786euoutp02P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597246; bh=CAw/3NZdUCT7HcK6OLIj7RcQBDNEzz0iYUHfeNuT9Ac=; h=From:To:Cc:Subject:Date:References:From; b=hJEcEZZPS93TQIDfCeQJKH6M0zNQMgmOUfO+l01bLDMXeq4IUTYR5gZJHuHBZz4h6 ap/QusX/Sny3Icj9lTM7Mbt9QVZYHO5ZENnsHaKkl61Lsyg2YWgq8ggYQcsuXBEnMa GEE51jrriYejtjLtF4kINcrKPa5Suzcu8QwlEAeM= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221024074046eucas1p27478119a74eaec4cd8acc70124be7e32~g8V2SJ-Tn2045120451eucas1p2y; Mon, 24 Oct 2022 07:40:46 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 7A.29.07817.E7146536; Mon, 24 Oct 2022 08:40:46 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024074045eucas1p1275de4a78930b1b934cc44660a77b75c~g8V115j1c0899708997eucas1p1f; Mon, 24 Oct 2022 07:40:45 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024074045eusmtrp2d2bdf504f371c6ffb86bcf0b3a309cc8~g8V11RYN43223032230eusmtrp2b; Mon, 24 Oct 2022 07:40:45 +0000 (GMT) X-AuditID: cbfec7f4-893ff70000011e89-ce-6356417eab35 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id A0.9F.07473.D7146536; Mon, 24 Oct 2022 08:40:45 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221024074045eusmtip265cd0e0093a7a2bf4685b8becbe52c34~g8V1hfBxE2250522505eusmtip2O; Mon, 24 Oct 2022 07:40:45 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:40:34 +0200 Message-Id: <20221024074034.1218-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7p1jmHJBk3beS2+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsErozp7e2sBRcXMVa8mv6cvYHxWFkX IyeHhICJxK3ps9i6GLk4hARWMEpMnHAcyvnCKPHkVC8LhPOZUWLC46/sMC2zOx8zQiSWM0ps XrccLCEk0M4kce6VLojNJqAr8fLDIyYQW0TAVOJk8142EJtZQFti3d3vYLawQIDE9/6TYL0s AqoSW/feZwWxeQWsJNacWcQMsUxTYsKWOUwQcUGJkzOfsEDEuSXWzbrECjFTXqJ562xmkIMk BH6ySxz7vA7qUheJ9V93QjUIS7w6vgUqLiPxf+d8oKEcQHaxxKF+BwizRuLQj3SICmuJt43H GUHCzEAnrN+lDxF2lHi95z0jRDWfxI23ghAH8ElM2jadGSLMK9HRJgRhqkj0dYpBNEpJPF02 B+olD4nLDx8xTWBUnIXkq1lIPpmFsHYBI/MqRvHU0uLc9NRio7zUcr3ixNzi0rx0veT83E2M wARx+t/xLzsYl7/6qHeIkYmD8RCjBAezkggvy5PgZCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8 bDO0koUE0hNLUrNTUwtSi2CyTBycUg1M5rf2H59dGSBpM69UpLqtRz71OO/b9U0O95yXV798 /fBSj8B87i9Ta0xOZzA3rZd4la28b7Hv4vgda9P1lnV/e1ynrpMxRTr8zEGeGzGTLq//6MPp osW1Xlf4mPVznYMv3Ft22SkIv/faOZnFsO/9t3cXlJz3L90j+i3C4+bkBVnzHY+9KNnrVBVw MMtZQpL7qciJNoO/UzVErxtHp5/7Mrn7zoc/nq/uKZrt1no+uT3ta6Fhje625ZO2Tzt7OmZd jbNOSIkgrxj/ydmdRY0almqv4rnP7C273Jg6z7GyaG3n2aUePZvF9jUIN+XtORjj2bBYsG7W 5kd6FdckZ1s9Xmu/KSKkyLayelH0/ko9JZbijERDLeai4kQAopKe4H8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7q1jmHJBmsW6Vt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehnT29tZCy4uYqx4Nf05ewPjsbIuRk4OCQETidmdjxm7GLk4hASW MkrsuD+XHSIhJbF06SJGCFtY4s+1LjaIolYmiUPfellBEmwCuhIvPzxiArFFBMwlLq67BdbA LKAtse7ud6AGDg5hAT+J7gemIGEWAVWJrXvvg7XyClhJrDmziBlivqbEhC1zmCDighInZz5h gYhzS6ybdYkVYqS8RPPW2cwTGPlnISmbhSS1gJFpFaNIamlxbnpusaFecWJucWleul5yfu4m RmDgbjv2c/MOxnmvPuodYmTiYDzEKMHBrCTCy/IkOFmINyWxsiq1KD++qDQntfgQoynQrROZ pUST84Gxk1cSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwJTe25KT Z8/abDpFqv6jQ4LcYb1TE0Nu1a4UfuLzyYlz4UPNg3w5i92Esre42JaKtezMEPn61qG+Rn7j ixOzorl0pqVsuvvzfeJ/159rMvcvjrSYJ570uNJb91jUvF2CPo3iV9hLe7bmLQ4P3a3pYjbR 5O7xY1FfmU+c/+tUn/wirIWr99EJpbTi3/OnnHWZfT3+j+H5GUceL96c7hmrZLl0WYHDckf7 J0qHjlQGx7X8d/4crm6m+KpG8ZCdj+g5s0kG7G3+pYLhdeEbevd2sGVFCljWOVU80w13y5Ni j6pbOnV6zPUzDLsiVeqZJ1xQbJA6/7ap507E+h15P/fkT5K4YhvhdUPOnWvpmacnlViKMxIN tZiLihMBuVt/TOUCAAA= X-CMS-MailID: 20221024074045eucas1p1275de4a78930b1b934cc44660a77b75c X-Msg-Generator: CA X-RootMTR: 20221024074045eucas1p1275de4a78930b1b934cc44660a77b75c X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074045eucas1p1275de4a78930b1b934cc44660a77b75c References: Subject: [FFmpeg-devel] [PATCH v14 6/9] avcodec/evc_decoder: Provided support for EVC decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9OzU077DAJ3R - 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 | 423 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 462 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index fdb9adcf87..0e19f5738b 100755 --- a/configure +++ b/configure @@ -292,6 +292,7 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxeve enable EVC encoding via libxeve [no] + --enable-libxevd enable EVC decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1877,6 +1878,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3413,6 +3415,7 @@ libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" 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" @@ -6747,6 +6750,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 70" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.0" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index 5ba85cf9b1..54720ee8b4 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -130,6 +130,30 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://github.com/mpeg5/xevd}. + +@subsection Options + +The following options are supported by the libxevd wrapper. +The xevd-equivalent options or values are listed in parentheses for easy migration. + +To get a more accurate and extensive documentation of the libxevd options, +invoke the command @code{xevd_app --help} or consult the libxevd documentation. + +@table @option +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section QSV Decoders The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC, diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 21e700ee34..38940d497a 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 @@ -944,7 +952,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 1b5b56c428..7fe0c89104 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1110,6 +1110,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 d322681e06..d5ee6b14c7 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -809,6 +809,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..133d004f4b --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,423 @@ +/* + * 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 +} 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; + + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + avctx->colorspace = AVCOL_SPC_UNSPECIFIED; + + 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; + } + + return 0; +} + +/** + * Decode picture + * + * @param avctx codec context + * @param[out] frame decoded frame + * @param[out] got_frame_ptr decoder sets to 0 or 1 to indicate that a + * non-empty frame or subtitle was returned in + * outdata. + * @param[in] avpkt AVPacket containing encoded data to be decoded + * + * @return amount of bytes read from the packet on success, negative error + * code on failure + */ +static int libxevd_decode(struct AVCodecContext *avctx, struct AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) +{ + XevdContext *xectx = NULL; + XEVD_IMGB *imgb = NULL; + XEVD_STAT stat; + XEVD_BITB bitb; + int xevd_ret, nalu_size, bs_read_pos; + int ret = 0; + + xectx = avctx->priv_data; + + if (avpkt->size > 0) { + bs_read_pos = 0; + imgb = NULL; + while(avpkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + memset(&stat, 0, sizeof(XEVD_STAT)); + memset(&bitb, 0, sizeof(XEVD_BITB)); + + nalu_size = read_nal_unit_length(avpkt->data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + ret = AVERROR_INVALIDDATA; + goto ERR; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = avpkt->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"); + ret = AVERROR_EXTERNAL; + goto ERR; + } + + bs_read_pos += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) + goto ERR; + } + + if (stat.read != nalu_size) + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n,", nalu_size, stat.read); + if (stat.fnum >= 0) { + // already has a decoded image + if (imgb) { + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } + xevd_ret = xevd_pull(xectx->id, &imgb); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", xevd_ret, stat.fnum); + ret = AVERROR_EXTERNAL; + goto ERR; + } else if (xevd_ret == XEVD_OK_FRM_DELAYED) { + if (imgb) { + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } + } + if (imgb) { + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + goto ERR; + } + + frame->pts = avpkt->pts; + *got_frame_ptr = 1; + + // 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; + } else + *got_frame_ptr = 0; + } + } + } else { // bumping + xevd_ret = xevd_pull(xectx->id, &(imgb)); + if (xevd_ret == XEVD_ERR_UNEXPECTED) { // bumping process completed + *got_frame_ptr = 0; + return 0; + } else if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", xevd_ret); + ret = AVERROR_EXTERNAL; + goto ERR; + } + if (imgb) { + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + goto ERR; + } + + frame->pts = avpkt->pts; + *got_frame_ptr = 1; + + // 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; + } else + *got_frame_ptr = 0; + } + + return avpkt->size; + +ERR: + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + *got_frame_ptr = 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; + } + + 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_DECODE_CB(libxevd_decode), + .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 | AV_CODEC_CAP_DR1, + .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, +}; From patchwork Mon Oct 24 07:41:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2080956pzb; Mon, 24 Oct 2022 00:41:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6yUDlLjjNeSouT2Ti+QUIOIrtbQGIAYpRY5yZWY/AMXeS0LsnlQuJ8scSeAJOVP3wz6cVa X-Received: by 2002:a17:907:746:b0:741:4a1b:cb1f with SMTP id xc6-20020a170907074600b007414a1bcb1fmr25302626ejb.370.1666597312381; Mon, 24 Oct 2022 00:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597312; cv=none; d=google.com; s=arc-20160816; b=q7WJYMvjkssRrRUqQkQsz/6GSvpN5LoRAA881MmpiBVfE1qP5nfUmsg/ClPceJ4rsZ /l3tlR8tgiahflgUc1uULolkOdfnJ7GzSAkbrQngTJBhbvbxhE+QAev518pFbTCt0FPR TZ/+wQqZmuqh8UwZKpqcUkL8YlFv67950QDosn/kr3ss6esUt8cE9niamZG8ddQh+K0c L85miDmGt+Vka2/H2uTgLxDp/PX92Se5WLxXAvaPzMbBkbMo2jHYW7qy89tC2xAkZM0M WQSpQb3zaVNBBXtnsA8o2jIlrjH+ZXBpIVow5rMNBjoTh9n2OWv62cDQtKZeBUIhppCK +jNg== 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=/JMGEB+TLjsYpZWSi1ucySgpGam2FaMm2djMOmgFfg0=; b=FSSY/WygnbpDruQkEMEVxyJrItlIg+l8EaEbairYSZe6k4WHUjjs/DMe07731nuNBU aQJ+4jwYOnrkIsTZBH5mAEqEF+x7zeojWsOQr/vHf1p88s8KJ7iwlsSinGQTFmVh6gRw ArzJ2GB5Xkyfrpv9+0HZP+dnp0mMJc0wLDd3OkcPfuyGe5esrDXnO6hEdqaivDdJLW2/ TumoFoWzvUqDZmJAjX2o63mspMTi0yGjs3ysKok/EYISYWvj4jybpq1igaJCd3pQ0zIO L/lgTMc74bUzmkx6srbWZN0pF/9Aue6hwoKT95WzinRw5mXIGtbsHpWvG+FPE6LWhymq WKHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=eU67V2dZ; 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 oz15-20020a1709077d8f00b0078dcc87b1c4si15060666ejc.923.2022.10.24.00.41.51; Mon, 24 Oct 2022 00:41:52 -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=eU67V2dZ; 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 CD7DE68BD8A; Mon, 24 Oct 2022 10:41:49 +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 D130968BC3C for ; Mon, 24 Oct 2022 10:41:42 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074142euoutp01931122ae14d3b5d05f098e7007257e95~g8Wqi8hs90868008680euoutp01H for ; Mon, 24 Oct 2022 07:41:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221024074142euoutp01931122ae14d3b5d05f098e7007257e95~g8Wqi8hs90868008680euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597302; bh=DvG8Hpeb1nYilTETutbL4Q9YsLXyaZy8EwDWZLgEn7w=; h=From:To:Cc:Subject:Date:References:From; b=eU67V2dZxbVfagUzQWykRso/ypi+IzGKsm0H8BBlRfjoK6JyVjQxtJeTfUo2mkbvv sBnsICvFhkKkJ+Uak+dkuJmKucEXCzzAK1W6o9ST/VciSr7dzinKpQByoO3gB3CmbV 1K0CkIfXnwWufoEwQi1Dqj21vrhl4/myHgWwkiHw= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221024074142eucas1p11d16fc4393f4cead767cdade83ae70c5~g8WqWWjUN0526805268eucas1p1B; Mon, 24 Oct 2022 07:41:42 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 1F.81.29727.6B146536; Mon, 24 Oct 2022 08:41:42 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221024074141eucas1p2b4db2dbf5ac5d02e95b9307468e09b46~g8Wp3AGEi0117701177eucas1p2t; Mon, 24 Oct 2022 07:41:41 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024074141eusmtrp271e21691dc1147a9e3f67257f1235db8~g8Wp2Uz_-0037700377eusmtrp2v; Mon, 24 Oct 2022 07:41:41 +0000 (GMT) X-AuditID: cbfec7f2-205ff7000001741f-76-635641b5c661 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6F.BF.07473.5B146536; Mon, 24 Oct 2022 08:41:41 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221024074141eusmtip21bbb2b026982a0e705e4905e00fb006d~g8WphTFsU2250822508eusmtip2r; Mon, 24 Oct 2022 07:41:41 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:41:02 +0200 Message-Id: <20221024074102.1903-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7rbHMOSDR72MVt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBmH+/ayFFzczVix++EN5gbGPx2M XYycHBICJhKrr54Asrk4hARWMEosm/mCGcL5wigx5fZbqMxnIOfFKTaYlvV7H7NCJJYzSky+ sRiqqp1J4tLFO6wgVWwCuhIvPzxiArFFBEwlTjbvBetmFtCWWHf3O5gtLBAr8WH+HbAaFgFV iV83/jKD2LwCVhK/T/azQGzTlJiwZQ4TRFxQ4uTMJ1Bxbol1sy6xQsyUl2jeOpsZIv6TXWLL JSEI20VidsdjqLiwxKvjW9ghbBmJ/zvnA83kALKLJQ71O0CYNRKHfqRDVFhLvG08zggSZga6 YP0ufYgKR4mdV6D6+CRuvBWEWM8nMWnbdGaIMK9ER5sQhKki0dcpBjFOSuLpsjlQFR4S/+Y4 T2BUnIXkpVlI3piFsHQBI/MqRvHU0uLc9NRiw7zUcr3ixNzi0rx0veT83E2MwPRw+t/xTzsY 5776qHeIkYmD8RCjBAezkggvy5PgZCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8bDO0koUE0hNL UrNTUwtSi2CyTBycUg1MHCHvG78nC2bO1xU8fYv9Zoedxdz8F7s/X/vpyGAZMEtS187q//uQ a4lyMyKWb1kQvPXy+hXz9NuenPmt++6oVYf1Rv0jVntFSzkqnPvPzLZQ/Kq1dF6TUJfo+ifT X84yX5fXHLm8oHJVjYTY+qOTrz9et1J1l/ZBfX1luWOrqq/m9ojOLDk7J6HidN1edZOYlD99 U7U39ilfsqtU83u4VVnD++iZ3UEuV7PP/bqW53f2guADNus4VaW2a79iupTD5ZYvE/nL7fHy xrTgXXWfen/qWHoIzT6+fqXZZd/M0IyJvdXP7bQ9srSe/vrie3Tdi2MPPfZHzLdxkJ9rX20l 5NjdKSc4I0GC37LZcuMaJZbijERDLeai4kQA7CKYGX4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xe7pbHcOSDT5NUbX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DIO9+1lKbi4m7Fi98MbzA2MfzoYuxg5OSQETCTW733M2sXIxSEk sJRR4tLmBawQCSmJpUsXQRUJS/y51sUGUdTKJHH8wQGwIjYBXYmXHx4xgdgiAuYSF9fdAmtg FtCWWHf3OxuILSwQLfHw42SwOIuAqsSvG3+ZQWxeASuJ3yf7WSAWaEpM2DKHCSIuKHFy5hOo OLfEulmXWCFmyks0b53NPIGRfxaSsllIUgsYmVYxiqSWFuem5xYb6hUn5haX5qXrJefnbmIE Bu+2Yz8372Cc9+qj3iFGJg7GQ4wSHMxKIrwsT4KThXhTEiurUovy44tKc1KLDzGaAt06kVlK NDkfGD95JfGGZgamhiZmlgamlmbGSuK8ngUdiUIC6YklqdmpqQWpRTB9TBycUg1MlXr7Zeqj HS3jJYVWaSedszXs/9oWdINp0Qr5/RKHKw9vDPS4Wvz107TP4r6u+dY6lnVz9653a3u5z6CO pS5r2eLzfcuN9e2dXd9IHbeSVI71/CkmP82r+dxdwRmvVnqo7g1y/brplKDRQQXT0+6tKal7 3jh/nJG62TLifc+FKI1vbpycpnkZzGJP3TN8lsa3BNjYCG1TmJx6RWI5y7Lt764Iq7sqPFuu 2Rm/M6PChLmnYhr3wedPl6bO0p5ynrtGUXz/CmMuG0PRxI9T17BFro06ZmIk9K2x4kyipkyV z6GXt3inKyj5PWi92HTk7Kk7Zr+yip03ZKUorzKTX7u+6qo/28SzdzpiIx32fldiKc5INNRi LipOBAA1Aq/75wIAAA== X-CMS-MailID: 20221024074141eucas1p2b4db2dbf5ac5d02e95b9307468e09b46 X-Msg-Generator: CA X-RootMTR: 20221024074141eucas1p2b4db2dbf5ac5d02e95b9307468e09b46 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074141eucas1p2b4db2dbf5ac5d02e95b9307468e09b46 References: Subject: [FFmpeg-devel] [PATCH v14 7/9] 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: 5liFswlBETFj - 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 | 35 +++- 5 files changed, 536 insertions(+), 2 deletions(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index af175d2097..6ae5056c61 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..72c2759924 --- /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_NAL_UNIT_LENGTH_BYTE (4) /* byte */ +#define EVC_NAL_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_NAL_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_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; 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_NAL_UNIT_LENGTH_BYTE) { + nalu_size = read_nal_unit_length(data, EVC_NAL_UNIT_LENGTH_BYTE); + if (nalu_size == 0) break; + + data += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_NAL_UNIT_LENGTH_BYTE; + + 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 e2b80405cc..8ca740cab1 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 754f95912a..6f782bd536 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" @@ -1392,6 +1393,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) { @@ -1641,6 +1657,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; @@ -1722,6 +1748,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) { @@ -2290,6 +2318,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) { @@ -6033,7 +6064,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || - par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && + par->codec_id == AV_CODEC_ID_TRUEHD || + par->codec_id == AV_CODEC_ID_EVC) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ trk->vos_len = size; @@ -7692,6 +7724,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 Mon Oct 24 07:41:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2081081pzb; Mon, 24 Oct 2022 00:42:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47FHcBsF5Y7MKXOsb09FPeMMzdHy4VzBAN/wDKdwOIj+m2tU/+jQXB5c20Twd7bsypfs1z X-Received: by 2002:a17:907:9811:b0:79a:a1fe:8be6 with SMTP id ji17-20020a170907981100b0079aa1fe8be6mr13773542ejc.480.1666597336049; Mon, 24 Oct 2022 00:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597336; cv=none; d=google.com; s=arc-20160816; b=R0gXDelEoPbwFeCsXX9sJ1imqvNgaCiPVMLhnsJnt0tTK8ZzBh9oF1gjYQMAF6aX5a k82jfVqW/9wzwo5gdpRlNmmkUHj9nn8tiFgurk46oQgnndWtloim4NTfzledAFaAgywy XLp2XY5QymAqAylmwHE8Acyl8vGbDGOlm+RirHBn2n9zfTVvH6m5alLm43oyqsakN0sk Xt7VmmDEtMdNoE68GulxTw/nP3J+yJVEN9LtraEBwM0s6iFXFIG0BU2Nkc5nYK7XxYyM v+N4n+gflNTV80QP+P0T7WeW15CONl4X+18Ui030tPg/VfnqWvM6CZpKsbisEU857vu6 0BUQ== 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=kmMvGyuenR+nBfHnPWkJPlV2A3VePVP+2WKfAAn5GOI=; b=YGzyiuyjkHEsZ2DEoPKv+ODlxIyJsDGNn9uGLWTkn3bWG0xkiQj+hssz69WJjvVQzr VZe57chiF8pEjLosPndWmjYcDfisO3TpUcnZ8z1hfeOdu8xe29ez4LBWVTxhwbqMo6+h cHvH4RBfFBMjoKWxQUa3I3cDuXEKZzrLRo4IOVd5RrMz68Rw2Pg/kTXVH/nYuXGg8bxl wW8lSg5xCokx3/I3JpzwQw2Qro+JcsrWW4e3hO+bzO81MfTqBcT68PJQ5KCt9rkB0cZq QxjzHFRJFVdTi2chSJgGqh/HuLicAz1ULp+Q5tw6D3phzAwe8ZbsVtJDGY+96ZF64r3W JaRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=Kbknmcv3; 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 12-20020a508e0c000000b0045d02c98c3bsi23737762edw.301.2022.10.24.00.42.15; Mon, 24 Oct 2022 00:42:16 -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=Kbknmcv3; 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 CB04168BC3C; Mon, 24 Oct 2022 10:42:13 +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 AB7F568BC3C for ; Mon, 24 Oct 2022 10:42:11 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074211euoutp015b46f7bd11ea25fb55ee7178abbe7af1~g8XFUhyQu0867708677euoutp01Y for ; Mon, 24 Oct 2022 07:42:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221024074211euoutp015b46f7bd11ea25fb55ee7178abbe7af1~g8XFUhyQu0867708677euoutp01Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597331; bh=f2mdicmifmazMTixqAy1DHb5CP7N/A0FmCwGogj0lpM=; h=From:To:Cc:Subject:Date:References:From; b=Kbknmcv3P07HEEkkPKSLEJUbebKbiVYDPtjDtqSz9WxEiFi7MiWLEnv1WMz3o23sb qUWBVcXYZkeVB+w6PX0k7WlLrhv+uadvQt5dYihHLKKDQodujcdEM2yKkKLK18qsPT IPJ+YkTgykoy80iGNndtGVTx+8HfLt4QmRcizOPM= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221024074210eucas1p151a48ad8a0f065630e8f0e0c066b2bb5~g8XFBhCqW0526805268eucas1p1r; Mon, 24 Oct 2022 07:42:10 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 2A.A1.29727.2D146536; Mon, 24 Oct 2022 08:42:10 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024074210eucas1p1218d6095705ab843700787e1e714ecf4~g8XEnain-0748107481eucas1p1Y; Mon, 24 Oct 2022 07:42:10 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221024074210eusmtrp1625c2130685b32ec4e7ca473fc1af9b5~g8XEmxMk01743417434eusmtrp1Q; Mon, 24 Oct 2022 07:42:10 +0000 (GMT) X-AuditID: cbfec7f2-205ff7000001741f-e6-635641d2f1a2 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 57.85.10862.2D146536; Mon, 24 Oct 2022 08:42:10 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221024074210eusmtip157e71d8608cdd7898dec57ab6fa9b70e~g8XEQSJVR0455704557eusmtip1I; Mon, 24 Oct 2022 07:42:09 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:41:58 +0200 Message-Id: <20221024074158.1950-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87qXHMOSDa4+NbD4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDI6t+1gK5jGV/HiwyymBsZXXF2M HBwSAiYSq0+kdDFycQgJrGCUeHbgLjOE84VR4uq6r6wQzmdGieaTZxm7GDnBOj7uW8QEkVjO KDH/5UYWCKedSeJeWx8zSBWbgK7Eyw+PmEBsEQFTiZPNe9lAbGYBbYl1d7+D2cICiRLLlv0E s1kEVCUWdrWzg9i8AlYS72Z/YoLYpikxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1Ntjd EgI/2SU6fjxjhihykVg68TsrhC0s8er4FnYIW0bi9OQeFkgAFEsc6neAMGskDv1Ih6iwlnjb eJwRJMwMdML6XfoQYUeJvbeWs0NU80nceCsIcQCfxKRt05khwrwSHW1CEKaKRF+nGESjlMTT ZXOgrvKQeL98B/sERsVZSL6aheSTWQhrFzAyr2IUTy0tzk1PLTbMSy3XK07MLS7NS9dLzs/d xAhMD6f/Hf+0g3Huq496hxiZOBgPMUpwMCuJ8LI8CU4W4k1JrKxKLcqPLyrNSS0+xCjNwaIk zss2QytZSCA9sSQ1OzW1ILUIJsvEwSnVwDQv9lmNW+GcfCXh2RbiAhcNV+eo655nUPzE4bWZ L+y0/pkJ2961ZG1tlgpeV94/UcN1ovg0zhSFiDU3uv/tNIjL1WTnOfdv58NTd7K+CytyeEXq Bux4ddfRsebVKsbALaub90wITLp80nV9c4NEwFw7Bo6Hd9+Wzv74ISG1UTwxRGzaRdYWznOq +v07mzQ3hfF0l7fELo9bYK/0UFIwxM7748TSBxf7szZtTdNUdnHxt36zjHmSsZOCR2Zy/YdD Xc0vpzwxqRB8bSt91+DS1Oo5a7gnXH3zTI/r1bb5bRvK2yp2hE3f8rn+uO0/icDPt1eZarnP F/vy5VDu77jHtf79wqXCMfxRJw/c2/XmkRJLcUaioRZzUXEiAEOE+zl+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7qXHMOSDW4dErT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DI6t+1gK5jGV/HiwyymBsZXXF2MnBwSAiYSH/ctYupi5OIQEljK KPHj8yMWiISUxNKlixghbGGJP9e62CCKWpkkbq+eBJZgE9CVePnhEROILSJgLnFx3S2wOLOA tsS6u9/ZQGxhgXiJS49fgcVZBFQlFna1s4PYvAJWEu9mf2KCWKApMWHLHCaIuKDEyZlPoI7g llg36xIrxEx5ieats5knMPLPQlI2C0lqASPTKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxNjMDA 3Xbs55YdjCtffdQ7xMjEwXiIUYKDWUmEl+VJcLIQb0piZVVqUX58UWlOavEhRlOgWycyS4km 5wNjJ68k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1Oqgal5z/KrRmt+ BqzcO4M39EP8l5d5S8JPtPBrL7Myvzlrxqbr3NIrDSVqFizi3xD1k+fRYvYVBjGKWWpWOTf1 a5QvBDj7ukw3Fjs/6/mT++8/ai1Ld3tyKNdEPPLpVeEpIe3bzv9XVr7wcm/TAYtDbWbaV19d P9ua9uEqk+iXFwotU193vvskeEhc8Rk/2/yqaP2Xq8ofrVqv3+Ffl/3k3kVDy49/X/ZN2rK8 Tvfxh/3ts19nifCvFJN9YLhUus9WZkVW+gH9fekrrMQ/XpT7EbpRZl3nh3SpaI4JhcELky+2 P/cIiPz/Yfe0Oa21nbP2Pq/Z+dRm6pUfBU0Ltn41fNBn8H7B/yr1zPafbjX9mSn7lFiKMxIN tZiLihMBFY5ALOUCAAA= X-CMS-MailID: 20221024074210eucas1p1218d6095705ab843700787e1e714ecf4 X-Msg-Generator: CA X-RootMTR: 20221024074210eucas1p1218d6095705ab843700787e1e714ecf4 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074210eucas1p1218d6095705ab843700787e1e714ecf4 References: Subject: [FFmpeg-devel] [PATCH v14 8/9] 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: DBFp6e8HPP9T - 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 2dfd82a63c..f3ebe4d09b 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 1f436e21d6..435c9d905e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2502,6 +2502,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: @@ -9130,7 +9131,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 Mon Oct 24 07:42:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 38957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2081215pzb; Mon, 24 Oct 2022 00:42:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7JpAYq3wdnabFWlCWDsYLTP5jCffHLk6K77iYDJx6yimv1B2m8lhRRM4F6cRH+006oLfHh X-Received: by 2002:a17:907:3f27:b0:78d:ad42:f733 with SMTP id hq39-20020a1709073f2700b0078dad42f733mr27031935ejc.320.1666597358537; Mon, 24 Oct 2022 00:42:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666597358; cv=none; d=google.com; s=arc-20160816; b=GAeKWoJf3UlmKrgJhdkD8hKAbCbstuVPOP7cC79S0dhq6q/VFPlW7gOgnhaj1DGMV6 gO5uqlo+rdEJv7I305tMjJgwsaiDsAV7xQSjyWPSXERwMbYjBPFNqyxs516gw1xYXd6q THMC9NptwfNugZy4q8+U0yaLmtHKg7QasO9YtnMPLZDpkFuYBK0JDblRyy6UGU2LfkEq Uim+IBr2g4YOXe3sm0egadFSOIP+3OdturrdgWo9Y4+nFvtMUDuVrUTUYYiRbaPrDOd3 OwIifaMQXC5LnaNURe3o86/UU1GFjE3+yp/oTjHKiyiLzaZBLyF51nwrpyoGGMwqPiQ6 k4sA== 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=cFlsgdumoGKWIuKsSnB84xXI5tYdP5mVO4mdiKSZHW8=; b=iJRP/FAdvKqSCHB1BDb84qpBIyWo73cuvs147sobYEcq3/PdItWCw8YdfgXMLOCDFl BwcF4PCz3ScvQX2Tk+nKsPzqaqvJIf2EUEPRGSQyVuOCgtL4/TFTZVoCCmuRY9KK9iwH F7JnLsB18hy9OYnTrewNIXabBQI4aL0M7im46dnA0cDbBGShOggaG+FdVOctm8QegqDh nH8ysL2I8AOzq0nBS7B3WTB2I7svNb9lsyXt17McLyHI4Y9aayKGwPsGLfi7JXm+ipYz Z2Bc2/o0xJdhGuVlOyUyPv1d2IWS8FJ/Voa+YS3sU0cAT5fv1zTDjypSkzoMljMRWwbK e6Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=r1wlUQd7; 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 q10-20020a170906678a00b0078da83673a3si23748177ejp.138.2022.10.24.00.42.38; Mon, 24 Oct 2022 00:42:38 -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=r1wlUQd7; 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 33CB768BDCD; Mon, 24 Oct 2022 10:42: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 93E1068BD88 for ; Mon, 24 Oct 2022 10:42:34 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221024074234euoutp0255bf88fe7525924d18bc2c7e3de72d18~g8Xan67_D1996919969euoutp02U for ; Mon, 24 Oct 2022 07:42:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221024074234euoutp0255bf88fe7525924d18bc2c7e3de72d18~g8Xan67_D1996919969euoutp02U DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1666597354; bh=AJE2majWKuz/91lIw48mclZcMzMgz5FZ6zfSu20K2hA=; h=From:To:Cc:Subject:Date:References:From; b=r1wlUQd7sDtoRyxMtIjnkLnAkVpAvjVzDlEHOhB9HCfB8SS5qMEKdZr6TGp9yEYOq J9BrAwc0gk2PHfIC10vNFGx1goT4hBNaDXh+h6KlVE3ThRDs+rFaeBL7NSl2fBkvln WaveilHSR8MTH9gV2Hm0O/dOldoaL67m6d2kh/Vs= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221024074233eucas1p1e767b6d68016c243bc35a90365343b46~g8XabUSNe1228312283eucas1p1k; Mon, 24 Oct 2022 07:42:33 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 72.99.07817.9E146536; Mon, 24 Oct 2022 08:42:33 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221024074233eucas1p125b43125cce202641bf48d0f174a39a1~g8XZ6HF7C1227312273eucas1p12; Mon, 24 Oct 2022 07:42:33 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221024074233eusmtrp2cae0190c37a6f82061ff98404b8f8a34~g8XZ5cIFV0097400974eusmtrp2T; Mon, 24 Oct 2022 07:42:33 +0000 (GMT) X-AuditID: cbfec7f4-893ff70000011e89-a5-635641e9a90e Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 06.EF.07473.9E146536; Mon, 24 Oct 2022 08:42:33 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221024074232eusmtip217e2be819ff53be116cd4a19780ffe07~g8XZksvL12651826518eusmtip2L; Mon, 24 Oct 2022 07:42:32 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 09:42:21 +0200 Message-Id: <20221024074221.217-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87ovHcOSDa7vMbT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKWP7zJVHCBr+Lwx1ssDYzXOboY OTgkBEwkbk536WLk4hASWMEo8efkWXYI5wujxMY1O5khnM+MEv92HGTpYuQE61j1fwoziC0k sJxRYsnxLIiidiaJBTsbwRJsAroSLz88YgKxRQRMJU4272UDsZkFtCXW3f3OBrJaWCBI4kVn GUiYRUBV4vy9k2CtvAKWEpvfHGKF2KUpMWHLHCaIuKDEyZlPoG7gllg36xIrxEh5ieats8EO lRD4yS7x+/IiqGYXiVOTJzBC2MISr45vYYewZST+75zPBPF+scShfgcIs0bi0I90iApribeN xxlBwsxAJ6zfpQ8RdpR4tXEaC0Q1n8SNt4IQB/BJTNo2nRkizCvR0SYEYapI9HWKQTRKSTxd NocZwvaQWHRsPtMERsVZSL6aheSTWQhrFzAyr2IUTy0tzk1PLTbKSy3XK07MLS7NS9dLzs/d xAhMDaf/Hf+yg3H5q496hxiZOBgPMUpwMCuJ8LI8CU4W4k1JrKxKLcqPLyrNSS0+xCjNwaIk zss2QytZSCA9sSQ1OzW1ILUIJsvEwSnVwLRTNvK994l2pWa2W2LKcz+8EHl2Leq5yMvwm657 z+axbBSY+/W06nImKeavVvd+nF+feqHqXOrXQqmrXNo85QrfjpaqK31TY5zw4W668Nwb59bb d7Wy/5a4tavPu7ZZ/+vpY0/aUnc76Ym6bc+797V/Vrvh3n3rOaqeqqjLPljxXlGQJ+SL05lO iew1Vo4mjxfPXPbVnNVY42HlklPOeYFLhP9dESi32L21Kvpt9Pqg1Qsy3KIXeV9tO7OoS6T1 Irvngru+voduFEfLuVXoLqlnzjTY3+VeE6jt12qlv3tTppnDj9ft/+IuSO33VaizecyjtORV jnNpF5PR+ZOcK7XjhZ5Nmzf55l9Btc03k5VYijMSDbWYi4oTAe8fWX18AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7ovHcOSDTZs5LH4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DKWP7zJVHCBr+Lwx1ssDYzXOboYOTkkBEwkVv2fwgxiCwksZZS4 +k4LIi4lsXTpIkYIW1jiz7Uuti5GLqCaViaJF2+OsIMk2AR0JV5+eMQEYosImEtcXHcLrIFZ QFti3d3vbCC2sECAxPuXbWA1LAKqEufvnQRbxitgKbH5zSFWiAWaEhO2zGGCiAtKnJz5hAUi zi2xbtYlVoiZ8hLNW2czT2Dkn4WkbBaS1AJGplWMIqmlxbnpucWGesWJucWleel6yfm5mxiB Ybvt2M/NOxjnvfqod4iRiYPxEKMEB7OSCC/Lk+BkId6UxMqq1KL8+KLSnNTiQ4ymQLdOZJYS Tc4HRk5eSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVANT/Id6Qzae OQHFKlt+62fMn3sl9I5e6JRtx17Lx9+ebxzG/e7qg+atF1sWKVoW+WyfpNSabfJ+fdGZG7sM lgnxef+Ta5otyS/F0FO33/1L888lEcvU2z8f/n2uQfT5zGa1nMgFG031tts61kjrJvqyOG7S nZKbsibVnu2dE6PTIUa9T0rll+8n9RZd2Hj77PzA+9NCQ7ReBptUB5Rl1kWvsbOMvercUH83 ccf0EIF5ClpOGSnvtnR9fTE5tnHm3ZMizx0dxf9e+RQ3adKDzt5akzb1oNP6faY7RJdO9bqg sGGGcNam16ffZXrcetS284jXKwO2+VxZsfc3z8vMCfsY+NNc8c7Fo793d7rp9/9UYinOSDTU Yi4qTgQAuT2Kx+QCAAA= X-CMS-MailID: 20221024074233eucas1p125b43125cce202641bf48d0f174a39a1 X-Msg-Generator: CA X-RootMTR: 20221024074233eucas1p125b43125cce202641bf48d0f174a39a1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221024074233eucas1p125b43125cce202641bf48d0f174a39a1 References: Subject: [FFmpeg-devel] [PATCH v14 9/9] avcodec/evc: Changes in Changelog and MAINTAINERS 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: ytvP+6vpQYL+ - Changelog update - MAINTAINERS update Signed-off-by: Dawid Kozinski --- Changelog | 3 ++- MAINTAINERS | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index ec9de1bd85..19e9ae3b1f 100644 --- a/Changelog +++ b/Changelog @@ -45,6 +45,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: @@ -92,7 +94,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer diff --git a/MAINTAINERS b/MAINTAINERS index eebfa5cfb7..df8d8eca73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -200,6 +200,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Dawid Kozinski + libxeve.c, Dawid Kozinski libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -420,6 +422,9 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc.c, evc.h Dawid Kozinski + evcdec.c Dawid Kozinski + evc_parser.c Dawid Kozinski ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer