From patchwork Wed Dec 14 11:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp248473pzb; Wed, 14 Dec 2022 03:58:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf7c8DcErFZpYTOcMvzcqba8PqZZsGJdd4TivozmsPDXOAXLlp//LgvFhY69aJ6wX1XxsVeY X-Received: by 2002:a17:906:8d0e:b0:7c1:7cc2:1f1e with SMTP id rv14-20020a1709068d0e00b007c17cc21f1emr5648324ejc.35.1671019089351; Wed, 14 Dec 2022 03:58:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019089; cv=none; d=google.com; s=arc-20160816; b=M9p5N9BOM/xQ/OY+vP+NJnftN53+PqmCU8EKOTdMoI1fRVylBenzCXVfd6wwwb5xWB RBhMUx2VdIr6/QdJKWqWt7023Z9Vaq5vDmVN2j+BiLVmJ1Etc1AGCzsQx6ebfA1kTLQ7 u6QLex+LdB3X3VBl5fhLSsj1uXo2d6w60oMvP7NiXt/WUS2pCzEXZqfptH/h52Dm5Ddv k3UZVFBx8q+ystyQk7+V4vpVxI1cTUBuhWT1aB6wOSDBpg0FBFiGMtDRBJo0jshEmwJP v+OmY0JhPqCnsvf1vJrahuAy/53a8hx3a415UqTzkZPmfaM1gGTUfjHV4nS0EUz1HvZU 2tUA== 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=pOp2qV/q7bf7uFcq3fF/HePnrRYV7O09vTvz2B9xcEM=; b=GI5lFQ9I/6Stg9mUewv5B7FjRePkUTl4eWX4RRBT8ZIDU3tWjrgoHt4T6k1+UtG4L1 mzwucKhK3WkvZGBtxUDFx69OeKCB0FwFlhptrCzit+oE06zGrcI4d5T/aVlp9/zWBXRI ke0fJwFJysQa3gqiyaGy/ydb6z1ES811U9fshVtlZNZd04tVEqVZdlbgJ+3GSFLO3SUu +EeXUHCojuo5RFwApptX4u80wuIZZ/GRG9xujFv/LcIsnAQFYk0TdocMBut6pIPVkgsE KpFRaegu1PHHxohu/cE549y+ZczlhRBb5FVr6QDQr8pc3JbFaoHaMC1EYL2oa55KJT82 zSNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ACAjTbA0; 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 cs15-20020a170906dc8f00b007c31599251csi2025232ejc.590.2022.12.14.03.58.08; Wed, 14 Dec 2022 03:58:09 -0800 (PST) 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=ACAjTbA0; 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 2BFED68BA8D; Wed, 14 Dec 2022 13:58:05 +0200 (EET) 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 653EA68B9F1 for ; Wed, 14 Dec 2022 13:57:58 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214115755euoutp02ff4f6537987f92508232c29d7e45a5d7~wpv7gfcLT1296112961euoutp02B for ; Wed, 14 Dec 2022 11:57:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214115755euoutp02ff4f6537987f92508232c29d7e45a5d7~wpv7gfcLT1296112961euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019075; bh=MkCkcGIBpV/SF1GLXVo8QLk/tAZbsaJxO8BodqjgisQ=; h=From:To:Cc:Subject:Date:References:From; b=ACAjTbA0OM6pT4q+Qk+PGeTE/QrtjmssOHWMWOSm3RWSGPr26s6LF6K/B9vE/Yxrz HupLDQb88SOhhJleI/xdd8pKe9e2502Zyua4s+NbwkFXmAJKhDhzlDAFmdLO62mefo ybEljDPdd7PKaK9gNLUFknvuxFtcgdr4gO0HGGl8= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214115754eucas1p1e74c9e1356aca1c6037d80fb8eb8c4dd~wpv6aYtPB2801228012eucas1p11; Wed, 14 Dec 2022 11:57:54 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 43.A7.09549.24AB9936; Wed, 14 Dec 2022 11:57:54 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78~wpv6IWjPf2801228012eucas1p1y; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221214115753eusmtrp274bde22131855cf30ef8346dc7f82b49~wpv6HVQK91739717397eusmtrp2f; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) X-AuditID: cbfec7f5-f47ff7000000254d-f8-6399ba4220b9 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D5.4C.08916.14AB9936; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221214115753eusmtip1cf53098743a10b025adb0ca7a78aebae~wpv5vVpVH1556215562eusmtip1e; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 12:57:07 +0100 Message-Id: <20221214115707.1352-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87pOu2YmG9y5yWbx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGUc2DGBseCKdEXP7gtsDYy3RLsY OTkkBEwkpj/8wNrFyMUhJLCCUWL9x5NMEM4XRomPzUuhnM+MErs/LGHvYuQAa+k6lg7SLSSw nFFi0xkJCLudSeLsFl8Qm01AV+Llh0dMILaIgKnEyea9bCA2s4C2xLq738FsYQFniT+t/Swg NouAqsT5hwcYQWxeASuJpfcfMUNcpykxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1NjPI nRICf9klDn/8wApR5CKx9uwzdghbWOLV8S1QtozE/53zmSB+KZY41O8AYdZIHPqRDlFhLfG2 8TgjSJgZ6IT1u/Qhwo4Sfft3MkJU80nceCsIcQCfxKRt05khwrwSHW1CEKaKRF+nGESjlMTT ZXOgXvKQaN7zi3UCo+IsJF/NQvLJLIS1CxiZVzGKp5YW56anFhvnpZbrFSfmFpfmpesl5+du YgSmhtP/jn/dwbji1Ue9Q4xMHIyHGCU4mJVEeFU1piUL8aYkVlalFuXHF5XmpBYfYpTmYFES 510xpSNZSCA9sSQ1OzW1ILUIJsvEwSnVwCT6KGJW62JP/RlP3htvPl8nFmYacX13+dqtjUJs PM5m1oEVC2r/XbjnctzJrKnWeY9y5aL8VjNlDd9DrPcsoq9VHHyUaLMtnFf59d6grn2zfL0+ SlWcrLnmoyKx6EzEH/+Vanse5ohYcP8ym7Q6dNuHLgEVJVa5A9Mmbby+zPlB9q5AOf6MaRbF oflCsXpV5tWvz1s/9pWVkGn1ONbgsfxkyxPW+88Wf30T8Z6XkWVGt/m7nnx2150e+Xav1ZyO mAkGKx/I+T951Q67OV5M2x6HshXZyHDPaa9xnDz79YqfFr6HA68uE9vyNDL5vJB0kdyHKXx/ f4a6HmY4/vWw8zc74z7+TazHFV1arxstUGIpzkg01GIuKk4EAIxHOiZ8AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qOu2YmG2xbYWDx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GUc2DGBseCKdEXP7gtsDYy3RLsYOTgkBEwkuo6ldzFycQgJLGWU OLCrm6mLkRMoLiWxdOkiRghbWOLPtS42iKJWJolrU5+xgCTYBHQlXn54BNYgImAucXHdLbAG ZgFtiXV3v7OB2MICzhJ/WvvB6lkEVCXOPzwAVsMrYCWx9P4jZogFmhITtsxhgogLSpyc+YQF Is4tsW7WJVaImfISzVtnM09g5J+FpGwWktQCRqZVjCKppcW56bnFhnrFibnFpXnpesn5uZsY gWG77djPzTsY5736qHeIkYmD8RCjBAezkgivqsa0ZCHelMTKqtSi/Pii0pzU4kOMpkC3TmSW Ek3OB0ZOXkm8oZmBqaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QD0+avl2Yr FDM93sXgKPb3CedMPiYzjsdTYpZOmCdU+IWhK/3sGpem3ld3k/dHVKUtCg283f67PPpE3Bf2 91zGk+vTd7Jsd36vkrq1qXPP0eon11w/sIov8BIwqhOerd1/UmLKsuxXK0rebLfsDhReEsIl nf52VYK75m7pOSf5P+Yc3ywq5a78+fupmQVSUzQ2fdtb1Hr29+LuNWvuJRf9v8s6eWrN6XnV a6sq7c7sL3ITtJe/w7z9itWPWXdTI85f6V/gf/pfh0zI5zqN7X3LT9rMfaFskr4s6+nRvQp1 /fIxkivY/05T2vcvfJ0+V3nKx672+N92DzW9/56Tf3BjuvDVBufkPTsanota3bWYvEGJpTgj 0VCLuag4EQDs+lYI5AIAAA== X-CMS-MailID: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 X-Msg-Generator: CA X-RootMTR: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 References: Subject: [FFmpeg-devel] [PATCH v15 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: YOszQNXsHT5G 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 0ac581d660..39296021c4 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 9f42f09f4e..6b8a1dbb79 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 55 +#define LIBAVCODEC_VERSION_MINOR 56 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Wed Dec 14 11:58:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39720 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:594:b0:360:794a:a6db with SMTP id ls20csp316232pxb; Wed, 14 Dec 2022 03:58:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7VwQDGBS1q4Nr1X9UzGle+z6X1A6YRfkGW8knVTDizQ/ZNVmnPu+nr02QhGGO2rdnvYUuA X-Received: by 2002:aa7:cf0c:0:b0:470:410a:8ea7 with SMTP id a12-20020aa7cf0c000000b00470410a8ea7mr6461570edy.18.1671019131072; Wed, 14 Dec 2022 03:58:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019131; cv=none; d=google.com; s=arc-20160816; b=EA8PWAZP5ps/tSYJwRFJcolJovaNWKcsjUkyifYl8D8CGALmGIobwYo+7JigyJ58e8 PlTTyzGwZlJ5omn7fRygcEwVO5C86B9MPA618cAMd34lSH2ab5jWTvPL/XWHjUyg++di dRsakn9/tlgAIc9S3kb1o/OSnl5vCh6/IPEGMh3onPh1naWDOZA/alXp0vJpe5vvKFW0 Lvo6zy3TOR3SZq15S/43pm55QiXxxhUfUL5KLmtQtdVT4se1pkjK7Uj4BCbBvgKdjYmn d5VhgWv9AVKmBi/PJn4YPxBfwJqrhYsbnz5fCY91x1dwmOmOYn5JI4bsIcNRv6IsBByg 5VEA== 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=aUsULtIZm9fkylQW2KYu6NCrclLZAGW0yFq/mdGGT2E=; b=oZiwy1WEjtOTliLBDZAXgoQ6si/C5zVv7NGzebhqYOZF9SJtsh81+NZrsdH/RzU1Ey jbiyu+l13d7NhqL1E+PYxutI7mT5AAHNuUsE2gGVhlkiyzGO9GlfdQYDxPmXdkAQ0C/Q cSpC0+zG5CfMZpyjkVXJauh10EmGiRcWcB4tuOpk/9DzRmwlEH00kRxOKLTHmKQ7tm0F FG3DeBwmZvDTmRz6EkjwqaVjCZeEWjwkTyf04eE/lqPqhTDjs+R05g/GCQryfb5wOkFd YEVnGGZoi0O+Loe/dZI+x9/7OHOCZN26ClsiqqZz5N0R4OIJ8/dLXItt3Qmlrd+eOBuh uo+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=XARUQjbQ; 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 hr9-20020a1709073f8900b0078316f0b5f8si12609439ejc.88.2022.12.14.03.58.50; Wed, 14 Dec 2022 03:58:51 -0800 (PST) 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=XARUQjbQ; 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 197BE68BAC7; Wed, 14 Dec 2022 13:58:50 +0200 (EET) 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 55E1F68BA97 for ; Wed, 14 Dec 2022 13:58:44 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214115843euoutp0284adcdb2feb433c4ba2fdae9b9006f56~wpwoojuvu1300013000euoutp02L for ; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214115843euoutp0284adcdb2feb433c4ba2fdae9b9006f56~wpwoojuvu1300013000euoutp02L DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019123; bh=6AUqSlFetobfBZlTLrTTob6CCgDPRibZzV/tSuzWfoM=; h=From:To:Cc:Subject:Date:References:From; b=XARUQjbQ3aEBe66ENRToV14bqw7sTJKafGzO4VdRgqCzBn+dSs6Y+6/1ytsQEHxkW nMZ0zg4zS+2FHZBBhZ23+LJIkDTF5e8MTo9uTELgKN+2LbJUfW2zZ1UrK73h9auL0U HYz/OiZtMURK85BsUYytRD5rGawAymaAByzROpI4= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221214115843eucas1p2cd4421edc6e1f5c1ca12bc00b14ed9d9~wpwodQ3sE0238402384eucas1p2K; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id C5.BF.09561.37AB9936; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221214115843eucas1p1b0fbf56e6da910c8f46506b1efa86dfd~wpwoDV1yE2542625426eucas1p1Y; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221214115843eusmtrp28724ed7ebc80cec62022b681be08895f~wpwoCmBmE1739717397eusmtrp2Y; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) X-AuditID: cbfec7f2-0b3ff70000002559-1c-6399ba7343c6 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 0A.6C.08916.37AB9936; Wed, 14 Dec 2022 11:58:43 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221214115842eusmtip213c76591fe3f9c69b00a063ec28bc805~wpwnlrdkI0286302863eusmtip2j; Wed, 14 Dec 2022 11:58:42 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 12:58:23 +0100 Message-Id: <20221214115823.2017-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djP87rFu2YmGxxtULb4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDI6VuQU/GhgqbjcuIepgXHuQ6Yu Rk4OCQETiX3vO4FsLg4hgRWMEreP/2KEcL4wSuz+v4wZwvnMKNHx9zVcy6EHS6ASyxklJrVN h2ppZ5J4/P84I0gVm4CuxMsPj8A6RARMJU4272UDsZkFtCXW3f0OZgsLREoc3NbKAmKzCKhK 3N/cBBbnFbCS+POomRFim6bEhC1zmCDighInZz5hgYhzS6ybdYkVYqa8RPPW2WAXSQj8ZJc4 fWAqVJGLxKuHe6AGCUu8Or6FHcKWkfi/cz7QUA4gu1jiUL8DhFkjcehHOkSFtcTbRpBXOIDG a0qs36UPUeEo0X41DcLkk7jxVhBiP5/EpG3TmSHCvBIdbUIQpopEX6cYxDgpiafL5jBD2B4S B1fcZ5rAqDgLyVOzkDwyC2HrAkbmVYziqaXFuempxYZ5qeV6xYm5xaV56XrJ+bmbGIEJ4vS/ 4592MM599VHvECMTB+MhRgkOZiURXlWNaclCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeVdM6UgW EkhPLEnNTk0tSC2CyTJxcEo1MGlU7DqmEhXIPMei0aLU0+cBbxl37NPYGZ4snYHvLwtG3W50 7+rcFF8ZpZMvIXKO7fX+rUHvXjDVXinW+nl3meDN8q7vAb7xhfG/BT/P1tBoTr8WO+V80/rz 22bqnE9OExP2O792m/zGknUcG3smbe1Ymd8tzmdvMHsR2zX5Sb0iPn+nfuC63WyaMjOeNf35 800TBAVj3fa8nfyo8/LjENWC73LLn9/KMD3R/y6TK9eEoUnKPvx4QWl5tMzxbY/qH+2Y/OHk SquJO6f8qV493aEoZ/0Gf7Vwx98ZT7TMvqT57+HINt3P53t0/rlvjop89nyZp9R2qbi2vL7u 9+Vc5Kp5U9nDnV/7lb8/tT+tTomlOCPRUIu5qDgRAMIhVJh/AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7rFu2YmGzROZbH4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DI6VuQU/GhgqbjcuIepgXHuQ6YuRk4OCQETiUMPljB3MXJxCAks ZZTYtm86K0RCSmLp0kWMELawxJ9rXWwQRa1MErP6loEVsQnoSrz88AhskoiAucTFdbfAGpgF tCXW3f0O1MDBISwQLvF7gTdImEVAVeL+5iY2EJtXwEriz6NmqPmaEhO2zGGCiAtKnJz5hAUi zi2xbtYlVoiR8hLNW2czT2Dkn4WkbBaS1AJGplWMIqmlxbnpucWGesWJucWleel6yfm5mxiB gbvt2M/NOxjnvfqod4iRiYPxEKMEB7OSCK+qxrRkId6UxMqq1KL8+KLSnNTiQ4ymQLdOZJYS Tc4Hxk5eSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVANT/zPO5oWG L7fNMT3uZjP/aO9Co4YZFxsPaSeu/MM+Wcqy887UrJyPal1M7bvjE22N1RTTNk4/WRBwSqF6 pYsH4505spJSbb+ldgZNnmZZcmu5hKC7+KtHy8zZViVLHI9efUVWNcd7jcIP92ilZGfrgJId Rw4Fp7Jtc1rus7zhzA+f+vvtLd/kV1eq/XB+7R4gaOGxamLp3KM7/AXEw4KnfhC9dPbq81kb ZMr71qnMY/guYq/RbZ+iNrEmwtbby4U38/7nI0+OKnJY2midiCp35U48K+3BW71MZl745/tz rm5+/PTfk4BOjqbji+e1HuO+aVX+xHPjI+kW9Yv33Ju/bH4288nE426T3rP2HvJQYinOSDTU Yi4qTgQA0cVUq+UCAAA= X-CMS-MailID: 20221214115843eucas1p1b0fbf56e6da910c8f46506b1efa86dfd X-Msg-Generator: CA X-RootMTR: 20221214115843eucas1p1b0fbf56e6da910c8f46506b1efa86dfd X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214115843eucas1p1b0fbf56e6da910c8f46506b1efa86dfd References: Subject: [FFmpeg-devel] [PATCH v15 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: FI7NGX7KhlJw Content-Length: 64286 Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/evc.h | 155 +++++ libavcodec/evc_parser.c | 1417 +++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 1574 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 98841ed07c..401d0b7310 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1146,6 +1146,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o +OBJS-$(CONFIG_EVC_PARSER) += evc_parser.o OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_FTR_PARSER) += ftr_parser.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o diff --git a/libavcodec/evc.h b/libavcodec/evc.h new file mode 100644 index 0000000000..d1fdb4fac6 --- /dev/null +++ b/libavcodec/evc.h @@ -0,0 +1,155 @@ +/* + * EVC definitions and enums + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_EVC_H +#define AVCODEC_EVC_H + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +/** + * @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic + * Table 4 - NAL unit type codes and NAL unit type classes + */ +enum EVCNALUnitType { + EVC_NOIDR_NUT = 0, /* Coded slice of a non-IDR picture */ + EVC_IDR_NUT = 1, /* Coded slice of an IDR picture */ + EVC_RSV_VCL_NUT02 = 2, + EVC_RSV_VCL_NUT03 = 3, + EVC_RSV_VCL_NUT04 = 4, + EVC_RSV_VCL_NUT05 = 5, + EVC_RSV_VCL_NUT06 = 6, + EVC_RSV_VCL_NUT07 = 7, + EVC_RSV_VCL_NUT08 = 8, + EVC_RSV_VCL_NUT09 = 9, + EVC_RSV_VCL_NUT10 = 10, + EVC_RSV_VCL_NUT11 = 11, + EVC_RSV_VCL_NUT12 = 12, + EVC_RSV_VCL_NUT13 = 13, + EVC_RSV_VCL_NUT14 = 14, + EVC_RSV_VCL_NUT15 = 15, + EVC_RSV_VCL_NUT16 = 16, + EVC_RSV_VCL_NUT17 = 17, + EVC_RSV_VCL_NUT18 = 18, + EVC_RSV_VCL_NUT19 = 19, + EVC_RSV_VCL_NUT20 = 20, + EVC_RSV_VCL_NUT21 = 21, + EVC_RSV_VCL_NUT22 = 22, + EVC_RSV_VCL_NUT23 = 23, + EVC_SPS_NUT = 24, /* Sequence parameter set */ + EVC_PPS_NUT = 25, /* Picture paremeter set */ + EVC_APS_NUT = 26, /* Adaptation parameter set */ + EVC_FD_NUT = 27, /* Filler data */ + EVC_SEI_NUT = 28, /* Supplemental enhancement information */ + EVC_RSV_NONVCL29 = 29, + EVC_RSV_NONVCL30 = 30, + EVC_RSV_NONVCL31 = 31, + EVC_RSV_NONVCL32 = 32, + EVC_RSV_NONVCL33 = 33, + EVC_RSV_NONVCL34 = 34, + EVC_RSV_NONVCL35 = 35, + EVC_RSV_NONVCL36 = 36, + EVC_RSV_NONVCL37 = 37, + EVC_RSV_NONVCL38 = 38, + EVC_RSV_NONVCL39 = 39, + EVC_RSV_NONVCL40 = 40, + EVC_RSV_NONVCL41 = 41, + EVC_RSV_NONVCL42 = 42, + EVC_RSV_NONVCL43 = 43, + EVC_RSV_NONVCL44 = 44, + EVC_RSV_NONVCL45 = 45, + EVC_RSV_NONVCL46 = 46, + EVC_RSV_NONVCL47 = 47, + EVC_RSV_NONVCL48 = 48, + EVC_RSV_NONVCL49 = 49, + EVC_RSV_NONVCL50 = 50, + EVC_RSV_NONVCL51 = 51, + EVC_RSV_NONVCL52 = 52, + EVC_RSV_NONVCL53 = 53, + EVC_RSV_NONVCL54 = 54, + EVC_RSV_NONVCL55 = 55, + EVC_UNSPEC_NUT56 = 56, + EVC_UNSPEC_NUT57 = 57, + EVC_UNSPEC_NUT58 = 58, + EVC_UNSPEC_NUT59 = 59, + EVC_UNSPEC_NUT60 = 60, + EVC_UNSPEC_NUT61 = 61, + EVC_UNSPEC_NUT62 = 62 +}; + +// slice type +// @see ISO_IEC_23094-1_2020 7.4.5 Slice header semantics +// +enum EVCSliceType { + EVC_SLICE_TYPE_B = 0, + EVC_SLICE_TYPE_P = 1, + EVC_SLICE_TYPE_I = 2 +}; + +enum { + // 7.4.3.2: aps_video_parameter_set_id is u(4). + EVC_MAX_APS_COUNT = 32, + + // 7.4.3.1: sps_seq_parameter_set_id is in [0, 15]. + EVC_MAX_SPS_COUNT = 16, + + // 7.4.3.2: pps_pic_parameter_set_id is in [0, 63]. + EVC_MAX_PPS_COUNT = 64, + + // 7.4.5: slice header slice_pic_parameter_set_id in [0, 63] + EVC_MAX_SH_COUNT = 64, + + // E.3.2: cpb_cnt_minus1[i] is in [0, 31]. + EVC_MAX_CPB_CNT = 32, + + // A.4.1: in table A.1 the highest level allows a MaxLumaPs of 35 651 584. + EVC_MAX_LUMA_PS = 35651584, + + EVC_MAX_NUM_REF_PICS = 21, + + EVC_MAX_NUM_RPLS = 32, + + // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are + // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ + // width are bounded above by sqrt(8 * 35651584) = 16888.2 samples. + EVC_MAX_WIDTH = 16888, + EVC_MAX_HEIGHT = 16888, + + // A.4.1: table A.1 allows at most 22 tile rows for any level. + EVC_MAX_TILE_ROWS = 22, + // A.4.1: table A.1 allows at most 20 tile columns for any level. + EVC_MAX_TILE_COLUMNS = 20, + + // A.4.1: table A.1 allows at most 600 slice segments for any level. + EVC_MAX_SLICE_SEGMENTS = 600, + + // 7.4.7.1: in the worst case (tiles_enabled_flag and + // entropy_coding_sync_enabled_flag are both set), entry points can be + // placed at the beginning of every Ctb row in every tile, giving an + // upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1. + // Only a stream with very high resolution and perverse parameters could + // get near that, though, so set a lower limit here with the maximum + // possible value for 4K video (at most 135 16x16 Ctb rows). + HEVC_MAX_ENTRY_POINT_OFFSETS = EVC_MAX_TILE_COLUMNS * 135, +}; + +#endif // AVCODEC_EVC_H diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..d06362c2fe --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,1417 @@ +/* + * EVC format parser + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/common.h" +#include "parser.h" +#include "golomb.h" +#include "evc.h" + +#define EVC_MAX_QP_TABLE_SIZE 58 + +#define EXTENDED_SAR 255 +#define NUM_CPB 32 + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// chromaQP table structure to be signalled in SPS +typedef struct ChromaQpTable +{ + int chroma_qp_table_present_flag; // u(1) + int same_qp_table_for_chroma; // u(1) + int global_offset_flag; // u(1) + int num_points_in_qp_table_minus1[2]; // ue(v) + int delta_qp_in_val_minus1[2][EVC_MAX_QP_TABLE_SIZE]; // u(6) + int delta_qp_out_val[2][EVC_MAX_QP_TABLE_SIZE]; // se(v) +} ChromaQpTable; + +// Hypothetical Reference Decoder (HRD) parameters, part of VUI +typedef struct HRDParameters +{ + int cpb_cnt_minus1; // ue(v) + int bit_rate_scale; // u(4) + int cpb_size_scale; // u(4) + int bit_rate_value_minus1[NUM_CPB]; // ue(v) + int cpb_size_value_minus1[NUM_CPB]; // ue(v) + int cbr_flag[NUM_CPB]; // u(1) + int initial_cpb_removal_delay_length_minus1; // u(5) + int cpb_removal_delay_length_minus1; // u(5) + int dpb_output_delay_length_minus1; // u(5) + int time_offset_length; // u(5) +} HRDParameters; + +// video usability information (VUI) part of SPS +typedef struct VUIParameters +{ + int aspect_ratio_info_present_flag; // u(1) + int aspect_ratio_idc; // u(8) + int sar_width; // u(16) + int sar_height; // u(16) + int overscan_info_present_flag; // u(1) + int overscan_appropriate_flag; // u(1) + int video_signal_type_present_flag; // u(1) + int video_format; // u(3) + int video_full_range_flag; // u(1) + int colour_description_present_flag; // u(1) + int colour_primaries; // u(8) + int transfer_characteristics; // u(8) + int matrix_coefficients; // u(8) + int chroma_loc_info_present_flag; // u(1) + int chroma_sample_loc_type_top_field; // ue(v) + int chroma_sample_loc_type_bottom_field; // ue(v) + int neutral_chroma_indication_flag; // u(1) + int field_seq_flag; // u(1) + int timing_info_present_flag; // u(1) + int num_units_in_tick; // u(32) + int time_scale; // u(32) + int fixed_pic_rate_flag; // u(1) + int nal_hrd_parameters_present_flag; // u(1) + int vcl_hrd_parameters_present_flag; // u(1) + int low_delay_hrd_flag; // u(1) + int pic_struct_present_flag; // u(1) + int bitstream_restriction_flag; // u(1) + int motion_vectors_over_pic_boundaries_flag; // u(1) + int max_bytes_per_pic_denom; // ue(v) + int max_bits_per_mb_denom; // ue(v) + int log2_max_mv_length_horizontal; // ue(v) + int log2_max_mv_length_vertical; // ue(v) + int num_reorder_pics; // ue(v) + int max_dec_pic_buffering; // ue(v) + + HRDParameters hrd_parameters; +} VUIParameters; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + struct RefPicListStruct rpls[2][EVC_MAX_NUM_RPLS]; + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + + struct ChromaQpTable chroma_qp_table_struct; + + int vui_parameters_present_flag; // u(1) + + struct VUIParameters vui_parameters; + +} EVCParserSPS; + +typedef struct EVCParserPPS { + int pps_pic_parameter_set_id; // ue(v) + int pps_seq_parameter_set_id; // ue(v) + int num_ref_idx_default_active_minus1[2]; // ue(v) + int additional_lt_poc_lsb_len; // ue(v) + int rpl1_idx_present_flag; // u(1) + int single_tile_in_pic_flag; // u(1) + int num_tile_columns_minus1; // ue(v) + int num_tile_rows_minus1; // ue(v) + int uniform_tile_spacing_flag; // u(1) + int tile_column_width_minus1[EVC_MAX_TILE_ROWS]; // ue(v) + int tile_row_height_minus1[EVC_MAX_TILE_COLUMNS]; // ue(v) + int loop_filter_across_tiles_enabled_flag; // u(1) + int tile_offset_len_minus1; // ue(v) + int tile_id_len_minus1; // ue(v) + int explicit_tile_id_flag; // u(1) + int tile_id_val[EVC_MAX_TILE_ROWS][EVC_MAX_TILE_COLUMNS]; // u(v) + int pic_dra_enabled_flag; // u(1) + int pic_dra_aps_id; // u(5) + int arbitrary_slice_present_flag; // u(1) + int constrained_intra_pred_flag; // u(1) + int cu_qp_delta_enabled_flag; // u(1) + int log2_cu_qp_delta_area_minus6; // ue(v) + +} EVCParserPPS; + +// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.6 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +// u(n) - unsigned integer using n bits. +// When n is "v" in the syntax table, the number of bits varies in a manner dependent on the value of other syntax elements. +typedef struct EVCParserSliceHeader { + int slice_pic_parameter_set_id; // ue(v) + int single_tile_in_slice_flag; // u(1) + int first_tile_id; // u(v) + int arbitrary_slice_flag; // u(1) + int last_tile_id; // u(v) + int num_remaining_tiles_in_slice_minus1; // ue(v) + int delta_tile_id_minus1[EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS]; // ue(v) + + int slice_type; // ue(v) + int no_output_of_prior_pics_flag; // u(1) + int mmvd_group_enable_flag; // u(1) + int slice_alf_enabled_flag; // u(1) + + int slice_alf_luma_aps_id; // u(5) + int slice_alf_map_flag; // u(1) + int slice_alf_chroma_idc; // u(2) + int slice_alf_chroma_aps_id; // u(5) + int slice_alf_chroma_map_flag; // u(1) + int slice_alf_chroma2_aps_id; // u(5) + int slice_alf_chroma2_map_flag; // u(1) + int slice_pic_order_cnt_lsb; // u(v) + + // @note + // Currently the structure does not reflect the entire Slice Header RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSliceHeader; + +// picture order count of the current picture +typedef struct EVCParserPoc { + int PicOrderCntVal; // current picture order count value + int prevPicOrderCntVal; // the picture order count of the previous Tid0 picture + int DocOffset; // the decoding order count of the previous picture +} EVCParserPoc; + +typedef struct EVCParserContext { + ParseContext pc; + EVCParserSPS sps[EVC_MAX_SPS_COUNT]; + EVCParserPPS pps[EVC_MAX_PPS_COUNT]; + EVCParserSliceHeader slice_header[EVC_MAX_PPS_COUNT]; + + int to_read; // number of bytes of NAL Unit that do not fit into the current input data chunk and must be read from the new chunk(s) + int bytes_read; // number of bytes of the current Access Unit that already has been read + + int incomplete_nalu_prefix_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit prefix + int incomplete_nalu_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit (more input data is needed to read complete NAL unit) + + int nuh_temporal_id; // the value of TemporalId (shall be the same for all VCL NAL units of an Access Unit) + + int nalu_prefix_assembled; // the flag is set to when NALU prefix has been assembled from last chunk and current chunk of incoming data + int nalu_type; // the current NALU type + int nalu_size; // the current NALU size + int time_base; + + EVCParserPoc poc; + + int parsed_extradata; + +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// nuh_temporal_id specifies a temporal identifier for the NAL unit +static int get_temporal_id(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int temporal_id = 0; + short t = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + for (int i = 0; i < EVC_NALU_HEADER_SIZE; i++) + t = (t << 8) | p[i]; + + temporal_id = (t >> 6) & 0x0007; + } + + return temporal_id; +} + +// @see ISO_IEC_23094-1 (7.3.7 Reference picture list structure syntax) +static int ref_pic_list_struct(GetBitContext* gb, RefPicListStruct* rpl) +{ + uint32_t delta_poc_st, strp_entry_sign_flag = 0; + rpl->ref_pic_num = get_ue_golomb(gb); + if (rpl->ref_pic_num > 0) + { + delta_poc_st = get_ue_golomb(gb); + + rpl->ref_pics[0] = delta_poc_st; + if (rpl->ref_pics[0] != 0) + { + strp_entry_sign_flag = get_bits(gb, 1); + + rpl->ref_pics[0] *= 1 - (strp_entry_sign_flag << 1); + } + } + + for (int i = 1; i < rpl->ref_pic_num; ++i) + { + delta_poc_st = get_ue_golomb(gb); + if (delta_poc_st != 0) { + strp_entry_sign_flag = get_bits(gb, 1); + } + rpl->ref_pics[i] = rpl->ref_pics[i - 1] + delta_poc_st * (1 - (strp_entry_sign_flag << 1)); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.2 HRD parameters syntax) +static int hrd_parameters(GetBitContext* gb, HRDParameters* hrd) { + hrd->cpb_cnt_minus1 = get_ue_golomb(gb); + hrd->bit_rate_scale = get_bits(gb, 4); + hrd->cpb_size_scale = get_bits(gb, 4); + for (int SchedSelIdx = 0; SchedSelIdx <= hrd->cpb_cnt_minus1; SchedSelIdx++) + { + hrd->bit_rate_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cpb_size_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cbr_flag[SchedSelIdx] = get_bits(gb, 1); + } + hrd->initial_cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->time_offset_length = get_bits(gb, 5); + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.1 VUI parameters syntax) +static int vui_parameters(GetBitContext* gb, VUIParameters* vui) { + vui->aspect_ratio_info_present_flag = get_bits(gb, 1); + if (vui->aspect_ratio_info_present_flag) + { + vui->aspect_ratio_idc = get_bits(gb, 8); + if (vui->aspect_ratio_idc == EXTENDED_SAR) + { + vui->sar_width = get_bits(gb, 16); + vui->sar_height = get_bits(gb, 16); + } + } + vui->overscan_info_present_flag = get_bits(gb, 1); + if (vui->overscan_info_present_flag) + { + vui->overscan_appropriate_flag = get_bits(gb, 1); + } + vui->video_signal_type_present_flag = get_bits(gb, 1); + if (vui->video_signal_type_present_flag) + { + vui->video_format = get_bits(gb, 3); + vui->video_full_range_flag = get_bits(gb, 1); + vui->colour_description_present_flag = get_bits(gb, 1); + if (vui->colour_description_present_flag) + { + vui->colour_primaries = get_bits(gb, 8); + vui->transfer_characteristics = get_bits(gb, 8); + vui->matrix_coefficients = get_bits(gb, 8); + } + } + vui->chroma_loc_info_present_flag = get_bits(gb, 1); + if (vui->chroma_loc_info_present_flag) + { + vui->chroma_sample_loc_type_top_field = get_ue_golomb(gb); + vui->chroma_sample_loc_type_bottom_field = get_ue_golomb(gb); + } + vui->neutral_chroma_indication_flag = get_bits(gb, 1); + + vui->field_seq_flag = get_bits(gb, 1); + + vui->timing_info_present_flag = get_bits(gb, 1); + if (vui->timing_info_present_flag) + { + vui->num_units_in_tick = get_bits(gb, 32); + vui->time_scale = get_bits(gb, 32); + vui->fixed_pic_rate_flag = get_bits(gb, 1); + } + vui->nal_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->nal_hrd_parameters_present_flag) + { + hrd_parameters(gb, &vui->hrd_parameters); + } + vui->vcl_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->vcl_hrd_parameters_present_flag) + { + hrd_parameters(gb, &vui->hrd_parameters); + } + if (vui->nal_hrd_parameters_present_flag || vui->vcl_hrd_parameters_present_flag) + { + vui->low_delay_hrd_flag = get_bits(gb, 1); + } + vui->pic_struct_present_flag = get_bits(gb, 1); + vui->bitstream_restriction_flag = get_bits(gb, 1); + if (vui->bitstream_restriction_flag) { + vui->motion_vectors_over_pic_boundaries_flag = get_bits(gb, 1); + vui->max_bytes_per_pic_denom = get_ue_golomb(gb); + vui->max_bits_per_mb_denom = get_ue_golomb(gb); + vui->log2_max_mv_length_horizontal = get_ue_golomb(gb); + vui->log2_max_mv_length_vertical = get_ue_golomb(gb); + vui->num_reorder_pics = get_ue_golomb(gb); + vui->max_dec_pic_buffering = get_ue_golomb(gb); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static EVCParserSPS *parse_sps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + sps = &ev->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if (sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if (sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if (sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if (sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if (sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if (sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if (sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if (sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if (!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if (sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + if (!sps->sps_rpl_flag) { + sps->max_num_tid0_ref_pics = get_ue_golomb(&gb); + } else { + sps->sps_max_dec_pic_buffering_minus1 = get_ue_golomb(&gb); + sps->long_term_ref_pic_flag = get_bits(&gb, 1); + sps->rpl1_same_as_rpl0_flag = get_bits(&gb, 1); + sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(&gb); + + for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[0][i]); + + if (!sps->rpl1_same_as_rpl0_flag) + { + sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(&gb); + for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[1][i]); + } + } + + sps->picture_cropping_flag = get_bits(&gb, 1); + + if (sps->picture_cropping_flag) { + sps->picture_crop_left_offset = get_ue_golomb(&gb); + sps->picture_crop_right_offset = get_ue_golomb(&gb); + sps->picture_crop_top_offset = get_ue_golomb(&gb); + sps->picture_crop_bottom_offset = get_ue_golomb(&gb); + } + + if (sps->chroma_format_idc != 0) + { + sps->chroma_qp_table_struct.chroma_qp_table_present_flag = get_bits(&gb, 1); + + if (sps->chroma_qp_table_struct.chroma_qp_table_present_flag) + { + sps->chroma_qp_table_struct.same_qp_table_for_chroma = get_bits(&gb, 1); + sps->chroma_qp_table_struct.global_offset_flag = get_bits(&gb, 1); + for (int i = 0; i < (sps->chroma_qp_table_struct.same_qp_table_for_chroma ? 1 : 2); i++) + { + sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i] = get_ue_golomb(&gb);; + for (int j = 0; j <= sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i]; j++) + { + sps->chroma_qp_table_struct.delta_qp_in_val_minus1[i][j] = get_bits(&gb, 6); + sps->chroma_qp_table_struct.delta_qp_out_val[i][j] = get_se_golomb(&gb); + } + } + } + } + + sps->vui_parameters_present_flag = get_bits(&gb, 1); + if (sps->vui_parameters_present_flag) + vui_parameters(&gb, &(sps->vui_parameters)); + + // @note + // If necessary, add the missing fields to the EVCParserSPS structure + // and then extend parser implementation + + return sps; +} + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +// +// @note +// The current implementation of parse_sps function doesn't handle VUI parameters parsing. +// If it will be needed, parse_sps function could be extended to handle VUI parameters parsing +// to initialize fields of the AVCodecContex i.e. color_primaries, color_trc,color_range +// +static EVCParserPPS *parse_pps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserPPS *pps; + + int pps_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + pps_pic_parameter_set_id = get_ue_golomb(&gb); + if (pps_pic_parameter_set_id > EVC_MAX_PPS_COUNT) + return NULL; + + pps = &ev->pps[pps_pic_parameter_set_id]; + + pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; + + pps->pps_seq_parameter_set_id = get_ue_golomb(&gb); + if (pps->pps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + pps->num_ref_idx_default_active_minus1[0] = get_ue_golomb(&gb); + pps->num_ref_idx_default_active_minus1[1] = get_ue_golomb(&gb); + pps->additional_lt_poc_lsb_len = get_ue_golomb(&gb); + pps->rpl1_idx_present_flag = get_bits(&gb, 1); + pps->single_tile_in_pic_flag = get_bits(&gb, 1); + + if (!pps->single_tile_in_pic_flag) { + pps->num_tile_columns_minus1 = get_ue_golomb(&gb); + pps->num_tile_rows_minus1 = get_ue_golomb(&gb); + pps->uniform_tile_spacing_flag = get_bits(&gb, 1); + + if (!pps->uniform_tile_spacing_flag) { + for (int i = 0; i < pps->num_tile_columns_minus1; i++) + pps->tile_column_width_minus1[i] = get_ue_golomb(&gb); + + for (int i = 0; i < pps->num_tile_rows_minus1; i++) + pps->tile_row_height_minus1[i] = get_ue_golomb(&gb); + } + pps->loop_filter_across_tiles_enabled_flag = get_bits(&gb, 1); + pps->tile_offset_len_minus1 = get_ue_golomb(&gb); + } + + pps->tile_id_len_minus1 = get_ue_golomb(&gb); + pps->explicit_tile_id_flag = get_bits(&gb, 1); + + if (pps->explicit_tile_id_flag) { + for (int i = 0; i <= pps->num_tile_rows_minus1; i++) { + for (int j = 0; j <= pps->num_tile_columns_minus1; j++) + pps->tile_id_val[i][j] = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } + } + + pps->pic_dra_enabled_flag = 0; + pps->pic_dra_enabled_flag = get_bits(&gb, 1); + + if (pps->pic_dra_enabled_flag) + pps->pic_dra_aps_id = get_bits(&gb, 5); + + pps->arbitrary_slice_present_flag = get_bits(&gb, 1); + pps->constrained_intra_pred_flag = get_bits(&gb, 1); + pps->cu_qp_delta_enabled_flag = get_bits(&gb, 1); + + if (pps->cu_qp_delta_enabled_flag) + pps->log2_cu_qp_delta_area_minus6 = get_ue_golomb(&gb); + + return pps; +} + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +static EVCParserSliceHeader *parse_slice_header(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSliceHeader *sh; + EVCParserPPS *pps; + EVCParserSPS *sps; + + int num_tiles_in_slice = 0; + int slice_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + slice_pic_parameter_set_id = get_ue_golomb(&gb); + + if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) + return NULL; + + sh = &ev->slice_header[slice_pic_parameter_set_id]; + pps = &ev->pps[slice_pic_parameter_set_id]; + sps = &ev->sps[slice_pic_parameter_set_id]; + + sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; + + if (!pps->single_tile_in_pic_flag) { + sh->single_tile_in_slice_flag = get_bits(&gb, 1); + sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } else + sh->single_tile_in_slice_flag = 1; + + if (!sh->single_tile_in_slice_flag) { + if (pps->arbitrary_slice_present_flag) + sh->arbitrary_slice_flag = get_bits(&gb, 1); + + if (!sh->arbitrary_slice_flag) + sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + else { + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + for (int i = 0; i < num_tiles_in_slice - 1; ++i) + sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + } + } + + sh->slice_type = get_ue_golomb(&gb); + + if (ev->nalu_type == EVC_IDR_NUT) + sh->no_output_of_prior_pics_flag = get_bits(&gb, 1); + + if (sps->sps_mmvd_flag && ((sh->slice_type == EVC_SLICE_TYPE_B) || (sh->slice_type == EVC_SLICE_TYPE_P))) + sh->mmvd_group_enable_flag = get_bits(&gb, 1); + else + sh->mmvd_group_enable_flag = 0; + + if (sps->sps_alf_flag) { + int ChromaArrayType = sps->chroma_format_idc; + + sh->slice_alf_enabled_flag = get_bits(&gb, 1); + + if (sh->slice_alf_enabled_flag) { + sh->slice_alf_luma_aps_id = get_bits(&gb, 5); + sh->slice_alf_map_flag = get_bits(&gb, 1); + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if ((ChromaArrayType == 1 || ChromaArrayType == 2) && sh->slice_alf_chroma_idc > 0) + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + } + if (ChromaArrayType == 3) { + int sliceChromaAlfEnabledFlag = 0; + int sliceChroma2AlfEnabledFlag = 0; + + if (sh->slice_alf_chroma_idc == 1) { // @see ISO_IEC_23094-1 (7.4.5) + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 0; + } else if (sh->slice_alf_chroma_idc == 2) { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 1; + } else if (sh->slice_alf_chroma_idc == 3) { + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 1; + } else { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 0; + } + + if (!sh->slice_alf_enabled_flag) + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if (sliceChromaAlfEnabledFlag) { + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma_map_flag = get_bits(&gb, 1); + } + + if (sliceChroma2AlfEnabledFlag) { + sh->slice_alf_chroma2_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma2_map_flag = get_bits(&gb, 1); + } + } + } + + if (ev->nalu_type != EVC_IDR_NUT) { + if (sps->sps_pocs_flag) + sh->slice_pic_order_cnt_lsb = get_bits(&gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + } + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +/** + * + * Parse NAL unit + * + * @param s parser context + * @param buf buffer with field/frame data + * @param buf_size size of the buffer + * @param avctx codec context + */ +static int parse_nal_unit(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + int tid; + const uint8_t *data = buf; + int data_size = buf_size; + + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + s->key_frame = -1; + + + nalu_size = buf_size; + if (nalu_size <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return AVERROR_INVALIDDATA; + } + + // @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes) + // @see enum EVCNALUnitType in evc.h + nalu_type = get_nalu_type(data, data_size, avctx); + if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + return AVERROR_INVALIDDATA; + } + ev->nalu_type = nalu_type; + + tid = get_temporal_id(data, data_size, avctx); + if (tid < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid); + return AVERROR_INVALIDDATA; + } + ev->nuh_temporal_id = tid; + + if (data_size < nalu_size) { + av_log(avctx, AV_LOG_ERROR, "NAL unit does not fit in the data buffer\n"); + return AVERROR_INVALIDDATA; + } + + data += EVC_NALU_HEADER_SIZE; + data_size -= EVC_NALU_HEADER_SIZE; + + if (nalu_type == EVC_SPS_NUT) { + EVCParserSPS *sps; + int SubGopLength; + + sps = parse_sps(data, nalu_size, ev); + if (!sps) { + av_log(avctx, AV_LOG_ERROR, "SPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + + s->coded_width = sps->pic_width_in_luma_samples; + s->coded_height = sps->pic_height_in_luma_samples; + s->width = sps->pic_width_in_luma_samples - sps->picture_crop_left_offset - sps->picture_crop_right_offset; + s->height = sps->pic_height_in_luma_samples - sps->picture_crop_top_offset - sps->picture_crop_bottom_offset; + + SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + avctx->gop_size = SubGopLength; + + avctx->delay = (sps->sps_max_dec_pic_buffering_minus1)?sps->sps_max_dec_pic_buffering_minus1-1:SubGopLength+sps->max_num_tid0_ref_pics-1; + + if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else avctx->profile = FF_PROFILE_EVC_BASELINE; + + ev->time_base = avctx->time_base.den; + + switch (sps->chroma_format_idc) { + case 0: /* YCBCR400_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR400_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_GRAY10LE; + return -1; + case 1: /* YCBCR420_10LE */ + s->format = AV_PIX_FMT_YUV420P10LE; + break; + case 2: /* YCBCR422_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR422_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV422P10LE; + return -1; + case 3: /* YCBCR444_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR444_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV444P10LE; + return -1; + default: + s->format = AV_PIX_FMT_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown supported chroma format\n"); + return -1; + } + } else if (nalu_type == EVC_PPS_NUT) { + EVCParserPPS *pps; + + pps = parse_pps(data, nalu_size, ev); + if (!pps) { + av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + } else if (nalu_type == EVC_SEI_NUT) // Supplemental Enhancement Information + return 0; + else if (nalu_type == EVC_APS_NUT) // Adaptation parameter set + return 0; + else if (nalu_type == EVC_FD_NUT) /* Filler data */ + return 0; + else if (nalu_type == EVC_IDR_NUT || nalu_type == EVC_NOIDR_NUT) { // Coded slice of a IDR or non-IDR picture + EVCParserSliceHeader *sh; + EVCParserSPS *sps; + int slice_pic_parameter_set_id; + + sh = parse_slice_header(data, nalu_size, ev); + if (!sh) { + av_log(avctx, AV_LOG_ERROR, "Slice header parsing error\n"); + return AVERROR_INVALIDDATA; + } + + switch (sh->slice_type) { + case EVC_SLICE_TYPE_B: { + s->pict_type = AV_PICTURE_TYPE_B; + break; + } + case EVC_SLICE_TYPE_P: { + s->pict_type = AV_PICTURE_TYPE_P; + break; + } + case EVC_SLICE_TYPE_I: { + s->pict_type = AV_PICTURE_TYPE_I; + break; + } + default: { + s->pict_type = AV_PICTURE_TYPE_NONE; + } + } + + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + // POC (picture order count of the current picture) derivation + // @see ISO/IEC 23094-1:2020(E) 8.3.1 Decoding process for picture order count + slice_pic_parameter_set_id = sh->slice_pic_parameter_set_id; + sps = &ev->sps[slice_pic_parameter_set_id]; + + if (sps->sps_pocs_flag) { + + int PicOrderCntMsb = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + + if (nalu_type == EVC_IDR_NUT) + PicOrderCntMsb = 0; + else { + int MaxPicOrderCntLsb = 1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + + int prevPicOrderCntLsb = ev->poc.PicOrderCntVal & (MaxPicOrderCntLsb - 1); + int prevPicOrderCntMsb = ev->poc.PicOrderCntVal - prevPicOrderCntLsb; + + + if ((sh->slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && + ((prevPicOrderCntLsb - sh->slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb; + + else if ((sh->slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && + ((sh->slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb; + + else + PicOrderCntMsb = prevPicOrderCntMsb; + } + ev->poc.PicOrderCntVal = PicOrderCntMsb + sh->slice_pic_order_cnt_lsb; + + } else { + if (nalu_type == EVC_IDR_NUT) { + ev->poc.PicOrderCntVal = 0; + ev->poc.DocOffset = -1; + } else { + int SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + if (tid == 0) { + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + SubGopLength; + ev->poc.DocOffset = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + } else { + int ExpectedTemporalId; + int PocOffset; + int prevDocOffset = ev->poc.DocOffset; + + ev->poc.DocOffset = (prevDocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) { + ev->poc.prevPicOrderCntVal += SubGopLength; + ExpectedTemporalId = 0; + } else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + while (tid != ExpectedTemporalId) { + ev->poc.DocOffset = (ev->poc.DocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) + ExpectedTemporalId = 0; + else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + } + PocOffset = (int)(SubGopLength * ((2.0 * ev->poc.DocOffset + 1) / (int)pow(2.0, tid) - 2)); + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + PocOffset; + } + } + } + + s->output_picture_number = ev->poc.PicOrderCntVal; + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + return 0; + } + data += (nalu_size - EVC_NALU_HEADER_SIZE); + data_size -= (nalu_size - EVC_NALU_HEADER_SIZE); + + return 0; +} + +/** + * @brief Reconstruct NAL Unit from incomplete data + * + * @param[in] s parser context + * @param[in] data pointer to the buffer containg new data for current NALU prefix + * @param[in] data_size amount of bytes to read from the input buffer + * @param[out] nalu_prefix assembled NALU length + * @param[in ] avctx codec context + * + * Assemble the NALU prefix storing NALU length if it has been split between 2 subsequent buffers (input chunks) incoming to the parser. + * This is the case when the buffer size is not enough for the buffer to store the whole NAL unit prefix. + * In this case, we have to get part of the prefix from the previous buffer and assemble it with the rest from the current buffer. + * Then we'll be able to read NAL unit size. + */ +static int evc_assemble_nalu_prefix(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu_prefix, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + // + // ~~~~~~~ + // 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 | + // ------------------------------------------------------- + // | PREF | | | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0x00 | 0x3C | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // | PREF | PREF | PREF | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // nalu_prefix + // ---------- + // --------------------------------- + // | 0 | 1 | 2 | 3 | + // --------------------------------- + // | 0x00 | 0x00 | 0x00 | 0x3C | + // --------------------------------- + // | NALU LENGTH | + // --------------------------------- + // NAL Unit lenght = 60 (0x0000003C) + // + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) { + if (i < pc->index) + nalu_prefix[i] = pc->buffer[i]; + else + nalu_prefix[i] = data[i - pc->index]; + } + + return 0; +} + +/** + * @brief Reconstruct NALU from incomplete data + * Assemble NALU if it is split between multiple buffers + * + * This is the case when buffer size is not enough for the buffer to store NAL unit. + * In this case, we have to get parts of the NALU from the previous buffers stored in pc->buffer and assemble it with the rest from the current buffer. + * + * @param[in] s parser context + * @param[in] data pointer to the buffer containg new data for current NALU + * @param[in] data_size amount of bytes to read from the input buffer + * @param[out] nalu pointer to the memory block for storing assembled NALU + * @param[in] nalu_size assembled NALU length + * @param[in ] avctx codec context + */ +static int evc_assemble_nalu(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu, int nalu_size, + AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of the current NALU and previous NALUs that belongs to the current Access Unit. + // + // - prevoiusly read bytes are data that came with the previous incoming data chunks + // + // - pc->buffer contains bytes of the current NALU that have been already read while processing previous chunks of incoming data + // and already read bytes of previous NALUs belonging to the same Access Unit. + // + // - The ctx->bytes_read is the index of the first element of the current NALU int the pc->buffer. + // - The pc->index is the index of the element located right next to the last element of the current NALU in the pc->buffer. + // - The elements of pc->buffer located before ctx->bytes_read index contain previously read NALUs of the current Access Unit. + // + // 2. buf contains the rest of the NAL unit bytestime_base + // + // - ctx->to_read number of bytes to read from buf (the index of the element right next to the last element to read) + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit bytes is equal 1024-2 + // + // ---------- + // pc->buffer -> conatins already read bytes from prevois incoming data chunks + // ---------- + // __ctx->bytes_read == 2 __ pc->index == 1024 + // | | + // V V + // ------------------------------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | 5 | 6 | ... | 1023 | 1024 | + // ------------------------------------------------------------------------------- + // | 0x00 | 0x01 | 0x02 | 0x03 | 0x04 | 0x05 | 0x06 | ... | 0xA0 | 0xA1 | + // ------------------------------------------------------------------------------- + // | | | NALU | NALU | NALU | NALU | NALU | ... | NALU | | + // ------------------------------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // __ctx->to_read == 3 (index of the element right next to last one) + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | 1023 | + // ------------------------------------------------------- + // | 0xB0 | 0xB1 | 0xB2 | 0xB3 | 0xB4 | ... | 0xFF | + // ------------------------------------------------------- + // | NALU | NALU | NALU | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // nalu (nalu size 1025) + // ---------- + // + // ---------------------------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | 1021 | 1022 | 1023 | 1024 | + // ---------------------------------------------------------------------------- + // | 0x02 | 0x03 | 0x04 | 0x05 | 0x06 | ... | 0xA0 | 0xB0 | 0xB1 | 0xB3 | + // ---------------------------------------------------------------------------- + + uint8_t *prev_data = pc->buffer + ctx->bytes_read; + int prev_data_size = pc->index - ctx->bytes_read; + + memcpy(nalu, prev_data, prev_data_size); + memcpy(nalu + prev_data_size, data, data_size); + + return 0; +} + +static int end_of_access_unit_found(AVCodecParserContext *s, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + + if (avctx->profile == 0) { // BASELINE profile + if (ctx->nalu_type == EVC_NOIDR_NUT || ctx->nalu_type == EVC_IDR_NUT) + return 1; + } else { // MAIN profile + EVCParserContext *ev = s->priv_data; + if (ctx->nalu_type == EVC_NOIDR_NUT) { + if (ev->poc.PicOrderCntVal != ev->poc.prevPicOrderCntVal) + return 1; + } else if (ctx->nalu_type == EVC_IDR_NUT) + return 1; + } + return 0; +} + +/** + * Find the end of the current frame in the bitstream. + * The end of frame is the end of Access Unit. + * + * @param s parser context + * @param buf buffer with field/frame data + * @param buf_size size of the buffer + * @param avctx codex context + * + * @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 *ctx = s->priv_data; + + const uint8_t *data = buf; + int data_size = buf_size; + + while (data_size > 0) { + + if (ctx->to_read == 0) { + // Nothing must be read and appended to the data from previous chunks. + // The previous chunk of data provided the complete NALU prefix or provided the complete NALU. + + if (ctx->nalu_prefix_assembled) // NALU prefix has been assembled from previous and current chunks of incoming data + ctx->nalu_prefix_assembled = 0; + else { // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (data_size < EVC_NALU_LENGTH_PREFIX_SIZE) { + ctx->to_read = EVC_NALU_LENGTH_PREFIX_SIZE - data_size; + ctx->incomplete_nalu_prefix_read = 1; + return END_NOT_FOUND; + } + + ctx->nalu_size = read_nal_unit_length(data, data_size, avctx); + ctx->bytes_read += EVC_NALU_LENGTH_PREFIX_SIZE; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + data_size -= EVC_NALU_LENGTH_PREFIX_SIZE; + } + + if (data_size < ctx->nalu_size) { + + ctx->to_read = ctx->nalu_size - data_size; + ctx->incomplete_nalu_read = 1; + return END_NOT_FOUND; + } + + // the entire NALU can be read + if (parse_nal_unit(s, data, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + + data += ctx->nalu_size; + data_size -= ctx->nalu_size; + + ctx->bytes_read += ctx->nalu_size; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->bytes_read; + ctx->bytes_read = 0; + return read_bytes; + } + + // go to the next iteration + continue; + + } else { + // The previous chunk of input data did not contain the complete valid NALU prefix or did not contain the complete NALU. + // + // Missing data must be read from the current data chunk and merged with the data from the previous data chunk + // to assemble a complete NALU or complete NALU prefix. + // + // The data from the previous data chunk are stored in pc->buf + + if (ctx->to_read < data_size) { + + if (ctx->incomplete_nalu_prefix_read == 1) { + + uint8_t nalu_prefix[EVC_NALU_LENGTH_PREFIX_SIZE]; + evc_assemble_nalu_prefix(s, data, data_size, nalu_prefix, avctx); + + ctx->nalu_size = read_nal_unit_length(nalu_prefix, EVC_NALU_LENGTH_PREFIX_SIZE, avctx); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->to_read; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + ctx->incomplete_nalu_prefix_read = 0; + ctx->nalu_prefix_assembled = 1; + + continue; + } + if (ctx->incomplete_nalu_read == 1) { + + uint8_t *nalu = (uint8_t *)av_malloc(ctx->nalu_size); + + // assemble NAL unit using data from previous data chunks (pc->buffer) and the current one (data) + evc_assemble_nalu(s, data, ctx->to_read, nalu, ctx->nalu_size, avctx); + + if (parse_nal_unit(s, nalu, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + av_free(nalu); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->nalu_size; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + ctx->incomplete_nalu_read = 0; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->to_read; + + ctx->to_read = 0; + ctx->bytes_read = 0; + + return read_bytes; + } + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + continue; + } + } else { + // needed more input data to assemble complete valid NAL Unit + ctx->to_read = ctx->to_read - data_size; + return END_NOT_FOUND; + } + } + } + + return END_NOT_FOUND; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) + next = buf_size; + else { + next = evc_find_frame_end(s, buf, buf_size, avctx); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + // poutbuf contains just one Access Unit + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +const AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index d355808018..2c077ec3ae 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -41,6 +41,7 @@ extern const AVCodecParser ff_dvaudio_parser; extern const AVCodecParser ff_dvbsub_parser; extern const AVCodecParser ff_dvdsub_parser; extern const AVCodecParser ff_dvd_nav_parser; +extern const AVCodecParser ff_evc_parser; extern const AVCodecParser ff_flac_parser; extern const AVCodecParser ff_ftr_parser; extern const AVCodecParser ff_g723_1_parser; From patchwork Wed Dec 14 11:59:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39696 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp249623pzb; Wed, 14 Dec 2022 03:59:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Erh7AoPyi0EZUxl+tZzAqUtBK+iA27ieQ6O/rbHVgoW6mT2E9Qpe1MSF+jeRal57mDo0p X-Received: by 2002:a17:906:bc8b:b0:7c0:9f6f:6d8 with SMTP id lv11-20020a170906bc8b00b007c09f6f06d8mr17656842ejb.2.1671019195547; Wed, 14 Dec 2022 03:59:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019195; cv=none; d=google.com; s=arc-20160816; b=eO5mcxo55EIY+mQ6Wrz6eHryjsfLEOE43cVe2nNTdB4V3mEI1lPaTqzbKCrGzqagbL T0AmdS78EXPXKw57ABRy31YLuLLZkh07EZRKsZzVGLq+02lFRxQzAl5ezJ+Harg1SggW q7uuZ1GcgSh9IGsSdlnBszAG0Qjy7RgtiHLYgG3Ad1PB3l4eQ3wLEy93eftYkH4jZkp/ LhrrXB3MzfBkFukgzs6AJ+wjkG5QzK7Jzj/+bm3FeX6Ucgq4uNgfSGkwQhjU/i/fpMVa JT6rX9+zQd/FLq5rQHPV1XRmrzgNZXllj+w5AzPkYj7ygKG0FbOPy8J0guSIYgVRDiGJ hRKw== 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=xhBOynkLIbckVq0cLv341KYRTglj7O4+EPcSfDuOApo=; b=Km+Y2tsZ1UPW73Y5Cag06catl5PspOKET0nmUdo1AXKwD/XFZdoUlBI7rs9YYCmvhd OuEqj2/b0AsVYAuWWRxd0iz5Mv+rQNLU2GI7uz9Rq5+aAyj5pDcDf81EmZssPryblKRq Hro4ibkzrc3rgzFMjNqgsvFhmJ2hcDbd7nWtaIfBTk4TGB5XauYjhB2CcZGsG+RlT0Rg 6t3th+DLC5VdZDRW8KukiS4aHgqam6vkAlKW4KO/opRWKD8pX/3P6sycuMWjQ15yMf5y OsuOd2yOwTAMoMxZIyM/lxvMeAixpJ+ynrOIpd9Ly4Z5qhy1GDAZV7md6HGs53J5WNkw 9shQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="IBm7v+u/"; 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 z18-20020a05640240d200b00461c314f79fsi13858000edb.284.2022.12.14.03.59.55; Wed, 14 Dec 2022 03:59:55 -0800 (PST) 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="IBm7v+u/"; 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 40AA768B554; Wed, 14 Dec 2022 13:59:53 +0200 (EET) 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 3B04568B554 for ; Wed, 14 Dec 2022 13:59:46 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221214115945euoutp013385c01c50bdf2da346d89dc16e7cb64~wpxhq2pDJ1276312763euoutp01a for ; Wed, 14 Dec 2022 11:59:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221214115945euoutp013385c01c50bdf2da346d89dc16e7cb64~wpxhq2pDJ1276312763euoutp01a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019185; bh=EQdBYhVZbF8VDo7LUul3tUVaNaWS6Y9rL2nfv9M/9Vk=; h=From:To:Cc:Subject:Date:References:From; b=IBm7v+u/c81fRF4SXhC5TmESlDyFriIx8lJkAlFpWjfNMlnlE8cmaWkOnD4j62YNa taE2gO/n4INHLQz3ObAtQfZrKgLlxWSRWpTDcYm7at95SSHw1fnY4jb43jcE3ZevfE c65S47od2r1tRgwCU2Qcez52NQhRFsU/2ep22dXQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221214115944eucas1p2ae0f4ee8b23907ee9e272be3f74ad030~wpxhc0LkM2862828628eucas1p2S; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id A0.08.09549.0BAB9936; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221214115944eucas1p107567a1dfa72ce221d6ac1882c19c4e4~wpxhJpP9o2539925399eucas1p10; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221214115944eusmtrp24383fdd69e80b00c2e097a66a52f3070~wpxhJFhhH1865518655eusmtrp2Q; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) X-AuditID: cbfec7f5-f47ff7000000254d-87-6399bab08560 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F2.9C.08916.0BAB9936; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221214115944eusmtip29b0f56ca10ea01c77db516ecdf5b8497~wpxg1FRD73265632656eusmtip21; Wed, 14 Dec 2022 11:59:44 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 12:59:13 +0100 Message-Id: <20221214115913.1122-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7obds1MNlj3QMfiy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK4rJJSc3JLEst0rdL4MroPzSfqeCVaMXMRzcYGxh/C3Qx cnBICJhInN2v18XIxSEksIJR4sS7WyxdjJxAzhdGiZk3FSESnxklnt6dygySAGlY2rSTBSKx nFHi0rF9UE47k8ShFQfZQKrYBHQlXn54xARiiwiYSpxs3gsWZxbQllh39zuYLSxQI3HvxE6w dSwCqhIrPh1mBLF5BawkJm5qZoXYpikxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1NjPI ERICP9klpm5/zw5R5CJxaHYLG4QtLPHq+BaouIzE/53zmSD+L5Y41O8AYdZIHPqRDlFhLfG2 8TgjSJgZ6IT1u/Qhwo4Sf77OZoGo5pO48VYQ4gA+iUnbpjNDhHklOtqEIEwVib5OMYhGKYmn y+ZAA9BD4uTaLWwTGBVnIflqFpJPZiGsXcDIvIpRPLW0ODc9tdg4L7Vcrzgxt7g0L10vOT93 EyMwOZz+d/zrDsYVrz7qHWJk4mA8xCjBwawkwquqMS1ZiDclsbIqtSg/vqg0J7X4EKM0B4uS OO+KKR3JQgLpiSWp2ampBalFMFkmDk6pBiZBhyXmt9hcZy2vL9FlyFby06r5Ocfgba3S8tOH 2zeznPgV/dD/f4aDRS6PxarJXEcTmeIDw+5emzbzp8eP6CidjVdb8tzinhbsz7TgOl7yJ3/t hV1HlzhvuM8YoaVyPkAmXuiXi2f8yxtOd+ze5KXsONF+6eiX321zPoZu4/q2oODoj2Q5xq1X ThW4v1zrGqR6snX7CR/zJ4bOz2ZoZdcnhehEOzatfNDEoHBceseGwNkVp25yae+tenKI387+ RCz/+123GvZ6e6pXrgn2Dz+bcicxUCvtkH3vDqEVzHr/N3IF5/+z37lOy/SIpnrZ2uJph0qX rL04J6jdwMG08pvFtFl6rOU5b+9XOhW/zVNiKc5INNRiLipOBACmCIgrfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7obds1MNlj3Wcriy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0MvoPzSfqeCVaMXMRzcYGxh/C3QxcnJICJhILG3aydLFyMUhJLCU UeJZ/3k2iISUxNKlixghbGGJP9e62CCKWpkkrhzoYQZJsAnoSrz88IgJxBYRMJe4uO4WWAOz gLbEurvfwQYJC1RJ9P55zwJiswioSqz4dBishlfASmLipmZWiAWaEhO2zGGCiAtKnJz5hAUi zi2xbtYlVoiZ8hLNW2czT2Dkn4WkbBaS1AJGplWMIqmlxbnpucWGesWJucWleel6yfm5mxiB gbvt2M/NOxjnvfqod4iRiYPxEKMEB7OSCK+qxrRkId6UxMqq1KL8+KLSnNTiQ4ymQLdOZJYS Tc4Hxk5eSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVAPT1nsGDSV1 lvs7jjp0zu3k3upwSmg+46XpjtI9uxUNVXYwc7etvLJ20U1Fl0lvmdwVZZK+GBUq+KgunNXg Gib8sdNBletl38Sf6g4Jkh94xZz55f3mPwtqmnVJWXf6HcXYLMXpB9vW/950c93U1EVf33uW HlmZ/djn2hKPCzZH4u38T3CsOe1w83AKc30se5F6gKD5zxMZlZecvN9O3H9T/dxTrl2Lgxn/ PXzX23ctcep8qcXrioUqHu6z7yv+qVN7Pvn216+nU3cluSXffPCByX4Xg9uUqjcnU1/9yZp5 m1U1+Y5lwYzABzNmu7rnuamrfNpkG3bVRJT7n473QpPJOkcmdmZM+nST90HVKdsVSizFGYmG WsxFxYkA36h51+UCAAA= X-CMS-MailID: 20221214115944eucas1p107567a1dfa72ce221d6ac1882c19c4e4 X-Msg-Generator: CA X-RootMTR: 20221214115944eucas1p107567a1dfa72ce221d6ac1882c19c4e4 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214115944eucas1p107567a1dfa72ce221d6ac1882c19c4e4 References: Subject: [FFmpeg-devel] [PATCH v15 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: qCvcB1sJwR1Y - 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 62262ae935..aabc9b5f99 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -153,6 +153,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 Wed Dec 14 12:00:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp250264pzb; Wed, 14 Dec 2022 04:00:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf4sumiTb4EWYR/qyi2vAhiE5AOBFGas8Pict6huS1MBqmLXqDIeOgGj9vm0ybZZ0sHqJj9X X-Received: by 2002:a17:907:d40f:b0:7c4:f402:9769 with SMTP id vi15-20020a170907d40f00b007c4f4029769mr1144764ejc.76.1671019239116; Wed, 14 Dec 2022 04:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019239; cv=none; d=google.com; s=arc-20160816; b=aqedTpD3TWUBq5brYG8lfHL56TNAFKyb6Xs1w1XAzskW2mDpMx8evHlLdqeoImHH1y PoDfX3qOALFlslJHFI68oJKuCZ+DkaCx7l2E8N7ZzcZNjxvxIggpZn+mIDH5SbVvbNoO WoIPMxKymfhmdYl1hS5sWrZiaUkgPGr5Y6BdUHIi6blZbZFFx+/0RDClyzNb9anHvofx GapRYY5w80Yb7rIhfPNnmOl4PmUH5V4LWbTOeCQ7xC8SN2uPqEssgRvSnBN8CfB1p7Y2 ooNBP1XHXaAnww5/4Qfy6VkNSFPOcO7rsuKQsLkRMxOE+QJwuLWlS2TQtMAWoJi31eRM aGNA== 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=0FhYCcwwOFsqxbSfY2NovJDpy9Dpxfde0tXUvVo9WKc=; b=fKnzTIVVIcGsRAkyYunLj1sn1qtoe4IRpBOvylv0eMwF9J3pEeJmjC25K/Q3Ll79M6 cci69LLy5ANE2M18hDxCqdfT4mdPvv8GCkTMHU5BpGVODqKeUwseClxfyj8zBDMgaZHS K9KZAY3hq7Av3M2+87ox5y6VJQGSNHWxmtznYu0vi4/8AV5wswXnv54w31aXFSKdUb+9 CNu7eAZ0cltEV41D2i7upA1RO+Xr3sfZEC48YC1qeB+Vv9A7WiTuD90ECpppWas3rFNX JuA/+/MMaMHBeHTJZ6955zAQ4KRc+T/0cLSNb0Me9BJAunc3Pa+69jIyT9w+8l6/C0Om h53A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qX60vZVK; 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 kf17-20020a17090776d100b0078d4b605b71si8424601ejc.338.2022.12.14.04.00.38; Wed, 14 Dec 2022 04:00:39 -0800 (PST) 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=qX60vZVK; 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 5A00268BAE4; Wed, 14 Dec 2022 14:00:36 +0200 (EET) 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 DC07768BAE4 for ; Wed, 14 Dec 2022 14:00:28 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120028euoutp02e46f4f143d533919be0ab4a858f9d84d~wpyKEk-cy1295412954euoutp024 for ; Wed, 14 Dec 2022 12:00:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214120028euoutp02e46f4f143d533919be0ab4a858f9d84d~wpyKEk-cy1295412954euoutp024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019228; bh=x0Ebh6ZM1zpyzS4o9hU7BTaPVofVI0IiwKMLOmUN7yQ=; h=From:To:Cc:Subject:Date:References:From; b=qX60vZVKsGOSCJ5Ff0b2/tlSto6N2tNDOEu9rDU486kYY4Mq6P03ddcvb0e24ivS4 Ci1d3z50LVZAVQszEqR+yHhTPxEGCq2onXSjKvHmYU95tcGmBfoLykrc40NTEOLjnm nl0DMSPL7bG/CvyDtYOolIBad7m1xeTVEEF924K8= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221214120028eucas1p2e42fc6196cabf9f63227146df60b6078~wpyJ1T8b00033100331eucas1p2Y; Wed, 14 Dec 2022 12:00:28 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id EF.26.10112.CDAB9936; Wed, 14 Dec 2022 12:00:28 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221214120027eucas1p20b8703a0b0cc9e087001e45577662628~wpyJjhF-s0400004000eucas1p2X; Wed, 14 Dec 2022 12:00:27 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221214120027eusmtrp228ac923d6bc885dc0caeca9f5488bfe6~wpyJi8sTm1992819928eusmtrp28; Wed, 14 Dec 2022 12:00:27 +0000 (GMT) X-AuditID: cbfec7f4-d09ff70000002780-68-6399badc303a Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id A5.2B.09026.BDAB9936; Wed, 14 Dec 2022 12:00:27 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221214120027eusmtip1ae6dd6a655a7b23cdaea089300e93c15~wpyJJjrRi2276422764eusmtip15; Wed, 14 Dec 2022 12:00:27 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:00:08 +0100 Message-Id: <20221214120008.1291-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87p3ds1MNui5wG7x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGW8vGNdsFWrYsPjK4wNjC0KXYyc HBICJhInuj+ydDFycQgJrGCU2LLlKSOE84VRYv/dQ6wQzmdGia3XPrDAtJxb9pAdIrGcUeLA 4R9QTjuTROf9+0wgVWwCuhIvPzwCs0UETCVONu9lA7GZBbQl1t39DmYLCyRInD58mR3EZhFQ lTg5cR/QOg4OXgEriSnfGSGWaUpM2DIHbAyvgKDEyZlPoI7gllg36xIrxEh5ieats5lBbpAQ +Msu8WX9Y6giF4nW9pvsELawxKvjW6BsGYn/O+czgeySECiWONTvAGHWSBz6kQ5RYS3xtvE4 I0iYGeiE9bv0IcKOEr8ufWOHqOaTuPFWEOIAPolJ26YzQ4R5JTrahCBMFYm+TjGIRimJp8vm MEPYHhIrp6xlncCoOAvJV7OQfDILYe0CRuZVjOKppcW56anFRnmp5XrFibnFpXnpesn5uZsY gcnh9L/jX3YwLn/1Ue8QIxMH4yFGCQ5mJRFeVY1pyUK8KYmVValF+fFFpTmpxYcYpTlYlMR5 V0zpSBYSSE8sSc1OTS1ILYLJMnFwSjUwzeD3rk6sknfW0uhy2ZFp9d5iSdVm/mBObQP+5Wn2 veqLikKds9qduqck+7bGO/zPStZzMHlypO7iPentO1szBb7+VpwccNtSzD/Byft21OVDjsxC 3jpPlRq77nXv1JhtVzV7i+n5veyzsndcepvyLzKm++lrtn8P/0m5Hlk5Perxp/JnCRqT3KQV r2rPi1wU8tdg4+uKUoOOv+FxHQ8KBWQ3TTkwc/NDyS86nXP6ZkxaKXmWZ2bUnfZZtyedXu5Q crpM7l7S+ck532cdSbsY+mRV1W8NlUUqrLavhftebVU+b6igucvVKtVjD0dFuOdD9/N1884Z SWQFCam9+eVua2wfszLAKTaMWbG1LUKJpTgj0VCLuag4EQA0stDrfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7q3d81MNmhYpWfx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GW8vGNdsFWrYsPjK4wNjC0KXYycHBICJhLnlj1k72Lk4hASWMoo 8X3WQjaIhJTE0qWLGCFsYYk/17rYIIpamSR+v+kDS7AJ6Eq8/PCICcQWETCXuLjuFlicWUBb Yt3d72CDhAXiJPZumcQOYrMIqEqcnLiPtYuRg4NXwEpiyneo+ZoSE7bMARvDKyAocXLmExaI OLfEulmXWCFGyks0b53NPIGRfxaSsllIUgsYmVYxiqSWFuem5xYb6RUn5haX5qXrJefnbmIE Bu22Yz+37GBc+eqj3iFGJg7GQ4wSHMxKIryqGtOShXhTEiurUovy44tKc1KLDzGaAp06kVlK NDkfGDd5JfGGZgamhiZmlgamlmbGSuK8ngUdiUIC6YklqdmpqQWpRTB9TBycUg1Mm56c3H9m ffjcR6vntAj06Rmv9Xu2yj9Bjkt8T+Rixblav5fV+XbtDmfqbvo3tSMi9wrLqwMdztMmm0yw npC5zWjXC7WwDUI7jhbfY/E9dFVv04nb96bbJKrN+85fcPb4ubxshbJS/kPtk75bq3z9IFLt eur2hSyV7Pm+U1+Z8sxqE/Conv3goJyrazWzlNjjJ1ceT5VaYhe0cYmyf59ZoeueCMtJR76o pH8Kf3b67Ip+hkvH2kp3vxDSnuvAc/Ws5fai+pfMb/rk31wUajxWX7zp+gzPSKd1O+J5Jzoo rJuU+eNI0tQ1J3o4H75O2WZvof3p5d1TFzjnCS5Udp3G/OraqoklDsxXlnI+WWW84JgSS3FG oqEWc1FxIgD+B0oO4wIAAA== X-CMS-MailID: 20221214120027eucas1p20b8703a0b0cc9e087001e45577662628 X-Msg-Generator: CA X-RootMTR: 20221214120027eucas1p20b8703a0b0cc9e087001e45577662628 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120027eucas1p20b8703a0b0cc9e087001e45577662628 References: Subject: [FFmpeg-devel] [PATCH v15 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: v9iPJDz5eNq/ - 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 aabc9b5f99..a963c0223d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -153,6 +153,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..7887f0b591 --- /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_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { // Cannot get bitstream information. Malformed bitstream. + return -1; + } + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + + nalu_size = read_nal_unit_length(bits, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + bits += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) From patchwork Wed Dec 14 12:01:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp251777pzb; Wed, 14 Dec 2022 04:02:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf5C0MKpEAI2ex3kd+LFWCjubQD1f2UiXiskJ/c6LvuH4+sBL2TDGHL75/wCJ4zkcsju5LGC X-Received: by 2002:a05:6402:5410:b0:463:7489:ce0a with SMTP id ev16-20020a056402541000b004637489ce0amr19297744edb.11.1671019321310; Wed, 14 Dec 2022 04:02:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019321; cv=none; d=google.com; s=arc-20160816; b=udUxnwrhA/C/Ws0KqBHoHUaGJzKgrfXR5x1/9PXFH8XQaiNsC0ciBurdKT0jASNaiJ sr6uhyCnAo4l+iRBpjA+PQ3W8aB1ykL5PsAA8+zS5I6CjUf1BN8ypjoNco8Ag0FADm8E D4BDK2dBmgrw0/V0LOi4wIjDo7cm0x5FO3UPy7gnWHTvL8/KZKuJWrnH2IYDvgR2OJi/ AnmBHUj0kZOrBL+YxHKlQr4Rp/mcI+gzmMb+U9Vj6GLZU3TpbkFLImLb7eHVB9O3QdwG /hHjB2LLZdkJkusfbfkKwli+w9JX9owLD7Qn3e+mHgPFRScbolmdmFAqV0XU4VQJAVZr EXrw== 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=vjUg/L4VvAAWdje9SsMqAQUrsvwkGO8FvgvvM8HIp60=; b=Qr2mNN05veiXiKGgLe0ndmf3+mHPtk8nFdCOGDL/tgSAjc2zcHUiDZj82hfJqHXN3P 63vHIC0uEUUXuvEB2jU22qdL2FqexiRDBYl7J7FMem3TRsLFdxtprPsPaPvOzHJvRc0O P86ivr3NEWE8yPlY8wmhauxoPhEUcQNeTx7+wMo3Pv7EFQ5Jh4z1jMA1+L7dil0Elhyj Hr6cM6XsX+5o6sODAOMr658uf+q3juMeHtC3j3sGoLFa5jPbGNB8yY591rc/7+T7S21d THhuVzHw7F6uPxMnMkodXLYyBeFEnKaugXHeQFpdVCO5xLq70W7LaumgB9+9Vc18E7Aq Wwhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=I77akOzD; 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 t3-20020a056402524300b00468ccfbba7asi13730132edd.387.2022.12.14.04.02.00; Wed, 14 Dec 2022 04:02:01 -0800 (PST) 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=I77akOzD; 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 8FEA868BAFB; Wed, 14 Dec 2022 14:01:58 +0200 (EET) 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 5971C68B554 for ; Wed, 14 Dec 2022 14:01:51 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120150euoutp0225f98cb4dcff27e3bba49b919ea3b3b4~wpzWzWKPw1295912959euoutp029 for ; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214120150euoutp0225f98cb4dcff27e3bba49b919ea3b3b4~wpzWzWKPw1295912959euoutp029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019310; bh=+M8sKsY0b8Hcsp2zvY9zH0gW5igEx3adVtZdcLeIDio=; h=From:To:Cc:Subject:Date:References:From; b=I77akOzDqGgqNKyFZiG59pxKYmymxlx6vnpxHC1jb7kVGz0ECyw5lY4hUQ8M6cFuN eU/e0DTBkbkAjOHbYVioOrfflI3nESPLQQyAg2iW+7UN35qP0P/I3PQ4Fd/oGPjPJ6 vU9TI0lSrVqGPzPW8AYv7G61tbraclcRYILOm5Eg= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214120150eucas1p11c9f69c792ee4abcdc2496733e353723~wpzWkJJXB1216612166eucas1p17; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 1F.60.09561.E2BB9936; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221214120150eucas1p25fd938a57028d19da989d63b66df1de1~wpzWL__zi0814208142eucas1p2b; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221214120150eusmtrp1082098ef2fd30b61c065343b49864e82~wpzWLddV52966529665eusmtrp1e; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) X-AuditID: cbfec7f2-0c9ff70000002559-1e-6399bb2ebbb6 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 17.6B.09026.E2BB9936; Wed, 14 Dec 2022 12:01:50 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221214120149eusmtip2fae712569454ffb35c2642990ad4c9aa~wpzV1gKvy3179931799eusmtip2Q; Wed, 14 Dec 2022 12:01:49 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:01:20 +0100 Message-Id: <20221214120121.298-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87p6u2cmGzz6K2Hx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVM37qeqeDyH8aKZ3vOszUwHt/H 2MXIySEhYCJxZ9dnli5GLg4hgRWMErdOP2MGSQgJfGGUOHlQACLxmVFi7+5dLDAdWx/fYIMo Ws4o0b9YCcJuZ5I4/zwLxGYT0JV4+eERE4gtImAqcbJ5L1g9s4C2xLq738FsYYEAie9/p4DV sAioSkxY+BvM5hWwlPj9/yLULk2JCVvmQMUFJU7OfAIV55ZYN+sSK8RMeYnmrbOZQQ6VEPjK LtG47ipUkYvE6t072SFsYYlXx7dA2TISpyf3ANVwANnFEof6HSDMGolDP9IhKqwl3jYeZwQJ MwOdsH6XPkTYUWLzmtXMENV8EjfeCkIcwCcxadt0qDCvREebEISpItHXKQbRKCXxdNkcZgjb Q6L15T7mCYyKs5B8NQvJJ7MQ1i5gZF7FKJ5aWpybnlpsmJdarlecmFtcmpeul5yfu4kRmB5O /zv+aQfj3Fcf9Q4xMnEwHmKU4GBWEuFV1ZiWLMSbklhZlVqUH19UmpNafIhRmoNFSZx3xZSO ZCGB9MSS1OzU1ILUIpgsEwenVAOT+Z0Zlp/FGt6Y1l3/ZHeLVc008cQ+sUzuY8EbEyzyue9t P3pRUk45PPv8hBlO50P2+9upVf6vfWn6Pur76lCDJRtufqzTSteJffWRWWNh0uvC0uOXm08o VOYe6fn1S3I/S8z6mo5d67Ml1Fob5m2cU7zr2YRL+ZeNRZZ87TzWv0519rLnzFUGNfdnZYkv +bd3fU+MO9/OglcVzJWvPiyUezPhx74XXn+sPqlFPugvdvRcG/6etfLuhJfH7r7oqFur7/5/ VVGufOfkQ7F61fpbOX9eMLRTc7MJ5TjwWS//mJ3rJKlvL942viv61ffJ4m3kbJ7bc+PMpk3O KMnoiLxw6xCD5ecghROsShJdTBtzlFiKMxINtZiLihMBvmvjE34DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xe7p6u2cmGxw+ymrx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVM37qeqeDyH8aKZ3vOszUwHt/H2MXIySEhYCKx9fENti5GLg4h gaWMElOeTGCDSEhJLF26CKpIWOLPtS6oolYmia9X1jGBJNgEdCVefngEZosImEtcXHcLrIFZ QFti3d3vYIOEBfwklu29yQxiswioSkxY+BusnlfAUuL3/4ssEAs0JSZsmQMVF5Q4OfMJVJxb Yt2sS6wQM+UlmrfOZp7AyD8LSdksJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAoN3 27GfW3Ywrnz1Ue8QIxMH4yFGCQ5mJRFeVY1pyUK8KYmVValF+fFFpTmpxYcYTYFuncgsJZqc D4yfvJJ4QzMDU0MTM0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGpvK/uwOzLyrs EPP29iyUerHjmKl26TOPuK4AW7f5e8JaGRom1V9rm2KePvdfUT7vgrRZttNMJ1fWifTv7+ux OMWze9+joHXrmz0Fxf2v3mBflT99g0Ta0zm8fDW+z66J/5qw7vbeJfGKFe8jPM60JSfv+Wx+ /9JfO94p0hdLknVYp3JucT/EmHhyZZbkHQ/77ujv26Nf2k2P2B3DonTixRtR51cufwVn6bU8 P3Up/IPM/rAFrPbTm9MWlpnV7V4fVd9z8seBub2VG3akeywubrpet0Ds/uvrMc/y3074t//O nMeZV5vsjRgTMh07Z4Wz7Uy8y8cx4fJZmZ515l5iHDnCT+NyEu//+HTl68PPk5VYijMSDbWY i4oTASwAJb/nAgAA X-CMS-MailID: 20221214120150eucas1p25fd938a57028d19da989d63b66df1de1 X-Msg-Generator: CA X-RootMTR: 20221214120150eucas1p25fd938a57028d19da989d63b66df1de1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120150eucas1p25fd938a57028d19da989d63b66df1de1 References: Subject: [FFmpeg-devel] [PATCH v15 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: vH/ORug9ENl+ - 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 | 618 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 704 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index f4eedfc207..3657fee06d 100755 --- a/configure +++ b/configure @@ -291,6 +291,7 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] + --enable-libxeve enable EVC encoding via libxeve [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1862,6 +1863,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3392,6 +3394,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" vapoursynth_demuxer_deps="vapoursynth" @@ -6711,6 +6714,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index b8051cda3f..15b8db76c0 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..748f516c69 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 supported through external librarys 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 401d0b7310..8119a4cb6d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1119,6 +1119,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 d5a6c427e1..514f791fdb 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -809,6 +809,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..7efdab4716 --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,618 @@ +/* + * 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] avpkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = avctx->priv_data; + int ret = -1; + + // No more input frames are available but encoder still can have some data in its internal buffer to process + // and some frames to dump. + if (xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + return 0; + } + } + + if (xectx->state == STATE_ENCODING) { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + imgb->ts[XEVE_TS_PTS] = frame->pts; + imgb->ts[XEVE_TS_DTS] = 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->time_base.num = 1; + avpkt->time_base.den = xectx->cdsc.param.fps; + + avpkt->pts = xectx->bitb.ts[XEVE_TS_PTS]; + avpkt->dts = xectx->bitb.ts[XEVE_TS_DTS]; + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return AVERROR_INVALIDDATA; + } + + ff_side_data_set_encoder_stats(avpkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + *got_packet = 1; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return AVERROR_EXTERNAL; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + if (xectx->id) { + xeve_delete(xectx->id); + xectx->id = NULL; + } + + av_free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE +}; + +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption libxeve_options[] = { + { "preset", "Encoding preset for setting encoding speed", OFFSET(preset_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PRESET_MEDIUM }, XEVE_PRESET_DEFAULT, XEVE_PRESET_PLACEBO, VE, "preset" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_DEFAULT }, INT_MIN, INT_MAX, VE, "preset" }, + { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_FAST }, INT_MIN, INT_MAX, VE, "preset" }, + { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_MEDIUM }, INT_MIN, INT_MAX, VE, "preset" }, + { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_SLOW }, INT_MIN, INT_MAX, VE, "preset" }, + { "placebo", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_PLACEBO }, INT_MIN, INT_MAX, VE, "preset" }, + { "tune", "Tuning parameter for special purpose operation", OFFSET(tune_id), AV_OPT_TYPE_INT, { .i64 = XEVE_TUNE_NONE }, XEVE_TUNE_NONE, XEVE_TUNE_PSNR, VE, "tune"}, + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_NONE }, INT_MIN, INT_MAX, VE, "tune" }, + { "zerolatency", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_ZEROLATENCY }, INT_MIN, INT_MAX, VE, "tune" }, + { "psnr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_PSNR }, INT_MIN, INT_MAX, VE, "tune" }, + { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, + { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, + { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "sei_info", "Embed SEI messages identifying encoder parameters and command line arguments", OFFSET(sei_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xeve-params", "Override the xeve configuration using a :-separated list of key=value parameters", OFFSET(xeve_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { NULL } +}; + +static const AVClass libxeve_class = { + .class_name = "libxeve", + .item_name = av_default_item_name, + .option = libxeve_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/** + * libavcodec generic global options, which can be set on all the encoders and decoders + * @see https://www.ffmpeg.org/ffmpeg-codecs.html#Codec-Options + */ +static const FFCodecDefault libxeve_defaults[] = { + { "b", "0" }, // bitrate in terms of kilo-bits per second + { "g", "0" }, // gop_size (key-frame interval 0: only one I-frame at the first time; 1: every frame is coded in I-frame) + { "bf", "15"}, // maximum number of B frames (0: no B-frames, 1,3,7,15) + { "threads", "0"}, // number of threads to be used (0: automatically select the number of threads to set) + { NULL }, +}; + +const FFCodec ff_libxeve_encoder = { + .p.name = "libxeve", + .p.long_name = NULL_IF_CONFIG_SMALL("libxeve MPEG-5 EVC"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxeve_init, + FF_CODEC_ENCODE_CB(libxeve_encode), + .close = libxeve_close, + .priv_data_size = sizeof(XeveContext), + .p.priv_class = &libxeve_class, + .defaults = libxeve_defaults, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxeve", + .p.pix_fmts = supported_pixel_formats, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Wed Dec 14 12:02:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp252386pzb; Wed, 14 Dec 2022 04:02:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ZlafeK2yChbnQm6Ix6nwIczn6UdrleJMyvtaEiyRrB3Pj+8qaxshhC8vMV9sVR08r+fPF X-Received: by 2002:a17:906:174b:b0:7ad:8319:cfb7 with SMTP id d11-20020a170906174b00b007ad8319cfb7mr20795100eje.48.1671019359270; Wed, 14 Dec 2022 04:02:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019359; cv=none; d=google.com; s=arc-20160816; b=uSDsz8MyXsHknZJjZRUdXRpSMipCSr0Jkg2UjULwWt5ntJlKVlzwjULJT1vsdL9OVo P1WssAbdsZZku8Z4aoIOIScXgH9WDf6SFcz5Fm68w3oXrtGLWW97bRUNoSad72huqthf cP2LkudEsiSWBNgXTJ6VBUlblw2iJzv+RCG4/lBrAXv2DiA8UO5B3TooBLh4ls1BVYGN rOVE3n1wMQHWlrd4FDPrAFr51ByOVJuZF3wvV+FIHoUtCucvg4cCRg6A67abrXvmFUoL PyB7DebyhYVUfavVL6De4xmTSaZZ3vESobVqj7uT9ROMc5K/KDw0AfWntI7X+BHwtbS3 CEqQ== 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=Iv5UfBFrkDRJlFcmy9947B6n+W6hFJxZYnMvOSWfq+I=; b=cDHMaJ1nwut+HDylL0MVkfd5M2/W1Y/YG6nxka8T6d30UKi0/5UCOqjMSgNGOZAn+i bMtg+82d9UcOry5AYGNBNkknF+zfI7G5YiwC7DZjH/RSQ51ssB8aOPaYHtar5rzWSLBr tpXnwuJ/67QGeAAjSnO1I+MKvwdWrRLuAPZ0YiwDzepsL2D3wXiNr8SL3b8N10Ij8blj Lt6Eipeo4c+6sWTjBfxrEV96lM6VP+bjJuky1rlupWK4D/vS3XUYDYB2ovLhM6YlN6eT qW1nbTdIFDv80ekW5KfSyGTPVyxtv0qXla6SHTUeUAldkRzV7WSWUI5NbkFmX12rODwS qe9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=IBNq4htC; 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 nb3-20020a1709071c8300b0073da4a0f01csi11155326ejc.743.2022.12.14.04.02.38; Wed, 14 Dec 2022 04:02:39 -0800 (PST) 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=IBNq4htC; 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 C1F2668BB59; Wed, 14 Dec 2022 14:02:36 +0200 (EET) 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 E4AFA68BA83 for ; Wed, 14 Dec 2022 14:02:30 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120230euoutp02a33e80a50243c89e4213654a2221e032~wpz7pvJ6d1775217752euoutp02R for ; Wed, 14 Dec 2022 12:02:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214120230euoutp02a33e80a50243c89e4213654a2221e032~wpz7pvJ6d1775217752euoutp02R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019350; bh=2+P89ddjiz8CWNJURX7QLAJ6Nn8XUS9SOwNuydAujWg=; h=From:To:Cc:Subject:Date:References:From; b=IBNq4htC7f+rcpqt60aDqZ32OEyXtH+PBrvz8XTgLPgiZzd5Rw+4AN+r5SEi/OIeL ky90stLnV4jcogPt6ec31XjABqEgcs5fsQyqlfBXln2qqapTF7GNkOfzOSnGmW37h+ UNXnYSHKGF7CBtUsJAc+Ph48pR1igpv/ap+BjzSg= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214120230eucas1p1c7b68dcc2b0ddd91bbe21c35a4665263~wpz7bBZyq2009720097eucas1p12; Wed, 14 Dec 2022 12:02:30 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 7F.80.09561.65BB9936; Wed, 14 Dec 2022 12:02:30 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221214120229eucas1p2ea5c4dbe0540b3d68ce45359d368ca39~wpz7D2ZZp1038110381eucas1p2T; Wed, 14 Dec 2022 12:02:29 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221214120229eusmtrp11a8e63803e858e0e784636e34de0f58d~wpz7DIQGR3012230122eusmtrp1P; Wed, 14 Dec 2022 12:02:29 +0000 (GMT) X-AuditID: cbfec7f2-0c9ff70000002559-bc-6399bb56b0c9 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id E7.1D.08916.55BB9936; Wed, 14 Dec 2022 12:02:29 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221214120229eusmtip136b52c36cfae8ea4d45ad73798b3aca5~wpz6rq1wr2278422784eusmtip1M; Wed, 14 Dec 2022 12:02:29 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:02:07 +0100 Message-Id: <20221214120207.355-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87phu2cmG0y4w2rx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGWsujCRtWDddMaKjcub2RoYewq6 GDk5JARMJG7u/szUxcjFISSwglGiZ9NlZgjnC6PE83N32SCcz4wSLzrPMsK0/Nv0BCqxnFHi yvQJjBBOO5NEy6ZedpAqNgFdiZcfHjGB2CICphInm/eygdjMAtoS6+5+B7OFBQIkpn+4ANTM wcEioCrx63c9SJhXwFJi6837bBDLNCUmbJnDBBEXlDg58wkLRJxbYt2sS6wQI+UlmrfOBjtb QuAvu8Tbjx9YIYpcJA6fOwjVICzx6vgWdghbRuL05B4WkL0SAsUSh/odIMwaiUM/0iEqrCXe Nh4Hu4wZ6IT1u/QhKhwlDu23gjD5JG68FYTYzycxadt0Zogwr0RHmxCEqSLR1ykGMU5K4umy OcwQtodE484nbBMYFWcheWoWkkdmIWxdwMi8ilE8tbQ4Nz212DAvtVyvODG3uDQvXS85P3cT IzA9nP53/NMOxrmvPuodYmTiYDzEKMHBrCTCq6oxLVmINyWxsiq1KD++qDQntfgQozQHi5I4 74opHclCAumJJanZqakFqUUwWSYOTqkGJsPkZ+nxzb8v+F47OltE58qaC3PYEo5GX9q089yq uYESnz6ftFrQbZ1+KX6daYtNz9Q23aPLEu7HsIadmCnq76CZPvOIx9fgt8vkdfT914c+XitY lrtref0eUc2QVd68L7qP1obdPO/dG1lU6D/l5DEe0wM7nrBWKD1sddMwb55+8YyfX3W/Qcmu 5GNqJ50OnL7dFfxxb8KlUKU8NYXd8id9wuOylqipKhy7xvfnskd829FypxX7c5appDMkep9/ MnmDyP1rJusqJsve3veW997H2mN8VTeYbqeY7Wx/+rBS6qJtyLW9yn7RL05nRX355NhwQ/Dh 5nfXyld1rtXv/DVTQPCcjff1Y3/+/F+wwk2JpTgj0VCLuag4EQC9DZ38fgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qhu2cmG3z+pWHx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GWsujCRtWDddMaKjcub2RoYewq6GDk5JARMJP5tesIGYgsJLGWU ONBbAhGXkli6dBEjhC0s8edaF1ANF1BNK5NE2/2TzCAJNgFdiZcfHjGB2CIC5hIX190Ca2AW 0JZYd/c72FBhAT+JJw8es3cxcnCwCKhK/PpdDxLmFbCU2HrzPhvEfE2JCVvmMEHEBSVOznzC AhHnllg36xIrxEh5ieats5knMPLPQlI2C0lqASPTKkaR1NLi3PTcYkO94sTc4tK8dL3k/NxN jMCw3Xbs5+YdjPNefdQ7xMjEwXiIUYKDWUmEV1VjWrIQb0piZVVqUX58UWlOavEhRlOgUycy S4km5wMjJ68k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1OqgSky/07Q W74DbcbB/255PX/lIXCk0mhOk1P9mvh/fCwPNnVeXFtUmrvV9+LligCrKYLlUzqfrTzc7RfN 1HN4r49N6rcaVeYvm68uFZetUtV3nvl8e0PfHon0P7u6Fm3fa7320IWp2vvz/+iZXp3TtuM6 /8+/JxnjFK/V+nQ2+dZN0Z7+vXpDq/GpaRV213Lnx02VPu/N+18+3y51YcGKnddmBd5VmBq5 9sK7gHh1hdlNezyXFR12U3pho3bCe/5Mly9MWqcZfzCu0j23LvTJgk11utYuqr+2pBye42UW uuQWe8++7mcZl3vfPZsm0zBv22q+rjefn0/e+vDj3utSpZckBB5vNJCueTrFhGnzGeaTSizF GYmGWsxFxYkAOgromuQCAAA= X-CMS-MailID: 20221214120229eucas1p2ea5c4dbe0540b3d68ce45359d368ca39 X-Msg-Generator: CA X-RootMTR: 20221214120229eucas1p2ea5c4dbe0540b3d68ce45359d368ca39 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120229eucas1p2ea5c4dbe0540b3d68ce45359d368ca39 References: Subject: [FFmpeg-devel] [PATCH v15 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: t9jXo82BREZM - 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 | 400 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 439 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index 3657fee06d..b092896a2d 100755 --- a/configure +++ b/configure @@ -292,6 +292,7 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxeve enable EVC encoding via libxeve [no] + --enable-libxevd enable EVC decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1863,6 +1864,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3394,6 +3396,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxevd_decoder_deps="libxevd" libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" @@ -6714,6 +6717,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.0" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index 5ba85cf9b1..54720ee8b4 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -130,6 +130,30 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://github.com/mpeg5/xevd}. + +@subsection Options + +The following options are supported by the libxevd wrapper. +The xevd-equivalent options or values are listed in parentheses for easy migration. + +To get a more accurate and extensive documentation of the libxevd options, +invoke the command @code{xevd_app --help} or consult the libxevd documentation. + +@table @option +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section QSV Decoders The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC, diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 748f516c69..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 supported through external librarys 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 8119a4cb6d..f0c41fb021 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1119,6 +1119,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 514f791fdb..956e9d454f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -810,6 +810,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..5f9976f357 --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,400 @@ +/* + * 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_NALU_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 + int coded_picture_number; +} 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 frame with decoupled packet/frame dataflow + * + * @param avctx codec context + * @param[out] frame decoded frame + * + * @return 0 on success, negative error code on failure + */ +static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + XevdContext *xectx = NULL; + int xevd_ret; + int ret = 0; + + xectx = avctx->priv_data; + + /* poll for new frame */ + { + XEVD_IMGB *imgb = NULL; + + xevd_ret = xevd_pull(xectx->id, &imgb); + if (XEVD_SUCCEEDED(ret)) { + if (imgb) { + + frame->coded_picture_number = imgb->ts[XEVD_TS_DTS]; + frame->display_picture_number = imgb->ts[XEVD_TS_PTS]; + + ret = libxevd_image_copy(avctx, imgb, frame); + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + return ret; + } + } else { + if (imgb) { // already has a decoded image + imgb->release(imgb); + imgb = NULL; + } + } + } + + /* feed decoder */ + { + XEVD_STAT stat; + XEVD_BITB bitb; + int nalu_size, bs_read_pos, dec_read_bytes; + + AVPacket pkt = {0}; + + pkt.data = NULL; + pkt.size = 0; + + // obtain input data + ret = ff_decode_get_packet(avctx, &pkt); + if (ret < 0) // no data is currently available or end of stream has been reached + return ret; + + memset(&stat, 0, sizeof(XEVD_STAT)); + memset(&bitb, 0, sizeof(XEVD_BITB)); + + if (pkt.size) { + + bs_read_pos = 0; + dec_read_bytes = 0; + while (pkt.size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + + nalu_size = read_nal_unit_length(pkt.data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + ret = AVERROR_INVALIDDATA; + goto ERR; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = pkt.data + bs_read_pos; + bitb.ssize = nalu_size; + bitb.ts[XEVD_TS_DTS] = xectx->coded_picture_number; + + /* 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; + dec_read_bytes += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) + goto ERR; + } else if (stat.nalu_type == XEVD_NUT_IDR || stat.nalu_type == XEVD_NUT_NONIDR) { + xectx->coded_picture_number++; + } + + if (stat.read != dec_read_bytes) { + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n", nalu_size, stat.read); + ret = AVERROR_EXTERNAL; + goto ERR; + } + } + } + +ERR: + av_packet_unref(&pkt); + return ret; + } + + return 0; +} + +/** + * 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_RECEIVE_FRAME_CB(libxevd_receive_frame), + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .p.priv_class = &libxevd_class, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxevd", + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Wed Dec 14 12:03:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39700 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp253977pzb; Wed, 14 Dec 2022 04:04:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf4erEH1k75REx5qUrvwPnnJHOL47rRQcI64BepfgIU7KC0bLkyYaFN1NcSHJ6zrkfJiXiH5 X-Received: by 2002:a17:906:b091:b0:7ae:bfec:74c7 with SMTP id x17-20020a170906b09100b007aebfec74c7mr21477792ejy.72.1671019452048; Wed, 14 Dec 2022 04:04:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019452; cv=none; d=google.com; s=arc-20160816; b=oFBDHsRKOLWa4MpBrrnlQ7vG/T4E6rKRhVwnr08IEd+etSNFgKyf1XJc0dd8akjHvi Yv2ZC0D38fDgHvFHJn8zUyTW6TaFrF416Ud+TJiO+hC4rPVBFcQ8JwxgPD1Y2+QrwqeV oRG0D5qC5oGzJk5Wx4edfN9h+OdtRzaSZdHCx2cxU5C13Oa/8jfQjnlC1okx1qVeWhtq b7qtrMWua+rY17eWj+F724C5TybmaqxokXClvgnUn541CVZLQ31sX3kDzqkZaCKRwK4Z 0QsNiWWmoaWMGEU+GwTfccVXxh9q2F8plWlfLvMWLAmgynOmjl7s512k6zIsjp+IWxIH eIrg== 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=KGEcNmqknD2xgbwHd/IhHT/n8Rmi0Y10bj8PiZokUGA=; b=vA/B8m2PG56LSqoD0LnC1SG7QW76TaG8BvziI33dGx2s2pfJmnkATjaBJQWgtHAU7t oiQTf4+0D6CvUA7mqbGMg5w2aPcIjjWRzHwVRfCPd2MQOg/OXyTNXcOgLqB7wTaJa4g/ rElle55kmL0BTgKmJty2fP1ALdGvb+bjRAlikCsmiAOYVg1nxMs0G1L3r26JRHX4nlu3 Jex4/darVF6zWCdFpmXnTtMy3xUeVm9yoeq6MkQjh2oRoK5wgIsDgisws0zIkM2SHcig as3LxPb5GCFKK5f9RuLUA4+kQ+9tyfneHe6NChbNUQBo968bNOHLsq6sqOluVaiEDcz7 rDTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=RtHJWzS+; 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 m12-20020a170906848c00b007c0d9525ba4si8759693ejx.877.2022.12.14.04.04.11; Wed, 14 Dec 2022 04:04:12 -0800 (PST) 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=RtHJWzS+; 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 1AB6B68BB48; Wed, 14 Dec 2022 14:04:09 +0200 (EET) 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 977EC68B554 for ; Wed, 14 Dec 2022 14:04:02 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120401euoutp0114818f0b8930d49330605cad466d915c~wp1Q4xK871965419654euoutp01a for ; Wed, 14 Dec 2022 12:04:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221214120401euoutp0114818f0b8930d49330605cad466d915c~wp1Q4xK871965419654euoutp01a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019441; bh=PCGlyds8X2yyhpJ++KleFzrkKe9Oze02irYw53oivoU=; h=From:To:Cc:Subject:Date:References:From; b=RtHJWzS+kbxW+fBF8g+tQs5moIx5nE03IVzT6Rwt/MfvYJJ26yt9THPhzWMVvCJYp DRHjtWElAkfqRiKSmPZmUdWdpg2HTTvn8utAS3TOkw4zCXbvrGhOj27fbJveIE+mtU 2XqfdFVYgw9Q+mr8Z7F9O7hX3o/PkQM2E3SGNQFY= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214120401eucas1p11dbc7321095fb1a5a44519cfd47dc741~wp1QWU8oG1171811718eucas1p1N; Wed, 14 Dec 2022 12:04:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 2A.E0.09561.1BBB9936; Wed, 14 Dec 2022 12:04:01 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221214120400eucas1p10234e519634add01f19386b458094be0~wp1Pxgx4W0951409514eucas1p1c; Wed, 14 Dec 2022 12:04:00 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221214120400eusmtrp147107fca0d323ea06bc87be516b41db5~wp1Pw6FB73086330863eusmtrp1W; Wed, 14 Dec 2022 12:04:00 +0000 (GMT) X-AuditID: cbfec7f2-0b3ff70000002559-02-6399bbb1e3d3 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 31.CB.09026.0BBB9936; Wed, 14 Dec 2022 12:04:00 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221214120400eusmtip14a0a3b1bc9a081c89125f7cac8f5dce3~wp1PZUefv2575625756eusmtip1u; Wed, 14 Dec 2022 12:04:00 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:03:23 +0100 Message-Id: <20221214120323.1172-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+NgFnrLIsWRmVeSWpSXmKPExsWy7djPc7obd89MNtjTxG3x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGXMfDGVqaBhN2PFikWrGBsYj3Qw djFyckgImEg0vZ3P3sXIxSEksIJRYvPEfcwQzhdGiaVvt7FBOJ8ZJdY8P8nSxcgB1nJwjytE fDmjxKUFq1ggnHYmiV0nFjGBzGUT0JV4+eERmC0iYCpxsnkvG4jNLKAtse7udzBbWCBW4vCn BmYQm0VAVeLKrN9gcV4BK4mra/6wQtynKTFhyxwmiLigxMmZT1gg4twS62ZdYoWYKS/RvHU2 2NkSAn/ZJe7POMYMUeQicWrtbXYIW1ji1fEtULaMxOnJPVDfFEsc6neAMGskDv1Ih6iwlnjb eJwRJMwMdML6XfoQYUeJ9+s3sEFU80nceCsIcQCfxKRt05khwrwSHW1CEKaKRF+nGESjlMTT ZXOgrvKQ2NmzjnUCo+IsJF/NQvLJLIS1CxiZVzGKp5YW56anFhvmpZbrFSfmFpfmpesl5+du YgSmiNP/jn/awTj31Ue9Q4xMHIyHGCU4mJVEeFU1piUL8aYkVlalFuXHF5XmpBYfYpTmYFES 510xpSNZSCA9sSQ1OzW1ILUIJsvEwSnVwDSb52ZZ2dItsZPFnzpv9V98TILhJnO8h9+1rikB ApOmcuhFd9UuTPjP8zJllrVXffWtR20lbMaysa/9G6Ua7lw7LFviVfolQ67lrLKvT/+rlavz vd52qO1fmFUp7vHvqsJhy8zNbD/rAnnd9VqdJyZOs1lhxH7l9rcPBy9x5PoWeB1Z1G/PcXB2 RumuWz3nea7XnNr7R9Vh7o6Wqb6fc/1X78xdOkPD8Mnu8LoD1T3e61fFMl++sdM98LrSpsoj Lrs4X8jPTV9/033dldV7rm+8r8EX/eeK69zHGzdfNpaTOsL5+/2XqSGnznEeyF591+3xwq2q S3dxcHC/eMFysuyUQK713qJH3K9nbmOvTbVVYinOSDTUYi4qTgQAc+Ep6oADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7obds9MNvi2Ws3iy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0MuY+WIqU0HDbsaKFYtWMTYwHulg7GLk4JAQMJE4uMe1i5GLQ0hg KaPErJl9zF2MnEBxKYmlSxcxQtjCEn+udbFBFLUySRz+dZ0dJMEmoCvx8sMjJhBbRMBc4uK6 W2ANzALaEuvufmcDsYUFoiV2H/gHFmcRUJW4Mus3WJxXwEri6po/rBALNCUmbJnDBBEXlDg5 8wkLRJxbYt2sS6wQM+UlmrfOZp7AyD8LSdksJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLz czcxAkN327GfW3Ywrnz1Ue8QIxMH4yFGCQ5mJRFeVY1pyUK8KYmVValF+fFFpTmpxYcYTYFu ncgsJZqcD4yevJJ4QzMDU0MTM0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGJp9V ofzfU8vesvCzlV/9MO2X9M78qnveQTE1sT5OK5xFTglueX26TSfKi/PPw76o9VuX/Zw5SXnK 3AlmOiKhrPtLjm25ySrW8u2ecWj4lKD8W44cc55Klpvazf4fz+Rv43llrbuUSJBJUmvN1AMu L668/+XXH1uwZhPTs1WdzDu21ear2C50mn2BmfF76dUDdyKq1u//ma3L906iT+at3PqQcNP/ bQ9+/X6g8WNRV77ZS8uwrXNT5ye851H7V1QRlujTH51WkChQ2HzWNV7mzl1TbUlv101VDKx3 L/7gmul0UtXwaXm05yk2w+Nm/3QkXa3v3DghLZ+ns631nM3PT5G7Flz8IRL6Vin6FAOzEktx RqKhFnNRcSIAuHRPeeYCAAA= X-CMS-MailID: 20221214120400eucas1p10234e519634add01f19386b458094be0 X-Msg-Generator: CA X-RootMTR: 20221214120400eucas1p10234e519634add01f19386b458094be0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120400eucas1p10234e519634add01f19386b458094be0 References: Subject: [FFmpeg-devel] [PATCH v15 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: RxQbkmsvHeZS - Changes in mov_write_video_tag function to handle EVC elementary stream - Provided structure EVCDecoderConfigurationRecord that specifies the decoder configuration information for ISO/IEC 23094-1 video content Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 2 +- libavformat/evc.c | 455 ++++++++++++++++++++++++++++++++++++++++ libavformat/evc.h | 44 ++++ libavformat/isom_tags.c | 2 + libavformat/movenc.c | 33 +++ 5 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index 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..42b7731c8f --- /dev/null +++ b/libavformat/evc.c @@ -0,0 +1,455 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/evc.h" +#include "avformat.h" +#include "avio.h" +#include "evc.h" +#include "avio_internal.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.1 +enum { + SPS_INDEX, + PPS_INDEX, + APS_INDEX, + SEI_INDEX, + NB_ARRAYS +}; + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + // @note + // Currently the structure does not reflect the entire SPS RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of EVCDecoderConfigurationRecord + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCSPS; + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +typedef struct EVCNALUnitArray { + uint8_t array_completeness; // when equal to 1 indicates that all NAL units of the given type are in the following array + uint8_t NAL_unit_type; // indicates the type of the NAL units in the following array + uint16_t numNalus; // indicates the number of NAL units of the indicated type + uint16_t *nalUnitLength; // indicates the length in bytes of the NAL unit + uint8_t **nalUnit; // contains an SPS, PPS, APS or a SEI NAL unit, as specified in ISO/IEC 23094-1 +} EVCNALUnitArray; + +/** + * @brief Specifies the decoder configuration information for ISO/IEC 23094-1 video content. + * @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.2 + * Carriage of network abstraction layer (NAL) unit structured video in the ISO base media file format + */ +typedef struct EVCDecoderConfigurationRecord { + uint8_t configurationVersion; // 8 bits + uint8_t profile_idc; // 8 bits + uint8_t level_idc; // 8 bits + uint32_t toolset_idc_h; // 32 bits + uint32_t toolset_idc_l; // 32 bits + uint8_t chroma_format_idc; // 2 bits + uint8_t bit_depth_luma_minus8; // 3 bits + uint8_t bit_depth_chroma_minus8; // 3 bits + uint16_t pic_width_in_luma_samples; // 16 bits + uint16_t pic_height_in_luma_samples; // 16 bits + uint8_t reserved; // 6 bits '000000'b + uint8_t lengthSizeMinusOne; // 2 bits + uint8_t num_of_arrays; // 8 bits + EVCNALUnitArray arrays[NB_ARRAYS]; +} EVCDecoderConfigurationRecord; + +typedef struct NALU { + int offset; + uint32_t size; +} NALU; + +typedef struct NALUList { + NALU *nalus; + unsigned nalus_array_size; + unsigned nb_nalus; ///< valid entries in nalus +} NALUList; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | bits[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfigurationRecord *evcc) +{ + GetBitContext gb; + int sps_seq_parameter_set_id; + EVCSPS sps; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return 0; + + sps.sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return 0; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps.profile_idc = get_bits(&gb, 8); + + sps.level_idc = get_bits(&gb, 8); + + sps.toolset_idc_h = get_bits(&gb, 32); + sps.toolset_idc_l = get_bits(&gb, 32); + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps.chroma_format_idc = get_ue_golomb(&gb); + + sps.pic_width_in_luma_samples = get_ue_golomb(&gb); + sps.pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps.bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps.bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + evcc->profile_idc = sps.profile_idc; + evcc->level_idc = sps.level_idc; + evcc->toolset_idc_h = sps.toolset_idc_h; + evcc->toolset_idc_l = sps.toolset_idc_l; + evcc->chroma_format_idc = sps.chroma_format_idc; + evcc->bit_depth_luma_minus8 = sps.bit_depth_luma_minus8; + evcc->bit_depth_chroma_minus8 = sps.bit_depth_chroma_minus8; + evcc->pic_width_in_luma_samples = sps.pic_width_in_luma_samples; + evcc->pic_height_in_luma_samples = sps.pic_height_in_luma_samples; + + return 0; +} + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +static int evcc_array_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, + uint8_t nal_type, int ps_array_completeness, + EVCNALUnitArray *array) +{ + int ret; + uint16_t numNalus = array->numNalus; + + ret = av_reallocp_array(&array->nalUnit, numNalus + 1, sizeof(uint8_t *)); + if (ret < 0) + return ret; + + ret = av_reallocp_array(&array->nalUnitLength, numNalus + 1, sizeof(uint16_t)); + if (ret < 0) + return ret; + + array->nalUnit [numNalus] = (uint8_t*)nal_buf; + array->nalUnitLength[numNalus] = nal_size; + array->NAL_unit_type = nal_type; + array->numNalus++; + + /* + * When the sample entry name is 'evc1', the default and mandatory value of + * array_completeness is 1 for arrays of all types of parameter sets, and 0 + * for all other arrays. + */ + if (nal_type == EVC_SPS_NUT || nal_type == EVC_PPS_NUT || nal_type == EVC_APS_NUT) + array->array_completeness = ps_array_completeness; + + return 0; +} + +static void evcc_init(EVCDecoderConfigurationRecord *evcc) +{ + memset(evcc, 0, sizeof(EVCDecoderConfigurationRecord)); + evcc->configurationVersion = 1; + evcc->lengthSizeMinusOne = 3; // 4 bytes +} + +static void evcc_close(EVCDecoderConfigurationRecord *evcc) +{ + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + EVCNALUnitArray *const array = &evcc->arrays[i]; + array->numNalus = 0; + av_freep(&array->nalUnit); + av_freep(&array->nalUnitLength); + } +} + +static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) +{ + uint16_t sps_count; + + av_log(NULL, AV_LOG_TRACE, "configurationVersion: %"PRIu8"\n", + evcc->configurationVersion); + av_log(NULL, AV_LOG_TRACE, "profile_idc: %"PRIu8"\n", + evcc->profile_idc); + av_log(NULL, AV_LOG_TRACE, "level_idc: %"PRIu8"\n", + evcc->level_idc); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_h: %"PRIu32"\n", + evcc->toolset_idc_h); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_l: %"PRIu32"\n", + evcc->toolset_idc_l); + av_log(NULL, AV_LOG_TRACE, "chroma_format_idc: %"PRIu8"\n", + evcc->chroma_format_idc); + av_log(NULL, AV_LOG_TRACE, "bit_depth_luma_minus8: %"PRIu8"\n", + evcc->bit_depth_luma_minus8); + av_log(NULL, AV_LOG_TRACE, "bit_depth_chroma_minus8: %"PRIu8"\n", + evcc->bit_depth_chroma_minus8); + av_log(NULL, AV_LOG_TRACE, "pic_width_in_luma_samples: %"PRIu16"\n", + evcc->pic_width_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "pic_height_in_luma_samples: %"PRIu16"\n", + evcc->pic_height_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "lengthSizeMinusOne: %"PRIu8"\n", + evcc->lengthSizeMinusOne); + av_log(NULL, AV_LOG_TRACE, "num_of_arrays: %"PRIu8"\n", + evcc->num_of_arrays); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if(array->numNalus == 0) + continue; + + av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + i, array->array_completeness); + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + i, array->NAL_unit_type); + av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + i, array->numNalus); + for ( unsigned j = 0; j < array->numNalus; j++) + av_log(NULL, AV_LOG_TRACE, + "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + i, j, array->nalUnitLength[j]); + } + + /* + * We need at least one SPS. + */ + sps_count = evcc->arrays[SPS_INDEX].numNalus; + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + /* unsigned int(8) configurationVersion = 1; */ + avio_w8(pb, evcc->configurationVersion); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->profile_idc); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->level_idc); + + /* unsigned int(32) toolset_idc_h */ + avio_wb32(pb, evcc->toolset_idc_h); + + /* unsigned int(32) toolset_idc_l */ + avio_wb32(pb, evcc->toolset_idc_l); + + /* + * unsigned int(2) chroma_format_idc; + * unsigned int(3) bit_depth_luma_minus8; + * unsigned int(3) bit_depth_chroma_minus8; + */ + avio_w8(pb, evcc->chroma_format_idc << 6 | + evcc->bit_depth_luma_minus8 << 3 | + evcc->bit_depth_chroma_minus8); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_width_in_luma_samples); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_height_in_luma_samples); + + /* + * bit(6) reserved = '111111'b; + * unsigned int(2) chromaFormat; + */ + avio_w8(pb, evcc->lengthSizeMinusOne | 0xfc); + + /* unsigned int(8) numOfArrays; */ + avio_w8(pb, evcc->num_of_arrays); + + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if (!array->numNalus) + continue; + + /* + * bit(1) array_completeness; + * unsigned int(1) reserved = 0; + * unsigned int(6) NAL_unit_type; + */ + avio_w8(pb, array->array_completeness << 7 | + array->NAL_unit_type & 0x3f); + + /* unsigned int(16) numNalus; */ + avio_wb16(pb, array->numNalus); + + for (unsigned j = 0; j < array->numNalus; j++) { + /* unsigned int(16) nalUnitLength; */ + avio_wb16(pb, array->nalUnitLength[j]); + + /* bit(8*nalUnitLength) nalUnit; */ + avio_write(pb, array->nalUnit[j], + array->nalUnitLength[j]); + } + } + + return 0; +} + +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness) +{ + EVCDecoderConfigurationRecord evcc; + int nalu_type; + size_t nalu_size; + int bytes_to_read = size; + unsigned array_index; + + int ret = 0; + + if (size < 8) { + /* We can't write a valid evcC from the provided data */ + return AVERROR_INVALIDDATA; + } else if (*data == 1) { + /* Data is already evcC-formatted */ + avio_write(pb, data, size); + return 0; + } + + evcc_init(&evcc); + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + nalu_size = read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(data, bytes_to_read); + + switch (nalu_type) { + case EVC_SPS_NUT: + array_index = SPS_INDEX; + break; + case EVC_PPS_NUT: + array_index = PPS_INDEX; + break; + case EVC_APS_NUT: + array_index = APS_INDEX; + break; + case EVC_SEI_NUT: + array_index = SEI_INDEX; + break; + default: + break; + } + + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &(evcc.arrays[array_index])); + if (ret < 0) + goto end; + if (evcc.arrays[array_index].numNalus == 1) + evcc.num_of_arrays++; + + if(nalu_type == EVC_SPS_NUT) { + ret = evcc_parse_sps(data, nalu_size, &evcc); + if (ret < 0) + goto end; + } + + data += nalu_size; + bytes_to_read -= nalu_size; + } + + ret = evcc_write(pb, &evcc); + +end: + evcc_close(&evcc); + return ret; +} diff --git a/libavformat/evc.h b/libavformat/evc.h new file mode 100644 index 0000000000..db56275fd8 --- /dev/null +++ b/libavformat/evc.h @@ -0,0 +1,44 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_EVC_H +#define AVFORMAT_EVC_H + +#include +#include "libavutil/rational.h" +#include "avio.h" + + + +/** + * Writes EVC sample metadata to the provided AVIOContext. + * + * @param pb pointer to the AVIOContext where the evc sample metadata shall be written + * @param buf input data buffer + * @param size size in bytes of the input data buffer + * @param ps_array_completeness @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + * + * @return 0 in case of success, a negative error code in case of failure + */ +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness); + +#endif // AVFORMAT_EVC_H diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 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 7b00e65cdd..2b67f50a81 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" @@ -1393,6 +1394,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) { @@ -1642,6 +1658,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; @@ -1723,6 +1749,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) { @@ -2291,6 +2319,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) { @@ -6035,6 +6066,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_VP9 || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ @@ -7694,6 +7726,7 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'p', '4', 'v') }, From patchwork Wed Dec 14 12:04:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp254496pzb; Wed, 14 Dec 2022 04:04:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf7imdENMhE2yN0FgIwqnXwiQGpaPOf/6GQQmg2ptTgb5bVqCuitPHOAlwHRaTUkqqVQQ3Ch X-Received: by 2002:a17:906:f9cc:b0:7c0:ad62:a25f with SMTP id lj12-20020a170906f9cc00b007c0ad62a25fmr16455142ejb.51.1671019487574; Wed, 14 Dec 2022 04:04:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019487; cv=none; d=google.com; s=arc-20160816; b=lnyomDY0WIEUoS+/FSyN8eTMP40yzegy5axt/fjM+5E1lSQCNrzk+P0jAh7gt4DcHf BdzbP2wdFchruFNwlS1hwMHMhhjaRskUr7D0LJpt6F7mByRIlYScJXsTRVOGS/ZmCC4Q F4A9kgtqiY7mcrvqHdNwqEPInn8p0FDZjQv1mjzwhSh76bvML7wup4uEWpfRIgWqJ/yg MnFnm1NXvtB6kQdTPJuOCZdcYq3Ee98FAaTchzoHoAKDVCTtH9N7LbXCxbbrdPDd2mnW pMv5VL++mNk92I+q7oYX6jIEHTP4Cr6hIfa3KQ+ojMwax5tYS5CL5P9fQz3t0XHNs4Ds o64g== 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=l8uCS3FpwazM7nGsEgGOxpAgKF+2icdYnbJynSiwn/E=; b=rzZlqqpb2anI+Od+ie2Fyc9IpwyVMIv1US3AJpiROvgADlN9iD7DlNciRcSuBSzMAE hoyDAlDIw6bJEndLoi2hUqLEHk+xjigycdkBLwGhvxWNyfXo+RZmtt9ibGd8PKzcqO+v gnDNridmcFQAjg6jH3LdXIT5lCULupxh5Sal1Ldlw60TDS3Ja0IvqyC42OGBMvvkfWf9 vl3VUpWZxG86FgsP0lUukcP3P+7Pey9Ai4QJTwUGIxmRCfRlqNtZWUuvEJVZvBVze4CQ dqkomQIFd85H5BW/vx/GKJhT1DuKa9HrR9OIg43PAaJb1T73fEYVNVmlB5k43i5gVwBB wVMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=pvBvE3vo; 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 oz13-20020a1709077d8d00b007b863be7bb1si12656362ejc.531.2022.12.14.04.04.47; Wed, 14 Dec 2022 04:04:47 -0800 (PST) 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=pvBvE3vo; 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 2F1D068BB94; Wed, 14 Dec 2022 14:04:45 +0200 (EET) 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 1EBDD68BAE4 for ; Wed, 14 Dec 2022 14:04:39 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120438euoutp0131e5925d35198c0a747a4d1f2105b1ad~wp1zDPslT1961619616euoutp01a for ; Wed, 14 Dec 2022 12:04:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221214120438euoutp0131e5925d35198c0a747a4d1f2105b1ad~wp1zDPslT1961619616euoutp01a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019478; bh=xfHtQ37KFU4DZ8z8ka4w9D370zKh02tV5iHWAWMJ7VQ=; h=From:To:Cc:Subject:Date:References:From; b=pvBvE3voiqpMdRuspLfJxtu1sA3pRrNL+Abq7E0VwQzLWo7DVKti6uRznLsAQALKL 11TniZbVi0i00+s1vFE/7w0dsT8f6nH4EdegskH5wuJuTPBvCoL7OLz4Jdozy+IooK XXBcpo+aKOZQXDNoCh5PWUcUTAqbU9HtYj4SqctQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214120438eucas1p1ce6c509dfc304e89e20bd196c35e721d~wp1yzV5QB3092830928eucas1p1o; Wed, 14 Dec 2022 12:04:38 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id F3.29.09549.6DBB9936; Wed, 14 Dec 2022 12:04:38 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221214120437eucas1p226428ee4dd5a292e333a23b959d5b465~wp1yYUNHH0510405104eucas1p2S; Wed, 14 Dec 2022 12:04:37 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221214120437eusmtrp10150e580345bd03951cfaa09d236f15a~wp1yXAa3i3130531305eusmtrp1a; Wed, 14 Dec 2022 12:04:37 +0000 (GMT) X-AuditID: cbfec7f5-f47ff7000000254d-0c-6399bbd665f9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id A5.7D.08916.5DBB9936; Wed, 14 Dec 2022 12:04:37 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221214120437eusmtip2a6dd0b6938c1197542a48040d7de9a71~wp1yCKJ540879008790eusmtip2B; Wed, 14 Dec 2022 12:04:37 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:04:17 +0100 Message-Id: <20221214120417.592-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87rXds9MNtjWzWPx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGXs2P+atWAaX8X1KzeZGhhfcXUx cnJICJhIrPp0k6mLkYtDSGAFo0T3mjZWCOcLo8Tx5R/ZQaqEBD4zSvw9pwjT8Xb7Uqii5YwS fVNfQLW3M0lM2/+WGaSKTUBX4uWHR0wgtoiAqcTJ5r1sIDazgLbEurvfwWxhgUSJvye/gdWz CKhKzL/eBRbnFbCU6Nn3lhFim6bEhC1zmCDighInZz5hgYhzS6ybdYkVYqa8RPPW2cwgR0gI fGWXmH9qARNEkYvE3s03oGxhiVfHt7BD2DISpyf3AA3iALKLJQ71O0CYNRKHfqRDVFhLvG08 zggSZgY6Yf0ufYiwo8SEeZ8ZIar5JG68FYQ4gE9i0rbpzBBhXomONiEIU0Wir1MMolFK4umy OcwQtofEq+6D7BMYFWch+WoWkk9mIaxdwMi8ilE8tbQ4Nz212DgvtVyvODG3uDQvXS85P3cT IzA9nP53/OsOxhWvPuodYmTiYDzEKMHBrCTCq6oxLVmINyWxsiq1KD++qDQntfgQozQHi5I4 74opHclCAumJJanZqakFqUUwWSYOTqkGJrVdAiUTX/HcYGFMO//TYKW37cz5uoF39zR+UItL 3tbtvOTujwklaUbh/U/f/3BXnXWqUo2pQmerT8n+u3veS01gVD2XLMuSNb/4985+duW2ae03 G3i4H9wKSr4ldY9HoLv0UQ33eh6PKZtSft26P7d6c23zl8YjUQ942pnkLhlynwuI4Yk1M3s1 YV7lywW3OLzs8/4xVQlpHLtdev+Zy95JzIop1RnXTnO1bT+w7vZUB99EHukzUs/CZbqWpH0+ +yDvW4H57fMvkg7+vZ7+J6W3vGhX1/lW9b6asy6HQxqWfxCs9H5ap9TNlyqzc1FB2iGxmZ/2 SdV0ST76LDP5uppoQpxYcJhTY4mIxssHSizFGYmGWsxFxYkA36aKRH4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7pXd89MNmj9YGTx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GXs2P+atWAaX8X1KzeZGhhfcXUxcnJICJhIvN2+lBXEFhJYyijR eNUWIi4lsXTpIkYIW1jiz7Uuti5GLqCaViaJlg8fmUESbAK6Ei8/PGICsUUEzCUurrsF1sAs oC2x7u53NhBbWCBe4uXxt2ALWARUJeZf7wKL8wpYSvTsewu1QFNiwpY5TBBxQYmTM5+wQMS5 JdbNusQKMVNeonnrbOYJjPyzkJTNQpJawMi0ilEktbQ4Nz232FCvODG3uDQvXS85P3cTIzBs tx37uXkH47xXH/UOMTJxMB5ilOBgVhLhVdWYlizEm5JYWZValB9fVJqTWnyI0RTo1onMUqLJ +cDIySuJNzQzMDU0MbM0MLU0M1YS5/Us6EgUEkhPLEnNTk0tSC2C6WPi4JRqYOoMv2b17tuu Jc8bWfwYJivsf362/8jrGLbUxVvWLbx4dMVuV6ucb3lnqiw39z9iEl6Qw6ZQOTE/genm2sk/ 5unY/9E+qZY5R+70zqht20J0rh980c/zrictZs+UTZOnXFAXjdevnJsu/ZgtMSFM46BwuaH2 U8672SK/LkfGPDmU47UlPKBgTl+efGFR+uvdcUd4pzqd3fnGSsq3XDXpT7mZbYvDB+NA3mLh tUxMLLeOBdTaxRuY7zwR/VtRN7pTfIaMhcW63d9MV35t3r925VHNrJyOe/8WCm9OPCB4UTu4 9q+MmL+hnoxq/JSv8+y7X+ivZeg0aP37zPsxW8kR49mxnlOsLSTkdFPie1nOKrEUZyQaajEX FScCAEXB3bHkAgAA X-CMS-MailID: 20221214120437eucas1p226428ee4dd5a292e333a23b959d5b465 X-Msg-Generator: CA X-RootMTR: 20221214120437eucas1p226428ee4dd5a292e333a23b959d5b465 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120437eucas1p226428ee4dd5a292e333a23b959d5b465 References: Subject: [FFmpeg-devel] [PATCH v15 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: hQbdxweHb3zW - 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 29bd3103e3..ab1776e1c4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2507,6 +2507,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: @@ -9135,7 +9136,7 @@ const AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif,evc", .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mov_probe, .read_header = mov_read_header, From patchwork Wed Dec 14 12:04:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39701 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp254986pzb; Wed, 14 Dec 2022 04:05:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf6zTujaMiHnfgU6Wk0xNpmk27qgs/BlCyo3wQria3F2HKqMojxADVJ3ZKkqeD7ePE7U/Joi X-Received: by 2002:a05:6402:43ce:b0:46c:a43d:5e23 with SMTP id p14-20020a05640243ce00b0046ca43d5e23mr25137833edc.28.1671019524791; Wed, 14 Dec 2022 04:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019524; cv=none; d=google.com; s=arc-20160816; b=Nx7gC+VcTCrkKianJ1sNBGo8oyyxGiibkZeaxEpfUzdbgt6BRAPUaXTfIDqCrUaHxu KZ4c3PChh0SCfdv9jN2dtGNL5GUHrK8qmwxVDfQeylBtsPyBmGtDo1wzY0FerAQk2j5T uOxxopDC+KCBLrDRZehyNSD77qdVnFZUf3uZ3SWKPkDr1QJ5PBUIcnUer4Wx6003cZEp Hx8JcI5aYpzwYO35d1QL4Lr/R0ZrWVPSeOf8eja5Zb5yn/6TBkaixcfFoLRCm8MQm2G0 zGxI8xWX1bDODDThHU/yLkVscjXeo+JbG27O5BooJBqWvXb+TIF+JwRns0abt/E/2E/c uFqQ== 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=Z/pAREA1P5uxVSIqixYj9CdGQantmHwVEA38VmCSqdM=; b=gdow18Vh+0UceR+bQs3mmSz0yaWd6IQuA1xB48sBSk+lDNbwS9zkM2Uk6XbJU5Airm c1lGNibJg/+VfdHz9GtXsmmpckxwy6z4P0Jsmz2U3sYjOckzgf+aSadhA4eetXzVNS+t UXP42nGDyQ/uV03gt/BIDXAgrKW/HPT9PXNKkZAxGFlRQ8kGwsGNAjPbQNTpuu/Y8dDv 1XrIHbadm1HZ+UJWSSVpaYfySTsB2EceAOH9g7GqWsjuRh3x//5kYFlUkP03vAcK87cU 9GjEuESpmUR3RCyOPYUyAXo7j2X//A7mb6IUO4sUQHvkCdu3cC4hO9VmMULBnLNXrQBu o/UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=SdGdab8E; 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 er23-20020a056402449700b00471fbcb7004si1456847edb.552.2022.12.14.04.05.24; Wed, 14 Dec 2022 04:05:24 -0800 (PST) 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=SdGdab8E; 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 4350968BB84; Wed, 14 Dec 2022 14:05:22 +0200 (EET) 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 7954268BAE4 for ; Wed, 14 Dec 2022 14:05:15 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20221214120514euoutp01cd6d5b34af02af6383e4edf74925d2e1~wp2UTzs351966619666euoutp01o for ; Wed, 14 Dec 2022 12:05:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20221214120514euoutp01cd6d5b34af02af6383e4edf74925d2e1~wp2UTzs351966619666euoutp01o DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019514; bh=dR/W+/RARCzF/Cxi/fOkt34YQ9DNYup2Tn/QeU+9LK0=; h=From:To:Cc:Subject:Date:References:From; b=SdGdab8Em6hOJrvktT0ywZgK/lhC7FQ1ZMtM5nMpJeXdozskmVHaaD4i1581babRt gAUy6JKsiLj0XF9pJgq1GkUSURTwNtCzx/oZXR9sX/eic+izWoD4STkPYs9txP5ntN 6swaZYXrmppgdtP4gAHDTCSmf3GgDRNMMHf9iH2k= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20221214120514eucas1p2ec438c8c16e0be2c86c7b98d89d6df90~wp2UEyjY73135231352eucas1p2M; Wed, 14 Dec 2022 12:05:14 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id F0.31.09561.9FBB9936; Wed, 14 Dec 2022 12:05:13 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20221214120513eucas1p2674073323ebc83f17f86dc584032b885~wp2T0KnD93135231352eucas1p2L; Wed, 14 Dec 2022 12:05:13 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20221214120513eusmtrp123d7c3e145fe7006195750a65077a802~wp2TzfLYy3177331773eusmtrp1l; Wed, 14 Dec 2022 12:05:13 +0000 (GMT) X-AuditID: cbfec7f2-0c9ff70000002559-fb-6399bbf9c48a Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id C3.FB.09026.9FBB9936; Wed, 14 Dec 2022 12:05:13 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20221214120513eusmtip22591729afda636c776c896551d29f731~wp2Tcl-GF3265632656eusmtip2B; Wed, 14 Dec 2022 12:05:13 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 13:04:53 +0100 Message-Id: <20221214120453.816-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+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87q/ds9MNnjNbfHl2hdmi5XffrNY fPt0htmB2ePPos0sHn1bVjEGMEVx2aSk5mSWpRbp2yVwZVz8s4uxYAFrxbk1F1kaGKeydDFy ckgImEh8PHKBtYuRi0NIYAWjxN+d09hAEkICXxglLi/Ihkh8ZpTofXmQHabjypbX7BCJ5YwS i2Ycg3LamSQ2NLYyg1SxCehKvPzwiAnEFhEwlTjZvBdsLLOAtsS6u9/BbGEBe4lPDY/B7mAR UJV4dHAXWJxXwFLizplDUPdpSkzYMocJIi4ocXLmE6g4t8S6WZdYIWbKSzRvnc0McoSEwFd2 iQ3tR5ghilwk+ie/Y4SwhSVeHd8C9YKMxOnJPUCDOIDsYolD/Q4QZo3EoR/pEBXWEm8bjzOC hJmBTli/Sx8i7Cgxf/JnqEY+iRtvBSEO4JOYtG06M0SYV6KjTQjCVJHo6xSDaJSSeLpsDtRV HhJnm2cxTmBUnIXkq1lIPpmFsHYBI/MqRvHU0uLc9NRiw7zUcr3ixNzi0rx0veT83E2MwORw +t/xTzsY5776qHeIkYmD8RCjBAezkgivqsa0ZCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8K6Z0 JAsJpCeWpGanphakFsFkmTg4pRqYqi92739mKXoqeRJf1y1rzjcGmxn9mji38O4SZTln1b2+ 89bbH6abb8uFbbXbfDlof10GX9C8IMv5FZs39ZfyKW39nb6p+Il7UvbheP+pMovSP1xcyF+X 13/VR95zU1CciXjku5X5nhZTFFbEz3m49eFW5qe6LD023HNPGJ3xq1ldsnD/NdGPZYKzxFJ6 y9h5H60y2RXQpflT5aPv50gbPXe9bCEn+fjTDr3xC3X2BEtmf5dInvf/z5NlpTqNnC8LKjUD rOzFVsV3bee4vaZaK/pxyLbqTu6wDw7rl5ifcVr/WMr7mqArR8gCho70psT07L0CjN2H7y7O qpDlmSS8cEpx2stCQZG+5192diuxFGckGmoxFxUnAgBb5ZhDfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7o/d89MNvjYqWXx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVc/LOLsWABa8W5NRdZGhinsnQxcnJICJhIXNnymr2LkYtDSGAp o8S6Xy3sEAkpiaVLFzFC2MISf651sUEUtTJJXGvdA1bEJqAr8fLDIyYQW0TAXOLiultgDcwC 2hLr7n5nA7GFBewlPjU8BtvGIqAq8ejgLrA4r4ClxJ0zh6Cu0JSYsGUOE0RcUOLkzCdQcW6J dbMusULMlJdo3jqbeQIj/ywkZbOQpBYwMq1iFEktLc5Nzy020itOzC0uzUvXS87P3cQIDNxt x35u2cG48tVHvUOMTByMhxglOJiVRHhVNaYlC/GmJFZWpRblxxeV5qQWH2I0Bbp1IrOUaHI+ MHbySuINzQxMDU3MLA1MLc2MlcR5PQs6EoUE0hNLUrNTUwtSi2D6mDg4pRqYQqzMH67/qyK7 rjR8GmuiENtD74wDHf4Ppxq9l1HJYe5eIVRy9syzHoMNYvw6dc/70mViJMRbr3/4sdLUNOFj kP+SY0rSwuuaTzV4/1iS1/UwKWmaaYfZGp0VF2enBM/exur989WW/Ut0jM/Xz2i4K7tA4Kdh 4cm5uxnTL/vE7068r5Z5P6DI87Um59bTkpnX5aTa2quqtHhj73NKLDn12renwlHtZrrMcqlj X4tSlkhaNC16rL+ohDfTvVbMYx5/1TP3eWLeEx1yt+5idD1TffTh2YudlwMkcifo8fqe3L8g d2qgocT/eee/WmvvZTNw+dHcvjNg1U0BoZVLPi39E7jlL9vvF+Faz5ptE2SUWIozEg21mIuK EwFzUeOy5QIAAA== X-CMS-MailID: 20221214120513eucas1p2674073323ebc83f17f86dc584032b885 X-Msg-Generator: CA X-RootMTR: 20221214120513eucas1p2674073323ebc83f17f86dc584032b885 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214120513eucas1p2674073323ebc83f17f86dc584032b885 References: Subject: [FFmpeg-devel] [PATCH v15 9/9] avcodec/evc: Changes in Changelog file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N8Qq6GCakqx8 - Changelog update Signed-off-by: Dawid Kozinski --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index af2dd65f8f..5fd778d06c 100644 --- a/Changelog +++ b/Changelog @@ -54,6 +54,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: @@ -101,7 +103,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer