From patchwork Thu Sep 1 13:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp283109pzh; Thu, 1 Sep 2022 06:21:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR6XJz+SJBABm7hbNqt7BYUJIPlqO/fiegCZNsGAxtH1FC3qjUyyPY/+cA0oUBn4f5kvvADh X-Received: by 2002:a17:907:87b0:b0:731:3dfd:bc8d with SMTP id qv48-20020a17090787b000b007313dfdbc8dmr23001517ejc.607.1662038463847; Thu, 01 Sep 2022 06:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038463; cv=none; d=google.com; s=arc-20160816; b=ZO/Oc7yvATtxOLzEuWAy9R6oFsc9fljxyGt2l9RSYY56Wh2uKK7t5DH2r+t3Vkarjt tlBOUUcqpajuUupCG5qMSGFP0v6tWuHdYlFMBxMqYsmD+Bs5cqwKaDrIu/zYXeSULg+r pSbFjwPzNKXD3u6u2A6QvGB4O9V88qYPuh08TWRPSf5Kw9JSWuWcYkmVUeynxX54j6jI ye5ppwW3MUDhjCZUdzL+++k/uLunWPmNQcEacCCG9AFMqfrmTvhB6Ih1VjzenTFUQup4 lYdIqM5bI/ZOeh+HyuceA1ti/WnM3Dl5Lr0MXVMbSZJh5zTjnBRFGH7MeFzbnPlLo9rD akSg== 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=L0iDOtJ7sqK6/8oqU1XOqBWevC9IpbBN9WbB6lnsdJA=; b=qitI7dU/2jRoq+F+cFmKasuhAHbnxWsllJF2KIUoddqv8MEjKxGwF7OPPVEIXrDNs2 TgpDDxRBLEAx/JTSFcNZilVGNehV1KiVgOPujnZ9rg1VlKK30eTbskY/vfLicNYDVQ3T o+c66b3iBJyh4GkXw/E0KKsQC5d/f/7E1bDfUeYeBq60EF5SFGBLtT9KwYcSh2s9i3Ob Rdjc5mLzocJCz2+SwNzOaM5oSsHGovXjNT+JBXU0TfthYtOVlb3rUiskQbR5h/ak7r65 jD85JLOUUbn5ZHU+7AynEvfx8Idl4RQ7D1KOiRunPYtFcuZHp08vrl3hLBO7YD6PnESo B7mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=r6hC3QCq; 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 l2-20020a1709067d4200b0073d719f1447si11766105ejp.426.2022.09.01.06.21.03; Thu, 01 Sep 2022 06:21:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=r6hC3QCq; 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 8E45E68B554; Thu, 1 Sep 2022 16:20:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBB4568B8EC for ; Thu, 1 Sep 2022 16:20:52 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132050euoutp018d612a5a9e6c6ab818e153f8bb4e3798~Qvyodhpdz2880128801euoutp01r for ; Thu, 1 Sep 2022 13:20:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220901132050euoutp018d612a5a9e6c6ab818e153f8bb4e3798~Qvyodhpdz2880128801euoutp01r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038450; bh=LRdOEfApSeZ6K/KjFP6QkRK7KpyPsxE9jyCjhQvedf0=; h=From:To:Cc:Subject:Date:References:From; b=r6hC3QCqX8FlpRjeB2Q4bvN4O6RBAJmPexc2HKW4uec5zF2DYajh4GIR2RWYlXVTd MII2xEUvMSLakPmzik0xWiJakrU6xw+I/38JWr8SQ6Vn16lt0XYnlBBtus/0PHRu6E DUU+Tz+ZFb7XXKsM3ewIZp62SCl5u7OGKjtEI2cA= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901132049eucas1p29f3b5706327f2fb8cd77a028960770bf~QvyoBOLqO3212232122eucas1p2x; Thu, 1 Sep 2022 13:20:49 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 0B.2C.07817.1B1B0136; Thu, 1 Sep 2022 14:20:49 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901132049eucas1p14cffaece0299aa2850a85a41b6521854~Qvyniqyrs0397103971eucas1p10; Thu, 1 Sep 2022 13:20:49 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220901132049eusmtrp2ddc073f127950037087a2c24436855bb~QvyniC7IH1277912779eusmtrp2r; Thu, 1 Sep 2022 13:20:49 +0000 (GMT) X-AuditID: cbfec7f4-8abff70000011e89-f3-6310b1b10b62 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 96.1D.07473.1B1B0136; Thu, 1 Sep 2022 14:20:49 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220901132048eusmtip1fd0eb6699a99473886f01f9a826ce59a~QvynHc88r3063430634eusmtip1Z; Thu, 1 Sep 2022 13:20:48 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:20:40 +0200 Message-Id: <20220901132040.241-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7obNwokG2zZpWjx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGU87D3JVjBLpmLen7/MDYyzxLoY OTkkBEwkpq47xNbFyMUhJLCCUeLVnbusEM4XRon+f3+hnM+MEi0XOphgWh782AFmCwksZ5T4 vy0OoqidSaL50C42kASbgK7Eyw+PwIpEBEwlTjbvBYszC2hLrLv7HcwWFjCT2N7+hhHEZhFQ lTjx6CwLiM0rYCnx/NF3ZohlmhKzJ7QzQ8QFJU7OfMICEeeWWDfrEivETHmJ5q2zmUGOkBD4 yS7x98guRogiF4mG2zugBglLvDq+hR3ClpH4v3M+0HEcQHaxxKF+BwizRuLQj3SICmuJt43H GUHCzEAnrN+lDxF2lJh09DcbRDWfxI23ghAH8ElM2jadGSLMK9HRJgRhqkj0dUKDWUri6bI5 UBUeEosXqExgVJyF5KlZSB6ZhbB1ASPzKkbx1NLi3PTUYqO81HK94sTc4tK8dL3k/NxNjMDk cPrf8S87GJe/+qh3iJGJg/EQowQHs5II7/dzPMlCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeZMz NyQKCaQnlqRmp6YWpBbBZJk4OKUamGKcg9L/KDrH+mXvvHXvSLhszb68fcpnb2T2rDXIFoyU MAuYor97B/MWlTmBLXlfzuka7nFrPyqxhGd52qK59784r+oOlp6Vt+D4lZ3OPfccEwt5HD9d SN7lWeZ/eVaYqc+M3Z2cEqu9JS5ckjq3MuX61WPnrR9aL3dtzYoUXv6UJeftWll/3Sl6tYxX tUzExeVlbzNt8T23tKdcRy1/8wMORWULy5v7Pz7RO/9nxatXiuI8T+Zsvn7cKPmdhd/fsMlX /x9dturr0v3XXZn7uoX/sX1q01lzbv+ruUvEvXmyp7pYTlL5GW0e08soseqLZsR5i+ffVhxt V0it/Bt77PF7l3SNf4uvisydmdvw46YSS3FGoqEWc1FxIgB2FK8ffQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7obNwokG0x8y2zx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GU87D3JVjBLpmLen7/MDYyzxLoYOTkkBEwkHvzYwdTFyMUhJLCU UWLD4mdsEAkpiaVLFzFC2MISf651sUEUtTJJnJxzDqyITUBX4uWHR0wgtoiAucTFdbfAGpgF tCXW3f0OViMsYCaxvf0NWJxFQFXixKOzLCA2r4ClxPNH35khFmhKzJ7QzgwRF5Q4OfMJC0Sc W2LdrEusEDPlJZq3zmaewMg/C0nZLCSpBYxMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQID d9uxn5t3MM579VHvECMTB+MhRgkOZiUR3u/neJKFeFMSK6tSi/Lji0pzUosPMZoC3TqRWUo0 OR8YO3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUxy27r71x9R Kn/75fkT0RdN8c0SDMskZmy1SY/5sLbg2D4N71/XdJY9i/uamzXdKFn1O+fW/BPTPXof/Jbu TLzE4VZxU/W0qeoDbq5MgUOWPCfFlI6I/tAT/x12436XifxxyQva57gvhn3YfslsSceLY2c9 PF3597xTijMP3dFa6pTFuOjqhg3G8oZGezef8Q8R7lvxsvH3nZvppVM4GBbaR5Ze+RQy+VTK odK6mHcTNkhMOy5keVvO9vr747F6C2Kryv4UHyo4fufZESv1FW7hX3zyDheusdJXs7/5eO+K Rqnf3O1hTK+qN87o2Jf4fcbzD/qRFSrRFTZyqSm9OR3u7u8Xh1Rb3lkwqcxK/qUSS3FGoqEW c1FxIgCe4CDo5QIAAA== X-CMS-MailID: 20220901132049eucas1p14cffaece0299aa2850a85a41b6521854 X-Msg-Generator: CA X-RootMTR: 20220901132049eucas1p14cffaece0299aa2850a85a41b6521854 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132049eucas1p14cffaece0299aa2850a85a41b6521854 References: Subject: [FFmpeg-devel] [PATCH v11 1/9] 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: aOkc8HFVUlDH 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 65c8535359..7d56a03fca 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1674,6 +1674,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 06dfe55d0f..d992374bb8 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1909,6 +1909,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, + { + .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 2247bc0309..ba32a33692 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -318,6 +318,7 @@ enum AVCodecID { AV_CODEC_ID_PHM, AV_CODEC_ID_RADIANCE_HDR, AV_CODEC_ID_WBMP, + 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 d7d5fca6b2..71a9882d82 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 42 +#define LIBAVCODEC_VERSION_MINOR 43 #define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Thu Sep 1 13:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp285618pzh; Thu, 1 Sep 2022 06:25:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR4MezdiU9+J5/nuvedPFb6iNQKZHCOXI3xVKVY3M6lDHtHuoet2yb5p+6iKcKSi903lAUqh X-Received: by 2002:a17:907:c24:b0:73d:7c20:cc45 with SMTP id ga36-20020a1709070c2400b0073d7c20cc45mr24485920ejc.294.1662038721559; Thu, 01 Sep 2022 06:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038721; cv=none; d=google.com; s=arc-20160816; b=vfsHuOqCgxnFwbLQPlRXYa/y36WbqiaUaOzpVdT1ijsZr3lHPsrM/SQcicq5g4+acX wwhpHi6+oGU7m2QSXR1IhRrwacCFA1/hlv4Pr0ymvg0MihSfZa4ks0OqqnhDDzUse0l4 kD1JDJqEBXHyoHQ3cD26h6xL6SGC4caSjO7AXAYx0XctWiu7mZWmbVvo6sVjOml8Gxae QD8KP0hkWffMNSHfWk/moYUa+tJGu3Oh4lCnEOLayrGxtYmMoZj1huimtZFFqauatdIT sVxyonBqVX3MVMqwuqzTb/sbGja+9eR9vCb53gpOjihYnCC+bi4Ah++ssxqabWlLn6jG r+tw== 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=d/yqEm3B4zmhnskJTFfdTxSla12b18aNwSgk5kNsIdQ=; b=IjqRl8tb1DqLCZZHQVN0NErDD9zRbGpEVdocVOl5dWY76EIjsApy/A7pFOWVzBKN7U bfxQ90MfYy4ucBCIvsYu0tdEDbXxnhwrpcA3ERYQxmrogNDjxTGbSi+lKQJpDJEK6+Rn 1+s6OdFzsM4h/l5Imu/DXokRgV1sP7wiz8oGY3Am9Pp1rt6jDRFov7vkswa3DEGClFeS vQC9lmuUGyVfHDXGekMZMhiJMZeaoSgOOt+rIKuKNfrEMp/jzxZtB2NcnTKTuT612gBy 95M0o8au1fQo3mmcKFgiCPbHor8K+yqQIYiqyMlz05+CmdOIqwugCS7Ycorz7l0aYbI4 7h3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=q3+Zaq3p; 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 p15-20020a170906498f00b0073d9630cb09si12398246eju.190.2022.09.01.06.25.21; Thu, 01 Sep 2022 06:25:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=q3+Zaq3p; 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 ED7DC68B45F; Thu, 1 Sep 2022 16:25:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74DF068B45F for ; Thu, 1 Sep 2022 16:25:11 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132510euoutp01b54e8ac9604836b6be65efd269a0d5a2~Qv2bVWAs30349703497euoutp01Q for ; Thu, 1 Sep 2022 13:25:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220901132510euoutp01b54e8ac9604836b6be65efd269a0d5a2~Qv2bVWAs30349703497euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038710; bh=jVhgFjZNTcCfkmG/gUmT/761EPGOlr8XgZ3fxAe67Ik=; h=From:To:Cc:Subject:Date:References:From; b=q3+Zaq3pVkRT3w1BzBqsUp0McMA6kQLdff0/jcyc+nzKbLeQs3is8PSsrpjGvTI63 LPqSZPKNSePlCEkQL40SmQbm2mr0o/Rwux/ZKuwu7F7HwZguyOmGHcYhg0Hie/Vc4j 9S3G0WndsSLcB+A64hY+cLx8+WLfUhFVfk0Z+sm4= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901132510eucas1p2a485535b373c07076abfbdb0d0bad4c3~Qv2ajY1d81712317123eucas1p2W; Thu, 1 Sep 2022 13:25:10 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 2C.1D.07817.5B2B0136; Thu, 1 Sep 2022 14:25:09 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901132509eucas1p192579f23e0377af9968dc5cd9f299523~Qv2Z6aUrg1840818408eucas1p1u; Thu, 1 Sep 2022 13:25:09 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220901132509eusmtrp1806127c57bf172e129cd987bac21108f~Qv2Z5lFTJ1271112711eusmtrp1l; Thu, 1 Sep 2022 13:25:09 +0000 (GMT) X-AuditID: cbfec7f4-8abff70000011e89-12-6310b2b5603c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 0A.71.10862.5B2B0136; Thu, 1 Sep 2022 14:25:09 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220901132508eusmtip157930d44e82577cc0c88d8e591f22cbf~Qv2Y8WGtk0466904669eusmtip1b; Thu, 1 Sep 2022 13:25:08 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:25:01 +0200 Message-Id: <20220901132501.1319-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7pbNwkkG2yYaWPx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGU09a1gK/gziani7cQDrA2Mfw8w djFyckgImEg82LgHzBYSWMEoseK9eRcjF5D9hVHi55NHLBDOZ0aJDf0vmWA6Gl8vZIdILGeU mHWpF6qqnUli271uFpAqNgFdiZcfHoF1iAiYSpxs3ssGYjMLaEusu/sdyObgEBZwktjxKA7E ZBFQlXi3KwKkglfASuLsqlfMELs0JWZPaGeGiAtKnJz5hAUizi2xbtYlVoiJ8hLNW2czg5wg IfCTXWL6s+tQzS4Ss45sgnpTWOLV8S3sELaMxOnJPSwgeyUEiiUO9TtAmDUSh36kQ1RYS7xt PM4IEmYGOmH9Ln2IsKPExC+rGCGq+SRuvBWEOIBPYtK26cwQYV6JjjYhCFNFoq9TDKJRSuLp sjlQV3lI7D7yg3kCo+IsJF/NQvLJLIS1CxiZVzGKp5YW56anFhvlpZbrFSfmFpfmpesl5+du YgSmh9P/jn/Zwbj81Ue9Q4xMHIyHGCU4mJVEeL+f40kW4k1JrKxKLcqPLyrNSS0+xCjNwaIk zpucuSFRSCA9sSQ1OzW1ILUIJsvEwSnVwJSzji3HqmXqpzO7H7jPTTizyHeyz15Hyeoje2Zq Jb/6G3FY/o5infwpbfYI558OR3ed0OuUajz51zPsmdGnXfn7tyV2Sflfm8EpufLelvn2zwMm Tzr1Jmu5ytqDf/rNucpTrsVytR96ljrjqvs7Rb6TeScqNCTX9aQv+7bvbKqfvm2fwhGDk4Gb L8+xUvty9OqchgWzVe8rOIRP4LwW+05swVLPh/s3tvKwXjt+9dOqFXH397+o9vRcaa484/LE dXc5lnrm//TgiJw/k1tYiPtBmvyjQwLhHPJ9bEnCWSZp0/fPN052Mb5bPGl7kYrdX7F/NyfX aE9Ju7vi5S15szM/Z303cHh9y8t9Wld/VOh1JZbijERDLeai4kQAMceFQ34DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7pbNwkkG/w6JWDx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GU09a1gK/gziani7cQDrA2Mfw8wdjFyckgImEg0vl7I3sXIxSEk sJRRYtbSO0wQCSmJpUsXQRUJS/y51sUGUdTKJPFh+QqwIjYBXYmXHx6B2SIC5hIX190Ca2AW 0JZYd/c7UAMHh7CAk8SOR3EgJouAqsS7XREgFbwCVhJnV71ihhivKTF7QjszRFxQ4uTMJywQ cW6JdbMusUJMlJdo3jqbeQIj/ywkZbOQpBYwMq1iFEktLc5Nzy020itOzC0uzUvXS87P3cQI DNxtx35u2cG48tVHvUOMTByMhxglOJiVRHi/n+NJFuJNSaysSi3Kjy8qzUktPsRoCnTqRGYp 0eR8YOzklcQbmhmYGpqYWRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUw5c5q2RP0 Wnzn4tipS65dKeJ7u5t3msBfn2m//B8HPyluqJJrzru9Xy3qqt7h0sr1F3h4Pni/vHwy06a/ ICtt14oTcpc1JD/Hqjr3TK6tCdGRvcteuk9xrrpDvMVxtaNv0y/ki4WcOyb+a7djh5LlVZP5 NyyYGw55+F1V5Hfx+ma/PXz982UeRcFu7CZcNs0P3jwr3CmR7nOhxMraQTKDb8rMd+cXTCxe b7T3WaHeefE38nNls90ufal7wuM602qrSd4Dju5t2kw3lv3tXnL49sJTjz9x7+6TWLrCMVMk JDzPN1PQV5L30mEBOannb2+GhXvxK2i3cpxnE5ddv1Vgzr7N/To7DfI33rjunbhEiaU4I9FQ i7moOBEAPWBcq+UCAAA= X-CMS-MailID: 20220901132509eucas1p192579f23e0377af9968dc5cd9f299523 X-Msg-Generator: CA X-RootMTR: 20220901132509eucas1p192579f23e0377af9968dc5cd9f299523 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132509eucas1p192579f23e0377af9968dc5cd9f299523 References: Subject: [FFmpeg-devel] [PATCH v11 2/9] Added parser implementaion 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: mTm5vpd+sypW Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/evc.h | 155 +++++++++ libavcodec/evc_parser.c | 726 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 883 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cb80f73d99..3d2e5d9bc2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1129,6 +1129,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_G723_1_PARSER) += g723_1_parser.o OBJS-$(CONFIG_G729_PARSER) += g729_parser.o diff --git a/libavcodec/evc.h b/libavcodec/evc.h new file mode 100644 index 0000000000..b3e648796c --- /dev/null +++ b/libavcodec/evc.h @@ -0,0 +1,155 @@ +/* + * EVC definitions and enums + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_EVC_H +#define AVCODEC_EVC_H + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NAL_UNIT_LENGTH_BYTE (4) /* byte */ +#define EVC_NAL_HEADER_SIZE (2) /* byte */ + +/** + * @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic + * Table 4 - NAL unit type codes and NAL unit type classes + */ +enum EVCNALUnitType { + EVC_NOIDR_NUT = 0, /* Coded slice of a non-IDR picture */ + EVC_IDR_NUT = 1, /* Coded slice of an IDR picture */ + EVC_RSV_VCL_NUT02 = 2, + EVC_RSV_VCL_NUT03 = 3, + EVC_RSV_VCL_NUT04 = 4, + EVC_RSV_VCL_NUT05 = 5, + EVC_RSV_VCL_NUT06 = 6, + EVC_RSV_VCL_NUT07 = 7, + EVC_RSV_VCL_NUT08 = 8, + EVC_RSV_VCL_NUT09 = 9, + EVC_RSV_VCL_NUT10 = 10, + EVC_RSV_VCL_NUT11 = 11, + EVC_RSV_VCL_NUT12 = 12, + EVC_RSV_VCL_NUT13 = 13, + EVC_RSV_VCL_NUT14 = 14, + EVC_RSV_VCL_NUT15 = 15, + EVC_RSV_VCL_NUT16 = 16, + EVC_RSV_VCL_NUT17 = 17, + EVC_RSV_VCL_NUT18 = 18, + EVC_RSV_VCL_NUT19 = 19, + EVC_RSV_VCL_NUT20 = 20, + EVC_RSV_VCL_NUT21 = 21, + EVC_RSV_VCL_NUT22 = 22, + EVC_RSV_VCL_NUT23 = 23, + EVC_SPS_NUT = 24, /* Sequence parameter set */ + EVC_PPS_NUT = 25, /* Picture paremeter set */ + EVC_APS_NUT = 26, /* Adaptation parameter set */ + EVC_FD_NUT = 27, /* Filler data */ + EVC_SEI_NUT = 28, /* Supplemental enhancement information */ + EVC_RSV_NONVCL29 = 29, + EVC_RSV_NONVCL30 = 30, + EVC_RSV_NONVCL31 = 31, + EVC_RSV_NONVCL32 = 32, + EVC_RSV_NONVCL33 = 33, + EVC_RSV_NONVCL34 = 34, + EVC_RSV_NONVCL35 = 35, + EVC_RSV_NONVCL36 = 36, + EVC_RSV_NONVCL37 = 37, + EVC_RSV_NONVCL38 = 38, + EVC_RSV_NONVCL39 = 39, + EVC_RSV_NONVCL40 = 40, + EVC_RSV_NONVCL41 = 41, + EVC_RSV_NONVCL42 = 42, + EVC_RSV_NONVCL43 = 43, + EVC_RSV_NONVCL44 = 44, + EVC_RSV_NONVCL45 = 45, + EVC_RSV_NONVCL46 = 46, + EVC_RSV_NONVCL47 = 47, + EVC_RSV_NONVCL48 = 48, + EVC_RSV_NONVCL49 = 49, + EVC_RSV_NONVCL50 = 50, + EVC_RSV_NONVCL51 = 51, + EVC_RSV_NONVCL52 = 52, + EVC_RSV_NONVCL53 = 53, + EVC_RSV_NONVCL54 = 54, + EVC_RSV_NONVCL55 = 55, + EVC_UNSPEC_NUT56 = 56, + EVC_UNSPEC_NUT57 = 57, + EVC_UNSPEC_NUT58 = 58, + EVC_UNSPEC_NUT59 = 59, + EVC_UNSPEC_NUT60 = 60, + EVC_UNSPEC_NUT61 = 61, + EVC_UNSPEC_NUT62 = 62 +}; + +// slice type +// @see ISO_IEC_23094-1_2020 7.4.5 Slice header semantics +// +enum EVCSliceType { + EVC_SLICE_TYPE_B = 0, + EVC_SLICE_TYPE_P = 1, + EVC_SLICE_TYPE_I = 2 +}; + +enum { + // 7.4.3.2: aps_video_parameter_set_id is u(4). + EVC_MAX_APS_COUNT = 32, + + // 7.4.3.1: sps_seq_parameter_set_id is in [0, 15]. + EVC_MAX_SPS_COUNT = 16, + + // 7.4.3.2: pps_pic_parameter_set_id is in [0, 63]. + EVC_MAX_PPS_COUNT = 64, + + // 7.4.5: slice header slice_pic_parameter_set_id in [0, 63] + EVC_MAX_SH_COUNT = 64, + + // E.3.2: cpb_cnt_minus1[i] is in [0, 31]. + EVC_MAX_CPB_CNT = 32, + + // A.4.1: in table A.1 the highest level allows a MaxLumaPs of 35 651 584. + EVC_MAX_LUMA_PS = 35651584, + + EVC_MAX_NUM_REF_PICS = 21, + + EVC_MAX_NUM_RPLS = 32, + + // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are + // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ + // width are bounded above by sqrt(8 * 35651584) = 16888.2 samples. + EVC_MAX_WIDTH = 16888, + EVC_MAX_HEIGHT = 16888, + + // A.4.1: table A.1 allows at most 22 tile rows for any level. + EVC_MAX_TILE_ROWS = 22, + // A.4.1: table A.1 allows at most 20 tile columns for any level. + EVC_MAX_TILE_COLUMNS = 20, + + // A.4.1: table A.1 allows at most 600 slice segments for any level. + EVC_MAX_SLICE_SEGMENTS = 600, + + // 7.4.7.1: in the worst case (tiles_enabled_flag and + // entropy_coding_sync_enabled_flag are both set), entry points can be + // placed at the beginning of every Ctb row in every tile, giving an + // upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1. + // Only a stream with very high resolution and perverse parameters could + // get near that, though, so set a lower limit here with the maximum + // possible value for 4K video (at most 135 16x16 Ctb rows). + HEVC_MAX_ENTRY_POINT_OFFSETS = EVC_MAX_TILE_COLUMNS * 135, +}; + +#endif // AVCODEC_EVC_H diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..fff5184ef1 --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,726 @@ +/* + * EVC format parser + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/common.h" +#include "parser.h" +#include "golomb.h" +#include "evc.h" + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + RefPicListStruct rpls[2][EVC_MAX_NUM_RPLS]; + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + + // @note + // Currently the structure does not reflect the entire SPS RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSPS; + +typedef struct EVCParserPPS { + int pps_pic_parameter_set_id; // ue(v) + int pps_seq_parameter_set_id; // ue(v) + int num_ref_idx_default_active_minus1[2]; // ue(v) + int additional_lt_poc_lsb_len; // ue(v) + int rpl1_idx_present_flag; // u(1) + int single_tile_in_pic_flag; // u(1) + int num_tile_columns_minus1; // ue(v) + int num_tile_rows_minus1; // ue(v) + int uniform_tile_spacing_flag; // u(1) + int tile_column_width_minus1[EVC_MAX_TILE_ROWS]; // ue(v) + int tile_row_height_minus1[EVC_MAX_TILE_COLUMNS]; // ue(v) + int loop_filter_across_tiles_enabled_flag; // u(1) + int tile_offset_len_minus1; // ue(v) + int tile_id_len_minus1; // ue(v) + int explicit_tile_id_flag; // u(1) + int tile_id_val[EVC_MAX_TILE_ROWS][EVC_MAX_TILE_COLUMNS]; // u(v) + int pic_dra_enabled_flag; // u(1) + int pic_dra_aps_id; // u(5) + int arbitrary_slice_present_flag; // u(1) + int constrained_intra_pred_flag; // u(1) + int cu_qp_delta_enabled_flag; // u(1) + int log2_cu_qp_delta_area_minus6; // ue(v) + +} EVCParserPPS; + +// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.6 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +// u(n) - unsigned integer using n bits. +// When n is "v" in the syntax table, the number of bits varies in a manner dependent on the value of other syntax elements. +typedef struct EVCParserSliceHeader { + int slice_pic_parameter_set_id; // ue(v) + int single_tile_in_slice_flag; // u(1) + int first_tile_id; // u(v) + int arbitrary_slice_flag; // u(1) + int last_tile_id; // u(v) + int num_remaining_tiles_in_slice_minus1; // ue(v) + int delta_tile_id_minus1[EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS]; // ue(v) + + int slice_type; // ue(v) + + // @note + // Currently the structure does not reflect the entire Slice Header RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSliceHeader; + +typedef struct EVCParserContext { + ParseContext pc; + EVCParserSPS sps[EVC_MAX_SPS_COUNT]; + EVCParserPPS pps[EVC_MAX_PPS_COUNT]; + EVCParserSliceHeader slice_header[EVC_MAX_PPS_COUNT]; + int is_avc; + int nal_length_size; + int to_read; + int incomplete_nalu_prefix_read; // The flag is set to 1 when an incomplete NAL unit prefix has been read + +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NAL_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static EVCParserSPS *parse_sps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + sps = &ev->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if (sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if (sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if (sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if (sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if (sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if (sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if (sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if (sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if (!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if (sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + // @note + // If necessary, add the missing fields to the EVCParserSPS structure + // and then extend parser implementation + + return sps; +} + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +static EVCParserPPS *parse_pps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserPPS *pps; + + int pps_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + pps_pic_parameter_set_id = get_ue_golomb(&gb); + if (pps_pic_parameter_set_id > EVC_MAX_PPS_COUNT) + return NULL; + + pps = &ev->pps[pps_pic_parameter_set_id]; + + pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; + + pps->pps_seq_parameter_set_id = get_ue_golomb(&gb); + if (pps->pps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + pps->num_ref_idx_default_active_minus1[0] = get_ue_golomb(&gb); + pps->num_ref_idx_default_active_minus1[1] = get_ue_golomb(&gb); + pps->additional_lt_poc_lsb_len = get_ue_golomb(&gb); + pps->rpl1_idx_present_flag = get_bits(&gb, 1); + pps->single_tile_in_pic_flag = get_bits(&gb, 1); + + if (!pps->single_tile_in_pic_flag) { + pps->num_tile_columns_minus1 = get_ue_golomb(&gb); + pps->num_tile_rows_minus1 = get_ue_golomb(&gb); + pps->uniform_tile_spacing_flag = get_bits(&gb, 1); + + if (!pps->uniform_tile_spacing_flag) { + for (int i = 0; i < pps->num_tile_columns_minus1; i++) + pps->tile_column_width_minus1[i] = get_ue_golomb(&gb); + + for (int i = 0; i < pps->num_tile_rows_minus1; i++) + pps->tile_row_height_minus1[i] = get_ue_golomb(&gb); + } + pps->loop_filter_across_tiles_enabled_flag = get_bits(&gb, 1); + pps->tile_offset_len_minus1 = get_ue_golomb(&gb); + } + + pps->tile_id_len_minus1 = get_ue_golomb(&gb); + pps->explicit_tile_id_flag = get_bits(&gb, 1); + + if (pps->explicit_tile_id_flag) { + for (int i = 0; i <= pps->num_tile_rows_minus1; i++) { + for (int j = 0; j <= pps->num_tile_columns_minus1; j++) + pps->tile_id_val[i][j] = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } + } + + pps->pic_dra_enabled_flag = 0; + pps->pic_dra_enabled_flag = get_bits(&gb, 1); + + if (pps->pic_dra_enabled_flag) + pps->pic_dra_aps_id = get_bits(&gb, 5); + + pps->arbitrary_slice_present_flag = get_bits(&gb, 1); + pps->constrained_intra_pred_flag = get_bits(&gb, 1); + pps->cu_qp_delta_enabled_flag = get_bits(&gb, 1); + + if (pps->cu_qp_delta_enabled_flag) + pps->log2_cu_qp_delta_area_minus6 = get_ue_golomb(&gb); + + return pps; +} + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +static EVCParserSliceHeader *parse_slice_header(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSliceHeader *sh; + EVCParserPPS *pps; + int num_tiles_in_slice = 0; + int slice_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + slice_pic_parameter_set_id = get_ue_golomb(&gb); + + if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) + return NULL; + + sh = &ev->slice_header[slice_pic_parameter_set_id]; + pps = &ev->pps[slice_pic_parameter_set_id]; + + sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; + + if (!pps->single_tile_in_pic_flag) { + sh->single_tile_in_slice_flag = get_bits(&gb, 1); + sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } else + sh->single_tile_in_slice_flag = 1; + + if (!sh->single_tile_in_slice_flag) { + if (pps->arbitrary_slice_present_flag) + sh->arbitrary_slice_flag = get_bits(&gb, 1); + + if (!sh->arbitrary_slice_flag) + sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + else { + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + for (int i = 0; i < num_tiles_in_slice - 1; ++i) + sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + } + } + + sh->slice_type = get_ue_golomb(&gb); + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +static int parse_nal_units(AVCodecParserContext *s, const uint8_t *bs, + int bs_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + unsigned char *bits = (unsigned char *)bs; + int bits_size = bs_size; + + avctx->codec_id = AV_CODEC_ID_EVC; + s->pict_type = AV_PICTURE_TYPE_NONE; + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + s->key_frame = -1; + + nalu_size = read_nal_unit_length(bits, bits_size, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return -1; + } + + bits += EVC_NAL_UNIT_LENGTH_BYTE; + bits_size -= EVC_NAL_UNIT_LENGTH_BYTE; + + nalu_type = get_nalu_type(bits, bits_size, avctx); + + bits += EVC_NAL_HEADER_SIZE; + bits_size -= EVC_NAL_HEADER_SIZE; + + if (nalu_type == EVC_SPS_NUT) { // NAL Unit type: SPS (Sequence Parameter Set) + EVCParserSPS *sps; + + sps = parse_sps(bits, bits_size, ev); + if (!sps) { + av_log(avctx, AV_LOG_ERROR, "SPS parsing error\n"); + return -1; + } + + s->coded_width = sps->pic_width_in_luma_samples; + s->coded_height = sps->pic_height_in_luma_samples; + s->width = sps->pic_width_in_luma_samples; + s->height = sps->pic_height_in_luma_samples; + + if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else avctx->profile = FF_PROFILE_EVC_BASELINE; + + // Currently XEVD decoder supports ony YCBCR420_10LE chroma format for EVC stream + 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; + } + + // @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 + + } else if (nalu_type == EVC_PPS_NUT) { // NAL Unit type: PPS (Video Parameter Set) + EVCParserPPS *pps; + + pps = parse_pps(bits, bits_size, ev); + if (!pps) { + av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); + return -1; + } + } else if (nalu_type == EVC_SEI_NUT) // NAL unit type: SEI (Supplemental Enhancement Information) + return 0; + else if (nalu_type == EVC_IDR_NUT || nalu_type == EVC_NOIDR_NUT) { // NAL Unit type: Coded slice of a IDR or non-IDR picture + EVCParserSliceHeader *sh; + + sh = parse_slice_header(bits, bits_size, ev); + if (!sh) { + av_log(avctx, AV_LOG_ERROR, "Slice header parsing error\n"); + return -1; + } + switch (sh->slice_type) { + case EVC_SLICE_TYPE_B: { + s->pict_type = AV_PICTURE_TYPE_B; + break; + } + case EVC_SLICE_TYPE_P: { + s->pict_type = AV_PICTURE_TYPE_P; + break; + } + case EVC_SLICE_TYPE_I: { + s->pict_type = AV_PICTURE_TYPE_I; + break; + } + default: { + s->pict_type = AV_PICTURE_TYPE_NONE; + } + } + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: %d\n", nalu_type); + return -1; + } + + return 0; +} + +/** + * Find the end of the current frame in the bitstream. + * @return the position of the first byte of the next frame, or END_NOT_FOUND + */ +static int evc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + + if (!ev->to_read) { + int nal_unit_size = 0; + int next = END_NOT_FOUND; + + // This is the case when buffer size is not enough for buffer to store NAL unit length + if (buf_size < EVC_NAL_UNIT_LENGTH_BYTE) { + ev->to_read = EVC_NAL_UNIT_LENGTH_BYTE; + ev->nal_length_size = buf_size; + ev->incomplete_nalu_prefix_read = 1; + + return END_NOT_FOUND; + } + + nal_unit_size = read_nal_unit_length(buf, buf_size, avctx); + ev->nal_length_size = EVC_NAL_UNIT_LENGTH_BYTE; + + next = nal_unit_size + EVC_NAL_UNIT_LENGTH_BYTE; + ev->to_read = next; + if (next < buf_size) + return next; + else + return END_NOT_FOUND; + } else if (ev->to_read > buf_size) + return END_NOT_FOUND; + else { + if (ev->incomplete_nalu_prefix_read == 1) { + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + uint8_t nalu_len[EVC_NAL_UNIT_LENGTH_BYTE] = {0}; + int nal_unit_size = 0; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit prefix bytes is equal 1 + // + // ---------- + // pc->buffer -> conatins already read bytes + // ---------- + // __ pc->index == 1 + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0x00 | 0x3C | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; i++) { + if (i < pc->index) + nalu_len[i] = pc->buffer[i]; + else + nalu_len[i] = buf[i - pc->index]; + } + + // ---------- + // nalu_len + // ---------- + // --------------------------------- + // | 0 | 1 | 2 | 3 | + // --------------------------------- + // | 0x00 | 0x00 | 0x00 | 0x3C | + // --------------------------------- + // | NALU LENGTH | + // --------------------------------- + // NAL Unit lenght = 60 (0x0000003C) + + nal_unit_size = read_nal_unit_length(nalu_len, EVC_NAL_UNIT_LENGTH_BYTE, avctx); + + ev->to_read = nal_unit_size + EVC_NAL_UNIT_LENGTH_BYTE - pc->index; + + ev->incomplete_nalu_prefix_read = 0; + + if (ev->to_read > buf_size) + return END_NOT_FOUND; + else + return ev->to_read; + } + return ev->to_read; + } + + return END_NOT_FOUND; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + + ev->nal_length_size = EVC_NAL_UNIT_LENGTH_BYTE; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + int is_dummy_buf = !buf_size; + const uint8_t *dummy_buf = buf; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) + next = buf_size; + else { + next = evc_find_frame_end(s, buf, buf_size, avctx); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + ev->to_read -= buf_size; + return buf_size; + } + } + + is_dummy_buf &= (dummy_buf == buf); + + if (!is_dummy_buf) + parse_nal_units(s, buf, buf_size, avctx); + + // poutbuf contains just one NAL unit + *poutbuf = buf; + *poutbuf_size = buf_size; + ev->to_read -= next; + + return next; +} + +const AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index a8d52af6cb..ca00c63176 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_g723_1_parser; extern const AVCodecParser ff_g729_parser; From patchwork Thu Sep 1 13:26: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: 37590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp286322pzh; Thu, 1 Sep 2022 06:26:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR6WUUM80NMFQqFO7yW7/nP4MFF/Kb4YY/HPVIJ/A6cYRkB8pFn8kGSBZZjf7bb+9P+yX4vy X-Received: by 2002:a17:907:2724:b0:741:4a1f:6159 with SMTP id d4-20020a170907272400b007414a1f6159mr16426724ejl.542.1662038796465; Thu, 01 Sep 2022 06:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038796; cv=none; d=google.com; s=arc-20160816; b=BDlJt5g/hiEuW3v4lWuzETc08RLNrAABje/9hjQBgIe6vzsYGQ6y/eBbDTmPou7H61 HPMfmqaCULH12iR2F1tQ30agwQD41h5mmsNyjcVEtweTYI7TEsJGoAY6Skf7Vw7p2KrJ lz3QSm4CgC8wRYczbVUNFW2CvPf/ip67qU/koaI9uec9O2cLtOoLvvoPtwRbW3URxCNc tOmsZHHClY+ASaVOVuJ+ATy+32h3sRsH2FOe1odx//vQ7AP7hl5f2iRbY6ZsOwDJHpoc KXKn+lhnOd5cHBVEKEUqWjZntg5pRc4wgiR6dLmH7+93kafg6h4M1O2YP29tWVz9/Wtz Skkw== 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=2A9ELieqcmsgStcSWd0eRyNAPiju/IW253Y0dUqm/cs=; b=VzAPbiAjRW4arDLNurZfcP4ybwbl01S+GLPceiu3WkX31vwtSiyig0auDuzZqSv03F FOkaglZeVqF9LIGQjWHi1DLrl3AgKw8P67TOenOOuXvlHZfGEHSIKc04EiX6xatFoObn S1BmZZgiwlTEU/6V20StFbP2EDg8vSri6GX6vfHQ1hu7CMlqpkFAyHqB9cFIxiBtyB2a +imf6SX8EY4L+Ua6J4RXayXgNCgGNERB9K11Ss8x6j30Z8hBk4t1SPUi+k0Y7PO8XbXp cKUPSIUa2BU+WRKPY6FV4jN9y0nR7f7pjeI4EfffnDgJsxB19IsnlYc/ultx/+xzICfQ bcgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=aSOdynfa; 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 b5-20020a05640202c500b0043d604a5bf7si1622207edx.93.2022.09.01.06.26.25; Thu, 01 Sep 2022 06:26:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=aSOdynfa; 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 2235168BA6B; Thu, 1 Sep 2022 16:26:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C21368B45F for ; Thu, 1 Sep 2022 16:26:16 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132615euoutp01a8a9ddf1de41b2e9963939914fe43b38~Qv3Xx4MsK0129901299euoutp01h for ; Thu, 1 Sep 2022 13:26:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220901132615euoutp01a8a9ddf1de41b2e9963939914fe43b38~Qv3Xx4MsK0129901299euoutp01h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038775; bh=Euq+bg9+8missZ6TaWGDhAd2cWTaDa9UglRGZwAXNO4=; h=From:To:Cc:Subject:Date:References:From; b=aSOdynfaoQimW3iYmPoEg03T/87QOlTrbxiRxRS2Ssmaz68XuUEz/uvgkkahUjKd0 IclcfoJeNPszki1RMeyGY/WCNddLzc8pTWvaTmKRckWy9aDcdOQyY06XM0iSy3rKZ/ HlcFBKLBTNjyNJwnMUEZARpNQEguIK3j6chNRuy4= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220901132615eucas1p1a627cd28401a4359229325efac107e31~Qv3Xd3sHP3031630316eucas1p1W; Thu, 1 Sep 2022 13:26:15 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 36.7D.07817.7F2B0136; Thu, 1 Sep 2022 14:26:15 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220901132615eucas1p28d60d0e5b939a7324d910f8ae05bea41~Qv3XGJrBr1897418974eucas1p2T; Thu, 1 Sep 2022 13:26:15 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220901132615eusmtrp10d0909cde5f21764ce53056ae3e91064~Qv3XFfCbP1331213312eusmtrp1Q; Thu, 1 Sep 2022 13:26:15 +0000 (GMT) X-AuditID: cbfec7f4-893ff70000011e89-f0-6310b2f790f1 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 57.1E.07473.6F2B0136; Thu, 1 Sep 2022 14:26:14 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220901132614eusmtip1eb756454169bcd1fd1f5d773f22478e2~Qv3WvipR_0761107611eusmtip10; Thu, 1 Sep 2022 13:26:14 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:26:07 +0200 Message-Id: <20220901132607.1534-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7rfNwkkG3zdLWHx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGX0rJnEXvBKtOLm3u/sDYy/BboY OTkkBEwkJn/8ztLFyMUhJLCCUeLSzYPMEM4XRom3c2ewgFQJCXxmlHh/qASu48ZtNoii5YwS 018cY4Rw2pkkVl5fxQRSxSagK/HywyMwW0TAVOJk8142EJtZQFti3d3vYLawQIZEw6lGsBoW AVWJk4tageIcHLwCVhILHxdALNOUmD2hnRnE5hUQlDg58wkLRJxbYt2sS6wQI+UlmrfOBrta QuAvu8SSn4fYIIpcJHqnLoGyhSVeHd/CDmHLSJye3MMCsktCoFjiUL8DhFkjcehHOkSFtcTb xuOMIGFmoBPW79KHCDtKHDm2gBGimk/ixltBiAP4JCZtm84MEeaV6GgTgjBVJPo6xSAapSSe LpvDDGF7SHz+up95AqPiLCRfzULyySyEtQsYmVcxiqeWFuempxYb5aWW6xUn5haX5qXrJefn bmIEJofT/45/2cG4/NVHvUOMTByMhxglOJiVRHi/n+NJFuJNSaysSi3Kjy8qzUktPsQozcGi JM6bnLkhUUggPbEkNTs1tSC1CCbLxMEp1cDkE2i/+FySu6iF/c+Vvsb5xZpVp8TcY8/IzE/u fetyMmRL87zfhxrfXRM9k+PiZF2netHuetVmU/klnaleit9Y4hkXpnTs2hXkW6Hvksvaysje kLHZ5ZE3+44t9aEh1w7s+RTImbG0p/LdxhnrDduOeaquurCT+Ur60exdt879Lpm0x0H6X1cm 64qbGayxiXub3eo2dp9+Yls7U+rD4vP3dBNT1v9Pjl8VXMSf4/JH6d+huV4/382LXx/8ZlXt E7G1bSe3up2Y9dFyhY6zXfeC5mfilzYdtWh5xv3ocekM3cTkmPlPWJ7aPlpxlU37sNz/rXX/ n0cq6KiUCxsXvf6efEZabWO75+FtJqpvDokqsRRnJBpqMRcVJwIAWVPaQ30DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7rfNgkkG+zdYmPx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GX0rJnEXvBKtOLm3u/sDYy/BboYOTkkBEwkJt+4zdbFyMUhJLCU UeLllkZ2iISUxNKlixghbGGJP9e62EBsIYFWJolfy8JBbDYBXYmXHx4xgdgiAuYSF9fdAqtn FtCWWHf3O1i9sECaxK/pK8BmsgioSpxc1AoU5+DgFbCSWPi4AGK8psTsCe3MIDavgKDEyZlP WCDi3BLrZl1ihRgpL9G8dTbzBEb+WUjKZiFJLWBkWsUoklpanJueW2yoV5yYW1yal66XnJ+7 iREYtNuO/dy8g3Heq496hxiZOBgPMUpwMCuJ8H4/x5MsxJuSWFmVWpQfX1Sak1p8iNEU6NSJ zFKiyfnAuMkriTc0MzA1NDGzNDC1NDNWEuf1LOhIFBJITyxJzU5NLUgtgulj4uCUamDy/Pqk Je/+3je3tW+qM/ndTNhjXS0yeV7OGu8WtZ9/vqzsm2Xb+PjFVWb+aQsqH7yLFP4mbed0dsrj ZXWRe+uOJG7q/b9fVClH5ZTE5eLLW+I3un4vZ+3zFxWssfaOPJUW1qA58avo05KzM3tXpZgx vC15tcKn72G7qkilDN8vc/2ied9MuQV/ajJHHrktMsMj9p1sZUbz+lMXXZdl6IlH8L5nP77l Kcc73a1HOda9Vl/voHLxe3CNQDq7jrHGrkefSlp2tlrWy3xkMO39K8BuJasY1P1xq3n9/63z Ez8aaLw3C4iMS+Cb8Fgh+fiCjGVbPsg84sut/T+D48gn9WSWDha7OXeytodOevJabqISS3FG oqEWc1FxIgBSM9OS4wIAAA== X-CMS-MailID: 20220901132615eucas1p28d60d0e5b939a7324d910f8ae05bea41 X-Msg-Generator: CA X-RootMTR: 20220901132615eucas1p28d60d0e5b939a7324d910f8ae05bea41 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132615eucas1p28d60d0e5b939a7324d910f8ae05bea41 References: Subject: [FFmpeg-devel] [PATCH v11 3/9] 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: KRpeUR0IQImQ - 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 b2f4326aae..08ab20c09e 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2124,6 +2124,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 f67a99f839..7e3f0e6794 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -249,6 +249,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 ae4479fb7a..31508b69f0 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -148,6 +148,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 Thu Sep 1 13:27:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp287076pzh; Thu, 1 Sep 2022 06:27:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR4+RfVfeDdWXDYRlnIB7C2jHiQtHdxsoW+VN7BRj4b02CVe66aUxa0RHqhFYKnKnCRczDXu X-Received: by 2002:a17:907:1c27:b0:73d:ce49:6dd7 with SMTP id nc39-20020a1709071c2700b0073dce496dd7mr23602980ejc.470.1662038871133; Thu, 01 Sep 2022 06:27:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038871; cv=none; d=google.com; s=arc-20160816; b=E8Uc1tFHXkiZu2w0FzYQhqpc0UfNQOmA7J9/CPkqU8yUZMvVxX74DhFeY1L6KJGkZ/ xOPY/2RlO2JQGQRs3iM9oMHDthSP0s6ygq0FRh3qVXpv0bi1Wcsij3B03xyEM+KXpXpS mWznUg9f7bZi/Mapru7mmEbeiOHbhso24TBVLYGJJAQlrtodu9srfmMjO+Jbm/Fmxx+k A46PDzp49AMo09lMbxqtCkWOhsPghFagUR2/BB4qE6zhxMmeWxeYC9uoEL5Xyc2yU3Ts Rcz9U2ALGnKXqBTfQrOz6z6Ku3QvLiXpdzhuyu9EgcLkS20wzQStAiD7Shenf/qgGCxP ba3g== 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=QxsEs83Srcr1cAb3VZ8gX3AsjpxgwHzmivELk3m6yEc=; b=AP7dbmimIORJL3rdtmpNO43mpbvRa/pqKlm3jyJRYABMREaZgTjPWaIFlDpYVv9fKc iwh0CES2Ze3BSPDaZtSSLFYqkUAvNd+oYuVm8HtK9BIALDl0mQvIU+IcP/jqacQDDQGQ Ke4jZ1DgT7DxnIT2095Ec7/6XcoWmzbHPmfgMJFxRtRvJST6GOHLduNh+q2lT1RBHecm 2N7OQFMzPh9fpeR16Q4m8znmf+tq1bjd9h6pxyn8XwQScOxCBVdp090OazGxTet8UilT sMs9fM/5QJGF9Ef876nIBKasMYwT48LqFvZNHgtoj/gDXofmvOh9XU2j+f5bwG+MoBAn 92+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=jtVg977v; 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 go37-20020a1709070da500b0073d7097ac8asi15517240ejc.538.2022.09.01.06.27.44; Thu, 01 Sep 2022 06:27:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=jtVg977v; 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 437E868BA79; Thu, 1 Sep 2022 16:27:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F06868B5E6 for ; Thu, 1 Sep 2022 16:27:36 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132735euoutp02e98651587f3303647d525d52172d8d33~Qv4h3QO0p1120011200euoutp02P for ; Thu, 1 Sep 2022 13:27:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901132735euoutp02e98651587f3303647d525d52172d8d33~Qv4h3QO0p1120011200euoutp02P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038855; bh=o5rZIpBtebNuJ61NSktt2aJ3g8gMNFoVm5KtTpXp/qI=; h=From:To:Cc:Subject:Date:References:From; b=jtVg977vhQfBAqBTGCf7+Sm/zBCQjv5YgVjZQ+4K0wFYWRKYmrUvEhDxOFffSU2rk L+trhgwVZuPurfXY67MZQN6uU+bro7oaU+VNnRfW79Rcm/2y7LEcEM3/vx8rIJh/4u EozXg4sQKoJ9LELFSAQpjY8fyZJNC23amqJoEeO0= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901132734eucas1p25cc7b6dce5455057e465c7b8efb0da31~Qv4hcOJgi2425824258eucas1p2c; Thu, 1 Sep 2022 13:27:34 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 5D.E0.29727.643B0136; Thu, 1 Sep 2022 14:27:34 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220901132734eucas1p2474259f4bb3937c3034660afcb7b7952~Qv4hAZuHV2019320193eucas1p2g; Thu, 1 Sep 2022 13:27:34 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220901132734eusmtrp19c3bf5f8dee48613341d51d1f4a48749~Qv4g-1BaD1391413914eusmtrp1Y; Thu, 1 Sep 2022 13:27:34 +0000 (GMT) X-AuditID: cbfec7f2-21dff7000001741f-5b-6310b346a421 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F1.5E.07473.643B0136; Thu, 1 Sep 2022 14:27:34 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220901132733eusmtip2733e8f8d87df5f6876a6c29ec28151c7~Qv4gjdi_u2605026050eusmtip2Y; Thu, 1 Sep 2022 13:27:33 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:27:19 +0200 Message-Id: <20220901132719.553-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87pumwWSDY7OMrb4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDJmPpnPWDBHq+LYvnPMDYwf5bsY OTkkBEwkHm9cwNzFyMUhJLCCUeLnsg9sEM4XRolZjx9DOZ8ZJVrXzWaCa/kwAaplOaPE8ztb mCCcdiaJ9RdWs4FUsQnoSrz88AisQ0TAVOJk816wOLOAtsS6u9/BbGEBD4nlbT/YQWwWAVWJ JYc3M4LYvAKWEhf3/GSB2KYpMXtCOzNEXFDi5MwnUHFuiXWzLrFCzJSXaN46G+wiCYGf7BLt M2YALeYAclwkHjwNgagXlnh1fAs7hC0jcXpyDwtESbHEoX4HCLNG4tCPdIgKa4m3jccZQcLM QBes36UPEXaUeLX2DytENZ/EjbeCEPv5JCZtm84MEeaV6GgTgjBVJPo6xSAapSSeLpvDDGF7 SDy+9IVpAqPiLCRPzULyyCyEtQsYmVcxiqeWFuempxYb5qWW6xUn5haX5qXrJefnbmIEpofT /45/2sE499VHvUOMTByMhxglOJiVRHi/n+NJFuJNSaysSi3Kjy8qzUktPsQozcGiJM6bnLkh UUggPbEkNTs1tSC1CCbLxMEp1cA0b674cdU/z5w8ozKzv7Lc/Nq+UOtUZAU3QyT/zLsxd7ts 1Z/X2+78k/7xzUzBVGGhwpR+1djLEbbH1s6IYLYW2eO/pSWMT+Vh8q9rXW9yrFgUbpR/DUvp TXY9//vDfu2Pu9+3B3TNfp+wOCT2ncD+2l37a84FtsjMmf6uU36hnkJk41KbjZPXh69x2puo Zi5zI3vNSutFPa7ti7ZyMq3rv2K0RLxzUXiBVUCD0/P9ha8+n37It/DtXo91c1UULtcJ+HBE BcaJbNxyKMhY6JkBR5Ivl/n96/27Qla29+6PXDO3yEckfspDJnnt2wv3yUj6fzNTN2piVztp 86RRr85hrfFbY9a/R9cq1DCte6vEUpyRaKjFXFScCAAhaJdQfgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7pumwWSDb6dFbH4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJmPpnPWDBHq+LYvnPMDYwf5bsYOTkkBEwkHn+YwNzFyMUhJLCU UWLh9KdsEAkpiaVLFzFC2MISf651sUEUtTJJbFszkwUkwSagK/HywyMmEFtEwFzi4rpbYA3M AtoS6+5+BxskLOAhsbztBzuIzSKgKrHk8GawGl4BS4mLe36yQCzQlJg9oZ0ZIi4ocXLmE6g4 t8S6WZdYIWbKSzRvnc08gZF/FpKyWUhSCxiZVjGKpJYW56bnFhvqFSfmFpfmpesl5+duYgQG 7rZjPzfvYJz36qPeIUYmDsZDjBIczEoivN/P8SQL8aYkVlalFuXHF5XmpBYfYjQFunUis5Ro cj4wdvJK4g3NDEwNTcwsDUwtzYyVxHk9CzoShQTSE0tSs1NTC1KLYPqYODilGpjsXx9+9CZ5 35tzHQ8Xrdhi+0R+v5DaL7lmvUs8EybOvyr9c7OO7wy99UXVhn5OMzp86z7L5Dulisu3Xqo/ /+PsASGHYFY1r6X7bN7OZ41qzeGzdCitfDTXPOubf/g/9gmcfVwMK3fPjTfzUboyU67eRfOj qL+Db7GC34LuvTUMzHsuyK7ru59w0H7ZPsvwa7uctwt3P4+qvz675+t1kwuyq6WVvJk0JHXX nnB2nBgkdfvq5hThn+EWf2/w7Ls/ZbfYYae4c6eOuuUIfHu20dPkf3TxF4Gwi3JBvhEO0tm7 +h+tUTq4a4fTk5kvT5iE889Z9/Nmbt/y6yquiWvcV52boKL2XuhBYwRfwT5J5QQlluKMREMt 5qLiRAAd6z4d5QIAAA== X-CMS-MailID: 20220901132734eucas1p2474259f4bb3937c3034660afcb7b7952 X-Msg-Generator: CA X-RootMTR: 20220901132734eucas1p2474259f4bb3937c3034660afcb7b7952 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132734eucas1p2474259f4bb3937c3034660afcb7b7952 References: Subject: [FFmpeg-devel] [PATCH v11 4/9] 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: nxbQHxQaOTb8 - 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 7e3f0e6794..a320cac22b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -249,6 +249,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 31508b69f0..dfce49d149 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -148,6 +148,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..ffb7449c4d --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,124 @@ +/* + * RAW EVC video demuxer + * + * Copyright (c) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" +#include "libavcodec/evc.h" + +#include "rawdec.h" +#include "avformat.h" + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if(bits_size >= EVC_NAL_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { // Cannot get bitstream information. Malformed bitstream. + return -1; + } + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if(bits_size >= EVC_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for(int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while(bytes_to_read > EVC_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, EVC_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_NAL_UNIT_LENGTH_BYTE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) From patchwork Thu Sep 1 13:28:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp287702pzh; Thu, 1 Sep 2022 06:29:01 -0700 (PDT) X-Google-Smtp-Source: AA6agR48655iFZopErpNRmDUYE4zhWtjEwDZNCWWFv7nMi86Alk/f0y7gLARFuLQgAJ6IUZEnM3A X-Received: by 2002:a17:907:8a09:b0:731:610:ff8d with SMTP id sc9-20020a1709078a0900b007310610ff8dmr23620843ejc.399.1662038941109; Thu, 01 Sep 2022 06:29:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038941; cv=none; d=google.com; s=arc-20160816; b=b2hMnPxZlE7UagRFT+otKmsMEpi6cScLLCm6JzhqQX3oYBxjpwl4w7iOlmSPinkCmf j+Isi+5apQXceD+vQalZlWqmHmi0r0TCABOxOqBX23oW7IX+ZbGfvRqQ/7VQVezCU9xJ eGJZ+sptJTudU3FDkKmTU7FCSF/s6oqg4XrVW8qBoD5GQdbsNLCuqGFPR3uRtwobLomn nYzo2lhQE8kZC/5KWexOlDFZV5u4HuzB6xfLIW+I5D/KqfzvtpVCyA+GELVIFqwNlLC/ 7TAfOh5rKF1Vaclf0A0LSoZ4zzpsDpjgUD6yrzAbAAxtc7D5DE0qIkJt2xU41S0vYzOK SdFA== 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=uxQwT9xfDukZLktF9LpZdSpueKRRmYuQTfUow/KvTcw=; b=RxcABOG5FJUmAiWzoUR7pnj6CVsZ36CtmtCBTvt6oU7N6WkTIHvqHshDAwJoiSQQlW aiKmpCA9an0ioBTy55LSsXjkIeDIeMI+x65MJd0AHQn7ia+sKldEGzVdlVjJSJ9GRHEF IHeEUe3mrd9kVQdVllHyFiSGDo0SdjkyRW2dsE4UG+RzaDC8NoRxQtmakCWh6Px/7ESP EV6RwPqsdAlwFLJU6/OBGvdavEdwOF6GEFiTmxef15z+y3aDOaZu7yMiMnRjoHhKqPoF UztsWHh5NwjQt2UTsRZBZoeJANx63xXqLl00SVDofOiSCFQvySOX2VNs01VX1Sq+lBM9 DL7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mELCcNzY; 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 wg7-20020a17090705c700b00741a241c98bsi9459776ejb.194.2022.09.01.06.28.52; Thu, 01 Sep 2022 06:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mELCcNzY; 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 53F3968BA7A; Thu, 1 Sep 2022 16:28:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2716068B5E6 for ; Thu, 1 Sep 2022 16:28:43 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132842euoutp02a0a6a72050cecae907bb24a693bcc13a~Qv5gmITTQ1451614516euoutp02m for ; Thu, 1 Sep 2022 13:28:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901132842euoutp02a0a6a72050cecae907bb24a693bcc13a~Qv5gmITTQ1451614516euoutp02m DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038922; bh=ESSUwsYDceXvTcFy9eesNgnKPNe4C7KaTfp8FUgSV4Q=; h=From:To:Cc:Subject:Date:References:From; b=mELCcNzYE0pR1TTdigcZb8tHjfZybu2AVNTflT+6/ewX29gVSrySumNAwka1rl6M5 YXA61dWdzy/nsGJ2YN+OmNVUhJYGWyan6PJkkEhL0zSUPu7AIolQLGFH+PJbucDpuW O+VeBwTFePl4IhzpjS0fBAdltmOWxYJOlTWHEyJ0= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901132842eucas1p296a30dd6b50408f0f93cfb0b60ed35a8~Qv5gSuLPO2672226722eucas1p2D; Thu, 1 Sep 2022 13:28:42 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 57.D8.19378.A83B0136; Thu, 1 Sep 2022 14:28:42 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220901132841eucas1p25669404d670babc9909bc090199b893f~Qv5fzxBo32672226722eucas1p2C; Thu, 1 Sep 2022 13:28:41 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220901132841eusmtrp2f4b7036d604fbe1d6221b012699cc39c~Qv5fzGN_s1727517275eusmtrp2d; Thu, 1 Sep 2022 13:28:41 +0000 (GMT) X-AuditID: cbfec7f5-a4dff70000014bb2-cf-6310b38af567 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 36.8E.07473.983B0136; Thu, 1 Sep 2022 14:28:41 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220901132840eusmtip1b6b77a7f9124dca285a12b1f9eaacebe~Qv5fA5YKP0766207662eusmtip14; Thu, 1 Sep 2022 13:28:40 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:28:33 +0200 Message-Id: <20220901132833.1995-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djP87pdmwWSDU6/EbT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKmLJzMVnD7G2PFwa0BDYyHdjF2 MXJySAiYSPx5uImli5GLQ0hgBaPE3pddUM4XRomvs46xQzifGSWO/1jMCtNy++YbJojEckaJ zW2bmCGcdiaJyZ9mMYNUsQnoSrz88IgJxBYRMJU42byXDcRmFtCWWHf3O5gtLGApsbj1D1A9 BweLgKrEtP2cIGFeASuJ6atmMEMs05SYPaGdGSIuKHFy5hMWiDi3xLpZl1ghRspLNG+dDXaD hMBfdonzN26zQxS5SPy//ZUNwhaWeHV8C1RcRuL/zvlMIHslBIolDvU7QJg1Eod+pENUWEu8 bTzOCBJmBjph/S59iLCjxLK961khqvkkbrwVhDiAT2LStunMEGFeiY42IQhTRaKvUwyiUUri 6bI5UC95SDSenMU4gVFxFpKvZiH5ZBbC2gWMzKsYxVNLi3PTU4uN81LL9YoTc4tL89L1kvNz NzECE8Tpf8e/7mBc8eqj3iFGJg7GQ4wSHMxKIrzfz/EkC/GmJFZWpRblxxeV5qQWH2KU5mBR EudNztyQKCSQnliSmp2aWpBaBJNl4uCUamBaKav4wP/qmy33r4VK/W8Uvqvk9VXP8Nn6Wd1r BF8vT8zvuhXRYvuA7cKLbUpZPt/PSRvkT53H3nu/+57Azt9u2x1/cbi/LFu8a/mqFcs29Kw7 bD7NpnDrtdIDvPKaOydpxqbMq8588fUCh+7M2uL32QsmM6ezOO8w44oQW8pcdsBO2OHUfa6F 9WJH/xv6KOxp1Xtu72Nf/XrFj0c9DYv3WrsdbV7Wuuictgzf7UlHz6w1EN+wYOoZrqt5P7ln Vi15rG37/My2iJXN/o+mRGWZpCealHmECSkx6UcseKiacG/hvhAdJ5ZlH2z1OF6e2Ket+ad+ 4XRl0YerWA9+0Cqoss55cMrZknX+q+fOuU+slViKMxINtZiLihMBIj/5Rn8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qdmwWSDb40alt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehlTFk5mK7j9jbHi4NaABsZDuxi7GDk5JARMJG7ffMMEYgsJLGWU eHJIFSIuJbF06SKoGmGJP9e62LoYuYBqWpkkDty8zgKSYBPQlXj54RFYs4iAucTFdbfAGpgF tCXW3f3OBmILC1hKLG79w9zFyMHBIqAqMW0/J0iYV8BKYvqqGcwQ8zUlZk9oZ4aIC0qcnPmE BSLOLbFu1iVWiJHyEs1bZzNPYOSfhaRsFpLUAkamVYwiqaXFuem5xYZ6xYm5xaV56XrJ+bmb GIFhu+3Yz807GOe9+qh3iJGJg/EQowQHs5II7/dzPMlCvCmJlVWpRfnxRaU5qcWHGE2BTp3I LCWanA+MnLySeEMzA1NDEzNLA1NLM2MlcV7Pgo5EIYH0xJLU7NTUgtQimD4mDk6pBqbG5LU3 ZtZ7fJIUF2ZjUO5wOfxj6aINJwTXWdQ8YV9rmbShKe5dkoavVuDSE1/EtXimi+6r1/5x79AF +azXkSYeYmtqe7sULXY4Fc3563aIc5b0/B9OS7Zwqq9QNZrwtmZ6/tq2c8WrH3XrHk/0nBlT mn1nmvn2fU9+soTt3MD06eaxi1+PN6jf2Sizg4/h4/HjN0+p7l9+tbjF7dnpQv6icp5fEeKm lzliPq3SNKo9kaPWm2+o62idsd/86IanJ/PuvN5o0FxypyaqVPPdmRe3efjnczzsvvbzwflA uZCzzrPzc/pDHyn9VjDt7XqjqL05ws9mg/GpFXt3GK0/d/rL15sqpSkzrtTE/JUQuW2txFKc kWioxVxUnAgAAhR+QOQCAAA= X-CMS-MailID: 20220901132841eucas1p25669404d670babc9909bc090199b893f X-Msg-Generator: CA X-RootMTR: 20220901132841eucas1p25669404d670babc9909bc090199b893f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132841eucas1p25669404d670babc9909bc090199b893f References: Subject: [FFmpeg-devel] [PATCH v11 5/9] 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: ZumwtJTXGl2J - 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 | 601 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 687 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index 932ea5b553..8fe8bc0d49 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] @@ -1875,6 +1876,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3398,6 +3400,7 @@ libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" vapoursynth_demuxer_deps="vapoursynth" @@ -6719,6 +6722,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 70" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index d36464d629..40496f760d 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2892,6 +2892,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 86ec6d606b..3fb4aeb206 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 @@ -591,6 +599,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 @@ -930,6 +939,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 library libxeve @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3d2e5d9bc2..24e58c77b4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1102,6 +1102,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 6939a4e25f..4f9c0b5e63 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -802,6 +802,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..bb9c26e57c --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,601 @@ +/* + * 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 +} 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); + } + + /* create encoder */ + xectx->id = xeve_create(cdsc, NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVE encoder\n"); + return AVERROR_EXTERNAL; + } + + if ((ret = set_extra_config(avctx, xectx->id, xectx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set extra configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to get chroma shift\n"); + return AVERROR(EINVAL); + } + + // Chroma subsampling + // + // YUV format explanation + // shift_h == 1 && shift_v == 1 : YUV420 + // shift_h == 1 && shift_v == 0 : YUV422 + // shift_h == 0 && shift_v == 0 : YUV444 + // + width_chroma = AV_CEIL_RSHIFT(avctx->width, shift_h); + height_chroma = AV_CEIL_RSHIFT(avctx->height, shift_v); + + /* set default values for input image buffer */ + imgb = &xectx->imgb; + imgb->cs = libxeve_color_space(avctx->pix_fmt); + imgb->np = 3; /* only for yuv420p, yuv420ple */ + + for (i = 0; i < imgb->np; i++) + imgb->x[i] = imgb->y[i] = 0; + + imgb->w[0] = imgb->aw[0] = avctx->width; // width luma + imgb->w[1] = imgb->w[2] = imgb->aw[1] = imgb->aw[2] = width_chroma; + imgb->h[0] = imgb->ah[0] = avctx->height; // height luma + imgb->h[1] = imgb->h[2] = imgb->ah[1] = imgb->ah[2] = height_chroma; + + xectx->state = STATE_ENCODING; + + return 0; +} + +/** + * Encode raw data frame into EVC packet + * + * @param[in] avctx codec context + * @param[out] pkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = avctx->priv_data; + int ret = -1; + + // No more input frames are available but encoder still can have some data in its internal buffer to process + // and some frames to dump. + if (xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + return 0; + } + } + + if (xectx->state == STATE_ENCODING) { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + imgb->ts[0] = frame->pts; + imgb->ts[1] = 0; + + /* push image to encoder */ + ret = xeve_push(xectx->id, imgb); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_push() failed\n"); + return AVERROR_EXTERNAL; + } + } + if (xectx->state == STATE_ENCODING || xectx->state == STATE_BUMPING) { + /* encoding */ + ret = xeve_encode(xectx->id, &(xectx->bitb), &(xectx->stat)); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_encode() failed\n"); + return AVERROR_EXTERNAL; + } + + /* store bitstream */ + if (ret == XEVE_OK_OUT_NOT_AVAILABLE) { // Return OK but picture is not available yet + *got_packet = 0; + return 0; + } else if (ret == XEVE_OK) { + int av_pic_type; + + if (xectx->stat.write > 0) { + + ret = ff_get_encode_buffer(avctx, avpkt, xectx->stat.write, 0); + if (ret < 0) + return ret; + + memcpy(avpkt->data, xectx->bitb.addr, xectx->stat.write); + + avpkt->pts = xectx->bitb.ts[0]; + avpkt->dts = xectx->bitb.ts[1]; + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return AVERROR_INVALIDDATA; + } + + ff_side_data_set_encoder_stats(avpkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + *got_packet = 1; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return AVERROR_EXTERNAL; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + if (xectx->id) { + xeve_delete(xectx->id); + xectx->id = NULL; + } + + av_free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE +}; + +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption libxeve_options[] = { + { "preset", "Encoding preset for setting encoding speed", OFFSET(preset_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PRESET_MEDIUM }, XEVE_PRESET_DEFAULT, XEVE_PRESET_PLACEBO, VE, "preset" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_DEFAULT }, INT_MIN, INT_MAX, VE, "preset" }, + { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_FAST }, INT_MIN, INT_MAX, VE, "preset" }, + { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_MEDIUM }, INT_MIN, INT_MAX, VE, "preset" }, + { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_SLOW }, INT_MIN, INT_MAX, VE, "preset" }, + { "placebo", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_PLACEBO }, INT_MIN, INT_MAX, VE, "preset" }, + { "tune", "Tuning parameter for special purpose operation", OFFSET(tune_id), AV_OPT_TYPE_INT, { .i64 = XEVE_TUNE_NONE }, XEVE_TUNE_NONE, XEVE_TUNE_PSNR, VE, "tune"}, + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_NONE }, INT_MIN, INT_MAX, VE, "tune" }, + { "zerolatency", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_ZEROLATENCY }, INT_MIN, INT_MAX, VE, "tune" }, + { "psnr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_PSNR }, INT_MIN, INT_MAX, VE, "tune" }, + { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, + { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, + { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "sei_info", "Embed SEI messages identifying encoder parameters and command line arguments", OFFSET(sei_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { 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 Thu Sep 1 13:29:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp288274pzh; Thu, 1 Sep 2022 06:29:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR4BAQiwleqz7nHC9JooXDeB7izj8PnHFP/ChvshNXnClkHAjRaRdJR4nKEJuyyILWhPOXvP X-Received: by 2002:a05:6402:26c6:b0:448:6812:7355 with SMTP id x6-20020a05640226c600b0044868127355mr17285591edd.385.1662038999371; Thu, 01 Sep 2022 06:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662038999; cv=none; d=google.com; s=arc-20160816; b=L4HRb5Qwmm+4jbi8iCD2OWsmvIV4c2Q8yma3xxmiRQeRjn4VVtObV+RDh10PEDIXdm TAHxdPAo3W+BcPZN2Qcw/OYfg0EKnMchhLWrX/SecYipP3qIU0Hzzu402f8zTW0xyCKi 2j6inV3vC4Qmsf4qK1qqoaofQYfY/PODZjWPSmV9P3uFGuM0atutcBbG2dc5fy2ViS0U qGtQ5Mc0wFLgOdIoy39DrrvzsaXPFg83Eg0YLA6Y1n9RTfmuECIQk40suSYN7SE3o9uC MYyOtFk7h4WppdZMh62JTfHEicUp3KJRniRjke4zeo9rh5W4nNmBmTeeVJP2RX51wb9Q DeUA== 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=MBOM5Va81/zQhpKvdIu5cQZyir6elo4N/PJMz3sJMMg=; b=lInA4wH0dR+cnPcbsWNpOmpZXVYQ+lhxXJYNCiwY2fqowGbCajUgcLQ3LoU4Le6phk SQtQWnJuZfXZFej0LRi2rOtpszqQ1wZGTUYSdIXNFdX4jpXW1shihSWK2Gj+AgAKosmV t9mh/ggbpFntLhhsjVP3AbAV5GEaHQRwNTA982sLDkfVQatb/TwNjulfQZntFEDxda7U tiuedGLGNN56gBFzwGPyeKYdtoKOmP1DltIIRoO08pLsEYb6G3W4LnLzFEzod/gpGFc9 XUJbgzSG60Or2ObeZp6lIdHeciigFgYT87ph806qV8y+QsIunz0GGZfPIqAqC+9p4M6R Lcgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=I5YGaMeq; 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 qk35-20020a1709077fa300b0073d6481dedesi14094596ejc.224.2022.09.01.06.29.53; Thu, 01 Sep 2022 06:29:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=I5YGaMeq; 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 6AC6268BA6B; Thu, 1 Sep 2022 16:29:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8341C68BA6D for ; Thu, 1 Sep 2022 16:29:49 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901132948euoutp022a4aefcce3d1404bfa6e255e9a4c4c84~Qv6eTFXaH1543815438euoutp02u for ; Thu, 1 Sep 2022 13:29:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901132948euoutp022a4aefcce3d1404bfa6e255e9a4c4c84~Qv6eTFXaH1543815438euoutp02u DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662038988; bh=3SPa+CnkPIUUL8+ZkilFV0CDMzF8pSmeMeBI2NJrYcw=; h=From:To:Cc:Subject:Date:References:From; b=I5YGaMeqbf7FkZlk8s9O2vgLQJiObq5anaJwNj7h0jo7SK5+QbhvdIlcOAI3fJnkW CKRnCCnJQb+8UzrpW+8hlswJDMD4KvhR0L7lqhQH/XDetYDYfkdhn+kyyhVPF9Z82t cByFP+3E353VB70f4fq8pZ7X9Ut+Uk14+RtRGS+k= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220901132948eucas1p134b4203821d85592fde70ab17383ca23~Qv6eEqJFE2787927879eucas1p1o; Thu, 1 Sep 2022 13:29:48 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 09.09.19378.CC3B0136; Thu, 1 Sep 2022 14:29:48 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901132948eucas1p1681a5db6b307c7d0f91d92a85412ea0d~Qv6duz6z_2203322033eucas1p1-; Thu, 1 Sep 2022 13:29:48 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220901132948eusmtrp1cd030bbbb9e86544002ea8b3f68e0804~Qv6duLLx_1521915219eusmtrp1n; Thu, 1 Sep 2022 13:29:48 +0000 (GMT) X-AuditID: cbfec7f5-a35ff70000014bb2-c6-6310b3cca86f Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id D7.42.10862.CC3B0136; Thu, 1 Sep 2022 14:29:48 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220901132947eusmtip2cb0a16bc739e4a9c379328cc96d39495~Qv6dGj1RX2604726047eusmtip29; Thu, 1 Sep 2022 13:29:47 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:29:40 +0200 Message-Id: <20220901132940.56-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7pnNgskG/x7oWLx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVsOu9ZsG4RY8W5k53MDYwryroY OTgkBEwkzrwT7GLk4hASWMEoMfnySSYI5wujRGfnbyjnM6PEnOaZrF2MnGAdPfP2s0EklgMl Fm1hh3DamSR6fk1gA6liE9CVePnhEROILSJgKnGyeS9YnFlAW2Ld3e9gtrCApcSZq08ZQWwW AVWJU/8ng8V5BSwk+jZ/Z4HYpikxe0I7M0RcUOLkzCdQcW6JdbMusULMlJdo3jqbGeQICYGv 7BKP7ixkhyhykej+sQKqQVji1fEtUHEZidOTe1ggAVAscajfAcKskTj0Ix2iwlribeNxRpAw M9AJ63fpQ4QdJRYufssEUc0nceOtIMQBfBKTtk1nhgjzSnS0CUGYKhJ9nWIQjVIST5fNgarw kJhyj3ECo+IsJE/NQvLILIStCxiZVzGKp5YW56anFhvnpZbrFSfmFpfmpesl5+duYgQmh9P/ jn/dwbji1Ue9Q4xMHIyHGCU4mJVEeL+f40kW4k1JrKxKLcqPLyrNSS0+xCjNwaIkzpucuSFR SCA9sSQ1OzW1ILUIJsvEwSnVwKTyz3ol77nAfesarPak9/zS79Od91d+corUf547xU+fT1G8 /5wpM9Nrvx+DiPqG6SdqkznyzNotHK6L6yh+v5ZwK2PS+cXXyvJmPFcvCohSvmO2Y7Le02cB O6PZBHl5ylJ/M6wsk2779fj02iWcIUblBVN0Jqexz+9etFO/aPOVH44aX96fkr5WJjbrGauf 8sbkdQkLGDksAxr3KmX7Tp4R9KLMJPShWWJgZelVruxFIX3MGtL79zN90EziUKpidHiqpHhQ dopz91MeC1WD0haRdf4Vytxuf3MOnjCOdb7a9+yu10MVBT/LO28Nopp8LMJmc/zWOnysR7J2 Tcxj/mupMS/+tP42+3HiqdoGJZbijERDLeai4kQA9vcgBn0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7pnNgskG7xbzmfx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVsOu9ZsG4RY8W5k53MDYwryroYOTkkBEwkeubtZ+ti5OIQEljK KPHl9xY2iISUxNKlixghbGGJP9e6oIpamSR2XfwBVsQmoCvx8sMjJhBbRMBc4uK6W2ANzALa EuvufgerERawlDhz9SlYnEVAVeLU/8lgcV4BC4m+zd9ZIBZoSsye0M4MEReUODnzCVScW2Ld rEusEDPlJZq3zmaewMg/C0nZLCSpBYxMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQIDd9ux n1t2MK589VHvECMTB+MhRgkOZiUR3u/neJKFeFMSK6tSi/Lji0pzUosPMZoC3TqRWUo0OR8Y O3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUzbI8IfJW7nfx01 p4m7THjuqUddR2PDJSqepLNKB0vNSQ4R92ub6zbXKXTum3zeP6dmLtjJrKv4StsyTP/9vw+n WxX+yPUV/I/p3S16PYOvLaf1m/6GzuAk5+Q669l/jK58/3jr4I2D2yfwv1n0PCr5e1DZw/X9 f45+t/1ynT+xacLuNYc7refcf6zB4/noY9CMrFXmIjzZdxZ87NMIjNY1fdejLHrm3LI9lzz2 3T33JMO0+423aw9Hu9KUo75zXvYeCj99K5+jJ25rkW1ZiJvbszxpr+svAsNMe7kshHdzzowP 65QXE47ktZ93V7NyfuOU6hm/7EKWXHl+f++TxoiJEZL/P5zudXjLuOZgWIYSS3FGoqEWc1Fx IgBLEXsp5QIAAA== X-CMS-MailID: 20220901132948eucas1p1681a5db6b307c7d0f91d92a85412ea0d X-Msg-Generator: CA X-RootMTR: 20220901132948eucas1p1681a5db6b307c7d0f91d92a85412ea0d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901132948eucas1p1681a5db6b307c7d0f91d92a85412ea0d References: Subject: [FFmpeg-devel] [PATCH v11 6/9] 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: ecMb7Fhz3r03 - 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 | 422 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index 8fe8bc0d49..b191d2d9db 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] @@ -1876,6 +1877,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3400,6 +3402,7 @@ libx264rgb_encoder_select="libx264_encoder" libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxevd_decoder_deps="libxevd" libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" @@ -6722,6 +6725,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 70" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.0" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index e2fcbf5dc9..0bd9096114 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -126,6 +126,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 3fb4aeb206..89236047ea 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 @@ -940,7 +948,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 library libxeve + @tab encoding and decoding supported through external libraries libxeve and libxevd @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 24e58c77b4..ea9566b20c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1102,6 +1102,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 4f9c0b5e63..fc2882c7fd 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -803,6 +803,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..cddbfbcb1c --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,422 @@ +/* + * 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" + +#define XEVD_PARAM_BAD_NAME -1 +#define XEVD_PARAM_BAD_VALUE -2 + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder + */ +typedef struct XevdContext { + const AVClass *class; + + XEVD id; // XEVD instance identifier @see xevd.h + XEVD_CDSC cdsc; // decoding parameters @see xevd.h +} XevdContext; + +/** + * The function populates the XEVD_CDSC structure. + * XEVD_CDSC contains all decoder parameters that should be initialized before its use. + * + * @param[in] avctx codec context + * @param[out] cdsc contains all decoder parameters that should be initialized before its use + * + */ +static void get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) +{ + int cpu_count = av_cpu_count(); + + /* clear XEVS_CDSC structure */ + memset(cdsc, 0, sizeof(XEVD_CDSC)); + + /* init XEVD_CDSC */ + if (avctx->thread_count <= 0) + cdsc->threads = (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : XEVD_MAX_TASK_CNT; + else if (avctx->thread_count > XEVD_MAX_TASK_CNT) + cdsc->threads = XEVD_MAX_TASK_CNT; + else + cdsc->threads = avctx->thread_count; +} + +/** + * Read NAL unit length + * @param bs input data (bitstream) + * @return the length of NAL unit on success, 0 value on failure + */ +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if (bs_size == XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if (len == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return len; +} + +/** + * @param[in] xectx the structure that stores all the state associated with the instance of Xeve MPEG-5 EVC decoder + * @param[out] avctx codec context + * @return 0 on success, negative value on failure + */ +static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) +{ + int ret; + int size; + int color_space; + + avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + + size = 4; + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_WIDTH, &avctx->coded_width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_HEIGHT, &avctx->coded_height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_WIDTH, &avctx->width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_HEIGHT, &avctx->height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_COLOR_SPACE, &color_space, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get color_space\n"); + return AVERROR_EXTERNAL; + } + switch(color_space) { + case XEVD_CS_YCBCR400_10LE: + avctx->pix_fmt = AV_PIX_FMT_GRAY10LE; + break; + case XEVD_CS_YCBCR420_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case XEVD_CS_YCBCR422_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + break; + case XEVD_CS_YCBCR444_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; + } + + // the function returns sps->num_reorder_pics + ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); + return AVERROR_EXTERNAL; + } + + avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0; + + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + avctx->colorspace = AVCOL_SPC_UNSPECIFIED; + + return 0; +} + +/** + * @brief Copy image in imgb to frame. + * + * @param avctx codec context + * @param[in] imgb + * @param[out] frame + * @return 0 on success, negative value on failure + */ +static int libxevd_image_copy(struct AVCodecContext *avctx, XEVD_IMGB *imgb, struct AVFrame *frame) +{ + int ret; + if (imgb->cs != XEVD_CS_YCBCR420_10LE) { + av_log(avctx, AV_LOG_ERROR, "Not supported pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + return AVERROR_INVALIDDATA; + } + + if (imgb->w[0] != avctx->width || imgb->h[0] != avctx->height) { // stream resolution changed + if (ff_set_dimensions(avctx, imgb->w[0], imgb->h[0]) < 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set new dimension\n"); + return AVERROR_INVALIDDATA; + } + } + + if (ret = ff_get_buffer(avctx, frame, 0) < 0) { + return ret; + } + + av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a, + imgb->s, avctx->pix_fmt, + imgb->w[0], imgb->h[0]); + + return 0; +} + +/** + * Initialize decoder + * Create a decoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxevd_init(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + XEVD_CDSC *cdsc = &(xectx->cdsc); + + /* read configurations and set values for created descriptor (XEVD_CDSC) */ + get_conf(avctx, cdsc); + + /* create decoder */ + xectx->id = xevd_create(&(xectx->cdsc), NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * Decode picture + * + * @param avctx codec context + * @param[out] frame decoded frame + * @param[out] got_frame_ptr decoder sets to 0 or 1 to indicate that a + * non-empty frame or subtitle was returned in + * outdata. + * @param[in] avpkt AVPacket containing encoded data to be decoded + * + * @return amount of bytes read from the packet on success, negative error + * code on failure + */ +static int libxevd_decode(struct AVCodecContext *avctx, struct AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) +{ + XevdContext *xectx = NULL; + XEVD_IMGB *imgb = NULL; + XEVD_STAT stat; + XEVD_BITB bitb; + int xevd_ret, nalu_size, bs_read_pos; + int ret = 0; + + xectx = avctx->priv_data; + + if (avpkt->size > 0) { + bs_read_pos = 0; + imgb = NULL; + while(avpkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + memset(&stat, 0, sizeof(XEVD_STAT)); + memset(&bitb, 0, sizeof(XEVD_BITB)); + + nalu_size = read_nal_unit_length(avpkt->data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + ret = AVERROR_INVALIDDATA; + goto ERR; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = avpkt->data + bs_read_pos; + bitb.ssize = nalu_size; + + /* main decoding block */ + xevd_ret = xevd_decode(xectx->id, &bitb, &stat); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); + ret = AVERROR_EXTERNAL; + goto ERR; + } + + bs_read_pos += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) + goto ERR; + } + + if (stat.read != nalu_size) + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n,", nalu_size, stat.read); + if (stat.fnum >= 0) { + // already has a decoded image + if (imgb) { + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } + xevd_ret = xevd_pull(xectx->id, &imgb); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", xevd_ret, stat.fnum); + ret = AVERROR_EXTERNAL; + goto ERR; + } else if (xevd_ret == XEVD_OK_FRM_DELAYED) { + if (imgb) { + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } + } + if (imgb) { + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + goto ERR; + } + + frame->pts = avpkt->pts; + *got_frame_ptr = 1; + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } else + *got_frame_ptr = 0; + } + } + } else { // bumping + xevd_ret = xevd_pull(xectx->id, &(imgb)); + if (xevd_ret == XEVD_ERR_UNEXPECTED) { // bumping process completed + *got_frame_ptr = 0; + return 0; + } else if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", xevd_ret); + ret = AVERROR_EXTERNAL; + goto ERR; + } + if (imgb) { + int ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + goto ERR; + } + + frame->pts = avpkt->pts; + *got_frame_ptr = 1; + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + } else + *got_frame_ptr = 0; + } + + return avpkt->size; + +ERR: + if (imgb) { + imgb->release(imgb); + imgb = NULL; + } + *got_frame_ptr = 0; + + return ret; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if (xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + + return 0; +} + +#define OFFSET(x) offsetof(XevdContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + +static const AVClass libxevd_class = { + .class_name = "libxevd", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFCodec ff_libxevd_decoder = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxevd_init, + FF_CODEC_DECODE_CB(libxevd_decode), + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .p.priv_class = &libxevd_class, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_DR1, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxevd", + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Thu Sep 1 13:30:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp289148pzh; Thu, 1 Sep 2022 06:31:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR4oYg0fVmTMLuG0EQNLqyAuRcvGNGVN2aKHqwtmmR5jpzVsyiyhIhKk6O+TgQ7RpFvv3ZYj X-Received: by 2002:a05:6402:5c9:b0:446:fb0:56bb with SMTP id n9-20020a05640205c900b004460fb056bbmr29514137edx.173.1662039077778; Thu, 01 Sep 2022 06:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662039077; cv=none; d=google.com; s=arc-20160816; b=XK3UarUuBetSCYwgSd0TIpd78Qa6J1nZdm8YJBp4CkNpN0EZHlMxw9ML8mClbHjnYX TDyQ9lNZutxWrlEyYif2A204ElpxEcxUMrZAB1XNkzZEcii/A8EfYhJXABOhF7zVMnpm 1Sup+TVlcgn5oJnWJVIqgX8yWj03/ys3Ym6JS6ZG9YkfkSFT7F9DGiU7GVVyl1faqubL 4/Ban5QRbLyeC7qxLudcT1vKADYwlZIEw25+ev/tmBZG/OqDKQlo9R/joWnRg6dfDLin fSe/68/4QbkaknbxH+CMoe0oW9kK4vfWE1+3L20REgKFXdNi6M1dbX0UNpTAyX2adMye uqHg== 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=J+lO4L4DXokzS8hHkcyQhTMu94CFBHZYCTQekgxgkU4=; b=vxwrLML6BU21wH/W5WMeL5rtexCIktyKtwtaq+OsEdSI0wwQ5FVdLGHZMKgWUGe/7C LnsDhWk1+RGHB4hdppv6LTsUc+ol8Kzgx7SMGYJUuNuKnH8JHcae+8mr4XNZ/nZE701l is/LGa7HK16dnZDvqn5bJPQGsrbduhIyBX3iOOYawifQucMukDn+zZO8e66zZ0jSgLnM Mz1CLgs9IelAaAJPDOT58aGOGlTNwKR00mq/f4IhF6jRmkewpIMwF3LAvXwfxAzbhCrD yADkPj3lyDZaBJVLa71OgZFLzV00OwTy5lR1oPBIBu2O0zHN3eteImONpqQDgQDeVhap AUuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=GKgagYej; 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 r9-20020a05640251c900b004487c209b02si1834291edd.188.2022.09.01.06.31.09; Thu, 01 Sep 2022 06:31:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=GKgagYej; 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 8F31868BABA; Thu, 1 Sep 2022 16:31:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D523468B44B for ; Thu, 1 Sep 2022 16:30:59 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901133059euoutp02a1cb1de3ce8a08beefedf035f15279bd~Qv7f8wIm41497214972euoutp02H for ; Thu, 1 Sep 2022 13:30:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901133059euoutp02a1cb1de3ce8a08beefedf035f15279bd~Qv7f8wIm41497214972euoutp02H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662039059; bh=MCKQo+/yP31RnwyI+/GTKAwmdGWVeYLqRYbrIdYvgJk=; h=From:To:Cc:Subject:Date:References:From; b=GKgagYejsA07AWDE0qWwc58y1/KKMnw8K+BPtU07vyPy971L5xaA2cxQC/mIlTtJ3 1vSgaXHHkxQ9Qv8DURUBKTvNHWOvbM1riQhBPqj+At20P2V3TiF7HkCPvS5bEYvyBD DLiTTLG1n702YvvvtQy/t9cpoOG4pdQIPzseQvWM= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901133059eucas1p2745cf1af6cf57dc87bed0dbd44df2ee4~Qv7fth-Ig0476604766eucas1p27; Thu, 1 Sep 2022 13:30:59 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id ED.A1.29727.314B0136; Thu, 1 Sep 2022 14:30:59 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901133058eucas1p1deb9d3571b457c0a642cbd55dc3b1ac6~Qv7fUVNWA2136321363eucas1p1M; Thu, 1 Sep 2022 13:30:58 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220901133058eusmtrp2fdaf00a33c9a235adf28496729098a49~Qv7fTvxwE1959819598eusmtrp2D; Thu, 1 Sep 2022 13:30:58 +0000 (GMT) X-AuditID: cbfec7f2-21dff7000001741f-52-6310b413a219 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 2B.EE.07473.214B0136; Thu, 1 Sep 2022 14:30:58 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220901133058eusmtip1dc49a5877bc78492cc3219e25d8d9dff~Qv7eqvYRN3249732497eusmtip1j; Thu, 1 Sep 2022 13:30:58 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:30:51 +0200 Message-Id: <20220901133051.655-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87rCWwSSDY5uYLf4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDIuv7nIVHBwH2PFp4urGRsYX3Yx djFycEgImEisuevSxcjFISSwglHi7bFlbBDOF0aJCZ+3MUI4nxkl3r2/x9TFyAnW8eBKMwtE YjmjxIktnVBOO5PEp2d9LCBVbAK6Ei8/PALrEBEwlTjZvJcNxGYW0JZYd/c7G8huYQF3icWt oSBhFgFVievfVoKV8ApYSjz/eYMNYpmmxOwJ7cwQcUGJkzOfsEDEuSXWzbrECjFSXqJ562xm iPhfdomzV+UhXnORmPgtByIsLPHq+BZ2CFtG4v/O+UwQJcUSh/odIMwaiUM/0iEqrCXeNh4H hw8z0AHrd+lDhB0lOm8eZ4ao5pO48VYQYj2fxKRt06HCvBIdbUIQpopEX6cYRKOUxNNlc6AO 9JB49PYE2wRGxVlIfpqF5I9ZCGsXMDKvYhRPLS3OTU8tNsxLLdcrTswtLs1L10vOz93ECEwO p/8d/7SDce6rj3qHGJk4GA8xSnAwK4nwfj/HkyzEm5JYWZValB9fVJqTWnyIUZqDRUmcNzlz Q6KQQHpiSWp2ampBahFMlomDU6qBKSmBM+abwxqp7UpbLvqZ8D3aJm3y+3GKPHuv056fmz7u uKv9pi/61yf9kKnu82946F5YlXk+61CRXXZVTa/UpdjAwy475Qxfp786m/pn0omvP49YurxY I/TLOEk7Q7ug4uvrrNNrGQwZrL2NitcZ3TK6Yb/FaH7F35BTz97X6WXePMt7X+Ha0zMfrCqb Vzx4JiF1xXHdf6nZS6Oq9vo2nWly08yt/xK5zTEzYmH8utY2mQnvwzYc/3X7wUPtd11qXnu+ SyrxKlnp1iz6eEpha1rx1FoetSW7ty5UkWs65fX+3OubPYKPr8vkh+jvW/KrcpJJ+bvu73eu xaqfZXKaF2y9JVisffXufy9/zZ5n+E6JpTgj0VCLuag4EQA3qSzFfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7pCWwSSDX4v17T4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DIuv7nIVHBwH2PFp4urGRsYX3YxdjFyckgImEg8uNLM0sXIxSEk sJRR4l/3D2aIhJTE0qWLoIqEJf5c62IDsYUEWpkkPvyzAbHZBHQlXn54xARiiwiYS1xcdwus nllAW2Ld3e9A9RwcwgLuEotbQ0HCLAKqEte/rQQbwytgKfH85w02iPGaErMntDNDxAUlTs58 wgIR55ZYN+sSK8RIeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95Pzc TYzAwN127OfmHYzzXn3UO8TIxMF4iFGCg1lJhPf7OZ5kId6UxMqq1KL8+KLSnNTiQ4ymQLdO ZJYSTc4Hxk5eSbyhmYGpoYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVAOT1qnD d+t390TVva1P4y0xvpOvfvydmo9NwaeF1inrloT4pG8LNwp1v1J8hl1mnvUThmyL5sZ9mjtE /3yOZXg4oXrajAOJZ29qiFXI9i3lepCRwmAvY/RposSu4KP7iirULGRWz2MXvf5I1dzjdExZ rNTBgPoXfzb/mt8a6T1H47HM2qi3X0QbDRXZtT3N1I46rp/+QGZlJss/K8XGe4V3+zYxdnef n1S7djL/5HVafy/ZzYrYqO7vK8RXKnGoRqWAJebotN6Wt7GvD7+7Ep2jn7xJY1dJhaN9j9+T G67TTNYfs12vsSrs65p0zZirHEpLk39caaph3qXsvixCRMJ//Uqpbzq/1+29WjtvtZQSS3FG oqEWc1FxIgBJciwu5QIAAA== X-CMS-MailID: 20220901133058eucas1p1deb9d3571b457c0a642cbd55dc3b1ac6 X-Msg-Generator: CA X-RootMTR: 20220901133058eucas1p1deb9d3571b457c0a642cbd55dc3b1ac6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901133058eucas1p1deb9d3571b457c0a642cbd55dc3b1ac6 References: Subject: [FFmpeg-devel] [PATCH v11 7/9] 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: giUZHpV00KUR - 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 | 461 ++++++++++++++++++++++++++++++++++++++++ libavformat/evc.h | 44 ++++ libavformat/isom_tags.c | 2 + libavformat/movenc.c | 35 ++- 5 files changed, 542 insertions(+), 2 deletions(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index a320cac22b..bb4e96e460 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -360,7 +360,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..7953ee299a --- /dev/null +++ b/libavformat/evc.c @@ -0,0 +1,461 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/evc.h" +#include "avformat.h" +#include "avio.h" +#include "evc.h" +#include "avio_internal.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NAL_UNIT_LENGTH_BYTE (4) /* byte */ +#define EVC_NAL_HEADER_SIZE (2) /* byte */ + +// 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 *array; +} EVCDecoderConfigurationRecord; + +typedef struct NALU { + int offset; + uint32_t size; +} NALU; + +typedef struct NALUList { + NALU *nalus; + unsigned nalus_array_size; + unsigned nb_nalus; ///< valid entries in nalus +} NALUList; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NAL_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + for (int i = 0; i < EVC_NAL_UNIT_LENGTH_BYTE; i++) + t = (t << 8) | bits[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfigurationRecord *evcc) +{ + GetBitContext gb; + int sps_seq_parameter_set_id; + EVCSPS sps; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return 0; + + sps.sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return 0; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps.profile_idc = get_bits(&gb, 8); + + sps.level_idc = get_bits(&gb, 8); + + sps.toolset_idc_h = get_bits(&gb, 32); + sps.toolset_idc_l = get_bits(&gb, 32); + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps.chroma_format_idc = get_ue_golomb(&gb); + + sps.pic_width_in_luma_samples = get_ue_golomb(&gb); + sps.pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps.bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps.bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + evcc->profile_idc = sps.profile_idc; + evcc->level_idc = sps.level_idc; + evcc->toolset_idc_h = sps.toolset_idc_h; + evcc->toolset_idc_l = sps.toolset_idc_l; + evcc->chroma_format_idc = sps.chroma_format_idc; + evcc->bit_depth_luma_minus8 = sps.bit_depth_luma_minus8; + evcc->bit_depth_chroma_minus8 = sps.bit_depth_chroma_minus8; + evcc->pic_width_in_luma_samples = sps.pic_width_in_luma_samples; + evcc->pic_height_in_luma_samples = sps.pic_height_in_luma_samples; + + return 0; +} + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +static int evcc_array_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, + uint8_t nal_type, int ps_array_completeness, + EVCDecoderConfigurationRecord *evcc) +{ + int ret; + uint8_t index; + uint16_t numNalus; + EVCNALUnitArray *array; + + for (index = 0; index < evcc->num_of_arrays; index++) + if (evcc->array[index].NAL_unit_type == nal_type) + break; + + if (index >= evcc->num_of_arrays) { + uint8_t i; + + ret = av_reallocp_array(&evcc->array, index + 1, sizeof(EVCNALUnitArray)); + if (ret < 0) + return ret; + + for (i = evcc->num_of_arrays; i <= index; i++) + memset(&evcc->array[i], 0, sizeof(EVCNALUnitArray)); + evcc->num_of_arrays = index + 1; + } + + array = &evcc->array[index]; + 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) +{ + uint8_t i; + + for (i = 0; i < evcc->num_of_arrays; i++) { + evcc->array[i].numNalus = 0; + av_freep(&evcc->array[i].nalUnit); + av_freep(&evcc->array[i].nalUnitLength); + } + + evcc->num_of_arrays = 0; + av_freep(&evcc->array); +} + +static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) +{ + uint8_t i; + uint16_t j, aps_count = 0, sps_count = 0, pps_count = 0; + + 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 (i = 0; i < evcc->num_of_arrays; i++) { + av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + i, evcc->array[i].array_completeness); + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + i, evcc->array[i].NAL_unit_type); + av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + i, evcc->array[i].numNalus); + for (j = 0; j < evcc->array[i].numNalus; j++) + av_log(NULL, AV_LOG_TRACE, + "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + i, j, evcc->array[i].nalUnitLength[j]); + } + + /* + * We need at least one SPS. + */ + for (i = 0; i < evcc->num_of_arrays; i++) + switch (evcc->array[i].NAL_unit_type) { + case EVC_APS_NUT: + aps_count += evcc->array[i].numNalus; + break; + case EVC_SPS_NUT: + sps_count += evcc->array[i].numNalus; + break; + case EVC_PPS_NUT: + pps_count += evcc->array[i].numNalus; + break; + default: + break; + } + 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 (i = 0; i < evcc->num_of_arrays; i++) { + /* + * bit(1) array_completeness; + * unsigned int(1) reserved = 0; + * unsigned int(6) NAL_unit_type; + */ + avio_w8(pb, evcc->array[i].array_completeness << 7 | + evcc->array[i].NAL_unit_type & 0x3f); + + /* unsigned int(16) numNalus; */ + avio_wb16(pb, evcc->array[i].numNalus); + + for (j = 0; j < evcc->array[i].numNalus; j++) { + /* unsigned int(16) nalUnitLength; */ + avio_wb16(pb, evcc->array[i].nalUnitLength[j]); + + /* bit(8*nalUnitLength) nalUnit; */ + avio_write(pb, evcc->array[i].nalUnit[j], + evcc->array[i].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; + + int ret = 0; + + if (size < 8) { + /* We can't write a valid evcC from the provided data */ + return AVERROR_INVALIDDATA; + } else if (*data == 1) { + /* Data is already evcC-formatted */ + avio_write(pb, data, size); + return 0; + } + + evcc_init(&evcc); + + while (bytes_to_read > EVC_NAL_UNIT_LENGTH_BYTE) { + nalu_size = read_nal_unit_length(data, EVC_NAL_UNIT_LENGTH_BYTE); + if (nalu_size == 0) break; + + data += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_NAL_UNIT_LENGTH_BYTE; + + if (bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(data, bytes_to_read); + + switch (nalu_type) { + case EVC_SPS_NUT: + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &evcc); + if (ret < 0) + goto end; + ret = evcc_parse_sps(data, nalu_size, &evcc); + if (ret < 0) + goto end; + break; + case EVC_APS_NUT: + case EVC_PPS_NUT: + case EVC_SEI_NUT: + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &evcc); + if (ret < 0) + goto end; + default: + break; + } + + 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 362cb77e8f..98f866094b 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 c8b2e141cb..93e4f64a63 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -35,6 +35,7 @@ #include "isom.h" #include "av1.h" #include "avc.h" +#include "evc.h" #include "libavcodec/ac3_parser_internal.h" #include "libavcodec/dnxhddata.h" #include "libavcodec/flac.h" @@ -1392,6 +1393,21 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_evcc_tag(AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "evcC"); + + if (track->tag == MKTAG('e','v','c','1')) + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 1); + else + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 0); + + return update_size(pb, pos); +} + /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { @@ -1641,6 +1657,16 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } +static int mov_get_evc_codec_tag(AVFormatContext *s, MOVTrack *track) +{ + int tag = track->par->codec_tag; + + if (!tag) + tag = MKTAG('e', 'v', 'c', 'i'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1722,6 +1748,8 @@ static unsigned int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mov_get_mpeg2_xdcam_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_H264) tag = mov_get_h264_codec_tag(s, track); + else if (track->par->codec_id == AV_CODEC_ID_EVC) + tag = mov_get_evc_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_DNXHD) tag = mov_get_dnxhd_codec_tag(s, track); else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2280,6 +2308,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) { @@ -6030,7 +6061,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || - par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && + par->codec_id == AV_CODEC_ID_TRUEHD || + par->codec_id == AV_CODEC_ID_EVC) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ trk->vos_len = size; @@ -7689,6 +7721,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 Thu Sep 1 13:31:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37596 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp290079pzh; Thu, 1 Sep 2022 06:32:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR4rK7xlDpM8z9qYJiB6x53ivSUzixwzYl2Dt67UZ9MuSMi9e9//4ZmuSjckDKVtTm6Kme7c X-Received: by 2002:a17:906:4789:b0:742:55b1:c3f0 with SMTP id cw9-20020a170906478900b0074255b1c3f0mr9149898ejc.446.1662039150724; Thu, 01 Sep 2022 06:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662039150; cv=none; d=google.com; s=arc-20160816; b=sQGX4X6NxMrQKV27lrXRabtVNTfpwwi8y6JhMOUhSySxH9Fv1qIapojlVmN+oP6mAE swamWrD3Vvfnzv77cy5L2sZWN86wYLqoKzbMBxeMARg661apoycjxTUvRVV1YVrpUoQ3 GOhBbZjtB/OP0FlKIVkZ7hDvrBrfo0z7PpHH8fHY2XVtXQALIuGIu4iOFOet7ARuyTuz V/hh3Uod0v3OfLX4TFs8XTaGZ14Ul4oARBbnH7qnetE4wspp2GONRtXOq29GKjam41tr M2TF+Gx/JOrDMkpTzdMuW37TmFyWLOZCiifuQNoo9dhw5Gn9pwS3mQABwIYXFY5+Xw9K pIDw== 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=77zfzj4DfjHpsHwBPowOdiXz+gLSIO3UmyI2+ZoKJss=; b=tLycI2FvpBSLsbY/c0gENG5JuP0ewf9oRKCbbixhHHz+nDSFQi74Cz1ijdzm25EyC7 v7ou5VVC5jeefhut2m9EDYy9E00G1fycKP1w0CCAUkQ6IunXguH04zGSpkCHGvcetFMH eFWwpmOgZ5l+iGRnCB65c+N9KVXonUsRUrC3nYFZmGfQBRcWlrTMKKVnIqdcUSXzv/eS L2X+aT02LFPun5afcL/dDXa+OyWqX6+Yf+8cO5YDvRNXiWqQxK/FYMEoEWcSheoAScfz U3qxouBI1asBSYqD3XnwucW0UcKlfTWYujHiRIYB5w6v6/1U0KWT/QnjgfwrNRALMScv BM8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qVaHuhtu; 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 x2-20020a05640226c200b0043d9ec0eb4fsi1635033edd.16.2022.09.01.06.32.14; Thu, 01 Sep 2022 06:32:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qVaHuhtu; 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 B891B68BABF; Thu, 1 Sep 2022 16:32:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F7CA68BA9D for ; Thu, 1 Sep 2022 16:32:04 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901133204euoutp0265faf80abb474ffe6ec43245e827c961~Qv8cdhSrV2003720037euoutp02Q for ; Thu, 1 Sep 2022 13:32:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901133204euoutp0265faf80abb474ffe6ec43245e827c961~Qv8cdhSrV2003720037euoutp02Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662039124; bh=J57jGSm+DqvYxc0IRcku8GaORDN54HfBviPI3EJXp6Y=; h=From:To:Cc:Subject:Date:References:From; b=qVaHuhtuKpe1drYF43csZR8XSudn3D//Q+51fzCRq6hxBPQxE0KkdGdu6aYSlkmyd +nxS/E7unreMZCdS69eR5FBUSW9NtsbJWoKHgy+I61YQBiOnH0+Yp6EUxG5SKe938S nxobBU5QB9u/7E01XQ9mEjcgoxN4vUdOPb3ybB68= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901133203eucas1p2a9d8ddb98c9ec07f0568ab819a1afd12~Qv8b9eAng0481104811eucas1p2c; Thu, 1 Sep 2022 13:32:03 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 37.89.19378.354B0136; Thu, 1 Sep 2022 14:32:03 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901133203eucas1p1374ffb53cc9486073277185aa6baaeaf~Qv8bfI-wh2418924189eucas1p1G; Thu, 1 Sep 2022 13:32:03 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220901133203eusmtrp2b7c801771b246670a21a56c4a90818ed~Qv8begP0i1958019580eusmtrp2b; Thu, 1 Sep 2022 13:32:03 +0000 (GMT) X-AuditID: cbfec7f5-a4dff70000014bb2-aa-6310b4539c28 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id F4.A2.10862.354B0136; Thu, 1 Sep 2022 14:32:03 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220901133202eusmtip20b1859bc5e36d7ac417634a3fc1e68d5~Qv8bIClN82940129401eusmtip2V; Thu, 1 Sep 2022 13:32:02 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:31:55 +0200 Message-Id: <20220901133155.1807-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djPc7rBWwSSDS791bP4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKaLk5nKbjFVnFiyS/2BsYtrF2M nBwSAiYSUzp+s3QxcnEICaxglNi75zgzhPOFUWLh/ftQzmdGiclfF7DDtJx49BkqsZxR4v/9 O1BOO5PEvu8zwQazCehKvPzwiAnEFhEwlTjZvJcNxGYW0JZYd/c7mC0s4CnxdksrC4jNIqAq 0XBzLVgvr4CVxKtdH6G2aUrMntDODBEXlDg58wkLRJxbYt2sS6wQM+UlmrfOBjtCQuAru0TX 3znMEEUuEgdvr2SEsIUlXh3fAjVURuL/zvlAx3EA2cUSh/odIMwaiUM/0iEqrCXeNh5nBAkz A52wfpc+RNhRYmH7TKhGPokbbwUhDuCTmLRtOjNEmFeio00IwlSR6OsUg2iUkni6bA5UhYdE x4OoCYyKs5A8NQvJI7MQti5gZF7FKJ5aWpybnlpsnJdarlecmFtcmpeul5yfu4kRmB5O/zv+ dQfjilcf9Q4xMnEwHmKU4GBWEuH9fo4nWYg3JbGyKrUoP76oNCe1+BCjNAeLkjhvcuaGRCGB 9MSS1OzU1ILUIpgsEwenVAMT47Urx0Lttd44KhSEaB2ZY/7jUM2OKSGCM8ssX03/06Cg/Hj6 osUz1ipd1f9/qqae8VvkRZWC2PrTK7oUzxzkmCu6J0PS5mxwzYr6my1nLi5nTVf/cLp88fQv 0eEGd698bOAP3bVa2H5fs0+nk+he7qpXNtovF7anzom8rH2obZlSRefe9iMBU13eWOnP2Vhm UZSbNctf6fm2+ZMVlb+ld3LuyZtv+bSzyfuUCN+1aUXG3F9bGSceszhifeOVS7DFt9s3F3j8 X8sTMuly6JUvk+SNTxaY5tTUMh1ijFq46/l3w60hgpYLTh3xTtx5YcsKdpdzV3umfd106vO7 60pvzuu5eohfXnTxxA6f56znipRYijMSDbWYi4oTAfSg+XF+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7rBWwSSDfZdELL4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DKaLk5nKbjFVnFiyS/2BsYtrF2MnBwSAiYSJx59Zu5i5OIQEljK KDH/6hM2iISUxNKlixghbGGJP9e62CCKWpkkLk+cCFbEJqAr8fLDIyYQW0TAXOLiultgDcwC 2hLr7n4HqxEW8JR4u6WVBcRmEVCVaLi5Fmwzr4CVxKtdH9khFmhKzJ7QzgwRF5Q4OfMJC0Sc W2LdrEusEDPlJZq3zmaewMg/C0nZLCSpBYxMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQID d9uxn1t2MK589VHvECMTB+MhRgkOZiUR3u/neJKFeFMSK6tSi/Lji0pzUosPMZoC3TqRWUo0 OR8YO3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUyW7zmrlX+X lj802ZSYz+2+p2mLHPfRkI5pk9PPl0Sd785nXNu4stg3LeTn7WdHZi8NPRmSJLlvfq2whUjX hgmuBY6OulmHF53v3Rj7iCldcknps4hFUt+dhGOZIk+WKErzM7teue/61JjzXpLanCuWrd85 pIK+6z6RyXsXdPHd79eTvaUfud90lP35QHlrbRWvp8+COy1dC7N9rhxzv6fONefvxDeZAlpL zVnUJc1ex9t08PnWtNarXjK3/L13YqZLvyeLK+eskoIFXU1q9uxWx+2b1geZWIRM+nz9ROT8 H8FRFzaeTkhkC+Ne+/nTkYWTPzY3f13zjM1CyWVD/Yr0CyUpxlrVW7lUZdV3KLEUZyQaajEX FScCAGRVghvlAgAA X-CMS-MailID: 20220901133203eucas1p1374ffb53cc9486073277185aa6baaeaf X-Msg-Generator: CA X-RootMTR: 20220901133203eucas1p1374ffb53cc9486073277185aa6baaeaf X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901133203eucas1p1374ffb53cc9486073277185aa6baaeaf References: Subject: [FFmpeg-devel] [PATCH v11 8/9] 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: nX0rVPIfDd9v - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 35e2271b14..d537dfd434 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9127,7 +9127,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 Thu Sep 1 13:32:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 37597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp290773pzh; Thu, 1 Sep 2022 06:33:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR6xPkFAoEe9I6TFdNgvtYv1zmkghnMZH73B7rw3XXZen9y9HKGBTz7QKnuzivnDbdveBkVy X-Received: by 2002:a17:907:7630:b0:73d:d749:975b with SMTP id jy16-20020a170907763000b0073dd749975bmr22541321ejc.632.1662039208590; Thu, 01 Sep 2022 06:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662039208; cv=none; d=google.com; s=arc-20160816; b=gWcOw4GcJyx7Qwsl729GVSKOYz8Dqqqy746SxFeves3WUiy5/tl2GdBK9xfwebyJ2b UPkK2QQF8L3l2mQ6Ym2Ij+7g9I7KlONIYpOB3AfE3Cn4k55HGJMGEhmK7/Y0Hnlc6eJS ctdjttwPqGrG3Jo/7r9qTHfuff2JWVuYTsgJpk+iGmRmKPCAwKOlvx81m2WTtIWb2Odp a5UzEeSC4RO+N7qOc0+5JwxwF5FGPTmASX7S3b2gnRAb/qFIw+CIbqGBUVjbAHMV7FEJ QUKbvP77OrRRS922sZb4y5P5zokktxasXxn6qCJ6D+lHKsL2PU6xHgzcP/O6QtQpQKhk wBnw== 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=1r5xQopecPGiBpx2A9NsDPLINigjeLTsM/4wDvQyZc0=; b=Y3ziFYIwA1H1bBEo32aMAh7xwMLlR6PnJMQb23MZMWsYjUgzW2EDzLTk/FwxIXNGDU cs+v9jyXEdbg4lvesk42xCL3EJ83izRLkjoLqW79la98ooDb/xeoIxkfuKLbbRMz2evT 3rIBiFxBI4tbuBul62lYMtoasV0Z4gPDDXYhprUvT57Pfz3/2lMb4nPtUEgdCPOgjJnB zCBC2nhz9N/TurP8vvFniju2zWHPQXMyCqfAtDrnukbtZulwCnmsjWE/n6Xndvzvy06d txtGYiRV0An+W3hlkUPm69qm4fERp1uq1BbKcO6/dPb5saiZRbR8P5oIjI58MkQKHYW0 EITQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="W2v+/muj"; 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 hp23-20020a1709073e1700b0073d6f43993asi10318121ejc.297.2022.09.01.06.33.19; Thu, 01 Sep 2022 06:33:28 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="W2v+/muj"; 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 E172568BACA; Thu, 1 Sep 2022 16:33:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B22E768B9B1 for ; Thu, 1 Sep 2022 16:33:10 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220901133309euoutp02e0bbf43303391f48c87d3fd9162e3178~Qv9ZHtQ5z2111921119euoutp02N for ; Thu, 1 Sep 2022 13:33:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220901133309euoutp02e0bbf43303391f48c87d3fd9162e3178~Qv9ZHtQ5z2111921119euoutp02N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1662039189; bh=uh/8lOTt4CHw66kFLmoBPcdNFDTAztd+5fI8CpejSOE=; h=From:To:Cc:Subject:Date:References:From; b=W2v+/mujmgX1kHy6oI9GAGoXdmi/gsc7W+ga3IFq7Y9TidsLt9lP1lkmts3mtVjI3 NSFjuN0+mSHamXKt8JBdRkzFYwt3/pjKsXJ9CznKbCQGgzliq5rSSf6n4oj4H25G4B YEXrZAQcAMquw3Bltg3Vtvfsm6Ekehb00/Ihr2Ko= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220901133309eucas1p29b3984bdd3e14af6ac82485c173c6dde~Qv9Y7F6w_2923129231eucas1p2z; Thu, 1 Sep 2022 13:33:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id A9.EE.07817.594B0136; Thu, 1 Sep 2022 14:33:09 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220901133308eucas1p1dbbb3932a19b2b0ae595c96e65ebbeed~Qv9Yhl7Gx1757017570eucas1p13; Thu, 1 Sep 2022 13:33:08 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20220901133308eusmtrp2966209cc628fe6eb64831daf75fe5d4d~Qv9Yg9lyv2047320473eusmtrp2w; Thu, 1 Sep 2022 13:33:08 +0000 (GMT) X-AuditID: cbfec7f4-8abff70000011e89-c4-6310b495e5e1 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C0.4F.07473.494B0136; Thu, 1 Sep 2022 14:33:08 +0100 (BST) Received: from AMDN3260.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220901133308eusmtip26bd17f293e2e9a3cdaa9a2de2034623f~Qv9YHZF653038430384eusmtip2Q; Thu, 1 Sep 2022 13:33:08 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 1 Sep 2022 15:32:58 +0200 Message-Id: <20220901133258.1782-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7pTtwgkG3y4wG/x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVMmrKNqeAdX0X7ssvMDYzvOLoY OTkkBEwkerfvZO5i5OIQEljBKLG25Sk7hPOFUeLzpBOsEM5nRokj/XvZYVqOfXoNVbWcUeLP jG9Q/e1MEo1/17KBVLEJ6Eq8/PCICcQWETCVONm8FyzOLKAtse7udzBbWMBZ4u3+E8wgNouA qsT2s0eAbA4OXgEricNHOCGWaUrMntAOVsIrIChxcuYTFog4t8S6WZdYIUbKSzRvnQ12g4TA X3aJ2ZOfsYDMkRBwkbg6lxuiXlji1fEtUA/ISPzfOZ8JoqRY4lC/A4RZI3HoRzpEhbXE28bj jCBhZqAL1u/Shwg7SnyaD7IUpJpP4sZbQYj9fBKTtk1nhgjzSnS0CUGYKhJ9nWIQjVIST5fN YYawPSQOLpzPMoFRcRaSp2YheWQWwtoFjMyrGMVTS4tz01OLjfJSy/WKE3OLS/PS9ZLzczcx ApPD6X/Hv+xgXP7qo94hRiYOxkOMEhzMSiK838/xJAvxpiRWVqUW5ccXleakFh9ilOZgURLn Tc7ckCgkkJ5YkpqdmlqQWgSTZeLglGpgkhd9Wnd3Qdwb4ZqJn3bJ/010CL9nnL3lTZhZpfLh oMjmVbJar7Zfn/BO+8vFD7Nuxh/8KHHMPij99+1JzlkbTv5yVdQMLdP6XnBJU4xn1/LXKRq2 bpKfQ/1Shf+cOeOvzDTzYp3i0m+XJ6uzMuttDdzTL/vj2821v85pHTrjuWbzro77Lck9FSZi 8eVmf3z2tkXuyk5aJfzngJNG0JXL/48lXT5SvGL19Z61T1Iv7bhpFNl4i7OA/6SLVKfcHNeF le9/i17XUJW+wmWRE7OFb98fxleL03Z7Z++Z3JVb2fLncfyX6nmnoixm3/NQu/mnIVBjS+fb nq2dyavfPZwRJD894qZ61cboP3bpgUerlimxFGckGmoxFxUnAgA5RNgwfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7pTtggkG0xbZmTx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVMmrKNqeAdX0X7ssvMDYzvOLoYOTkkBEwkjn16zd7FyMUhJLCU UaJ3+nxGiISUxNKli6BsYYk/17rYIIpamSTe7jjKBpJgE9CVePnhEROILSJgLnFx3S2wBmYB bYl1d7+D1QgLOEu83X+CGcRmEVCV2H72CJDNwcErYCVx+AgnxHxNidkT2sFKeAUEJU7OfMIC EeeWWDfrEivESHmJ5q2zmScw8s9CUjYLSWoBI9MqRpHU0uLc9NxiQ73ixNzi0rx0veT83E2M wLDdduzn5h2M81591DvEyMTBeIhRgoNZSYT3+zmeZCHelMTKqtSi/Pii0pzU4kOMpkCnTmSW Ek3OB0ZOXkm8oZmBqaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QD05bAtWzM J877Vh+suPpN6mpOjKb6+l27LmzntX6U2PF3UVjn5UVLTn7YeCPmwXGV3SqB5v8nfCg2LJqx +aC+/nw+l6gFjJa7p6vwRDwVfeN9awFv9qPrvq2Ws9ffZr1xwHKZ+Y2rGl+kv3o8inponbKm ds95bbmQpW/Ydrh0JITO3f/r+b1e56/J4vtST2+5e8Dc/fcMh0kuwst+yZgHdP8+W/7rMcvv JXJCdtH3k5g6pY+YxT932tlsxpnDbaGVtc7d2+le7bcruXyVvZvytm0VXHftIPfqW5cXfhY/ sz3OqpMzuVF2wT07xYMFt3JO1RideSZqvKM/oyBx3a6mTZcYrR/vllDl+7X6wEujo9FKLMUZ iYZazEXFiQDb5w4j5AIAAA== X-CMS-MailID: 20220901133308eucas1p1dbbb3932a19b2b0ae595c96e65ebbeed X-Msg-Generator: CA X-RootMTR: 20220901133308eucas1p1dbbb3932a19b2b0ae595c96e65ebbeed X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220901133308eucas1p1dbbb3932a19b2b0ae595c96e65ebbeed References: Subject: [FFmpeg-devel] [PATCH v11 9/9] Changes in Changelog and MAINTAINERS files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9E4zBqfqrhPx - Changelog update - MAINTAINERS update Signed-off-by: Dawid Kozinski --- Changelog | 4 ++-- MAINTAINERS | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index fa83786a20..9631262858 100644 --- a/Changelog +++ b/Changelog @@ -36,7 +36,8 @@ version 5.1: - PHM image format support - remap_opencl filter - added chromakey_cuda filter - +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 5.0: - ADPCM IMA Westwood encoder @@ -83,7 +84,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer diff --git a/MAINTAINERS b/MAINTAINERS index ed2ec0b90c..69fc04e1d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -206,6 +206,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Dawid Kozinski + libxeve.c, Dawid Kozinski libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -426,6 +428,9 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc.c, evc.h Dawid Kozinski + evcdec.c Dawid Kozinski + evc_parser.c Dawid Kozinski ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer