From patchwork Mon Jan 2 12:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369031pzb; Mon, 2 Jan 2023 04:53:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXuVvYwzTJdr0EaQYaN0q0dkik3PryyMEfIfGAD76LU1grwX9QBjmfpodBSHXzxLx6FeTvJ4 X-Received: by 2002:aa7:c69a:0:b0:47d:674e:aca with SMTP id n26-20020aa7c69a000000b0047d674e0acamr33456145edq.19.1672663992527; Mon, 02 Jan 2023 04:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672663992; cv=none; d=google.com; s=arc-20160816; b=kgUe8E229rKdjEraV6TAMk6fzpYZnHshkgiGOMckaG8WTRm/KJiqccJbH10EuLNsMn 2PHFI+10pfWYlCM3vdLpmq5cwyo6vz5ecYPHndga2B7Oa5MHqYrhoH3E7KlkweB1IrG7 PkAqkT0kN8r40/9IdbIt0EmF+34RkMOGxNmFwpH/zDFhFf3GMlkXfGI1CSySmB9vkLIN 5WAYeeq05+LEj29zVuUHxZOC7zdTItuJxRS2LGJ4auM1XGq5X4mBpRlrK1wfjjghRwcH J47QQHHGILmaBMnTWJMb9dAeYLd6ODgK2KkczN5AqimPQq8UFi4J/4GzozZk6SMSxq7F vxMQ== 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=krbRb2ttCczclr5RU9wtGaCsZL2+SNYDh5nzz2amraw=; b=MQSBt+orO6UehQxu31jyCDGIEwa2brv5eXpi5QjVUthwYnvrZWdk02si3zlACACWzI 4pk8spRgVdeRB+JRKt08piqsoGMZNXXvE4MGXfUqa32Nsvj2CSIKWjjbb5atHb18Z9oK HreGW419PxZ0VRHYAXhDo9RjMcQ0xm7OCnOO/+4CJgcB+3vJqXkRlHDyjLA/vD7UxKy8 08aoOHIOUu/XVssujcvBWjalPODgM7LSnmNZ3egN1BRx7zkw4qdt+OZ9ZkacxExZoGW5 bhKsNpwuwAI1PIdVHR1DunCJdpIAAf1ybZDup48X+CySAu9mshWsAJbNGyB1S7zLikl6 ioxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=a4km0Zr8; 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 p34-20020a056402502200b0047ae036876fsi24626421eda.59.2023.01.02.04.53.11; Mon, 02 Jan 2023 04:53:12 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=a4km0Zr8; 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 D4A4568BC2E; Mon, 2 Jan 2023 14:53:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D74B568B9F3 for ; Mon, 2 Jan 2023 14:53:01 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125259euoutp0171882a01657e143c3e175e460a61971c~2fwbg2Rqp0162201622euoutp01C for ; Mon, 2 Jan 2023 12:52:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125259euoutp0171882a01657e143c3e175e460a61971c~2fwbg2Rqp0162201622euoutp01C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672663979; bh=zbxiZGVfHAJOal0rxhAOYB4O2FG/0vcIcrBRszJfPwo=; h=From:To:Cc:Subject:Date:References:From; b=a4km0Zr8ikK2u9bHiwS9V92ZrpMojj9spBoWFXlMX8pOHY9uMaVHUInWR1jH6cVfy +ovci43RUJIUoOocPseIjvQgUiYRlSvgbLIshnkNybHYwYGbhAM5f7H+S+RLWOo/U0 c5Y8N1QhBCpBxKjHe8xlcs29sDLSdv6mD906Ap9g= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230102125258eucas1p1fdc61dae782ee906b71b343813dfb9a9~2fwbV3w9M2913529135eucas1p1O; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 25.67.56180.AA3D2B36; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125258eucas1p2a2c60bccdef7d6b03d13314e266ca960~2fwa-eK3O0655606556eucas1p2h; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125258eusmtrp2b7ef3954be27f00f47007ad2f4eccb6a~2fwa_7GiR1953919539eusmtrp2I; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) X-AuditID: cbfec7f2-acbff7000000db74-fd-63b2d3aa0b81 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id CD.B8.23420.AA3D2B36; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230102125258eusmtip1e00fca3db4e7e60b98103bb9db03d55e~2fwanobTA1949819498eusmtip1i; Mon, 2 Jan 2023 12:52:58 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:52:46 +0100 Message-Id: <20230102125246.1874-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djP87qrLm9KNpi4zsziy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK4rJJSc3JLEst0rdL4Mp43vOaveCedMX5E3dYGxifiHYx cnJICJhIPLh4ga2LkYtDSGAFo8SGcxNYIZwvjBLPLl+Ccj4zSjzqb2GBabmz8BRUYjmjxJdv G9khnHYmiWXNG5hAqtgEdCVefngEZosImEqcbN7LBmIzC2hLrLv7HcwWFnCW2PjzANhUFgFV ic7X38DqeQWsJC7OPc0OsU1TYsKWOVBxQYmTM59AXcEtsW4WyHkgM+UlmrfOZgY5QkLgK7vE 5KmvmSGKXCROnXgDZQtLvDq+BWqojMT/nfOBhnIA2cUSh/odIMwaiUM/0iEqrCXeNh5nBAkz A52wfpc+RNhR4sbr81CNfBI33gpCHMAnMWnbdGaIMK9ER5sQhKki0dcpBtEoJfF02RyoSzwk Fp7fyjSBUXEWkq9mIflkFsLaBYzMqxjFU0uLc9NTiw3zUsv1ihNzi0vz0vWS83M3MQITxOl/ xz/tYJz76qPeIUYmDsZDjBIczEoivJc/r0sW4k1JrKxKLcqPLyrNSS0+xCjNwaIkzjtj6/xk IYH0xJLU7NTUgtQimCwTB6dUAxMrn/Ltj1snrY++wy3oVllqfbYpiPlU9/XJpwO3fHlSzdhT mhP6+UVrzZm0P7VTFqwTn3EoW+3NrS1JseIWxs7zD2xWu5YZsv1LbMR/7cWMk1osxX4/7Jom 0/3+R0bghE0mW34+eHTWRm4GE2tKNIOR88Vp3mt2iD1d38tmeyQtfQvn2bvyZzS4rmlv9thx YIHE7og738JdP3MmMDyfWXutUMFx99zXt1u3SNX0zjvOH3xef8blZ4w5U/39n1TY+FqueJR7 zEt44ylbvtqalwuOLpo0UfX5z1Ovd23XZ7o0J+zVQpMtE/Jb06Juz51yb2odT2aWfubk54sX vay6w7zvZuq9i88nz35Q6SsQkXKEX4mlOCPRUIu5qDgRADAYzLl/AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7qrLm9KNjizS8riy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0Mt43vOaveCedMX5E3dYGxifiHYxcnJICJhI3Fl4irWLkYtDSGAp o8S2JVPZIRJSEkuXLmKEsIUl/lzrYoMoamWSOD13J1gRm4CuxMsPj5hAbBEBc4mL626BNTAL aEusu/udDcQWFnCW2PjzAAuIzSKgKtH5+htYPa+AlcTFuaehlmlKTNgyByouKHFy5hMWiDi3 xLpZl1ghZspLNG+dzTyBkX8WkrJZSFILGJlWMYqklhbnpucWG+oVJ+YWl+al6yXn525iBAbu tmM/N+9gnPfqo94hRiYOxkOMEhzMSiK8lz+vSxbiTUmsrEotyo8vKs1JLT7EaAp060RmKdHk fGDs5JXEG5oZmBqamFkamFqaGSuJ83oWdCQKCaQnlqRmp6YWpBbB9DFxcEo1MIm7uC5caqt1 +1B5JHsLhzrnKueWjQYXT0ZfPMXHd038d0dyquOp9qerGNYW/358dn9R5ffPZkVvxTg+VYeE CD6ZOVWqzsgmdNLqX4KyPQfT/dfMu2DDemir5ywVU4loBsevy35azD9a8Uix+N39hgrPsN6H 9X5LLjPOzj5456bjq9va/txvD+833FK28jDXqQ/6EsYVa5b0lRnq7l9Y4/pKsEBqkfrbprOe d5KvLTl/XIfNo1c15oTeyz9cdi2iE7zvMn/57F6To54csrZGyM71wI557BeSOu2F0x1+Hbov IZYs9KDUfZVDsMGa099fi2fKHv6VwtIkGHXzt9/N44LhoZr7rdXalkpyrd/OrsRSnJFoqMVc VJwIAHkMDZ7lAgAA X-CMS-MailID: 20230102125258eucas1p2a2c60bccdef7d6b03d13314e266ca960 X-Msg-Generator: CA X-RootMTR: 20230102125258eucas1p2a2c60bccdef7d6b03d13314e266ca960 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125258eucas1p2a2c60bccdef7d6b03d13314e266ca960 References: Subject: [FFmpeg-devel] [PATCH v16 1/9] avcodec/evc: MPEG-5 EVC codec registration X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OSsVjJlZr1sV Added prerequisites that must be met before providing support for the MPEG-5 EVC codec - Added new entry to codec IDs list - Added new entry to the codec descriptor list - Bumped libavcodec minor version - Added profiles for EVC codec Signed-off-by: Dawid Kozinski --- libavcodec/avcodec.h | 3 +++ libavcodec/codec_desc.c | 8 ++++++++ libavcodec/codec_id.h | 1 + libavcodec/profiles.c | 6 ++++++ libavcodec/profiles.h | 1 + libavcodec/version.h | 2 +- 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0ac581d660..39296021c4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1668,6 +1668,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_KLVA_SYNC 0 #define FF_PROFILE_KLVA_ASYNC 1 +#define FF_PROFILE_EVC_BASELINE 0 +#define FF_PROFILE_EVC_MAIN 1 + /** * level * - encoding: Set by user. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 24a0433dba..357e17d82c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1923,6 +1923,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ViewQuest VQC"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_EVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-5 EVC (Essential Video Coding)"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index f436a2b624..b887a3788f 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -320,6 +320,7 @@ enum AVCodecID { AV_CODEC_ID_WBMP, AV_CODEC_ID_MEDIA100, AV_CODEC_ID_VQC, + AV_CODEC_ID_EVC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 7af7fbeb13..a31244e0db 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -181,4 +181,10 @@ const AVProfile ff_arib_caption_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_evc_profiles[] = { + { FF_PROFILE_EVC_BASELINE, "Baseline" }, + { FF_PROFILE_EVC_MAIN, "Main" }, + { FF_PROFILE_UNKNOWN }, +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 41a19aa9ad..cf92b5f126 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -72,5 +72,6 @@ extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; extern const AVProfile ff_mjpeg_profiles[]; extern const AVProfile ff_arib_caption_profiles[]; +extern const AVProfile ff_evc_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index eb95a0f827..5fc29bdb1f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 55 +#define LIBAVCODEC_VERSION_MINOR 56 #define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Mon Jan 2 12:53:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369195pzb; Mon, 2 Jan 2023 04:53:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXvUjjB5BjTRtU8ItIs59aiBjHepWt4vmNeTO7FQ3nPECohkrGu7F/FdHfgfVNDYB401Kunf X-Received: by 2002:a05:6402:904:b0:47d:92ab:5a85 with SMTP id g4-20020a056402090400b0047d92ab5a85mr33530555edz.36.1672664015133; Mon, 02 Jan 2023 04:53:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664015; cv=none; d=google.com; s=arc-20160816; b=iEdMYwDwIfGS5Qv1hzT9heRBo4tYZSbRe8oCUy7ilYOSW6At+2AnsSesQrqMFOAkyn 7oJkENOfLvPvClZ2+6jUDb27LmpRrdPC8heRmECD12OxhjT9iptLjXF+Roa3HmhGcsyn Xa3eSdH4ewyVnOMeREeawD2IePNsRDeIcgrCYGUl3kk9iiisvAcmJ9Ej0NGtwqXf5kBz 6scminZq9Y52mZ7D7i5+hXNZZNmVj6YPWDLtpn2XCNhi+l20L9k7y5aaANjbGAZYjym+ QXmdWIuzmJTQBma3lHEItVxUdTyBR+u/UqwYM9J7/GO9DM+jeExRkwUJX6pPV9BgBJpG yE+Q== 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=lpvPN+ypdtmjSb2jsTtkVCewoOxC+1jebiPXWD8ySSE=; b=N00/U+FZW/tsWqlfEP+NG1QkW/6ZhhhSRKbOSmzZrAASMS8CWZL29UjhVD4D++fBms HpgZ2OR1V+4MKE7LXZ5TbsreVkUJR8advsDSPLMMQbYt7wFqQif+FG5+mjT+BVbGtBtS 0lZ4/5VvLuEHMvwftcZA/nQvM9T6EZ/1L/OW9npMi2i+8LEoWxcEXh9i5f2I0VW5BAOn NyVrKi4mCQHJGDeWX9MKGLpKGJGmY+SF/WeOhuyUeU1+E7SJgrd2xm2fYodn/L3d5wt9 wgDRlGVfGh+qnUuvlaW60WCvUFW7fvG1nABnwbpYb+zx0wkzFPLDtbZY8/GD81n6lrmk TCsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qEwR7VDz; 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 gt44-20020a1709072dac00b007adf16570c3si27237840ejc.17.2023.01.02.04.53.34; Mon, 02 Jan 2023 04:53:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qEwR7VDz; 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 15FCA68BC63; Mon, 2 Jan 2023 14:53:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88EC868BC0F for ; Mon, 2 Jan 2023 14:53:25 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125325euoutp015701718283cbd8514dbe8ba220bcf718~2fwzrWmm00184801848euoutp01- for ; Mon, 2 Jan 2023 12:53:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125325euoutp015701718283cbd8514dbe8ba220bcf718~2fwzrWmm00184801848euoutp01- DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664005; bh=ibim7DdFjp+eQzArZ1RHQmw5q2C+Gld8T3IsZqcTKbc=; h=From:To:Cc:Subject:Date:References:From; b=qEwR7VDzWlqb48zA7rI+AlvlDRB1sYkvJhfY3yNeFPVk5DbFj4P+38JQm0LN5hUej Ek2eUJpcjZc3yghO/n3FwtPJWbF+M4x+xUsZeCVxhcc8zzyibCAJ8p3we3qmjOy1Sh Mh7rqJxpL0/t+W349QhjppGk6thKpiWdXIfQBpow= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230102125324eucas1p1146fdc4b5799bd096deebe6c6461bd01~2fwzF5MU70510905109eucas1p1_; Mon, 2 Jan 2023 12:53:24 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id CC.E7.43884.4C3D2B36; Mon, 2 Jan 2023 12:53:24 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125324eucas1p2827678b760934a3f1ff85e2322764c4d~2fwyxiTd12368723687eucas1p2X; Mon, 2 Jan 2023 12:53:24 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125324eusmtrp2f752084b1f46094187ba6ef7920f372e~2fwyw9ln21953919539eusmtrp2l; Mon, 2 Jan 2023 12:53:24 +0000 (GMT) X-AuditID: cbfec7f5-271ff7000000ab6c-9a-63b2d3c46cb7 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 06.C8.23420.3C3D2B36; Mon, 2 Jan 2023 12:53:23 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125323eusmtip2d18b3d4a105c96d202fe214569b6f278~2fwyXScR53200332003eusmtip2G; Mon, 2 Jan 2023 12:53:23 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:53:12 +0100 Message-Id: <20230102125312.1960-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsWy7djP87pHLm9KNli5Xtjiy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK4rJJSc3JLEst0rdL4Mo41DqLuaC1iaXixrKCBsbJj5i6 GDk5JARMJI49XM3cxcjFISSwglHi2LGrrBDOF0aJx3P6oJzPjBK3Hv9ihGlZ03OTDSKxnFFi wZpXUP3tTBLLLi9kA6liE9CVePkBYomIgKnEyea9YHFmAW2JdXe/g9nCApESO/b9YwWxWQRU Jb5cm8sMYvMKWEl03l/HArFNU2LCljlMEHFBiZMzn0DFuSXWzbrECjFTXqJ562ywIyQEvrJL 3J74DOo7F4n2FTNYIWxhiVfHt7BD2DIS/3fOB6rhALKLJQ71O0CYNRKHfqRDVFhLvG08zggS ZgY6Yf0ufYiwo8Sevd+YIar5JG68FYQ4gE9i0rbpUGFeiY42IQhTRaKvUwyiUUri6bI5zBC2 h8SPL73MExgVZyH5ahaST2YhrF3AyLyKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMjMEWc /nf86w7GFa8+6h1iZOJgPMQowcGsJMJ7+fO6ZCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8M7bO TxYSSE8sSc1OTS1ILYLJMnFwSjUw6e+5suhp/zMlxZOXWa7F2IWwK1ldCfQ/JLtnXkmPrbDY m8IrRq2zboksW6i26Xm6mczt5Iq9Sd0Tvi95foj5tc3nTdoPdGcFW06f/eu/q2xz2lcN9tz1 1gW1s44fFd+YIzjp4u8f+Txq15zPckmtPr1x5lWprnaRCQo5a8/5rire4FDByVKy8vebt4bi Fwqvu6/serVffVf4x7i30hIibwREF/24EbiGp9IlI/5oW7Ne9Sc5uz1n1C8EmE8OWW2XI8dp kuO5Ssx0lU0Wj1Fn7aqV7AKrvdJXBj4UrL+4ZUa85eZPEW8MFq4qjdu34IO/ZuC9FJWdH7bP nvX95g0Jk43TjPySp174PNH7gfbbw0osxRmJhlrMRcWJAGwZRNiAAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xe7qHL29KNlh428biy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0Ms41DqLuaC1iaXixrKCBsbJj5i6GDk5JARMJNb03GTrYuTiEBJY yijRNr+fESIhJbF06SIoW1jiz7UuqKJWJolvG58zgyTYBHQlXn6AmCQiYC5xcd0tsAZmAW2J dXe/s4HYwgLhEmvnfmYFsVkEVCW+XJsL1ssrYCXReX8dC8QCTYkJW+YwQcQFJU7OfAIV55ZY N+sSK8RMeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzA0N12 7OfmHYzzXn3UO8TIxMF4iFGCg1lJhPfy53XJQrwpiZVVqUX58UWlOanFhxhNgW6dyCwlmpwP jJ68knhDMwNTQxMzSwNTSzNjJXFez4KORCGB9MSS1OzU1ILUIpg+Jg5OqQamwPneD71NGpWn JP5YPPdjf7Ho3K8TmI+wlvhYJsq5T08v2Tn1Zfz+nELjqWYO2umrCnslhOeZdfq2+eY26Zzh 2nFlzsIAhXUa8Ud/b4/6+0btXlSKq/EP1wLe/LnLWT9sPP3N7Ond9wH5FkqzNL26Hh5bNO3X LJ3ZglcPiM353WY8Y5/QxprVy38vqOjSf26w9+vL6W1z+tlrrBdpa5VMKqjqv2x3QHu+3ufE aJ7+EG2Hu2bbglyzeNKOXXzeduiT2FmbGzev/j3K5HS2uCoz2fdP/Px7Dv6bt95cYb71V7Sj RbfwlRiHU5ePZQVEzIzJmmCdP2HthGnli1pEtDk8n8jzC9hWlnTMy9Oe8jhMiaU4I9FQi7mo OBEAqKcCnuYCAAA= X-CMS-MailID: 20230102125324eucas1p2827678b760934a3f1ff85e2322764c4d X-Msg-Generator: CA X-RootMTR: 20230102125324eucas1p2827678b760934a3f1ff85e2322764c4d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125324eucas1p2827678b760934a3f1ff85e2322764c4d References: Subject: [FFmpeg-devel] [PATCH v16 2/9] avcodec/evc_parser: Added parser implementation for EVC format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wvudy0BLcXYG - Added constants definitions for EVC parser - Provided NAL units parsing following ISO_IEC_23094-1 - EVC parser registration Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/evc.h | 155 +++++ libavcodec/evc_parser.c | 1417 +++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 1574 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 98841ed07c..401d0b7310 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1146,6 +1146,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o +OBJS-$(CONFIG_EVC_PARSER) += evc_parser.o OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_FTR_PARSER) += ftr_parser.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o diff --git a/libavcodec/evc.h b/libavcodec/evc.h new file mode 100644 index 0000000000..d1fdb4fac6 --- /dev/null +++ b/libavcodec/evc.h @@ -0,0 +1,155 @@ +/* + * EVC definitions and enums + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_EVC_H +#define AVCODEC_EVC_H + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +/** + * @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic + * Table 4 - NAL unit type codes and NAL unit type classes + */ +enum EVCNALUnitType { + EVC_NOIDR_NUT = 0, /* Coded slice of a non-IDR picture */ + EVC_IDR_NUT = 1, /* Coded slice of an IDR picture */ + EVC_RSV_VCL_NUT02 = 2, + EVC_RSV_VCL_NUT03 = 3, + EVC_RSV_VCL_NUT04 = 4, + EVC_RSV_VCL_NUT05 = 5, + EVC_RSV_VCL_NUT06 = 6, + EVC_RSV_VCL_NUT07 = 7, + EVC_RSV_VCL_NUT08 = 8, + EVC_RSV_VCL_NUT09 = 9, + EVC_RSV_VCL_NUT10 = 10, + EVC_RSV_VCL_NUT11 = 11, + EVC_RSV_VCL_NUT12 = 12, + EVC_RSV_VCL_NUT13 = 13, + EVC_RSV_VCL_NUT14 = 14, + EVC_RSV_VCL_NUT15 = 15, + EVC_RSV_VCL_NUT16 = 16, + EVC_RSV_VCL_NUT17 = 17, + EVC_RSV_VCL_NUT18 = 18, + EVC_RSV_VCL_NUT19 = 19, + EVC_RSV_VCL_NUT20 = 20, + EVC_RSV_VCL_NUT21 = 21, + EVC_RSV_VCL_NUT22 = 22, + EVC_RSV_VCL_NUT23 = 23, + EVC_SPS_NUT = 24, /* Sequence parameter set */ + EVC_PPS_NUT = 25, /* Picture paremeter set */ + EVC_APS_NUT = 26, /* Adaptation parameter set */ + EVC_FD_NUT = 27, /* Filler data */ + EVC_SEI_NUT = 28, /* Supplemental enhancement information */ + EVC_RSV_NONVCL29 = 29, + EVC_RSV_NONVCL30 = 30, + EVC_RSV_NONVCL31 = 31, + EVC_RSV_NONVCL32 = 32, + EVC_RSV_NONVCL33 = 33, + EVC_RSV_NONVCL34 = 34, + EVC_RSV_NONVCL35 = 35, + EVC_RSV_NONVCL36 = 36, + EVC_RSV_NONVCL37 = 37, + EVC_RSV_NONVCL38 = 38, + EVC_RSV_NONVCL39 = 39, + EVC_RSV_NONVCL40 = 40, + EVC_RSV_NONVCL41 = 41, + EVC_RSV_NONVCL42 = 42, + EVC_RSV_NONVCL43 = 43, + EVC_RSV_NONVCL44 = 44, + EVC_RSV_NONVCL45 = 45, + EVC_RSV_NONVCL46 = 46, + EVC_RSV_NONVCL47 = 47, + EVC_RSV_NONVCL48 = 48, + EVC_RSV_NONVCL49 = 49, + EVC_RSV_NONVCL50 = 50, + EVC_RSV_NONVCL51 = 51, + EVC_RSV_NONVCL52 = 52, + EVC_RSV_NONVCL53 = 53, + EVC_RSV_NONVCL54 = 54, + EVC_RSV_NONVCL55 = 55, + EVC_UNSPEC_NUT56 = 56, + EVC_UNSPEC_NUT57 = 57, + EVC_UNSPEC_NUT58 = 58, + EVC_UNSPEC_NUT59 = 59, + EVC_UNSPEC_NUT60 = 60, + EVC_UNSPEC_NUT61 = 61, + EVC_UNSPEC_NUT62 = 62 +}; + +// slice type +// @see ISO_IEC_23094-1_2020 7.4.5 Slice header semantics +// +enum EVCSliceType { + EVC_SLICE_TYPE_B = 0, + EVC_SLICE_TYPE_P = 1, + EVC_SLICE_TYPE_I = 2 +}; + +enum { + // 7.4.3.2: aps_video_parameter_set_id is u(4). + EVC_MAX_APS_COUNT = 32, + + // 7.4.3.1: sps_seq_parameter_set_id is in [0, 15]. + EVC_MAX_SPS_COUNT = 16, + + // 7.4.3.2: pps_pic_parameter_set_id is in [0, 63]. + EVC_MAX_PPS_COUNT = 64, + + // 7.4.5: slice header slice_pic_parameter_set_id in [0, 63] + EVC_MAX_SH_COUNT = 64, + + // E.3.2: cpb_cnt_minus1[i] is in [0, 31]. + EVC_MAX_CPB_CNT = 32, + + // A.4.1: in table A.1 the highest level allows a MaxLumaPs of 35 651 584. + EVC_MAX_LUMA_PS = 35651584, + + EVC_MAX_NUM_REF_PICS = 21, + + EVC_MAX_NUM_RPLS = 32, + + // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are + // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ + // width are bounded above by sqrt(8 * 35651584) = 16888.2 samples. + EVC_MAX_WIDTH = 16888, + EVC_MAX_HEIGHT = 16888, + + // A.4.1: table A.1 allows at most 22 tile rows for any level. + EVC_MAX_TILE_ROWS = 22, + // A.4.1: table A.1 allows at most 20 tile columns for any level. + EVC_MAX_TILE_COLUMNS = 20, + + // A.4.1: table A.1 allows at most 600 slice segments for any level. + EVC_MAX_SLICE_SEGMENTS = 600, + + // 7.4.7.1: in the worst case (tiles_enabled_flag and + // entropy_coding_sync_enabled_flag are both set), entry points can be + // placed at the beginning of every Ctb row in every tile, giving an + // upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1. + // Only a stream with very high resolution and perverse parameters could + // get near that, though, so set a lower limit here with the maximum + // possible value for 4K video (at most 135 16x16 Ctb rows). + HEVC_MAX_ENTRY_POINT_OFFSETS = EVC_MAX_TILE_COLUMNS * 135, +}; + +#endif // AVCODEC_EVC_H diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..d06362c2fe --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,1417 @@ +/* + * EVC format parser + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/common.h" +#include "parser.h" +#include "golomb.h" +#include "evc.h" + +#define EVC_MAX_QP_TABLE_SIZE 58 + +#define EXTENDED_SAR 255 +#define NUM_CPB 32 + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// chromaQP table structure to be signalled in SPS +typedef struct ChromaQpTable +{ + int chroma_qp_table_present_flag; // u(1) + int same_qp_table_for_chroma; // u(1) + int global_offset_flag; // u(1) + int num_points_in_qp_table_minus1[2]; // ue(v) + int delta_qp_in_val_minus1[2][EVC_MAX_QP_TABLE_SIZE]; // u(6) + int delta_qp_out_val[2][EVC_MAX_QP_TABLE_SIZE]; // se(v) +} ChromaQpTable; + +// Hypothetical Reference Decoder (HRD) parameters, part of VUI +typedef struct HRDParameters +{ + int cpb_cnt_minus1; // ue(v) + int bit_rate_scale; // u(4) + int cpb_size_scale; // u(4) + int bit_rate_value_minus1[NUM_CPB]; // ue(v) + int cpb_size_value_minus1[NUM_CPB]; // ue(v) + int cbr_flag[NUM_CPB]; // u(1) + int initial_cpb_removal_delay_length_minus1; // u(5) + int cpb_removal_delay_length_minus1; // u(5) + int dpb_output_delay_length_minus1; // u(5) + int time_offset_length; // u(5) +} HRDParameters; + +// video usability information (VUI) part of SPS +typedef struct VUIParameters +{ + int aspect_ratio_info_present_flag; // u(1) + int aspect_ratio_idc; // u(8) + int sar_width; // u(16) + int sar_height; // u(16) + int overscan_info_present_flag; // u(1) + int overscan_appropriate_flag; // u(1) + int video_signal_type_present_flag; // u(1) + int video_format; // u(3) + int video_full_range_flag; // u(1) + int colour_description_present_flag; // u(1) + int colour_primaries; // u(8) + int transfer_characteristics; // u(8) + int matrix_coefficients; // u(8) + int chroma_loc_info_present_flag; // u(1) + int chroma_sample_loc_type_top_field; // ue(v) + int chroma_sample_loc_type_bottom_field; // ue(v) + int neutral_chroma_indication_flag; // u(1) + int field_seq_flag; // u(1) + int timing_info_present_flag; // u(1) + int num_units_in_tick; // u(32) + int time_scale; // u(32) + int fixed_pic_rate_flag; // u(1) + int nal_hrd_parameters_present_flag; // u(1) + int vcl_hrd_parameters_present_flag; // u(1) + int low_delay_hrd_flag; // u(1) + int pic_struct_present_flag; // u(1) + int bitstream_restriction_flag; // u(1) + int motion_vectors_over_pic_boundaries_flag; // u(1) + int max_bytes_per_pic_denom; // ue(v) + int max_bits_per_mb_denom; // ue(v) + int log2_max_mv_length_horizontal; // ue(v) + int log2_max_mv_length_vertical; // ue(v) + int num_reorder_pics; // ue(v) + int max_dec_pic_buffering; // ue(v) + + HRDParameters hrd_parameters; +} VUIParameters; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + struct RefPicListStruct rpls[2][EVC_MAX_NUM_RPLS]; + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + + struct ChromaQpTable chroma_qp_table_struct; + + int vui_parameters_present_flag; // u(1) + + struct VUIParameters vui_parameters; + +} EVCParserSPS; + +typedef struct EVCParserPPS { + int pps_pic_parameter_set_id; // ue(v) + int pps_seq_parameter_set_id; // ue(v) + int num_ref_idx_default_active_minus1[2]; // ue(v) + int additional_lt_poc_lsb_len; // ue(v) + int rpl1_idx_present_flag; // u(1) + int single_tile_in_pic_flag; // u(1) + int num_tile_columns_minus1; // ue(v) + int num_tile_rows_minus1; // ue(v) + int uniform_tile_spacing_flag; // u(1) + int tile_column_width_minus1[EVC_MAX_TILE_ROWS]; // ue(v) + int tile_row_height_minus1[EVC_MAX_TILE_COLUMNS]; // ue(v) + int loop_filter_across_tiles_enabled_flag; // u(1) + int tile_offset_len_minus1; // ue(v) + int tile_id_len_minus1; // ue(v) + int explicit_tile_id_flag; // u(1) + int tile_id_val[EVC_MAX_TILE_ROWS][EVC_MAX_TILE_COLUMNS]; // u(v) + int pic_dra_enabled_flag; // u(1) + int pic_dra_aps_id; // u(5) + int arbitrary_slice_present_flag; // u(1) + int constrained_intra_pred_flag; // u(1) + int cu_qp_delta_enabled_flag; // u(1) + int log2_cu_qp_delta_area_minus6; // ue(v) + +} EVCParserPPS; + +// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.6 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +// u(n) - unsigned integer using n bits. +// When n is "v" in the syntax table, the number of bits varies in a manner dependent on the value of other syntax elements. +typedef struct EVCParserSliceHeader { + int slice_pic_parameter_set_id; // ue(v) + int single_tile_in_slice_flag; // u(1) + int first_tile_id; // u(v) + int arbitrary_slice_flag; // u(1) + int last_tile_id; // u(v) + int num_remaining_tiles_in_slice_minus1; // ue(v) + int delta_tile_id_minus1[EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS]; // ue(v) + + int slice_type; // ue(v) + int no_output_of_prior_pics_flag; // u(1) + int mmvd_group_enable_flag; // u(1) + int slice_alf_enabled_flag; // u(1) + + int slice_alf_luma_aps_id; // u(5) + int slice_alf_map_flag; // u(1) + int slice_alf_chroma_idc; // u(2) + int slice_alf_chroma_aps_id; // u(5) + int slice_alf_chroma_map_flag; // u(1) + int slice_alf_chroma2_aps_id; // u(5) + int slice_alf_chroma2_map_flag; // u(1) + int slice_pic_order_cnt_lsb; // u(v) + + // @note + // Currently the structure does not reflect the entire Slice Header RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSliceHeader; + +// picture order count of the current picture +typedef struct EVCParserPoc { + int PicOrderCntVal; // current picture order count value + int prevPicOrderCntVal; // the picture order count of the previous Tid0 picture + int DocOffset; // the decoding order count of the previous picture +} EVCParserPoc; + +typedef struct EVCParserContext { + ParseContext pc; + EVCParserSPS sps[EVC_MAX_SPS_COUNT]; + EVCParserPPS pps[EVC_MAX_PPS_COUNT]; + EVCParserSliceHeader slice_header[EVC_MAX_PPS_COUNT]; + + int to_read; // number of bytes of NAL Unit that do not fit into the current input data chunk and must be read from the new chunk(s) + int bytes_read; // number of bytes of the current Access Unit that already has been read + + int incomplete_nalu_prefix_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit prefix + int incomplete_nalu_read; // the flag is set to 1 when the current input data chunk contains an incomplete NAL unit (more input data is needed to read complete NAL unit) + + int nuh_temporal_id; // the value of TemporalId (shall be the same for all VCL NAL units of an Access Unit) + + int nalu_prefix_assembled; // the flag is set to when NALU prefix has been assembled from last chunk and current chunk of incoming data + int nalu_type; // the current NALU type + int nalu_size; // the current NALU size + int time_base; + + EVCParserPoc poc; + + int parsed_extradata; + +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// nuh_temporal_id specifies a temporal identifier for the NAL unit +static int get_temporal_id(const uint8_t *bits, int bits_size, AVCodecContext *avctx) +{ + int temporal_id = 0; + short t = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + for (int i = 0; i < EVC_NALU_HEADER_SIZE; i++) + t = (t << 8) | p[i]; + + temporal_id = (t >> 6) & 0x0007; + } + + return temporal_id; +} + +// @see ISO_IEC_23094-1 (7.3.7 Reference picture list structure syntax) +static int ref_pic_list_struct(GetBitContext* gb, RefPicListStruct* rpl) +{ + uint32_t delta_poc_st, strp_entry_sign_flag = 0; + rpl->ref_pic_num = get_ue_golomb(gb); + if (rpl->ref_pic_num > 0) + { + delta_poc_st = get_ue_golomb(gb); + + rpl->ref_pics[0] = delta_poc_st; + if (rpl->ref_pics[0] != 0) + { + strp_entry_sign_flag = get_bits(gb, 1); + + rpl->ref_pics[0] *= 1 - (strp_entry_sign_flag << 1); + } + } + + for (int i = 1; i < rpl->ref_pic_num; ++i) + { + delta_poc_st = get_ue_golomb(gb); + if (delta_poc_st != 0) { + strp_entry_sign_flag = get_bits(gb, 1); + } + rpl->ref_pics[i] = rpl->ref_pics[i - 1] + delta_poc_st * (1 - (strp_entry_sign_flag << 1)); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.2 HRD parameters syntax) +static int hrd_parameters(GetBitContext* gb, HRDParameters* hrd) { + hrd->cpb_cnt_minus1 = get_ue_golomb(gb); + hrd->bit_rate_scale = get_bits(gb, 4); + hrd->cpb_size_scale = get_bits(gb, 4); + for (int SchedSelIdx = 0; SchedSelIdx <= hrd->cpb_cnt_minus1; SchedSelIdx++) + { + hrd->bit_rate_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cpb_size_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cbr_flag[SchedSelIdx] = get_bits(gb, 1); + } + hrd->initial_cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->time_offset_length = get_bits(gb, 5); + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.1 VUI parameters syntax) +static int vui_parameters(GetBitContext* gb, VUIParameters* vui) { + vui->aspect_ratio_info_present_flag = get_bits(gb, 1); + if (vui->aspect_ratio_info_present_flag) + { + vui->aspect_ratio_idc = get_bits(gb, 8); + if (vui->aspect_ratio_idc == EXTENDED_SAR) + { + vui->sar_width = get_bits(gb, 16); + vui->sar_height = get_bits(gb, 16); + } + } + vui->overscan_info_present_flag = get_bits(gb, 1); + if (vui->overscan_info_present_flag) + { + vui->overscan_appropriate_flag = get_bits(gb, 1); + } + vui->video_signal_type_present_flag = get_bits(gb, 1); + if (vui->video_signal_type_present_flag) + { + vui->video_format = get_bits(gb, 3); + vui->video_full_range_flag = get_bits(gb, 1); + vui->colour_description_present_flag = get_bits(gb, 1); + if (vui->colour_description_present_flag) + { + vui->colour_primaries = get_bits(gb, 8); + vui->transfer_characteristics = get_bits(gb, 8); + vui->matrix_coefficients = get_bits(gb, 8); + } + } + vui->chroma_loc_info_present_flag = get_bits(gb, 1); + if (vui->chroma_loc_info_present_flag) + { + vui->chroma_sample_loc_type_top_field = get_ue_golomb(gb); + vui->chroma_sample_loc_type_bottom_field = get_ue_golomb(gb); + } + vui->neutral_chroma_indication_flag = get_bits(gb, 1); + + vui->field_seq_flag = get_bits(gb, 1); + + vui->timing_info_present_flag = get_bits(gb, 1); + if (vui->timing_info_present_flag) + { + vui->num_units_in_tick = get_bits(gb, 32); + vui->time_scale = get_bits(gb, 32); + vui->fixed_pic_rate_flag = get_bits(gb, 1); + } + vui->nal_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->nal_hrd_parameters_present_flag) + { + hrd_parameters(gb, &vui->hrd_parameters); + } + vui->vcl_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->vcl_hrd_parameters_present_flag) + { + hrd_parameters(gb, &vui->hrd_parameters); + } + if (vui->nal_hrd_parameters_present_flag || vui->vcl_hrd_parameters_present_flag) + { + vui->low_delay_hrd_flag = get_bits(gb, 1); + } + vui->pic_struct_present_flag = get_bits(gb, 1); + vui->bitstream_restriction_flag = get_bits(gb, 1); + if (vui->bitstream_restriction_flag) { + vui->motion_vectors_over_pic_boundaries_flag = get_bits(gb, 1); + vui->max_bytes_per_pic_denom = get_ue_golomb(gb); + vui->max_bits_per_mb_denom = get_ue_golomb(gb); + vui->log2_max_mv_length_horizontal = get_ue_golomb(gb); + vui->log2_max_mv_length_vertical = get_ue_golomb(gb); + vui->num_reorder_pics = get_ue_golomb(gb); + vui->max_dec_pic_buffering = get_ue_golomb(gb); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static EVCParserSPS *parse_sps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + sps = &ev->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if (sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if (sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if (sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if (sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if (sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if (sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if (sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if (sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if (!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if (sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + if (!sps->sps_rpl_flag) { + sps->max_num_tid0_ref_pics = get_ue_golomb(&gb); + } else { + sps->sps_max_dec_pic_buffering_minus1 = get_ue_golomb(&gb); + sps->long_term_ref_pic_flag = get_bits(&gb, 1); + sps->rpl1_same_as_rpl0_flag = get_bits(&gb, 1); + sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(&gb); + + for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[0][i]); + + if (!sps->rpl1_same_as_rpl0_flag) + { + sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(&gb); + for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[1][i]); + } + } + + sps->picture_cropping_flag = get_bits(&gb, 1); + + if (sps->picture_cropping_flag) { + sps->picture_crop_left_offset = get_ue_golomb(&gb); + sps->picture_crop_right_offset = get_ue_golomb(&gb); + sps->picture_crop_top_offset = get_ue_golomb(&gb); + sps->picture_crop_bottom_offset = get_ue_golomb(&gb); + } + + if (sps->chroma_format_idc != 0) + { + sps->chroma_qp_table_struct.chroma_qp_table_present_flag = get_bits(&gb, 1); + + if (sps->chroma_qp_table_struct.chroma_qp_table_present_flag) + { + sps->chroma_qp_table_struct.same_qp_table_for_chroma = get_bits(&gb, 1); + sps->chroma_qp_table_struct.global_offset_flag = get_bits(&gb, 1); + for (int i = 0; i < (sps->chroma_qp_table_struct.same_qp_table_for_chroma ? 1 : 2); i++) + { + sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i] = get_ue_golomb(&gb);; + for (int j = 0; j <= sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i]; j++) + { + sps->chroma_qp_table_struct.delta_qp_in_val_minus1[i][j] = get_bits(&gb, 6); + sps->chroma_qp_table_struct.delta_qp_out_val[i][j] = get_se_golomb(&gb); + } + } + } + } + + sps->vui_parameters_present_flag = get_bits(&gb, 1); + if (sps->vui_parameters_present_flag) + vui_parameters(&gb, &(sps->vui_parameters)); + + // @note + // If necessary, add the missing fields to the EVCParserSPS structure + // and then extend parser implementation + + return sps; +} + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +// +// @note +// The current implementation of parse_sps function doesn't handle VUI parameters parsing. +// If it will be needed, parse_sps function could be extended to handle VUI parameters parsing +// to initialize fields of the AVCodecContex i.e. color_primaries, color_trc,color_range +// +static EVCParserPPS *parse_pps(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserPPS *pps; + + int pps_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + pps_pic_parameter_set_id = get_ue_golomb(&gb); + if (pps_pic_parameter_set_id > EVC_MAX_PPS_COUNT) + return NULL; + + pps = &ev->pps[pps_pic_parameter_set_id]; + + pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; + + pps->pps_seq_parameter_set_id = get_ue_golomb(&gb); + if (pps->pps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + pps->num_ref_idx_default_active_minus1[0] = get_ue_golomb(&gb); + pps->num_ref_idx_default_active_minus1[1] = get_ue_golomb(&gb); + pps->additional_lt_poc_lsb_len = get_ue_golomb(&gb); + pps->rpl1_idx_present_flag = get_bits(&gb, 1); + pps->single_tile_in_pic_flag = get_bits(&gb, 1); + + if (!pps->single_tile_in_pic_flag) { + pps->num_tile_columns_minus1 = get_ue_golomb(&gb); + pps->num_tile_rows_minus1 = get_ue_golomb(&gb); + pps->uniform_tile_spacing_flag = get_bits(&gb, 1); + + if (!pps->uniform_tile_spacing_flag) { + for (int i = 0; i < pps->num_tile_columns_minus1; i++) + pps->tile_column_width_minus1[i] = get_ue_golomb(&gb); + + for (int i = 0; i < pps->num_tile_rows_minus1; i++) + pps->tile_row_height_minus1[i] = get_ue_golomb(&gb); + } + pps->loop_filter_across_tiles_enabled_flag = get_bits(&gb, 1); + pps->tile_offset_len_minus1 = get_ue_golomb(&gb); + } + + pps->tile_id_len_minus1 = get_ue_golomb(&gb); + pps->explicit_tile_id_flag = get_bits(&gb, 1); + + if (pps->explicit_tile_id_flag) { + for (int i = 0; i <= pps->num_tile_rows_minus1; i++) { + for (int j = 0; j <= pps->num_tile_columns_minus1; j++) + pps->tile_id_val[i][j] = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } + } + + pps->pic_dra_enabled_flag = 0; + pps->pic_dra_enabled_flag = get_bits(&gb, 1); + + if (pps->pic_dra_enabled_flag) + pps->pic_dra_aps_id = get_bits(&gb, 5); + + pps->arbitrary_slice_present_flag = get_bits(&gb, 1); + pps->constrained_intra_pred_flag = get_bits(&gb, 1); + pps->cu_qp_delta_enabled_flag = get_bits(&gb, 1); + + if (pps->cu_qp_delta_enabled_flag) + pps->log2_cu_qp_delta_area_minus6 = get_ue_golomb(&gb); + + return pps; +} + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +static EVCParserSliceHeader *parse_slice_header(const uint8_t *bs, int bs_size, EVCParserContext *ev) +{ + GetBitContext gb; + EVCParserSliceHeader *sh; + EVCParserPPS *pps; + EVCParserSPS *sps; + + int num_tiles_in_slice = 0; + int slice_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + slice_pic_parameter_set_id = get_ue_golomb(&gb); + + if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) + return NULL; + + sh = &ev->slice_header[slice_pic_parameter_set_id]; + pps = &ev->pps[slice_pic_parameter_set_id]; + sps = &ev->sps[slice_pic_parameter_set_id]; + + sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; + + if (!pps->single_tile_in_pic_flag) { + sh->single_tile_in_slice_flag = get_bits(&gb, 1); + sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } else + sh->single_tile_in_slice_flag = 1; + + if (!sh->single_tile_in_slice_flag) { + if (pps->arbitrary_slice_present_flag) + sh->arbitrary_slice_flag = get_bits(&gb, 1); + + if (!sh->arbitrary_slice_flag) + sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + else { + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + for (int i = 0; i < num_tiles_in_slice - 1; ++i) + sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + } + } + + sh->slice_type = get_ue_golomb(&gb); + + if (ev->nalu_type == EVC_IDR_NUT) + sh->no_output_of_prior_pics_flag = get_bits(&gb, 1); + + if (sps->sps_mmvd_flag && ((sh->slice_type == EVC_SLICE_TYPE_B) || (sh->slice_type == EVC_SLICE_TYPE_P))) + sh->mmvd_group_enable_flag = get_bits(&gb, 1); + else + sh->mmvd_group_enable_flag = 0; + + if (sps->sps_alf_flag) { + int ChromaArrayType = sps->chroma_format_idc; + + sh->slice_alf_enabled_flag = get_bits(&gb, 1); + + if (sh->slice_alf_enabled_flag) { + sh->slice_alf_luma_aps_id = get_bits(&gb, 5); + sh->slice_alf_map_flag = get_bits(&gb, 1); + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if ((ChromaArrayType == 1 || ChromaArrayType == 2) && sh->slice_alf_chroma_idc > 0) + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + } + if (ChromaArrayType == 3) { + int sliceChromaAlfEnabledFlag = 0; + int sliceChroma2AlfEnabledFlag = 0; + + if (sh->slice_alf_chroma_idc == 1) { // @see ISO_IEC_23094-1 (7.4.5) + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 0; + } else if (sh->slice_alf_chroma_idc == 2) { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 1; + } else if (sh->slice_alf_chroma_idc == 3) { + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 1; + } else { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 0; + } + + if (!sh->slice_alf_enabled_flag) + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if (sliceChromaAlfEnabledFlag) { + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma_map_flag = get_bits(&gb, 1); + } + + if (sliceChroma2AlfEnabledFlag) { + sh->slice_alf_chroma2_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma2_map_flag = get_bits(&gb, 1); + } + } + } + + if (ev->nalu_type != EVC_IDR_NUT) { + if (sps->sps_pocs_flag) + sh->slice_pic_order_cnt_lsb = get_bits(&gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + } + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +/** + * + * Parse NAL unit + * + * @param s parser context + * @param buf buffer with field/frame data + * @param buf_size size of the buffer + * @param avctx codec context + */ +static int parse_nal_unit(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ev = s->priv_data; + int nalu_type, nalu_size; + int tid; + const uint8_t *data = buf; + int data_size = buf_size; + + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + s->key_frame = -1; + + + nalu_size = buf_size; + if (nalu_size <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return AVERROR_INVALIDDATA; + } + + // @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes) + // @see enum EVCNALUnitType in evc.h + nalu_type = get_nalu_type(data, data_size, avctx); + if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + return AVERROR_INVALIDDATA; + } + ev->nalu_type = nalu_type; + + tid = get_temporal_id(data, data_size, avctx); + if (tid < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid); + return AVERROR_INVALIDDATA; + } + ev->nuh_temporal_id = tid; + + if (data_size < nalu_size) { + av_log(avctx, AV_LOG_ERROR, "NAL unit does not fit in the data buffer\n"); + return AVERROR_INVALIDDATA; + } + + data += EVC_NALU_HEADER_SIZE; + data_size -= EVC_NALU_HEADER_SIZE; + + if (nalu_type == EVC_SPS_NUT) { + EVCParserSPS *sps; + int SubGopLength; + + sps = parse_sps(data, nalu_size, ev); + if (!sps) { + av_log(avctx, AV_LOG_ERROR, "SPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + + s->coded_width = sps->pic_width_in_luma_samples; + s->coded_height = sps->pic_height_in_luma_samples; + s->width = sps->pic_width_in_luma_samples - sps->picture_crop_left_offset - sps->picture_crop_right_offset; + s->height = sps->pic_height_in_luma_samples - sps->picture_crop_top_offset - sps->picture_crop_bottom_offset; + + SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + avctx->gop_size = SubGopLength; + + avctx->delay = (sps->sps_max_dec_pic_buffering_minus1)?sps->sps_max_dec_pic_buffering_minus1-1:SubGopLength+sps->max_num_tid0_ref_pics-1; + + if (sps->profile_idc == 1) avctx->profile = FF_PROFILE_EVC_MAIN; + else avctx->profile = FF_PROFILE_EVC_BASELINE; + + ev->time_base = avctx->time_base.den; + + switch (sps->chroma_format_idc) { + case 0: /* YCBCR400_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR400_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_GRAY10LE; + return -1; + case 1: /* YCBCR420_10LE */ + s->format = AV_PIX_FMT_YUV420P10LE; + break; + case 2: /* YCBCR422_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR422_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV422P10LE; + return -1; + case 3: /* YCBCR444_10LE */ + av_log(avctx, AV_LOG_ERROR, "YCBCR444_10LE: Not supported chroma format\n"); + s->format = AV_PIX_FMT_YUV444P10LE; + return -1; + default: + s->format = AV_PIX_FMT_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown supported chroma format\n"); + return -1; + } + } else if (nalu_type == EVC_PPS_NUT) { + EVCParserPPS *pps; + + pps = parse_pps(data, nalu_size, ev); + if (!pps) { + av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + } else if (nalu_type == EVC_SEI_NUT) // Supplemental Enhancement Information + return 0; + else if (nalu_type == EVC_APS_NUT) // Adaptation parameter set + return 0; + else if (nalu_type == EVC_FD_NUT) /* Filler data */ + return 0; + else if (nalu_type == EVC_IDR_NUT || nalu_type == EVC_NOIDR_NUT) { // Coded slice of a IDR or non-IDR picture + EVCParserSliceHeader *sh; + EVCParserSPS *sps; + int slice_pic_parameter_set_id; + + sh = parse_slice_header(data, nalu_size, ev); + if (!sh) { + av_log(avctx, AV_LOG_ERROR, "Slice header parsing error\n"); + return AVERROR_INVALIDDATA; + } + + switch (sh->slice_type) { + case EVC_SLICE_TYPE_B: { + s->pict_type = AV_PICTURE_TYPE_B; + break; + } + case EVC_SLICE_TYPE_P: { + s->pict_type = AV_PICTURE_TYPE_P; + break; + } + case EVC_SLICE_TYPE_I: { + s->pict_type = AV_PICTURE_TYPE_I; + break; + } + default: { + s->pict_type = AV_PICTURE_TYPE_NONE; + } + } + + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + // POC (picture order count of the current picture) derivation + // @see ISO/IEC 23094-1:2020(E) 8.3.1 Decoding process for picture order count + slice_pic_parameter_set_id = sh->slice_pic_parameter_set_id; + sps = &ev->sps[slice_pic_parameter_set_id]; + + if (sps->sps_pocs_flag) { + + int PicOrderCntMsb = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + + if (nalu_type == EVC_IDR_NUT) + PicOrderCntMsb = 0; + else { + int MaxPicOrderCntLsb = 1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + + int prevPicOrderCntLsb = ev->poc.PicOrderCntVal & (MaxPicOrderCntLsb - 1); + int prevPicOrderCntMsb = ev->poc.PicOrderCntVal - prevPicOrderCntLsb; + + + if ((sh->slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && + ((prevPicOrderCntLsb - sh->slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb; + + else if ((sh->slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && + ((sh->slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb; + + else + PicOrderCntMsb = prevPicOrderCntMsb; + } + ev->poc.PicOrderCntVal = PicOrderCntMsb + sh->slice_pic_order_cnt_lsb; + + } else { + if (nalu_type == EVC_IDR_NUT) { + ev->poc.PicOrderCntVal = 0; + ev->poc.DocOffset = -1; + } else { + int SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + if (tid == 0) { + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + SubGopLength; + ev->poc.DocOffset = 0; + ev->poc.prevPicOrderCntVal = ev->poc.PicOrderCntVal; + } else { + int ExpectedTemporalId; + int PocOffset; + int prevDocOffset = ev->poc.DocOffset; + + ev->poc.DocOffset = (prevDocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) { + ev->poc.prevPicOrderCntVal += SubGopLength; + ExpectedTemporalId = 0; + } else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + while (tid != ExpectedTemporalId) { + ev->poc.DocOffset = (ev->poc.DocOffset + 1) % SubGopLength; + if (ev->poc.DocOffset == 0) + ExpectedTemporalId = 0; + else + ExpectedTemporalId = 1 + (int)log2(ev->poc.DocOffset); + } + PocOffset = (int)(SubGopLength * ((2.0 * ev->poc.DocOffset + 1) / (int)pow(2.0, tid) - 2)); + ev->poc.PicOrderCntVal = ev->poc.prevPicOrderCntVal + PocOffset; + } + } + } + + s->output_picture_number = ev->poc.PicOrderCntVal; + s->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + return 0; + } + data += (nalu_size - EVC_NALU_HEADER_SIZE); + data_size -= (nalu_size - EVC_NALU_HEADER_SIZE); + + return 0; +} + +/** + * @brief Reconstruct NAL Unit from incomplete data + * + * @param[in] s parser context + * @param[in] data pointer to the buffer containg new data for current NALU prefix + * @param[in] data_size amount of bytes to read from the input buffer + * @param[out] nalu_prefix assembled NALU length + * @param[in ] avctx codec context + * + * Assemble the NALU prefix storing NALU length if it has been split between 2 subsequent buffers (input chunks) incoming to the parser. + * This is the case when the buffer size is not enough for the buffer to store the whole NAL unit prefix. + * In this case, we have to get part of the prefix from the previous buffer and assemble it with the rest from the current buffer. + * Then we'll be able to read NAL unit size. + */ +static int evc_assemble_nalu_prefix(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu_prefix, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of NALU prefix + // 2. buf contains the rest of NAL unit prefix bytes + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit prefix bytes is equal 1 + // + // ---------- + // pc->buffer -> conatins already read bytes + // ---------- + // __ pc->index == 1 + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // | PREF | | | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | N | + // ------------------------------------------------------- + // | 0x00 | 0x00 | 0x3C | 0xXX | 0xXX | ... | 0xXX | + // ------------------------------------------------------- + // | PREF | PREF | PREF | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // nalu_prefix + // ---------- + // --------------------------------- + // | 0 | 1 | 2 | 3 | + // --------------------------------- + // | 0x00 | 0x00 | 0x00 | 0x3C | + // --------------------------------- + // | NALU LENGTH | + // --------------------------------- + // NAL Unit lenght = 60 (0x0000003C) + // + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) { + if (i < pc->index) + nalu_prefix[i] = pc->buffer[i]; + else + nalu_prefix[i] = data[i - pc->index]; + } + + return 0; +} + +/** + * @brief Reconstruct NALU from incomplete data + * Assemble NALU if it is split between multiple buffers + * + * This is the case when buffer size is not enough for the buffer to store NAL unit. + * In this case, we have to get parts of the NALU from the previous buffers stored in pc->buffer and assemble it with the rest from the current buffer. + * + * @param[in] s parser context + * @param[in] data pointer to the buffer containg new data for current NALU + * @param[in] data_size amount of bytes to read from the input buffer + * @param[out] nalu pointer to the memory block for storing assembled NALU + * @param[in] nalu_size assembled NALU length + * @param[in ] avctx codec context + */ +static int evc_assemble_nalu(AVCodecParserContext *s, const uint8_t *data, int data_size, + uint8_t *nalu, int nalu_size, + AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + ParseContext *pc = &ctx->pc; + + // 1. pc->buffer contains previously read bytes of the current NALU and previous NALUs that belongs to the current Access Unit. + // + // - prevoiusly read bytes are data that came with the previous incoming data chunks + // + // - pc->buffer contains bytes of the current NALU that have been already read while processing previous chunks of incoming data + // and already read bytes of previous NALUs belonging to the same Access Unit. + // + // - The ctx->bytes_read is the index of the first element of the current NALU int the pc->buffer. + // - The pc->index is the index of the element located right next to the last element of the current NALU in the pc->buffer. + // - The elements of pc->buffer located before ctx->bytes_read index contain previously read NALUs of the current Access Unit. + // + // 2. buf contains the rest of the NAL unit bytestime_base + // + // - ctx->to_read number of bytes to read from buf (the index of the element right next to the last element to read) + // + // ~~~~~~~ + // EXAMPLE + // ~~~~~~~ + // + // In the following example we assumed that the number of already read NAL Unit bytes is equal 1024-2 + // + // ---------- + // pc->buffer -> conatins already read bytes from prevois incoming data chunks + // ---------- + // __ctx->bytes_read == 2 __ pc->index == 1024 + // | | + // V V + // ------------------------------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | 5 | 6 | ... | 1023 | 1024 | + // ------------------------------------------------------------------------------- + // | 0x00 | 0x01 | 0x02 | 0x03 | 0x04 | 0x05 | 0x06 | ... | 0xA0 | 0xA1 | + // ------------------------------------------------------------------------------- + // | | | NALU | NALU | NALU | NALU | NALU | ... | NALU | | + // ------------------------------------------------------------------------------- + // + // ---------- + // buf -> contains newly read bytes + // ---------- + // __ctx->to_read == 3 (index of the element right next to last one) + // | + // V + // ------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | 1023 | + // ------------------------------------------------------- + // | 0xB0 | 0xB1 | 0xB2 | 0xB3 | 0xB4 | ... | 0xFF | + // ------------------------------------------------------- + // | NALU | NALU | NALU | | | ... | | + // ------------------------------------------------------- + // + // ---------- + // nalu (nalu size 1025) + // ---------- + // + // ---------------------------------------------------------------------------- + // | 0 | 1 | 2 | 3 | 4 | ... | 1021 | 1022 | 1023 | 1024 | + // ---------------------------------------------------------------------------- + // | 0x02 | 0x03 | 0x04 | 0x05 | 0x06 | ... | 0xA0 | 0xB0 | 0xB1 | 0xB3 | + // ---------------------------------------------------------------------------- + + uint8_t *prev_data = pc->buffer + ctx->bytes_read; + int prev_data_size = pc->index - ctx->bytes_read; + + memcpy(nalu, prev_data, prev_data_size); + memcpy(nalu + prev_data_size, data, data_size); + + return 0; +} + +static int end_of_access_unit_found(AVCodecParserContext *s, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + + if (avctx->profile == 0) { // BASELINE profile + if (ctx->nalu_type == EVC_NOIDR_NUT || ctx->nalu_type == EVC_IDR_NUT) + return 1; + } else { // MAIN profile + EVCParserContext *ev = s->priv_data; + if (ctx->nalu_type == EVC_NOIDR_NUT) { + if (ev->poc.PicOrderCntVal != ev->poc.prevPicOrderCntVal) + return 1; + } else if (ctx->nalu_type == EVC_IDR_NUT) + return 1; + } + return 0; +} + +/** + * Find the end of the current frame in the bitstream. + * The end of frame is the end of Access Unit. + * + * @param s parser context + * @param buf buffer with field/frame data + * @param buf_size size of the buffer + * @param avctx codex context + * + * @return the position of the first byte of the next frame, or END_NOT_FOUND + */ +static int evc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + EVCParserContext *ctx = s->priv_data; + + const uint8_t *data = buf; + int data_size = buf_size; + + while (data_size > 0) { + + if (ctx->to_read == 0) { + // Nothing must be read and appended to the data from previous chunks. + // The previous chunk of data provided the complete NALU prefix or provided the complete NALU. + + if (ctx->nalu_prefix_assembled) // NALU prefix has been assembled from previous and current chunks of incoming data + ctx->nalu_prefix_assembled = 0; + else { // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (data_size < EVC_NALU_LENGTH_PREFIX_SIZE) { + ctx->to_read = EVC_NALU_LENGTH_PREFIX_SIZE - data_size; + ctx->incomplete_nalu_prefix_read = 1; + return END_NOT_FOUND; + } + + ctx->nalu_size = read_nal_unit_length(data, data_size, avctx); + ctx->bytes_read += EVC_NALU_LENGTH_PREFIX_SIZE; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + data_size -= EVC_NALU_LENGTH_PREFIX_SIZE; + } + + if (data_size < ctx->nalu_size) { + + ctx->to_read = ctx->nalu_size - data_size; + ctx->incomplete_nalu_read = 1; + return END_NOT_FOUND; + } + + // the entire NALU can be read + if (parse_nal_unit(s, data, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + + data += ctx->nalu_size; + data_size -= ctx->nalu_size; + + ctx->bytes_read += ctx->nalu_size; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->bytes_read; + ctx->bytes_read = 0; + return read_bytes; + } + + // go to the next iteration + continue; + + } else { + // The previous chunk of input data did not contain the complete valid NALU prefix or did not contain the complete NALU. + // + // Missing data must be read from the current data chunk and merged with the data from the previous data chunk + // to assemble a complete NALU or complete NALU prefix. + // + // The data from the previous data chunk are stored in pc->buf + + if (ctx->to_read < data_size) { + + if (ctx->incomplete_nalu_prefix_read == 1) { + + uint8_t nalu_prefix[EVC_NALU_LENGTH_PREFIX_SIZE]; + evc_assemble_nalu_prefix(s, data, data_size, nalu_prefix, avctx); + + ctx->nalu_size = read_nal_unit_length(nalu_prefix, EVC_NALU_LENGTH_PREFIX_SIZE, avctx); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->to_read; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + ctx->incomplete_nalu_prefix_read = 0; + ctx->nalu_prefix_assembled = 1; + + continue; + } + if (ctx->incomplete_nalu_read == 1) { + + uint8_t *nalu = (uint8_t *)av_malloc(ctx->nalu_size); + + // assemble NAL unit using data from previous data chunks (pc->buffer) and the current one (data) + evc_assemble_nalu(s, data, ctx->to_read, nalu, ctx->nalu_size, avctx); + + if (parse_nal_unit(s, nalu, ctx->nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + av_free(nalu); + + // update variable storing amout of read bytes for teh current AU + ctx->bytes_read += ctx->nalu_size; + + // update data pointer and data size + data += ctx->to_read; + data_size -= ctx->to_read; + + ctx->incomplete_nalu_read = 0; + + if (end_of_access_unit_found(s, avctx)) { + + // parser should return buffer that contains complete AU + int read_bytes = ctx->to_read; + + ctx->to_read = 0; + ctx->bytes_read = 0; + + return read_bytes; + } + + // reset variable storing amount of bytes to read from the new data chunk + ctx->to_read = 0; + + continue; + } + } else { + // needed more input data to assemble complete valid NAL Unit + ctx->to_read = ctx->to_read - data_size; + return END_NOT_FOUND; + } + } + } + + return END_NOT_FOUND; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + EVCParserContext *ev = s->priv_data; + ParseContext *pc = &ev->pc; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) + next = buf_size; + else { + next = evc_find_frame_end(s, buf, buf_size, avctx); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + // poutbuf contains just one Access Unit + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ev = s->priv_data; + ev->incomplete_nalu_prefix_read = 0; + + return 0; +} + +const AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index d355808018..2c077ec3ae 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -41,6 +41,7 @@ extern const AVCodecParser ff_dvaudio_parser; extern const AVCodecParser ff_dvbsub_parser; extern const AVCodecParser ff_dvdsub_parser; extern const AVCodecParser ff_dvd_nav_parser; +extern const AVCodecParser ff_evc_parser; extern const AVCodecParser ff_flac_parser; extern const AVCodecParser ff_ftr_parser; extern const AVCodecParser ff_g723_1_parser; From patchwork Mon Jan 2 12:53:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369363pzb; Mon, 2 Jan 2023 04:53:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXtG/21mmk1YSjBm1tgjLg12/vXGkoUZWOsTzByqA/N15CWYzyql8ExYaPLBZQ1iGosK89AT X-Received: by 2002:a17:907:8b85:b0:7c4:f4b8:f1c6 with SMTP id tb5-20020a1709078b8500b007c4f4b8f1c6mr35937193ejc.4.1672664039655; Mon, 02 Jan 2023 04:53:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664039; cv=none; d=google.com; s=arc-20160816; b=rcAcO167i1BAGNBikq+7PYoxu5eP35v4/aUkdBSLN3Yy7eDfzK6rXxYI++dJ+zKHTE lg6ENP/TPr6IPQeRUZWR4cqxpSaRtbOhfaFBaA1P0qtgIyW6YEd9aYeyKcp9yH0WLVbY IDuPJB2AEkKM+Vak8SLEA8B4bfaHWZlbfke6sYR91tawOhiEmbY2jB2EsqZD3N725n2M Dn+GKzDRavj05v8fASGClIgwc72AeDw1+k8D/kw+VEHir0BHsgJa9507ywdMTDZ09AEy N/MQ7p9rHmVfzObhnpGiLn+DlrAVU/y8Z9lTXG0xvwwljYB/gTDUZYjIIYbZ/xOgJvbH FWnw== 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=mpBcUWwMt1FPc8mUTLUPzGZhzScsjmvBwkBwj2jVNzw=; b=B+jWHAAUKDX6V9Bbf/vqyqGEM7IU9TpJwByzNMbhAmvGICe5NrGWUcaZ+Guv8mK1bC HFGFdwQlpyIvHAhotkQvBEEpA/Fc1oNq/bGHF43/xMeIyvEz2wF/BMIBVPq1QQemZ3LQ kLcfE1jOkBvEOLrWZTbnYOBR/Byh9j2p+nwTONaQAEECg3vSwuhiXRJpdcbg+l6lHeBU LlfuHzt10PEC3ovKF/O0Sjafi2sGA59kmbqtPI6zpTlSf0+hG8CknZkhgF5Z3Tik7SFa xYJkEYL9rFwl3JKRovDYUCZ1rXQBn0VX6sowJYq5k6Ug58fi4bZzTESFk8yQ259uoRDp 8JPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=GJuN8pRe; 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 xd8-20020a170907078800b0078d9b2facaesi25164514ejb.339.2023.01.02.04.53.59; Mon, 02 Jan 2023 04:53:59 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=GJuN8pRe; 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 29E6468BC72; Mon, 2 Jan 2023 14:53:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95589688197 for ; Mon, 2 Jan 2023 14:53:50 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125350euoutp01be5eaa4a017e3430e26d1435f4d98e39~2fxK_BR9Z0184701847euoutp01L for ; Mon, 2 Jan 2023 12:53:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125350euoutp01be5eaa4a017e3430e26d1435f4d98e39~2fxK_BR9Z0184701847euoutp01L DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664030; bh=EN9gLPp9Uv66b87lSk3HnskSMw2C2vgjvzjRQgB4lwo=; h=From:To:Cc:Subject:Date:References:From; b=GJuN8pReiH3cqKXzopiv5fwCWhzPIWqD4OAHetgsNnRaqWmEO+FYg6nVf/QUfYnhG BzuwKXLcA8yZJyFiaGQFdJO2gGcZdM2JEzVCd1OqcquDKGxcG5nK80K+B1FV/wLTVJ GWc6KVz1XbWpmR/m4jX+1ftlp2s6s+La4uiRFm4c= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230102125349eucas1p2e1b7e390348509f582278dac44bee28d~2fxKxOna32589425894eucas1p2Z; Mon, 2 Jan 2023 12:53:49 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id C7.F7.43884.DD3D2B36; Mon, 2 Jan 2023 12:53:49 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125349eucas1p24a9e1497dbacd5af2295dfd6d813de5f~2fxKNNthP0654306543eucas1p2E; Mon, 2 Jan 2023 12:53:49 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125349eusmtrp20d5c3f04b9539ae438c629f0876c0047~2fxKMsII41953919539eusmtrp2F; Mon, 2 Jan 2023 12:53:49 +0000 (GMT) X-AuditID: cbfec7f5-25bff7000000ab6c-d9-63b2d3dd7d79 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BD.C8.23420.DD3D2B36; Mon, 2 Jan 2023 12:53:49 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230102125348eusmtip1e190e558fdacf0553352d7dbd56b80fe~2fxJ66awv1841918419eusmtip1y; Mon, 2 Jan 2023 12:53:48 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:53:37 +0100 Message-Id: <20230102125337.601-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87p3L29KNvhyW8/iy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK4rJJSc3JLEst0rdL4Mq4s/wHS8EX0Yr58+waGFsFuxg5 OSQETCT2LpvE2MXIxSEksIJR4sa861DOF0aJ5w+ms4FUCQl8ZpR48kYLpqOleTkrRNFyRonH H/awQDjtTBLdjz+yg1SxCehKvPzwiAnEFhEwlTjZvBdsErOAtsS6u9/BbGGBGoltayFqWARU Je5sPcIMYvMKWEpM+TybDWKbpsSELXOYIOKCEidnPmGBiHNLrJt1iRViprxE89bZzCBHSAj8 ZJfo3XqJCaLIReLs/ffMELawxKvjW9ghbBmJ/zvnA9VwANnFEof6HSDMGolDP9IhKqwl3jYe ZwQJMwOdsH6XPkTYUeLS9PWMENV8EjfeCkIcwCcxadt0Zogwr0RHmxCEqSLR1ykG0Sgl8XTZ HKhLPCSOzWximsCoOAvJV7OQfDILYe0CRuZVjOKppcW56anFxnmp5XrFibnFpXnpesn5uZsY gcnh9L/jX3cwrnj1Ue8QIxMH4yFGCQ5mJRHey5/XJQvxpiRWVqUW5ccXleakFh9ilOZgURLn nbF1frKQQHpiSWp2ampBahFMlomDU6qByb6yVNzcacupNUvDLbUjrhQvV21l+nXiQsIT14sP j2w/Hpkdubk7oub3swel11MmFTxbfTLeKmYm56KljCwn9Bnk+LkP393jX/rp4790f4GD/zY1 um6+daOx6Ra7g4Zwy8VfN3ckxbirvNH6ek7dN2zBylP32vQVLfibvS6en7sjZmVzNte2hHUJ ixZHm7W8XMokL63GcoO1+8Axg0U/uJflnMzew3qqi49TaGIGd1HZba6EE2qxkncj45Yr1qyO qndVKbyStXuqY2H/yTl+gW+vldScClvUWy6sYc0hNLF96rms4klvbxvU/djadF90q+8CtvLk Xq6vZzWf3dxakfjx9PxveW6C/obCT3NvKLEUZyQaajEXFScCAMax6/B9AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7p3L29KNvhxn9fiy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0Mu4s/wHS8EX0Yr58+waGFsFuxg5OSQETCRampezdjFycQgJLGWU +Pd3MjtEQkpi6dJFjBC2sMSfa11sEEWtTBJ3915nAkmwCehKvPzwCMwWETCXuLjuFlgDs4C2 xLq739lAbGGBKonXDcfB4iwCqhJ3th5hBrF5BSwlpnyezQaxQFNiwpY5TBBxQYmTM5+wQMS5 JdbNusQKMVNeonnrbOYJjPyzkJTNQpJawMi0ilEktbQ4Nz232FCvODG3uDQvXS85P3cTIzBs tx37uXkH47xXH/UOMTJxMB5ilOBgVhLhvfx5XbIQb0piZVVqUX58UWlOavEhRlOgWycyS4km 5wMjJ68k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1Oqgal0wXnxzUIp n6M0fa4ctub3eGwhsXTKbh7BPEH+LpWIR6mXU7a3uM9fuCry7++ZAjPKpYJ8Vrj4urrFhHKy N1ZXTzzOeVku1ORE45t+08lau98G7m89HeTYfu6ZeWTGg0LzO6H7t9zee1l944kj99daFmid ubLhcOm65Uqr3x6/eX5SGXPWOT/H45zG8qcnnJg9/YvAXO9H5oUPzrP4vPx41GDS0tsruS1z evdzvfe5qHi1f+mkhw+bwg6zq0e+0650+qB77NPMvCu57Y9n/mioffWs5tA3S/e/rqs3WNwq 0Tl8IcFrv1jZqdIm9nlXc2e1+tu9fP7dV/TCL86MdSwXZMLm+Ft1vV6UmR73w3qjEktxRqKh FnNRcSIAAvwKGeQCAAA= X-CMS-MailID: 20230102125349eucas1p24a9e1497dbacd5af2295dfd6d813de5f X-Msg-Generator: CA X-RootMTR: 20230102125349eucas1p24a9e1497dbacd5af2295dfd6d813de5f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125349eucas1p24a9e1497dbacd5af2295dfd6d813de5f References: Subject: [FFmpeg-devel] [PATCH v16 3/9] avformat/evc_muxer: Added muxer to handle writing EVC encoded data into file or output bytestream X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c9ExjGqj1iAO - 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 ed5341be39..eed6f0535f 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2126,6 +2126,12 @@ DTS Coherent Acoustics (DCA) audio. Dolby Digital Plus, also known as Enhanced AC-3, audio. +@subsection evc + +MPEG-5 Essential Video Coding (EVC) / EVC / MPEG-5 Part 1 EVC video. + +Extensions: evc + @subsection g722 ITU-T G.722 audio. diff --git a/libavformat/Makefile b/libavformat/Makefile index d7f198bf39..a14a759c1f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 62262ae935..aabc9b5f99 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -153,6 +153,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const AVOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 267fce252d..b7b2aff453 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -401,6 +401,19 @@ const AVOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +AVOutputFormat ff_evc_muxer = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .extensions = "evc", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_EVC, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const AVOutputFormat ff_m4v_muxer = { .name = "m4v", From patchwork Mon Jan 2 12:54:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369516pzb; Mon, 2 Jan 2023 04:54:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXvtkp6UhKehSHKd6TABC1Cx7fF7EEwkI4DACRk303GGf93Mp/dfJDDnBwmsqBO/UaYE8HKG X-Received: by 2002:a05:6402:78e:b0:487:a00e:192f with SMTP id d14-20020a056402078e00b00487a00e192fmr19564954edy.33.1672664062789; Mon, 02 Jan 2023 04:54:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664062; cv=none; d=google.com; s=arc-20160816; b=B0ArBADVobVpORoM3gLpIgskDbWO7UgtnN39LwHAXM2F7npqtSn1w4YqZvbcZtXEKO p//hOD0sLlSA+HFyGIAXFQGCCAuDQi5osXMtU2nwyCH/RkCVQafQ84imjwtmrdYUiOCZ TVL5JqXRxfQHce9R9eKD1myueX4qR6eaZFd/6viuTtyEEjnuS2sMafJ8MexbcmW6YUjY Q2YlEzPyZ5eenAOx2wkQAfzQPEY+o94T9LaGOYG/+etwAuHEZF7UXUByw8iDoNtPedAK Orh/mgZh50xOe8u2ugqLRkTWgm8NQnaEc0kyqw8MIzWsMNTmqHfVK5tKh6rPW6lZiyGI QgRg== 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=GQdsD3XkyNzeDRTWhe1axlkQWkqaWJeMPPn9yHhnRr4=; b=wVAhXxJGbNWxCr0seJ6D9JMvepdFzQPuqlWvtPtTiwyHf6yPQgi4Z5Agz0UEeyL7+/ D058skPB30ETCdQuo7aWt0E/sa0khSjVmYGQFNIrMkvBttH5eYSS5la9EvYnA9SyRV4i r7HzriCBYaKYLImrM9GFM+XKa+wvvK72JfXggtLYE24edSQI2umQ10ZwjoVr3uVErmjy Z5OVvjIrUkULoiwANShwRHCgPhOIJub38SK4zH8Q8YCSFGC5HVufFUK4y36ueKCeoQa3 9URVtiVsQj/0RA1Q4CjLbXvQ0Ymy4VVJvx5r72isNqqHDA/+woB/sA4PxEpiDRGt9rdn eSqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=gq2glnPM; 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 j16-20020a05640211d000b0048afff70577si7919652edw.595.2023.01.02.04.54.22; Mon, 02 Jan 2023 04:54:22 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=gq2glnPM; 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 435B168BC94; Mon, 2 Jan 2023 14:54:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66D3168BC2D for ; Mon, 2 Jan 2023 14:54:14 +0200 (EET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125413euoutp01203ddc7cd5f22661eb6daee03fb7fd3a~2fxhKY9YP0185901859euoutp01b for ; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125413euoutp01203ddc7cd5f22661eb6daee03fb7fd3a~2fxhKY9YP0185901859euoutp01b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664053; bh=reW5IXlpxXTu6vLXWAmMsi7swHlZUV5K1fLZoGvdM0M=; h=From:To:Cc:Subject:Date:References:From; b=gq2glnPM46uLxoF16kOPAvuu8ri4pyOmE4KIKftOn9Jx5g0qUqIUF5bZuf6EBKEXX kbMw5oEhVMm5ZmCDedcE8fs91g6JkMjGIbNQsl+gfmH3+t0yVdkA1toJaDc2N3LJjT k0Wy5lLyiwWBWjDvVfhSwsR4GTfj/9nUr5XcCBcQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230102125413eucas1p220f042f89a72decaef993da8de8857de~2fxhBwBS-0656806568eucas1p2C; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id F8.08.43884.5F3D2B36; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125413eucas1p2726bd4262c5ae86f8c902a5c716f57f6~2fxgwNGr10653806538eucas1p2H; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125413eusmtrp2fa34ecdd05eb00aa0a2e6e970d2e6051~2fxgvvyPW2034320343eusmtrp2M; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) X-AuditID: cbfec7f5-271ff7000000ab6c-1a-63b2d3f595f0 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 3A.D8.23420.5F3D2B36; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125413eusmtip2c8e044984e3ee1e9628fdc5173e2cf0c~2fxgdTOyG3080130801eusmtip2H; Mon, 2 Jan 2023 12:54:13 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:54:01 +0100 Message-Id: <20230102125401.450-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djPc7pfL29KNvi9UcPiy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK4rJJSc3JLEst0rdL4Mr4cLC4YL9WRX/LGpYGxj6FLkZO DgkBE4l1vW8YQWwhgRWMEo2TfLsYuYDsL4wST1+cZIVwPjNK3Jy+hhGmo/3GaajEckaJ26ta WSCcdiaJd4enMoFUsQnoSrz88AjMFhEwlTjZvJcNxGYW0JZYd/c7mC0skCDxsmkR2FQWAVWJ zX8egsV5BSwlLs9oZ4bYpikxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1NjPIERICX9kl 3m/vYoUocpHYcOQF1NnCEq+Ob2GHsGUk/u+cDzSUA8guljjU7wBh1kgc+pEOUWEt8bbxOCNI mBnohPW79CHCjhLL522GauSTuPFWEOIAPolJ26YzQ4R5JTrahCBMFYm+TjGIRimJp8vmQL3k IbH61B/2CYyKs5B8NQvJJ7MQ1i5gZF7FKJ5aWpybnlpsnJdarlecmFtcmpeul5yfu4kRmBxO /zv+dQfjilcf9Q4xMnEwHmKU4GBWEuG9/HldshBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeGVvn JwsJpCeWpGanphakFsFkmTg4pRqYulZxdevaTDqjVSa972w1b8a1SZxsJ56UPzA+vSE8bgL/ ZzWPfsliVcfz5V2KVl77mA97xAjNOWfBxMxx/U1QNcPS5TGF/UyzH3Sa5C5/NPHKmqWyDRxM IsEfpjft9U6ytIr43JoUyPzt7YLAFdsq77AukNSO/cPP8Dw6/PXHmHVxJtbHL7Grr/m/bvKp RtHCaVKcS8vD852fRT2Y+P2k+60n18oWcssVdR9UL1VVcHabn6veztxf/fJO4Q7BPw+WXfdo 0mcpjJr8qPhRT9xsrq/PKq491ZAqu5onEil/SE5wg3jR6b45B6R9Et2tlXd/mGK+5Obn46Xl 1tZeKwpVeGdW3zJ9Nis+++2Pd+pKLMUZiYZazEXFiQCmhOzrfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xe7pfL29KNpj7RdLiy7UvzBYrv/1m sfj26QyzA7PHn0WbWTz6tqxiDGCK0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2j7Uy MlXSt7NJSc3JLEst0rdL0Mv4cLC4YL9WRX/LGpYGxj6FLkZODgkBE4n2G6dZQWwhgaWMErfu aUPEpSSWLl3ECGELS/y51sXWxcgFVNPKJHH3TB9YA5uArsTLD4+YQGwRAXOJi+tugTUwC2hL rLv7nQ3EFhaIk5g45w0LiM0ioCqx+c9DsDivgKXE5RntzBALNCUmbJnDBBEXlDg58wkLRJxb Yt2sS6wQM+UlmrfOZp7AyD8LSdksJKkFjEyrGEVSS4tz03OLDfWKE3OLS/PS9ZLzczcxAoN2 27Gfm3cwznv1Ue8QIxMH4yFGCQ5mJRHey5/XJQvxpiRWVqUW5ccXleakFh9iNAW6dSKzlGhy PjBu8kriDc0MTA1NzCwNTC3NjJXEeT0LOhKFBNITS1KzU1MLUotg+pg4OKUamCzPsEYuWKLl Vt5+/unNuimKLGtfcD90b2bIXtaT+KbkU4qDdhhTzs3MMwnnitsrbYPWbXtyzqWpf5FXqUx7 zLlWH/2pHPcOHGaIk2N9ved72PS6XY8+W2+2eVo5MeKIVUB0z64/10r09nO4zefxi75eIeDV /aySxTxT9cjfbP/g+bY8au1qR07bb5/nkt1nNSnherLNiRm2uum6WbkOkcknjx35f1gl8K5F TxHHAzNxocSo91vFlr8JmKcezXJy9VuGD08eWIcn/br7/P5B7dQ6k61Jmx8ck+TkWvJz5of2 63l/e36x8KV5+xhO+r+5/IbDdoEJLGZz/zhMNZ0ocv1w2/YXSo8W9nNWP06qVGIpzkg01GIu Kk4EAO4GG13jAgAA X-CMS-MailID: 20230102125413eucas1p2726bd4262c5ae86f8c902a5c716f57f6 X-Msg-Generator: CA X-RootMTR: 20230102125413eucas1p2726bd4262c5ae86f8c902a5c716f57f6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125413eucas1p2726bd4262c5ae86f8c902a5c716f57f6 References: Subject: [FFmpeg-devel] [PATCH v16 4/9] avformat/evc_demuxer: Added demuxer to handle reading EVC video files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Zq7UmAVjC27L - Provided AVInputFormat structure describing EVC input format (ff_evc_demuxer) Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/evcdec.c | 124 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 libavformat/evcdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index a14a759c1f..af175d2097 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_DEMUXER) += evcdec.o rawdec.o OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index aabc9b5f99..a963c0223d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -153,6 +153,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..7887f0b591 --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,124 @@ +/* + * RAW EVC video demuxer + * + * Copyright (c) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" +#include "libavcodec/evc.h" + +#include "rawdec.h" +#include "avformat.h" + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { // Cannot get bitstream information. Malformed bitstream. + return -1; + } + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + + nalu_size = read_nal_unit_length(bits, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + bits += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) From patchwork Mon Jan 2 12:54:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369703pzb; Mon, 2 Jan 2023 04:54:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5WBWnltogjr8y9fVjD8cbrlXfcgIWHZ4ygwOhK87Kpn4FH1qB6Ts5Oq51KJEJqg4RBX2R X-Received: by 2002:aa7:ca54:0:b0:47f:4901:d46d with SMTP id j20-20020aa7ca54000000b0047f4901d46dmr31905558edt.41.1672664093820; Mon, 02 Jan 2023 04:54:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664093; cv=none; d=google.com; s=arc-20160816; b=qiuZ1DtXawDrEm2eBL4rSDMoIrq6hRoxRd9s08NykkVUjvvRvZg/nxpChdmhv9cdx0 GBCeBikfIxBna+jdxGFBHSQo2NTp6A4eiBzuLbIF3zQrZizcdN9vqjpKItHjImbIJh6B 0J5eXDjPD0iI39NErgtNCuJK4kTvgZ1+Np5yWButkvnrYLcdqZeUwww3un6VyjU9JwWU 4/dfYUo21OAfyMWSRwmAEb7wm+rW178eJiwWx12un6Vw8nzg1jsisCmYvIKQaUGXJUSc VIms6mZ5MS7uMSDrzZfc0GvUtqj/mzIsmMeQ04mWUwDGGDmCuUNzznBAtS6TxTuqdv7I 3xqg== 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=2Ns7ZZ8fuHL7xAJhr6LSyLt/ZtzDWa3+WF7bv4hmLVk=; b=Fjs9qbWmxwyyqKFBXpgi3/SjB8svzQUe9+6Xw1cpS6ACR+IWI2/MGENntR4V8JDWJR rsXXc+UOfzPZ08rbWkM0lyt75UWRKTjUAgM47rcSS1ltmTt0un+rbHZSTTCHTagqrXGo UG9L/7D1Gt9s/1uvZTxDPpLshvIjD9wFVxqJBV8aFgMw0I8w1mC0pqaWCw+NltYkUIZz yV7w2FzWUK1wdS6Mp7fW26rtpGLOg+JXc0ZwaqTD0djqkrlUQOEQ/63L1hPtMU+R9IcD AjfOaeg3MuSRlO+x1WHCHweSaJCklA+cK27DjFssT/oIDHJDT0EyCAgG53PTNMvMNrf2 y4Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=PZk4YRqA; 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 q13-20020a056402518d00b0046c8b65bcf9si28040576edd.351.2023.01.02.04.54.52; Mon, 02 Jan 2023 04:54:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=PZk4YRqA; 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 533F368BC48; Mon, 2 Jan 2023 14:54:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2FAA68BC59 for ; Mon, 2 Jan 2023 14:54:43 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125442euoutp027d63ee9f29670f6abc7b594532d0ae0f~2fx8FusPq2885928859euoutp02B for ; Mon, 2 Jan 2023 12:54:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230102125442euoutp027d63ee9f29670f6abc7b594532d0ae0f~2fx8FusPq2885928859euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664082; bh=4zpEq+bkuuArE7ky5Ruc3Yj2VR7nFeWr1nSplX6tqC0=; h=From:To:Cc:Subject:Date:References:From; b=PZk4YRqAdfuPOlgeveVrWYQIJZ7E0FU/mFoFfeagswUfmnGgAHTihuK3v3q51qk8h X8gF1jlocgAJEq6tZW+an4vK9eRIkzWnlvNuUQrnQ4pVR8bfquG/kXte2t/q95XdhU iyPzLXzCa7mRJpeE6ipA8kcy4J9cCdvzYoXzvaO4= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230102125442eucas1p29d97634c3a629e5a1e1fdd9efdef8219~2fx70_FE10656406564eucas1p2c; Mon, 2 Jan 2023 12:54:42 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 99.18.43884.214D2B36; Mon, 2 Jan 2023 12:54:42 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230102125442eucas1p1c7c20fbc546613ef07df6b78f373b246~2fx7aVSSu2235922359eucas1p1D; Mon, 2 Jan 2023 12:54:42 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125442eusmtrp2f7475126277ce7c7e12c2c71c2f7c98d~2fx7Zp6ck2011720117eusmtrp28; Mon, 2 Jan 2023 12:54:42 +0000 (GMT) X-AuditID: cbfec7f5-271ff7000000ab6c-66-63b2d412dd0c Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DC.DB.52424.114D2B36; Mon, 2 Jan 2023 12:54:41 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125441eusmtip22577988730731483ec8f4dc682a08664~2fx7DBfxj3200332003eusmtip2R; Mon, 2 Jan 2023 12:54:41 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:54:25 +0100 Message-Id: <20230102125426.1626-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87pCVzYlG8x/LWfx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGV8Pn6dteDOH8aKq227mBoYL+xj 7GLk5JAQMJFov7wWyObiEBJYwShxe+F+VgjnC6PEvnP/2CGcz0CZsweBHA6wllvncyDiyxkl Zky8B1XUziRx/vI0NpC5bAK6Ei8/PGICsUUETCVONu8FizMLaEusu/sdzBYWCJD4ePg2K4jN IqAq8fzgUxaQBbwCVhI35/JDnKcpMWHLHLAxvAKCEidnPmGBiHNLrJt1iRVipLxE89bZzBDx v+wSR/c7QdzpIvHxiShEWFji1fEt7BC2jMT/nfOZIEqKJQ71O0CYNRKHfqRDVFhLvG08zggS ZgY6YP0ufYiwo0TDlkZGiGo+iRtvBSHW80lM2jadGSLMK9HRJgRhqkj0dYpBNEpJPF02B+pA D4lbG94xT2BUnIXkp1lI/piFsHYBI/MqRvHU0uLc9NRi47zUcr3ixNzi0rx0veT83E2MwORw +t/xrzsYV7z6qHeIkYmD8RCjBAezkgjv5c/rkoV4UxIrq1KL8uOLSnNSiw8xSnOwKInzztg6 P1lIID2xJDU7NbUgtQgmy8TBKdXAlNS1cv+naQ+OPnmk6zlJo2rSkSUWBVPXfHcW/D3rf4gO TxbT2t13V9gb9624FbziWHZHBrvfjykPwhQLWrnEKic81tys8XFVRfZZBmXrm+f+TNGo+1S1 a6rPvEmeucoLMtJPGmhHHz3mvDtzxZOr6tnOEysFop5+VYlTnelq/zbR6V3f1aWFW5i8pLUn MqW1qe6Z3XKgdK1HfNjpZHYetbjr0sGxPHOOtP+UzZxaOP27y8O4xYFsB464RC/LklJfdGDL i4CPzBP8FKxSfyiL7bu01m/HlFXp7z7qtzEtsJnI18pqxqc4zVhMmn+G0JqTq8zWz94vqiUa w774+QKdo286JZeUPpZzzNmzeKFrqhJLcUaioRZzUXEiAKTlAFB9AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xe7pCVzYlG2yStvhy7Quzxcpvv1ks vn06w+zA7PFn0WYWj74tqxgDmKL0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxM lfTtbFJSczLLUov07RL0Mj4fv85acOcPY8XVtl1MDYwX9jF2MXJwSAiYSNw6n9PFyMUhJLCU UWLv232sXYycQHEpiaVLFzFC2MISf651sYHYQgKtTBIv+hJAbDYBXYmXHx4xgdgiAuYSF9fd AqtnFtCWWHf3O1i9sICfxIpzL9hBbBYBVYnnB5+ygOzlFbCSuDmXH2K8psSELXPAxvAKCEqc nPmEBSLOLbFu1iVWiJHyEs1bZzNPYOSfhaRsFpLUAkamVYwiqaXFuem5xUZ6xYm5xaV56XrJ +bmbGIFBu+3Yzy07GFe++qh3iJGJg/EQowQHs5II7+XP65KFeFMSK6tSi/Lji0pzUosPMZoC nTqRWUo0OR8YN3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUwC MWe07gaVP925YGbymt4floLqL584/3KX7vzxKNRwo9JPBuYriwtuztKUE7nqm7Hlhpvqql2M 13rs9ih5bOldprtUTyTD6OlX8b+2yzfWfb7VNcOktMKt8v9L5a6zUW0vz7baH7NkZZ8XWPzk XFjBA3/nSuHgWGkx/nPyQTJMcfK5f7KnlfTZ6N5/xrs10SjxVpPkrfdPzXhnnPlyJSAz3OPe 1Oglex2rAvyibkzbLDOft07un4Gg8drtRobLPL+l9fYqOzzOKTksqeX0Z8nZ1o+KFYW/PztM FQIG3OzIdSbZfybcan1amtGSdkVqi8SJVsENHReLpK7c2LaeiZ2v3+v63b+bulu+ZqQoKbEU ZyQaajEXFScCANdobBjjAgAA X-CMS-MailID: 20230102125442eucas1p1c7c20fbc546613ef07df6b78f373b246 X-Msg-Generator: CA X-RootMTR: 20230102125442eucas1p1c7c20fbc546613ef07df6b78f373b246 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125442eucas1p1c7c20fbc546613ef07df6b78f373b246 References: Subject: [FFmpeg-devel] [PATCH v16 5/9] avcodec/evc_encoder: Provided support for EVC encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ae8KqmgiLdTG - Added EVC encoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xeve wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/encoders.texi | 69 +++++ doc/general_contents.texi | 11 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxeve.c | 618 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 704 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index 675dc84f56..392169a4ee 100755 --- a/configure +++ b/configure @@ -291,6 +291,7 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] + --enable-libxeve enable EVC encoding via libxeve [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1862,6 +1863,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3394,6 +3396,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" vapoursynth_demuxer_deps="vapoursynth" @@ -6718,6 +6721,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index b8051cda3f..15b8db76c0 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2894,6 +2894,75 @@ ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2 @end example @end table +@section libxeve + +eXtra-fast Essential Video Encoder (XEVE) MPEG-5 EVC encoder wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +This encoder requires the presence of the libxeve headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxeve}. + +@float NOTE +Many libxeve encoder options are mapped to FFmpeg global codec options, +while unique encoder options are provided through private options. +Additionally the xeve-params private options allows one to pass a list +of key=value tuples as accepted by the libxeve @code{parse_xeve_params} function. +@end float + +The xeve project website is at @url{https://github.com/mpeg5/xeve}. + +@subsection Options + +The following options are supported by the libxeve wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +@float NOTE +To reduce the duplication of documentation, only the private options +and some others requiring special attention are documented here. For +the documentation of the undocumented generic options, see +@ref{codec-options,,the Codec Options chapter}. +@end float + +@float NOTE +To get a more accurate and extensive documentation of the libxeve options, +invoke the command @code{xeve_app --help} or consult the libxeve documentation. +@end float + +@table @option +@item b (@emph{bitrate}) +Set target video bitrate in bits/s. +Note that FFmpeg's b option is expressed in bits/s, while xeve's bitrate is in kilobits/s. + +@item bf (@emph{bframes}) +Set the maximum number of B frames (1,3,7,15). + +@item g (@emph{keyint}) +Set the GOP size (I-picture period). + +@item preset (@emph{preset}) +Set the xeve preset. +Set the encoder preset value to determine encoding speed [fast, medium, slow, placebo] + +@item tune (@emph{tune}) +Set the encoder tune parameter [psnr, zerolatency] + +@item profile (@emph{profile}) +Set the encoder profile [0: baselie; 1: main] + +@item crf (@emph{crf}) +Set the quality for constant quality mode. +Constant rate factor <10..49> [default: 32] + +@item qp (@emph{qp}) +Set constant quantization rate control method parameter. +Quantization parameter qp <0..51> [default: 32] + +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section libxvid Xvid MPEG-4 Part 2 encoder wrapper. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 8399fcb6b7..bcff3e29b7 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -343,6 +343,14 @@ libxavs2 is under the GNU Public License Version 2 or later details), you must upgrade FFmpeg's license to GPL in order to use it. @end float +@section eXtra-fast Essential Video Encoder (XEVE) + +FFmpeg can make use of the XEVE library for EVC video encoding. + +Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for +installing the XEVE library. Then pass @code{--enable-libxeve} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -595,6 +603,7 @@ library: @item raw DTS @tab X @tab X @item raw DTS-HD @tab @tab X @item raw E-AC-3 @tab X @tab X +@item raw EVC @tab X @tab X @item raw FLAC @tab X @tab X @item raw GSM @tab @tab X @item raw H.261 @tab X @tab X @@ -934,6 +943,8 @@ following image formats are supported: @item Electronic Arts TQI video @tab @tab X @item Escape 124 @tab @tab X @item Escape 130 @tab @tab X +@item EVC / MPEG-5 Part 1 @tab X @tab X + @tab encoding supported through external 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 401d0b7310..8119a4cb6d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1119,6 +1119,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d5a6c427e1..514f791fdb 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -809,6 +809,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; #endif extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; +extern const FFCodec ff_libxeve_encoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxeve.c b/libavcodec/libxeve.c new file mode 100644 index 0000000000..7efdab4716 --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,618 @@ +/* + * libxeve encoder + * EVC (MPEG-5 Essential Video Coding) encoding using XEVE MPEG-5 EVC encoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/time.h" +#include "libavutil/cpu.h" +#include "libavutil/avstring.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "encode.h" + +#define MAX_BS_BUF (16*1024*1024) + +/** + * Error codes + */ +#define XEVE_PARAM_BAD_NAME -100 +#define XEVE_PARAM_BAD_VALUE -200 + +/** + * Encoder states + * + * STATE_ENCODING - the encoder receives and processes input frames + * STATE_BUMPING - there are no more input frames, however the encoder still processes previously received data + */ +typedef enum State { + STATE_ENCODING, + STATE_BUMPING, +} State; + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + */ +typedef struct XeveContext { + const AVClass *class; + + XEVE id; // XEVE instance identifier + XEVE_CDSC cdsc; // coding parameters i.e profile, width & height of input frame, num of therads, frame rate ... + XEVE_BITB bitb; // bitstream buffer (output) + XEVE_STAT stat; // encoding status (output) + XEVE_IMGB imgb; // image buffer (input) + + State state; // encoder state (skipping, encoding, bumping) + + int profile_id; // encoder profile (main, baseline) + int preset_id; // preset of xeve ( fast, medium, slow, placebo) + int tune_id; // tune of xeve (psnr, zerolatency) + + // variables for rate control modes + int rc_mode; // Rate control mode [ 0(CQP) / 1(ABR) / 2(CRF) ] + int qp; // quantization parameter (QP) [0,51] + int crf; // constant rate factor (CRF) [10,49] + + int hash; // embed picture signature (HASH) for conformance checking in decoding + int sei_info; // embed Supplemental enhancement information while encoding + + int color_format; // input data color format: currently only XEVE_CF_YCBCR420 is supported + + AVDictionary *xeve_params; +} XeveContext; + +/** + * Convert FFmpeg pixel format (AVPixelFormat) to XEVE pre-defined color format + * + * @param[in] av_pix_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * @param[out] xeve_col_fmt XEVE pre-defined color format (@see xeve.h) + * + * @return 0 on success, negative value on failure + */ +static int libxeve_color_fmt(enum AVPixelFormat av_pix_fmt, int *xeve_col_fmt) +{ + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + default: + *xeve_col_fmt = XEVE_CF_UNKNOWN; + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Convert FFmpeg pixel format (AVPixelFormat) into XEVE pre-defined color space + * + * @param[in] px_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * + * @return XEVE pre-defined color space (@see xeve.h) on success, XEVE_CF_UNKNOWN on failure + */ +static int libxeve_color_space(enum AVPixelFormat av_pix_fmt) +{ + /* color space of input image */ + int cs = XEVE_CF_UNKNOWN; + + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + cs = XEVE_CS_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR420, 10, 1); +#else + cs = XEVE_CS_YCBCR420_10LE; +#endif + + break; + default: + cs = XEVE_CF_UNKNOWN; + break; + } + + return cs; +} + +/** + * The function returns a pointer to the object of the XEVE_CDSC type. + * XEVE_CDSC contains all encoder parameters that should be initialized before the encoder is used. + * + * The field values of the XEVE_CDSC structure are populated based on: + * - the corresponding field values of the AvCodecConetxt structure, + * - the xeve encoder specific option values, + * (the full list of options available for xeve encoder is displayed after executing the command ./ffmpeg --help encoder = libxeve) + * + * The order of processing input data and populating the XEVE_CDSC structure + * 1) first, the fields of the AVCodecContext structure corresponding to the provided input options are processed, + * (i.e -pix_fmt yuv420p -s:v 1920x1080 -r 30 -profile:v 0) + * 2) then xeve-specific options added as AVOption to the xeve AVCodec implementation + * (i.e -preset 0) + * + * Keep in mind that, there are options that can be set in different ways. + * In this case, please follow the above-mentioned order of processing. + * The most recent assignments overwrite the previous values. + * + * @param[in] avctx codec context (AVCodecContext) + * @param[out] cdsc contains all Xeve MPEG-5 EVC encoder encoder parameters that should be initialized before the encoder is use + * + * @return 0 on success, negative error code on failure + */ +static int get_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) +{ + XeveContext *xectx = NULL; + int ret; + + xectx = avctx->priv_data; + + /* initialize xeve_param struct with default values */ + ret = xeve_param_default(&cdsc->param); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set_default parameter\n"); + return AVERROR_EXTERNAL; + } + + /* read options from AVCodecContext */ + if (avctx->width > 0) + cdsc->param.w = avctx->width; + + if (avctx->height > 0) + cdsc->param.h = avctx->height; + + if (avctx->framerate.num > 0) { + // fps can be float number, but xeve API doesn't support it + cdsc->param.fps = (int)(((float)avctx->framerate.num / avctx->framerate.den) + 0.5); + } + + if (avctx->gop_size >= 0) // GOP size (key-frame interval, I-picture period) + cdsc->param.keyint = avctx->gop_size; // 0: only one I-frame at the first time; 1: every frame is coded in I-frame + + if (avctx->max_b_frames == 0 || avctx->max_b_frames == 1 || avctx->max_b_frames == 3 || + avctx->max_b_frames == 7 || avctx->max_b_frames == 15) // number of b-frames + cdsc->param.bframes = avctx->max_b_frames; + else { + av_log(avctx, AV_LOG_ERROR, "Incorrect value for maximum number of B frames: (%d) \n" + "Acceptable values for bf option (maximum number of B frames) are 0,1,3,7 or 15\n", avctx->max_b_frames); + return AVERROR_INVALIDDATA; + } + + if (avctx->level >= 0) + cdsc->param.level_idc = avctx->level; + + if (avctx->rc_buffer_size) // VBV buf size + cdsc->param.vbv_bufsize = (int)(avctx->rc_buffer_size / 1000); + + cdsc->param.rc_type = xectx->rc_mode; + + if (xectx->rc_mode == XEVE_RC_CQP) { + cdsc->param.qp = xectx->qp; + } else if (xectx->rc_mode == XEVE_RC_ABR) { + if (avctx->bit_rate / 1000 > INT_MAX || avctx->rc_max_rate / 1000 > INT_MAX) { + av_log(avctx, AV_LOG_ERROR, "Not supported bitrate bit_rate and rc_max_rate > %d000\n", INT_MAX); + return AVERROR_INVALIDDATA; + } + cdsc->param.bitrate = (int)(avctx->bit_rate / 1000); + } else if (xectx->rc_mode == XEVE_RC_CRF) { + cdsc->param.crf = xectx->crf; + } else { + av_log(avctx, AV_LOG_ERROR, "Not supported rate control type: %d\n", xectx->rc_mode); + return AVERROR_INVALIDDATA; + } + + if (avctx->thread_count <= 0) { + int cpu_count = av_cpu_count(); + cdsc->param.threads = (cpu_count < XEVE_MAX_THREADS) ? cpu_count : XEVE_MAX_THREADS; + } else if (avctx->thread_count > XEVE_MAX_THREADS) + cdsc->param.threads = XEVE_MAX_THREADS; + else + cdsc->param.threads = avctx->thread_count; + + + libxeve_color_fmt(avctx->pix_fmt, &xectx->color_format); + + cdsc->param.cs = XEVE_CS_SET(xectx->color_format, cdsc->param.codec_bit_depth, AV_HAVE_BIGENDIAN); + + cdsc->max_bs_buf_size = MAX_BS_BUF; + + ret = xeve_param_ppt(&cdsc->param, xectx->profile_id, xectx->preset_id, xectx->tune_id); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set profile(%d), preset(%d), tune(%d)\n", xectx->profile_id, xectx->preset_id, xectx->tune_id); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * Set XEVE_CFG_SET_USE_PIC_SIGNATURE for encoder + * + * @param[in] logger context + * @param[in] id XEVE encodec instance identifier + * @param[in] ctx the structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + * + * @return 0 on success, negative error code on failure + */ +static int set_extra_config(AVCodecContext *avctx, XEVE id, XeveContext *ctx) +{ + int ret, size; + size = 4; + + // embed SEI messages identifying encoder parameters and command line arguments + // - 0: off\n" + // - 1: emit sei info" + // + // SEI - Supplemental enhancement information contains information + // that is not necessary to decode the samples of coded pictures from VCL NAL units. + // Some SEI message information is required to check bitstream conformance + // and for output timing decoder conformance. + // @see ISO_IEC_23094-1_2020 7.4.3.5 + // @see ISO_IEC_23094-1_2020 Annex D + ret = xeve_config(id, XEVE_CFG_SET_SEI_CMD, &ctx->sei_info, &size); // sei_cmd_info + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for sei command info messages\n"); + return AVERROR_EXTERNAL; + } + + ret = xeve_config(id, XEVE_CFG_SET_USE_PIC_SIGNATURE, &ctx->hash, &size); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for picture signature\n"); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * @brief Switch encoder to bumping mode + * + * @param id XEVE encodec instance identifier + * @return 0 on success, negative error code on failure + */ +static int setup_bumping(XEVE id) +{ + int val = 1; + int size = sizeof(int); + if (XEVE_FAILED(xeve_config(id, XEVE_CFG_SET_FORCE_OUT, (void *)(&val), &size))) + return AVERROR_EXTERNAL; + + return 0; +} + +/** + * @brief Initialize eXtra-fast Essential Video Encoder codec + * Create an encoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_init(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + unsigned char *bs_buf = NULL; + int i; + int shift_h = 0; + int shift_v = 0; + int width_chroma = 0; + int height_chroma = 0; + XEVE_IMGB *imgb = NULL; + int ret = 0; + + XEVE_CDSC *cdsc = &(xectx->cdsc); + + /* allocate bitstream buffer */ + bs_buf = av_malloc(MAX_BS_BUF); + if (bs_buf == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot allocate bitstream buffer\n"); + return AVERROR(ENOMEM); + } + xectx->bitb.addr = bs_buf; + xectx->bitb.bsize = MAX_BS_BUF; + + /* read configurations and set values for created descriptor (XEVE_CDSC) */ + if ((ret = get_conf(avctx, cdsc)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot get configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = xeve_param_check(&cdsc->param)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid configuration\n"); + return AVERROR(EINVAL); + } + + { + AVDictionaryEntry *en = NULL; + while (en = av_dict_get(xectx->xeve_params, "", en, AV_DICT_IGNORE_SUFFIX)) { + if ((ret = xeve_param_parse(&cdsc->param, en->key, en->value)) < 0) { + av_log(avctx, AV_LOG_WARNING, + "Error parsing option '%s = %s'.\n", + en->key, en->value); + } + } + } + + /* create encoder */ + xectx->id = xeve_create(cdsc, NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVE encoder\n"); + return AVERROR_EXTERNAL; + } + + if ((ret = set_extra_config(avctx, xectx->id, xectx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set extra configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to get chroma shift\n"); + return AVERROR(EINVAL); + } + + // Chroma subsampling + // + // YUV format explanation + // shift_h == 1 && shift_v == 1 : YUV420 + // shift_h == 1 && shift_v == 0 : YUV422 + // shift_h == 0 && shift_v == 0 : YUV444 + // + width_chroma = AV_CEIL_RSHIFT(avctx->width, shift_h); + height_chroma = AV_CEIL_RSHIFT(avctx->height, shift_v); + + /* set default values for input image buffer */ + imgb = &xectx->imgb; + imgb->cs = libxeve_color_space(avctx->pix_fmt); + imgb->np = 3; /* only for yuv420p, yuv420ple */ + + for (i = 0; i < imgb->np; i++) + imgb->x[i] = imgb->y[i] = 0; + + imgb->w[0] = imgb->aw[0] = avctx->width; // width luma + imgb->w[1] = imgb->w[2] = imgb->aw[1] = imgb->aw[2] = width_chroma; + imgb->h[0] = imgb->ah[0] = avctx->height; // height luma + imgb->h[1] = imgb->h[2] = imgb->ah[1] = imgb->ah[2] = height_chroma; + + xectx->state = STATE_ENCODING; + + return 0; +} + +/** + * Encode raw data frame into EVC packet + * + * @param[in] avctx codec context + * @param[out] avpkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = avctx->priv_data; + int ret = -1; + + // No more input frames are available but encoder still can have some data in its internal buffer to process + // and some frames to dump. + if (xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + return 0; + } + } + + if (xectx->state == STATE_ENCODING) { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + imgb->ts[XEVE_TS_PTS] = frame->pts; + imgb->ts[XEVE_TS_DTS] = 0; + + /* push image to encoder */ + ret = xeve_push(xectx->id, imgb); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_push() failed\n"); + return AVERROR_EXTERNAL; + } + } + if (xectx->state == STATE_ENCODING || xectx->state == STATE_BUMPING) { + /* encoding */ + ret = xeve_encode(xectx->id, &(xectx->bitb), &(xectx->stat)); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_encode() failed\n"); + return AVERROR_EXTERNAL; + } + + /* store bitstream */ + if (ret == XEVE_OK_OUT_NOT_AVAILABLE) { // Return OK but picture is not available yet + *got_packet = 0; + return 0; + } else if (ret == XEVE_OK) { + int av_pic_type; + + if (xectx->stat.write > 0) { + + ret = ff_get_encode_buffer(avctx, avpkt, xectx->stat.write, 0); + if (ret < 0) + return ret; + + memcpy(avpkt->data, xectx->bitb.addr, xectx->stat.write); + + avpkt->time_base.num = 1; + avpkt->time_base.den = xectx->cdsc.param.fps; + + avpkt->pts = xectx->bitb.ts[XEVE_TS_PTS]; + avpkt->dts = xectx->bitb.ts[XEVE_TS_DTS]; + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return AVERROR_INVALIDDATA; + } + + ff_side_data_set_encoder_stats(avpkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + *got_packet = 1; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return AVERROR_EXTERNAL; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + if (xectx->id) { + xeve_delete(xectx->id); + xectx->id = NULL; + } + + av_free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE +}; + +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption libxeve_options[] = { + { "preset", "Encoding preset for setting encoding speed", OFFSET(preset_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PRESET_MEDIUM }, XEVE_PRESET_DEFAULT, XEVE_PRESET_PLACEBO, VE, "preset" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_DEFAULT }, INT_MIN, INT_MAX, VE, "preset" }, + { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_FAST }, INT_MIN, INT_MAX, VE, "preset" }, + { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_MEDIUM }, INT_MIN, INT_MAX, VE, "preset" }, + { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_SLOW }, INT_MIN, INT_MAX, VE, "preset" }, + { "placebo", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_PLACEBO }, INT_MIN, INT_MAX, VE, "preset" }, + { "tune", "Tuning parameter for special purpose operation", OFFSET(tune_id), AV_OPT_TYPE_INT, { .i64 = XEVE_TUNE_NONE }, XEVE_TUNE_NONE, XEVE_TUNE_PSNR, VE, "tune"}, + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_NONE }, INT_MIN, INT_MAX, VE, "tune" }, + { "zerolatency", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_ZEROLATENCY }, INT_MIN, INT_MAX, VE, "tune" }, + { "psnr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_PSNR }, INT_MIN, INT_MAX, VE, "tune" }, + { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, + { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, + { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "sei_info", "Embed SEI messages identifying encoder parameters and command line arguments", OFFSET(sei_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xeve-params", "Override the xeve configuration using a :-separated list of key=value parameters", OFFSET(xeve_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { NULL } +}; + +static const AVClass libxeve_class = { + .class_name = "libxeve", + .item_name = av_default_item_name, + .option = libxeve_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/** + * libavcodec generic global options, which can be set on all the encoders and decoders + * @see https://www.ffmpeg.org/ffmpeg-codecs.html#Codec-Options + */ +static const FFCodecDefault libxeve_defaults[] = { + { "b", "0" }, // bitrate in terms of kilo-bits per second + { "g", "0" }, // gop_size (key-frame interval 0: only one I-frame at the first time; 1: every frame is coded in I-frame) + { "bf", "15"}, // maximum number of B frames (0: no B-frames, 1,3,7,15) + { "threads", "0"}, // number of threads to be used (0: automatically select the number of threads to set) + { NULL }, +}; + +const FFCodec ff_libxeve_encoder = { + .p.name = "libxeve", + .p.long_name = NULL_IF_CONFIG_SMALL("libxeve MPEG-5 EVC"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxeve_init, + FF_CODEC_ENCODE_CB(libxeve_encode), + .close = libxeve_close, + .priv_data_size = sizeof(XeveContext), + .p.priv_class = &libxeve_class, + .defaults = libxeve_defaults, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxeve", + .p.pix_fmts = supported_pixel_formats, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Mon Jan 2 12:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7369925pzb; Mon, 2 Jan 2023 04:55:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXv/eR0A7pD3fti9yZyjojQXKLlFqbaLLWK1xQs2cP2YZ2RkTCW5Lf8/AZzX59Hg8/qQqKJb X-Received: by 2002:a17:907:2155:b0:7c0:c1cf:f9e8 with SMTP id rk21-20020a170907215500b007c0c1cff9e8mr40321321ejb.30.1672664122381; Mon, 02 Jan 2023 04:55:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664122; cv=none; d=google.com; s=arc-20160816; b=s8jKlsAvoKJZUb8HXa0OfhiBEPtuuT1WywDEdbgrvij1phpnYJodgPSKPNzdKLQJHX vQYwiqgA3D/HQ5yX4LQ8is5FTvKaVVD++gAsaxF1sOpKYP8wnxh39jMj5VMjY583i1xV tMSpStmFch2Q6rC5Niai7z48hJP+YlIKVlBYGFBurmJyCPmsbdnU0sANX53mdnGV5J4d jYFtkzV9TNKzF/Ek5SinmIkhW8uev1yzaSjtrRVgpE/vAP+C732hXrrxHiDL6DKIRRIn OdzuSZmX1jsrDL11Mp4TzhmSQaejlSW44cVscvs/V4qr8HG79Zo7m0b+D0AghaP1pJ4A ecPQ== 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=0qxVE4CtvTrw8cwM9wYdblPBtqO2aTbQVObfxqpSEbg=; b=V06lQVEqP6i7/OWTLfE34PvS0AJYpXUz53T4Btn9YZKJ4lXz0xaNUfERVuIKmwYTOY goouEekxKYcSJ0hHSlkYF2elVac9mctntJLTJnkf3j/z0VIDG3CwjpzfBO3jg7L/PJ2d XF+fUPSKQ7mBIAHCaX/CDkTIPoO916OhOcYgOlu0t2usxRUdpJpZ50EFNLm2p7Kj83U0 4ptwu5xj89KATzkoAvD979y469IOLhpvV5PvqlcaKISGza0sLS/VEEOFHyIMurj8l4A2 prQ+WjqdUx3LQjj/U8ljAtIWPqXYnjU7ddEsOTMw/re9uWyVclu1OoTRlzKuOs4rCF3/ +DKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="n9/x3rnY"; 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 gs40-20020a1709072d2800b007b7eb087819si27162550ejc.200.2023.01.02.04.55.21; Mon, 02 Jan 2023 04:55:22 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="n9/x3rnY"; 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 8BD3E68BC8B; Mon, 2 Jan 2023 14:55:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A159568BC8B for ; Mon, 2 Jan 2023 14:55:12 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125512euoutp0154132092c9cf30402784990981f84851~2fyXci8KU0821708217euoutp01C for ; Mon, 2 Jan 2023 12:55:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125512euoutp0154132092c9cf30402784990981f84851~2fyXci8KU0821708217euoutp01C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664112; bh=jhBT9fQgPt01xZ47Opq9WIoK8rl30fljoA0mXQox33Q=; h=From:To:Cc:Subject:Date:References:From; b=n9/x3rnYvmqBc+hwKjWNLsNYcKjW8MH7autYPm69/SRgWei0PTHGb7+F4kM0L/VBV 1s33rz0hbwgibNPgx9sGQLnYbOb+4cJLnc2ZF5pQqPK1+f6cIVc1m6M6VcFKbzW3M1 4JrcvtOn5RY7fArMj6xq98rG+HWPLGdG8dKt0trE= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230102125512eucas1p23b2fd580b9cc9bb6cf0d85df680a3b3b~2fyXTAGvp0654306543eucas1p2z; Mon, 2 Jan 2023 12:55:12 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 66.28.43884.F24D2B36; Mon, 2 Jan 2023 12:55:11 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125511eucas1p2bbad60a8d0a0fc44629c791542d1a398~2fyWyVDnX0654306543eucas1p2y; Mon, 2 Jan 2023 12:55:11 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125511eusmtrp2362c7a68fb49062d62f4906d932877af~2fyWxz22s2011720117eusmtrp2T; Mon, 2 Jan 2023 12:55:11 +0000 (GMT) X-AuditID: cbfec7f5-25bff7000000ab6c-ab-63b2d42fea2a Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id FF.E8.23420.F24D2B36; Mon, 2 Jan 2023 12:55:11 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125511eusmtip227110f65ba4aabf94e1e13b1607c9bbc~2fyWZAHSc3166931669eusmtip2P; Mon, 2 Jan 2023 12:55:11 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:54:58 +0100 Message-Id: <20230102125458.1642-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87r6VzYlG/TvsrD4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDJ6m/8wFmyfzljRcNq+gXFqQRcj J4eEgInE/xlb2boYuTiEBFYwSmzY/ZQFwvnCKDH1x1VmkCohgc+MEq9++sJ0LPz0lgmiaDmj xNEXn9khitqZJLb+4AKx2QR0JV5+eMQEYosImEqcbN7LBmIzC2hLrLv7Hcjm4BAWCJC43ZkI EmYRUJU4d64JbAyvgJXEr55/bBC7NCUmbJnDBBEXlDg58wkLRJxbYt2sS6wQI+UlmrfOZga5 R0LgJ7vE94YnrBBFLhJ7P3yDGiQs8er4FnYIW0bi/875TCA3SAgUSxzqd4AwayQO/UiHqLCW eNt4nBEkzAx0wvpd+hBhR4nfU2+xQ1TzSdx4KwhxAJ/EpG3TmSHCvBIdbUIQpopEX6cYRKOU xNNlc5ghbA+J/pnPmCYwKs5C8tUsJJ/MQli7gJF5FaN4amlxbnpqsXFearlecWJucWleul5y fu4mRmBqOP3v+NcdjCtefdQ7xMjEwXiIUYKDWUmE9/LndclCvCmJlVWpRfnxRaU5qcWHGKU5 WJTEeWdsnZ8sJJCeWJKanZpakFoEk2Xi4JRqYNr47IaJUmC7jtTVP957zUK8RGewFqcnP2ry WWjUu9ymPSCqr1Lm/FXO8qR9DHveLBd4f/W2S/XZA2f2VH77xLwrN32a4MG7i23/hXLxy+7N vb/tE7d1SPWEk1mbdWpsajuv7zV97ro9PuLjjDKG8u/HNLbcWjA9dMsykd5ZHAdtVcTnime/ /uBho/bjy5eSd+b/gj2Yyw7GLrw4cQb39zX7OUNu8L5qz1ar0hFiiDj0Ln+JidBn7aV7VDfH lYpnsF/dN/N1wnNdhbQJF5OyPU/bzToQHJ/wt2jnx2i3I12V5udWqYrcbno13y7e8jRT5Fqz PZdbwuoM0w0ehnR84LL7wZOhJPRE8r1K8Sf/A0osxRmJhlrMRcWJAN+qPEB8AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7r6VzYlG/SdELX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJ6m/8wFmyfzljRcNq+gXFqQRcjJ4eEgInEwk9vmboYuTiEBJYy Spw/8I0VIiElsXTpIkYIW1jiz7UuNoiiViaJ6V9bwBJsAroSLz88YgKxRQTMJS6uuwUWZxbQ llh39ztQAweHsICfxPqZJSBhFgFViXPnmthBbF4BK4lfPf/YIOZrSkzYMocJIi4ocXLmExaI OLfEulmXWCFGyks0b53NPIGRfxaSsllIUgsYmVYxiqSWFuem5xYb6hUn5haX5qXrJefnbmIE hu22Yz8372Cc9+qj3iFGJg7GQ4wSHMxKIryXP69LFuJNSaysSi3Kjy8qzUktPsRoCnTrRGYp 0eR8YOTklcQbmhmYGpqYWRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUwCb1e953/ p0UBYyeXo+X2ku8Tp2zbxnJhdSMz/6WUrZKR33bfbfB4uaZpwR/b+cqvpJj3/J580c2nbEF8 761T/rsvqL15YFNUED45zffj0v5Nm19Hz2o3UX/idSlnwZKeOztqAtbL/lS93u31sGbrnu6S IyVvm7TsV5mn7jpRzxN3ZpFD16blvJ82Ovq/OnTrdGVcvq2LV1Bfbeq9As95Wb+dDTfdX3qt d1mwv1JDrIU8872HRQ9uv5nqOEX8ielbsXBbE1uDBse3CleS5J29dR7+MczmE0m0bChc3NXz 9XTppLDTq7kb5ZwF3hX7/3LMEuyITT/IesTCpuH2xu+vV1+bpui/8tZeqVPnr55TV2Ipzkg0 1GIuKk4EAJZsNw3kAgAA X-CMS-MailID: 20230102125511eucas1p2bbad60a8d0a0fc44629c791542d1a398 X-Msg-Generator: CA X-RootMTR: 20230102125511eucas1p2bbad60a8d0a0fc44629c791542d1a398 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125511eucas1p2bbad60a8d0a0fc44629c791542d1a398 References: Subject: [FFmpeg-devel] [PATCH v16 6/9] avcodec/evc_decoder: Provided support for EVC decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LqGke0dF9Jtf - Added EVC decoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xevd wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/decoders.texi | 24 +++ doc/general_contents.texi | 10 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxevd.c | 400 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 439 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index 392169a4ee..f9b83b7166 100755 --- a/configure +++ b/configure @@ -292,6 +292,7 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxeve enable EVC encoding via libxeve [no] + --enable-libxevd enable EVC decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1863,6 +1864,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3396,6 +3398,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxevd_decoder_deps="libxevd" libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" @@ -6721,6 +6724,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.0" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.0" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index 5ba85cf9b1..54720ee8b4 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -130,6 +130,30 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://github.com/mpeg5/xevd}. + +@subsection Options + +The following options are supported by the libxevd wrapper. +The xevd-equivalent options or values are listed in parentheses for easy migration. + +To get a more accurate and extensive documentation of the libxevd options, +invoke the command @code{xevd_app --help} or consult the libxevd documentation. + +@table @option +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section QSV Decoders The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC, diff --git a/doc/general_contents.texi b/doc/general_contents.texi index bcff3e29b7..38940d497a 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -351,6 +351,14 @@ Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for installing the XEVE library. Then pass @code{--enable-libxeve} to configure to enable it. +@section eXtra-fast Essential Video Decoder (XEVD) + +FFmpeg can make use of the XEVD library for EVC video decoding. + +Go to @url{https://github.com/mpeg5/xevd} and follow the instructions for +installing the XEVD library. Then pass @code{--enable-libxevd} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -944,7 +952,7 @@ following image formats are supported: @item Escape 124 @tab @tab X @item Escape 130 @tab @tab X @item EVC / MPEG-5 Part 1 @tab X @tab X - @tab encoding supported through external 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 8119a4cb6d..f0c41fb021 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1119,6 +1119,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 514f791fdb..956e9d454f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -810,6 +810,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; extern const FFCodec ff_libxeve_encoder; +extern const FFCodec ff_libxevd_decoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c new file mode 100644 index 0000000000..5f9976f357 --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,400 @@ +/* + * libxevd decoder + * EVC (MPEG-5 Essential Video Coding) decoding using XEVD MPEG-5 EVC decoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/imgutils.h" +#include "libavutil/cpu.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "decode.h" + +#define XEVD_PARAM_BAD_NAME -1 +#define XEVD_PARAM_BAD_VALUE -2 + +#define EVC_NALU_HEADER_SIZE 2 /* byte */ + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder + */ +typedef struct XevdContext { + const AVClass *class; + + XEVD id; // XEVD instance identifier @see xevd.h + XEVD_CDSC cdsc; // decoding parameters @see xevd.h + int coded_picture_number; +} XevdContext; + +/** + * The function populates the XEVD_CDSC structure. + * XEVD_CDSC contains all decoder parameters that should be initialized before its use. + * + * @param[in] avctx codec context + * @param[out] cdsc contains all decoder parameters that should be initialized before its use + * + */ +static void get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) +{ + int cpu_count = av_cpu_count(); + + /* clear XEVS_CDSC structure */ + memset(cdsc, 0, sizeof(XEVD_CDSC)); + + /* init XEVD_CDSC */ + if (avctx->thread_count <= 0) + cdsc->threads = (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : XEVD_MAX_TASK_CNT; + else if (avctx->thread_count > XEVD_MAX_TASK_CNT) + cdsc->threads = XEVD_MAX_TASK_CNT; + else + cdsc->threads = avctx->thread_count; +} + +/** + * Read NAL unit length + * @param bs input data (bitstream) + * @return the length of NAL unit on success, 0 value on failure + */ +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if (bs_size == XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if (len == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return len; +} + +/** + * @param[in] xectx the structure that stores all the state associated with the instance of Xeve MPEG-5 EVC decoder + * @param[out] avctx codec context + * @return 0 on success, negative value on failure + */ +static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) +{ + int ret; + int size; + int color_space; + + avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + + size = 4; + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_WIDTH, &avctx->coded_width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_HEIGHT, &avctx->coded_height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_WIDTH, &avctx->width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_HEIGHT, &avctx->height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_COLOR_SPACE, &color_space, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get color_space\n"); + return AVERROR_EXTERNAL; + } + switch(color_space) { + case XEVD_CS_YCBCR400_10LE: + avctx->pix_fmt = AV_PIX_FMT_GRAY10LE; + break; + case XEVD_CS_YCBCR420_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case XEVD_CS_YCBCR422_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + break; + case XEVD_CS_YCBCR444_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; + } + + // the function returns sps->num_reorder_pics + ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); + return AVERROR_EXTERNAL; + } + + avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0; + + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + avctx->colorspace = AVCOL_SPC_UNSPECIFIED; + + return 0; +} + +/** + * @brief Copy image in imgb to frame. + * + * @param avctx codec context + * @param[in] imgb + * @param[out] frame + * @return 0 on success, negative value on failure + */ +static int libxevd_image_copy(struct AVCodecContext *avctx, XEVD_IMGB *imgb, struct AVFrame *frame) +{ + int ret; + if (imgb->cs != XEVD_CS_YCBCR420_10LE) { + av_log(avctx, AV_LOG_ERROR, "Not supported pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + return AVERROR_INVALIDDATA; + } + + if (imgb->w[0] != avctx->width || imgb->h[0] != avctx->height) { // stream resolution changed + if (ff_set_dimensions(avctx, imgb->w[0], imgb->h[0]) < 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set new dimension\n"); + return AVERROR_INVALIDDATA; + } + } + + if (ret = ff_get_buffer(avctx, frame, 0) < 0) + return ret; + + av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a, + imgb->s, avctx->pix_fmt, + imgb->w[0], imgb->h[0]); + + return 0; +} + +/** + * Initialize decoder + * Create a decoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxevd_init(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + XEVD_CDSC *cdsc = &(xectx->cdsc); + + /* read configurations and set values for created descriptor (XEVD_CDSC) */ + get_conf(avctx, cdsc); + + /* create decoder */ + xectx->id = xevd_create(&(xectx->cdsc), NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * Decode frame with decoupled packet/frame dataflow + * + * @param avctx codec context + * @param[out] frame decoded frame + * + * @return 0 on success, negative error code on failure + */ +static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + XevdContext *xectx = NULL; + int xevd_ret; + int ret = 0; + + xectx = avctx->priv_data; + + /* poll for new frame */ + { + XEVD_IMGB *imgb = NULL; + + xevd_ret = xevd_pull(xectx->id, &imgb); + if (XEVD_SUCCEEDED(ret)) { + if (imgb) { + + frame->coded_picture_number = imgb->ts[XEVD_TS_DTS]; + frame->display_picture_number = imgb->ts[XEVD_TS_PTS]; + + ret = libxevd_image_copy(avctx, imgb, frame); + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + return ret; + } + } else { + if (imgb) { // already has a decoded image + imgb->release(imgb); + imgb = NULL; + } + } + } + + /* feed decoder */ + { + XEVD_STAT stat; + XEVD_BITB bitb; + int nalu_size, bs_read_pos, dec_read_bytes; + + AVPacket pkt = {0}; + + pkt.data = NULL; + pkt.size = 0; + + // obtain input data + ret = ff_decode_get_packet(avctx, &pkt); + if (ret < 0) // no data is currently available or end of stream has been reached + return ret; + + memset(&stat, 0, sizeof(XEVD_STAT)); + memset(&bitb, 0, sizeof(XEVD_BITB)); + + if (pkt.size) { + + bs_read_pos = 0; + dec_read_bytes = 0; + while (pkt.size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + + nalu_size = read_nal_unit_length(pkt.data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + ret = AVERROR_INVALIDDATA; + goto ERR; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = pkt.data + bs_read_pos; + bitb.ssize = nalu_size; + bitb.ts[XEVD_TS_DTS] = xectx->coded_picture_number; + + /* main decoding block */ + xevd_ret = xevd_decode(xectx->id, &bitb, &stat); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); + ret = AVERROR_EXTERNAL; + goto ERR; + } + + bs_read_pos += nalu_size; + dec_read_bytes += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) + goto ERR; + } else if (stat.nalu_type == XEVD_NUT_IDR || stat.nalu_type == XEVD_NUT_NONIDR) { + xectx->coded_picture_number++; + } + + if (stat.read != dec_read_bytes) { + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n", nalu_size, stat.read); + ret = AVERROR_EXTERNAL; + goto ERR; + } + } + } + +ERR: + av_packet_unref(&pkt); + return ret; + } + + return 0; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if (xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + return 0; +} + +#define OFFSET(x) offsetof(XevdContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + +static const AVClass libxevd_class = { + .class_name = "libxevd", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFCodec ff_libxevd_decoder = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxevd_init, + FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame), + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .p.priv_class = &libxevd_class, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxevd", + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Mon Jan 2 12:55:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7370081pzb; Mon, 2 Jan 2023 04:55:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXvUf4SjfmVxek0gLQ4XyQwb2un+0BGEaCgLzGSjNEIq0rwpHNMQ9hpoRBF5GnQX1brHUXHr X-Received: by 2002:a17:906:5956:b0:81b:f617:eb99 with SMTP id g22-20020a170906595600b0081bf617eb99mr34085887ejr.67.1672664141540; Mon, 02 Jan 2023 04:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664141; cv=none; d=google.com; s=arc-20160816; b=TLqb3/ugSIdlVKMizLQktbsOLUIHczp/EnAd5ZnG/vayw7R8OnyQtvxDLG1Ij/qtDM y9nTSBcgC1yVntCXK6HR4BG9uKpGlBa3qU+ThMIzaNNapnZQxOTD+DhR6aqZPohqbjqR FtQEvL/6MbFHxJdtz4CsdnhcVtmABFECmOkQSHM6BbF8sD5L5MU0z6QGHfSJy2btscfV EbSeStXsKJaiz4JQ+ovw8yDybcUuqjnGYs+LmGoNSCumM9LZTltlTT1o6Oxpib7qJQEx lRvFuH3J9sASL4YluFEKsKgh2o2Ofla3ojU7hpjzi4IndsG0BLiXcKWL1vbVgyvnSVpV hDOw== 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=llxrzGAee1sABL0Gi2w5bnl51/nciaIVHHnVOg4tfQI=; b=PPF8fAuXz/fl+2Xvxs4YHd4UTkD7Q9sPM62O8dX1gGD/MOF3ZeVQfjQwLdCTSEK3kB q34eBLYV1zM3uaYorZtPEk0MPt6IQgm+NFaSgauRRzFSKZBaxVqBo/uPPEvjm7OEtfJz xhP/nlA8sWcLApqy/vYmUkUY0Tj3gL7lypvlAnDjGoF4y9Giwi7j172STOfWvxVUKXim wOTBRZtU0NBSKowiR88KTDOi0MjPqeovPPZw7yMgf3uLZomPeFNuR1lW1LRSRRicA5Ka dKvB+GrXjOVBhn22NFFTJpd+5wZ8/3bq9uzsrbgc8/XJPlMc8DLkuZLOD/aoRgFxVRkQ pl6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="ON1/NouR"; 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 s15-20020a056402164f00b0048b8e656038si6467130edx.383.2023.01.02.04.55.41; Mon, 02 Jan 2023 04:55:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="ON1/NouR"; 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 AA5D368BC61; Mon, 2 Jan 2023 14:55:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4733868BC61 for ; Mon, 2 Jan 2023 14:55:37 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125536euoutp01be554412660052dc5d24579c2ffd6f7f~2fyuUBBjr0791307913euoutp01Q for ; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125536euoutp01be554412660052dc5d24579c2ffd6f7f~2fyuUBBjr0791307913euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664136; bh=922arnyhNduGp/gJYNL847QZH0rWWFlD+0ABnY7rqI8=; h=From:To:Cc:Subject:Date:References:From; b=ON1/NouRSiribkCFNGihomxnH8HUYgtrATZVYNN8Xms1FIqmIQ6DpBPpxeTLBPpwi cBFzRXReaxqcQLv7sEUbwdTBosMHJvFUTh6uCrpMNk6ZrrXqRNquv01PVeJRFqjKJ7 hpf/5WFbXuU6adsONcTUDwZZ4G4WDQoIXKz6iHgM= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230102125536eucas1p1b6b7a457d4e07e1c1bf8a1b70aef87cc~2fyuGHXNH0652506525eucas1p18; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 3F.C7.56180.844D2B36; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230102125536eucas1p1ef400cbc77674dfb083db78004390f8a~2fytyNOD11364313643eucas1p1Q; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230102125536eusmtrp2567c700c75b4ce8b5475acde942f13ae~2fytxsn3Z2034320343eusmtrp2c; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) X-AuditID: cbfec7f2-acbff7000000db74-98-63b2d4480e1a Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 7B.F8.23420.844D2B36; Mon, 2 Jan 2023 12:55:36 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125535eusmtip2ee51823ab9f9fcc384ec97da8a80cb6f~2fytbYys-3166931669eusmtip2U; Mon, 2 Jan 2023 12:55:35 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:55:23 +0100 Message-Id: <20230102125523.23-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djPc7oeVzYlG+zdJWXx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVsX9rLVNC1m7Fi/tNn7A2M5zoY uxg5OSQETCSWd25k62Lk4hASWMEo8btlGROE84VR4s6WOVDOZ0aJaYsfMcG0XGh4ywKRWM4o ceHbd6iqdiaJlasgqtgEdCVefoCwRQRMJU4272UDsZkFtCXW3f0OZgsLxEps7O8As1kEVCWu /m1gB7F5BSwk1hw9wAqxTVNiAtgZIHFBiZMzn7BAxLkl1s26xAoxU16ieetsZpAjJAT+skuc 6pkIVeQi8XftT3YIW1ji1fEtULaMxP+d84GGcgDZxRKH+h0gzBqJQz/SISqsJd42HmcECTMD nbB+lz5E2FHiRsdnqEY+iRtvBSEO4JOYtG06M0SYV6KjTQjCVJHo6xSDaJSSeLpsDjOE7SHR 9u0p6wRGxVlIvpqF5JNZCGsXMDKvYhRPLS3OTU8tNsxLLdcrTswtLs1L10vOz93ECEwSp/8d /7SDce6rj3qHGJk4GA8xSnAwK4nwXv68LlmINyWxsiq1KD++qDQntfgQozQHi5I474yt85OF BNITS1KzU1MLUotgskwcnFINTPMv3c72T1ioc4ZxgZKWspqtlYlaZ/C/PSsve4b+trT1MW/I 2PNqabfKtJKXYUt1Lr67O0U7ZWLe8/OnvcSnlUXYL5QVLmEzatnZ9dZigf6HnPh/rmd+uTNx NSy5dsV24TRvB69NaTnfX4h5FJ+044jdFRMxX8qQUa1RTC2f+3xZNa/KtuT38emJFiFrmt5c 1z0efy1Tvu7r3f9tIjm/nh2dHTr3Z7Dov5OXhaN+c3qx/tbidjnDfOWPyKHjXz++yL4+cdmk 3kO8FX+MtF0YX0x0X17+cNq7h73TTcR+CsztFOKQMk0893CFW6KewLbdjAX3y6TahPzr0875 a83nO/WfSTv6lNeX7FQ1pUsvlFiKMxINtZiLihMBNCc/2IEDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xe7oeVzYlG2x7ymrx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVsX9rLVNC1m7Fi/tNn7A2M5zoYuxg5OSQETCQuNLxl6WLk4hAS WMoosXj9HmaIhJTE0qWLoIqEJf5c62KDKGplkjg0s40NJMEmoCvx8sMjJhBbRMBc4uK6W2AN zALaEuvufgerERaIlvi9axkriM0ioCpx9W8DO4jNK2AhseboAVaIBZoSE7bMYYKIC0qcnPmE BSLOLbFu1iVWiJnyEs1bZzNPYOSfhaRsFpLUAkamVYwiqaXFuem5xYZ6xYm5xaV56XrJ+bmb GIHBu+3Yz807GOe9+qh3iJGJg/EQowQHs5II7+XP65KFeFMSK6tSi/Lji0pzUosPMZoC3TqR WUo0OR8YP3kl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUxCS2z/ VJ/mzPNI/XPpw8vMu90hBxe0Nd+Qmb1yW94rhs43J2Tecjksf8TUEbDMM3CP75m2yVwHjV86 PHhgt/rUT4/vC5KL+27scW/jWTXvlkjH906m8l8V5s/VYsv+HtupL7nT4kQgv4dfyDbFtJmt tyTKJjtESvaf+M7q7eDPb5ahySNfbnCbUSP90AZX7lmLF5ttrVtpcyh1k/68K1vqVv6aZnpL 7FH468k3ND1P/q4u/+ka1V9n3vQ/v5t7y3e54w/0tX7qpXX/tYuziHi+wKI4bP3KBaL7S3ZW L7+y5EjfQ72nO2QPbz0Znsb1KeCm91a5O9GmWRlaPI67ztnV3S/ZfMNGb8v1f07H1+xWYinO SDTUYi4qTgQAxAqDkucCAAA= X-CMS-MailID: 20230102125536eucas1p1ef400cbc77674dfb083db78004390f8a X-Msg-Generator: CA X-RootMTR: 20230102125536eucas1p1ef400cbc77674dfb083db78004390f8a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125536eucas1p1ef400cbc77674dfb083db78004390f8a References: Subject: [FFmpeg-devel] [PATCH v16 7/9] avformat/mov_muxer: Extended MOV muxer to handle EVC video content X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DFisf67UbAkf - Changes in mov_write_video_tag function to handle EVC elementary stream - Provided structure EVCDecoderConfigurationRecord that specifies the decoder configuration information for ISO/IEC 23094-1 video content Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 2 +- libavformat/evc.c | 455 ++++++++++++++++++++++++++++++++++++++++ libavformat/evc.h | 44 ++++ libavformat/isom_tags.c | 2 + libavformat/movenc.c | 33 +++ 5 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index af175d2097..6ae5056c61 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -363,7 +363,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o \ - dovi_isom.o + dovi_isom.o evc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/evc.c b/libavformat/evc.c new file mode 100644 index 0000000000..42b7731c8f --- /dev/null +++ b/libavformat/evc.c @@ -0,0 +1,455 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/evc.h" +#include "avformat.h" +#include "avio.h" +#include "evc.h" +#include "avio_internal.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.1 +enum { + SPS_INDEX, + PPS_INDEX, + APS_INDEX, + SEI_INDEX, + NB_ARRAYS +}; + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + // @note + // Currently the structure does not reflect the entire SPS RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of EVCDecoderConfigurationRecord + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCSPS; + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +typedef struct EVCNALUnitArray { + uint8_t array_completeness; // when equal to 1 indicates that all NAL units of the given type are in the following array + uint8_t NAL_unit_type; // indicates the type of the NAL units in the following array + uint16_t numNalus; // indicates the number of NAL units of the indicated type + uint16_t *nalUnitLength; // indicates the length in bytes of the NAL unit + uint8_t **nalUnit; // contains an SPS, PPS, APS or a SEI NAL unit, as specified in ISO/IEC 23094-1 +} EVCNALUnitArray; + +/** + * @brief Specifies the decoder configuration information for ISO/IEC 23094-1 video content. + * @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.2 + * Carriage of network abstraction layer (NAL) unit structured video in the ISO base media file format + */ +typedef struct EVCDecoderConfigurationRecord { + uint8_t configurationVersion; // 8 bits + uint8_t profile_idc; // 8 bits + uint8_t level_idc; // 8 bits + uint32_t toolset_idc_h; // 32 bits + uint32_t toolset_idc_l; // 32 bits + uint8_t chroma_format_idc; // 2 bits + uint8_t bit_depth_luma_minus8; // 3 bits + uint8_t bit_depth_chroma_minus8; // 3 bits + uint16_t pic_width_in_luma_samples; // 16 bits + uint16_t pic_height_in_luma_samples; // 16 bits + uint8_t reserved; // 6 bits '000000'b + uint8_t lengthSizeMinusOne; // 2 bits + uint8_t num_of_arrays; // 8 bits + EVCNALUnitArray arrays[NB_ARRAYS]; +} EVCDecoderConfigurationRecord; + +typedef struct NALU { + int offset; + uint32_t size; +} NALU; + +typedef struct NALUList { + NALU *nalus; + unsigned nalus_array_size; + unsigned nb_nalus; ///< valid entries in nalus +} NALUList; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | bits[i]; + + nalu_len = t; + if (nalu_len == 0) + return 0; + } + + return nalu_len; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfigurationRecord *evcc) +{ + GetBitContext gb; + int sps_seq_parameter_set_id; + EVCSPS sps; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return 0; + + sps.sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return 0; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps.profile_idc = get_bits(&gb, 8); + + sps.level_idc = get_bits(&gb, 8); + + sps.toolset_idc_h = get_bits(&gb, 32); + sps.toolset_idc_l = get_bits(&gb, 32); + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps.chroma_format_idc = get_ue_golomb(&gb); + + sps.pic_width_in_luma_samples = get_ue_golomb(&gb); + sps.pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps.bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps.bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + evcc->profile_idc = sps.profile_idc; + evcc->level_idc = sps.level_idc; + evcc->toolset_idc_h = sps.toolset_idc_h; + evcc->toolset_idc_l = sps.toolset_idc_l; + evcc->chroma_format_idc = sps.chroma_format_idc; + evcc->bit_depth_luma_minus8 = sps.bit_depth_luma_minus8; + evcc->bit_depth_chroma_minus8 = sps.bit_depth_chroma_minus8; + evcc->pic_width_in_luma_samples = sps.pic_width_in_luma_samples; + evcc->pic_height_in_luma_samples = sps.pic_height_in_luma_samples; + + return 0; +} + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +static int evcc_array_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, + uint8_t nal_type, int ps_array_completeness, + EVCNALUnitArray *array) +{ + int ret; + uint16_t numNalus = array->numNalus; + + ret = av_reallocp_array(&array->nalUnit, numNalus + 1, sizeof(uint8_t *)); + if (ret < 0) + return ret; + + ret = av_reallocp_array(&array->nalUnitLength, numNalus + 1, sizeof(uint16_t)); + if (ret < 0) + return ret; + + array->nalUnit [numNalus] = (uint8_t*)nal_buf; + array->nalUnitLength[numNalus] = nal_size; + array->NAL_unit_type = nal_type; + array->numNalus++; + + /* + * When the sample entry name is 'evc1', the default and mandatory value of + * array_completeness is 1 for arrays of all types of parameter sets, and 0 + * for all other arrays. + */ + if (nal_type == EVC_SPS_NUT || nal_type == EVC_PPS_NUT || nal_type == EVC_APS_NUT) + array->array_completeness = ps_array_completeness; + + return 0; +} + +static void evcc_init(EVCDecoderConfigurationRecord *evcc) +{ + memset(evcc, 0, sizeof(EVCDecoderConfigurationRecord)); + evcc->configurationVersion = 1; + evcc->lengthSizeMinusOne = 3; // 4 bytes +} + +static void evcc_close(EVCDecoderConfigurationRecord *evcc) +{ + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + EVCNALUnitArray *const array = &evcc->arrays[i]; + array->numNalus = 0; + av_freep(&array->nalUnit); + av_freep(&array->nalUnitLength); + } +} + +static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) +{ + uint16_t sps_count; + + av_log(NULL, AV_LOG_TRACE, "configurationVersion: %"PRIu8"\n", + evcc->configurationVersion); + av_log(NULL, AV_LOG_TRACE, "profile_idc: %"PRIu8"\n", + evcc->profile_idc); + av_log(NULL, AV_LOG_TRACE, "level_idc: %"PRIu8"\n", + evcc->level_idc); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_h: %"PRIu32"\n", + evcc->toolset_idc_h); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_l: %"PRIu32"\n", + evcc->toolset_idc_l); + av_log(NULL, AV_LOG_TRACE, "chroma_format_idc: %"PRIu8"\n", + evcc->chroma_format_idc); + av_log(NULL, AV_LOG_TRACE, "bit_depth_luma_minus8: %"PRIu8"\n", + evcc->bit_depth_luma_minus8); + av_log(NULL, AV_LOG_TRACE, "bit_depth_chroma_minus8: %"PRIu8"\n", + evcc->bit_depth_chroma_minus8); + av_log(NULL, AV_LOG_TRACE, "pic_width_in_luma_samples: %"PRIu16"\n", + evcc->pic_width_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "pic_height_in_luma_samples: %"PRIu16"\n", + evcc->pic_height_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "lengthSizeMinusOne: %"PRIu8"\n", + evcc->lengthSizeMinusOne); + av_log(NULL, AV_LOG_TRACE, "num_of_arrays: %"PRIu8"\n", + evcc->num_of_arrays); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if(array->numNalus == 0) + continue; + + av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + i, array->array_completeness); + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + i, array->NAL_unit_type); + av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + i, array->numNalus); + for ( unsigned j = 0; j < array->numNalus; j++) + av_log(NULL, AV_LOG_TRACE, + "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + i, j, array->nalUnitLength[j]); + } + + /* + * We need at least one SPS. + */ + sps_count = evcc->arrays[SPS_INDEX].numNalus; + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + /* unsigned int(8) configurationVersion = 1; */ + avio_w8(pb, evcc->configurationVersion); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->profile_idc); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->level_idc); + + /* unsigned int(32) toolset_idc_h */ + avio_wb32(pb, evcc->toolset_idc_h); + + /* unsigned int(32) toolset_idc_l */ + avio_wb32(pb, evcc->toolset_idc_l); + + /* + * unsigned int(2) chroma_format_idc; + * unsigned int(3) bit_depth_luma_minus8; + * unsigned int(3) bit_depth_chroma_minus8; + */ + avio_w8(pb, evcc->chroma_format_idc << 6 | + evcc->bit_depth_luma_minus8 << 3 | + evcc->bit_depth_chroma_minus8); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_width_in_luma_samples); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_height_in_luma_samples); + + /* + * bit(6) reserved = '111111'b; + * unsigned int(2) chromaFormat; + */ + avio_w8(pb, evcc->lengthSizeMinusOne | 0xfc); + + /* unsigned int(8) numOfArrays; */ + avio_w8(pb, evcc->num_of_arrays); + + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if (!array->numNalus) + continue; + + /* + * bit(1) array_completeness; + * unsigned int(1) reserved = 0; + * unsigned int(6) NAL_unit_type; + */ + avio_w8(pb, array->array_completeness << 7 | + array->NAL_unit_type & 0x3f); + + /* unsigned int(16) numNalus; */ + avio_wb16(pb, array->numNalus); + + for (unsigned j = 0; j < array->numNalus; j++) { + /* unsigned int(16) nalUnitLength; */ + avio_wb16(pb, array->nalUnitLength[j]); + + /* bit(8*nalUnitLength) nalUnit; */ + avio_write(pb, array->nalUnit[j], + array->nalUnitLength[j]); + } + } + + return 0; +} + +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness) +{ + EVCDecoderConfigurationRecord evcc; + int nalu_type; + size_t nalu_size; + int bytes_to_read = size; + unsigned array_index; + + int ret = 0; + + if (size < 8) { + /* We can't write a valid evcC from the provided data */ + return AVERROR_INVALIDDATA; + } else if (*data == 1) { + /* Data is already evcC-formatted */ + avio_write(pb, data, size); + return 0; + } + + evcc_init(&evcc); + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + nalu_size = read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(data, bytes_to_read); + + switch (nalu_type) { + case EVC_SPS_NUT: + array_index = SPS_INDEX; + break; + case EVC_PPS_NUT: + array_index = PPS_INDEX; + break; + case EVC_APS_NUT: + array_index = APS_INDEX; + break; + case EVC_SEI_NUT: + array_index = SEI_INDEX; + break; + default: + break; + } + + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &(evcc.arrays[array_index])); + if (ret < 0) + goto end; + if (evcc.arrays[array_index].numNalus == 1) + evcc.num_of_arrays++; + + if(nalu_type == EVC_SPS_NUT) { + ret = evcc_parse_sps(data, nalu_size, &evcc); + if (ret < 0) + goto end; + } + + data += nalu_size; + bytes_to_read -= nalu_size; + } + + ret = evcc_write(pb, &evcc); + +end: + evcc_close(&evcc); + return ret; +} diff --git a/libavformat/evc.h b/libavformat/evc.h new file mode 100644 index 0000000000..db56275fd8 --- /dev/null +++ b/libavformat/evc.h @@ -0,0 +1,44 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_EVC_H +#define AVFORMAT_EVC_H + +#include +#include "libavutil/rational.h" +#include "avio.h" + + + +/** + * Writes EVC sample metadata to the provided AVIOContext. + * + * @param pb pointer to the AVIOContext where the evc sample metadata shall be written + * @param buf input data buffer + * @param size size in bytes of the input data buffer + * @param ps_array_completeness @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + * + * @return 0 in case of success, a negative error code in case of failure + */ +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness); + +#endif // AVFORMAT_EVC_H diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e2b80405cc..8ca740cab1 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -147,6 +147,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', '1') }, /* AVC-based Dolby Vision derived from avc1 */ { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', 'v') }, /* AVC-based Dolby Vision derived from avc3 */ + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, /* EVC/MPEG-5 */ + { AV_CODEC_ID_VP8, MKTAG('v', 'p', '0', '8') }, /* VP8 */ { AV_CODEC_ID_VP9, MKTAG('v', 'p', '0', '9') }, /* VP9 */ { AV_CODEC_ID_AV1, MKTAG('a', 'v', '0', '1') }, /* AV1 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7d49892283..dd7a26bf06 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -35,6 +35,7 @@ #include "isom.h" #include "av1.h" #include "avc.h" +#include "evc.h" #include "libavcodec/ac3_parser_internal.h" #include "libavcodec/dnxhddata.h" #include "libavcodec/flac.h" @@ -1393,6 +1394,21 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_evcc_tag(AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "evcC"); + + if (track->tag == MKTAG('e','v','c','1')) + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 1); + else + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 0); + + return update_size(pb, pos); +} + /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { @@ -1642,6 +1658,16 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } +static int mov_get_evc_codec_tag(AVFormatContext *s, MOVTrack *track) +{ + int tag = track->par->codec_tag; + + if (!tag) + tag = MKTAG('e', 'v', 'c', 'i'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1723,6 +1749,8 @@ static unsigned int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mov_get_mpeg2_xdcam_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_H264) tag = mov_get_h264_codec_tag(s, track); + else if (track->par->codec_id == AV_CODEC_ID_EVC) + tag = mov_get_evc_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_DNXHD) tag = mov_get_dnxhd_codec_tag(s, track); else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2291,6 +2319,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex mov_write_avcc_tag(pb, track); if (track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); + } + else if (track->par->codec_id ==AV_CODEC_ID_EVC) { + mov_write_evcc_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VP9) { mov_write_vpcc_tag(mov->fc, pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AV1) { @@ -6036,6 +6067,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_VP9 || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ @@ -7695,6 +7727,7 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'p', '4', 'v') }, From patchwork Mon Jan 2 12:55:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39824 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7370370pzb; Mon, 2 Jan 2023 04:56:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXskVGRIV6NhPle1Q6eNygDVEe3ZWEvh3klZ7LTNk5EkCn/8/OnbcggVOWK02LpcWjQuc2Ra X-Received: by 2002:a17:907:2587:b0:7c0:e7ad:fb0f with SMTP id ad7-20020a170907258700b007c0e7adfb0fmr28409561ejc.20.1672664171779; Mon, 02 Jan 2023 04:56:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664171; cv=none; d=google.com; s=arc-20160816; b=U+ivp3d7l2YqZGvms2gHwAdNMxYM35lRoyXiv/tFRiBdoGRDXsfXYHrBr9hISmiwXb dJFKqqCuuYVLI7PwO6M85b60MylmGRhiiZ3mxFaULrkFsWRiVk/sANbpc9DpLY+3OIxM BumsRfgRuTCJFPfZT5Lzc05k31bLw7WU4/HmuReMbJVeuXQUMRTU78v0slqAvdIoV/OJ S90AFGq54wDWm5+5R/VA2+kzccnL9TOzGIcBda6NkKhq389Rv7uLUWEModqMcUUkp6Co iB0cvPmoUs8qlueIjxowsUSAxwOpOOwR7p1CWJpm7mzddsI+rxqn2ByM7rN5niuJTLMT 8G/g== 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=CZ3YeUZQyZqEgM9aNhCeJAVjulabgfdTAmabzPvKL8w=; b=ufH7v5lG9T8rbzvGJzJy5xFnyaq1W2o3CMs/0b/XYn0XF1fvgdhko9Pj60wmwoKQhT R5prEhki35sfNkgxLde0bTa57d3Tn4OdajUwKKGQBHxy0dD9Q/1CSEBHkMTimw2VVsZv J1hiXlUilJT7scN7USlVQAIPXtOYNBEI42wdY6avD+u2NEcjC7kzaJBOS6b1CEQu2YRP Y14KbemfO6MLl3k80L2S5i7nlsAKHlJoGfSU6fCyDUQwDcm9Fbcy+sjcQG2ldxoKKYRZ LC5C/tqDQ7ElGINETuKAk0RulaalrYIzi7fYzgrCisd3agzPKkrbpajxgRKcYOM7PF0v 4eeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=NCYOcguf; 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 hg3-20020a1709072cc300b0082b7e633998si24075704ejc.455.2023.01.02.04.56.11; Mon, 02 Jan 2023 04:56:11 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=NCYOcguf; 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 C7EE968BCD5; Mon, 2 Jan 2023 14:56:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BEE568A2DE for ; Mon, 2 Jan 2023 14:56:02 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125601euoutp01ee7d31cf38d080cad0e8823b68695530~2fzFoX-rI0821708217euoutp01T for ; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230102125601euoutp01ee7d31cf38d080cad0e8823b68695530~2fzFoX-rI0821708217euoutp01T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664161; bh=B/nc3UxUrYNC6A8AvA5sZ6JCYveKtKMOcsQPmQ9e72o=; h=From:To:Cc:Subject:Date:References:From; b=NCYOcgufWEXme2KfZmahmM7OPN1/hIEeJk3eP2YrtkV9OoPjSVpP2A/nmNL5Fva9o 3Wx6TZ7Ek784AmeqgKLY1P9gposx2qpahPoK7QTqdHglcpaBRn2F5OXAwHuBHHx03Q f9OcCbKbOMN1n8rwGAN44ksu7pMDE8wWK1cSNZgY= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230102125601eucas1p24346a4fbfbd04fadc3222ff660b9bc1a~2fzFZ4V5Z2274522745eucas1p2l; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id A4.48.43884.164D2B36; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125601eucas1p29cdbb58f8a5edfa71adccfa5e1aa9e81~2fzFGmFgG2369123691eucas1p2C; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230102125601eusmtrp1327266b7fadce856b5d701188abe4d14~2fzFFtGbY1458914589eusmtrp1L; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) X-AuditID: cbfec7f5-271ff7000000ab6c-33-63b2d4617ff9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 9C.FB.52424.164D2B36; Mon, 2 Jan 2023 12:56:01 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230102125600eusmtip22d9f594e243398bb884231a7b53cc08a~2fzEu8_Nk3261232612eusmtip2f; Mon, 2 Jan 2023 12:56:00 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:55:47 +0100 Message-Id: <20230102125548.627-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFIsWRmVeSWpSXmKPExsWy7djP87qJVzYlG/xvkbX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDI2P2pmKVjAV9Hx+T1bA+MXri5G Tg4JAROJHY9vsYLYQgIrGCV65iRD2F8YJX7NDuhi5AKyPzNKbLtyiQmmYdHufSwQieWMEjeX bYRy2pkk/kz+zw5SxSagK/HywyOwDhEBU4mTzXvZQGxmAW2JdXe/g9nCAokSx3+0gdWzCKhK HDn2BayeV8BS4uIpiHoJAU2JCVvmQMUFJU7OfMICEeeWWDfrEivETHmJ5q2zmUGOkBD4yi4x 8cd9qCIXicaDf5ghbGGJV8e3sEPYMhKnJ/cA1XAA2cUSh/odIMwaiUM/0iEqrCXeNh5nBAkz A52wfpc+RNhRouPWEqhGPokbbwUhDuCTmLRtOjNEmFeio00IwlSR6OsUg2iUkni6bA7UJR4S pxa/YJnAqDgLyVezkHwyC2HtAkbmVYziqaXFuempxcZ5qeV6xYm5xaV56XrJ+bmbGIHJ4fS/ 4193MK549VHvECMTB+MhRgkOZiUR3suf1yUL8aYkVlalFuXHF5XmpBYfYpTmYFES552xdX6y kEB6YklqdmpqQWoRTJaJg1OqgckivUo7mfsM9/qb/vp3TtsaLS28evZeeKL//12z5nzOX+7z 335OW4yggPXK+ScyqxsePfeql41Qu/Jds7Dh4PUgFfEPl+7XWFQ9XPBNvTD3pR3PuVnTbA5z 1sr9NQtqictn81L9UX7Bx31qltGsaN6smACLNdcyTD4cZZ6qoCaXO6Pk1sRD9b+0W9YcupjG w/DvxTQb1fY0xuklZuc9b00uuOW/xv1Ur23NeheHvatvyzXtmdK55tqPORynklScuQIjFr64 dN/SQdI0N8baLXC+dt8ti5O9p5uevZVV3R7dIy60cL+9WEhVlfVB7TcXv2+8+cL1woUjhzcU yP/PPfI+o33Ttvb0p2uXaBeuuqHEUpyRaKjFXFScCABJjFYtfQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7qJVzYlG/QtZrP4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DI2P2pmKVjAV9Hx+T1bA+MXri5GTg4JAROJRbv3sYDYQgJLGSUW boeKS0ksXbqIEcIWlvhzrYuti5ELqKaVSeLRn0dgCTYBXYmXHx4xgdgiAuYSF9fdAoszC2hL rLv7nQ3EFhaIl9j4dD9YnEVAVeLIsS9g9bwClhIXT+1lg1igKTFhyxyouKDEyZlPWCDi3BLr Zl1ihZgpL9G8dTbzBEb+WUjKZiFJLWBkWsUoklpanJueW2ykV5yYW1yal66XnJ+7iREYttuO /dyyg3Hlq496hxiZOBgPMUpwMCuJ8F7+vC5ZiDclsbIqtSg/vqg0J7X4EKMp0K0TmaVEk/OB kZNXEm9oZmBqaGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cA0t8H1kpq1Zm6H b8+RzZN6KieEPGO73ZTqyvMwxDRNMlROt1/m8RLBN2nsM5T+tsu97TKV/vz+5X6jad910r51 zbbgvSiUEOG3ZBfjtT8R27gPXJWZamYmfy1Qd9KuYznn7gZOkMyP/r8gZWH6m00arl/OihrK HO0o1/7l9/PHTpW27kMGLww88vZfZ39pHHx70k2Dt8/XTj8T4vVc4Pu5B3sSbf4d27nvep6b b+blyX9lGQwvLanieb51Yb8bf6TBVJaLejGLlVa/nvbsQZLPdXcRfeZ7S3latHL5+HuZv1Ud dWabGL9BnXWq/sz0w5bv5vhIsvcZnmnJbp79Pa1f66r7ey7j6LZpLJe1fk1UYinOSDTUYi4q TgQABC/TSOQCAAA= X-CMS-MailID: 20230102125601eucas1p29cdbb58f8a5edfa71adccfa5e1aa9e81 X-Msg-Generator: CA X-RootMTR: 20230102125601eucas1p29cdbb58f8a5edfa71adccfa5e1aa9e81 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125601eucas1p29cdbb58f8a5edfa71adccfa5e1aa9e81 References: Subject: [FFmpeg-devel] [PATCH v16 8/9] avformat/mov_demuxer: Extended MOV demuxer to handle EVC video content X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jNmSh1IHp2tM - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- libavformat/demux.c | 1 + libavformat/mov.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 2dfd82a63c..f3ebe4d09b 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -120,6 +120,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, { "truehd", AV_CODEC_ID_TRUEHD, AVMEDIA_TYPE_AUDIO }, + { "evc", AV_CODEC_ID_EVC, AVMEDIA_TYPE_VIDEO }, { 0 } }; int score; diff --git a/libavformat/mov.c b/libavformat/mov.c index 29bd3103e3..ab1776e1c4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2507,6 +2507,7 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, case AV_CODEC_ID_VP9: sti->need_parsing = AVSTREAM_PARSE_FULL; break; + case AV_CODEC_ID_EVC: case AV_CODEC_ID_AV1: /* field_order detection of H264 requires parsing */ case AV_CODEC_ID_H264: @@ -9135,7 +9136,7 @@ const AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif,evc", .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mov_probe, .read_header = mov_read_header, From patchwork Mon Jan 2 12:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39825 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7370637pzb; Mon, 2 Jan 2023 04:56:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXursBN4nIcT5RJrnPVtUHYLFZICdh77JSaiAJlYsi7Z0VZGe06e7b644YkhrH+nyb3hkXs0 X-Received: by 2002:a17:906:5956:b0:81b:f617:eb99 with SMTP id g22-20020a170906595600b0081bf617eb99mr34088178ejr.67.1672664206783; Mon, 02 Jan 2023 04:56:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672664206; cv=none; d=google.com; s=arc-20160816; b=qFu170NEwjrRhY0xt9sOOP95MAqWE7FYHzNAQiZvg2OtJa4Rkj0FZpvAe/BYoEUJOt rJiyfqqp3Uw92MXocItzPWTaZLtTxla/wguzTUD7eg8ZyagP5YWkrSPLINHC5u6OgQ1w cKL7XIvsY4LDTSs0ggZwV252IYrqU6TfapRKttYs8WGPDNn3O/qK+CUePL4gC85X1ZX5 5QbNo+7dr/ktJ4pseVdhvUzQnXSQvVNH4YObVp3V8/r/4+ZovgtQZuDxUe+jioVCuwP3 2JqART5sPF5MO66wjKOo5ez3lCzdtCS0anA3cPzBWyX2At3WvrEuNXWyG5AhFFHj7A2b HQWA== 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=BQKZNlZCvLFk5ttgSYJlzNk4f9BHriwacQXeleVA6Oc=; b=YhQ+7jfsCL8WUiSWmPWogL/viApR5tNEAqv/FhlUcS3HP7LOyEaZQOUCeMHvroc/SN fP3tmqbJkZ90HTW24UG56B1hVMB0ichnpVsvk5kYqOabJaMhKQ0pC6SExfVnV7OkYhw7 JLi7dAExBwX2yAyeGHnTteVcLHm8Lrhmc5L7aamFKWHKMD8yzk25OnYlBTqH+LIL0XlJ ZsOXJ76FUrbGHoXuw50csr2w2bS5ZnPzJdiZj1FqJLosjkeOXClIR+5hSAfr+mSJIaAr SiO8Za9U6wzsNJlRT7n9ROmsngvk9eOf9yhz9w9NrXS/08UQutpF/U/8da9snkt5rYJx Rltw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=oOYEf0of; 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 f22-20020a0564021e9600b0046b953601c9si29003532edf.7.2023.01.02.04.56.46; Mon, 02 Jan 2023 04:56:46 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=oOYEf0of; 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 16B8968BCC1; Mon, 2 Jan 2023 14:56:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A409268BCC1 for ; Mon, 2 Jan 2023 14:56:37 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230102125637euoutp02f17f1916d2a2a0dc84db4b5f478b3a31~2fzmnIAqK2887628876euoutp02i for ; Mon, 2 Jan 2023 12:56:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230102125637euoutp02f17f1916d2a2a0dc84db4b5f478b3a31~2fzmnIAqK2887628876euoutp02i DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1672664197; bh=K+26CX7LQUDJHYvUeocQ7Nqx6rb2vuLjJTSHfolst3U=; h=From:To:Cc:Subject:Date:References:From; b=oOYEf0ofN23T5cWVbujZkjv7GLCu+uDFFG0trww0nF6EUPwjjKD/DkwL54c3X1EKV dy0DXJ4tvrkBNZ6KZ3g6A1Sd2kez2HurYKHrigOLiJtAPZr9sYJGe4CJ8t/z1XOnWz L7IXGyE7v1bxGU+LpiPoT02KTv5kg3aPUTCe7SU8= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230102125636eucas1p13eda12fbb4af3114bf5d7c5037c01165~2fzmZ4BHv2361623616eucas1p1q; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 34.F7.56180.484D2B36; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230102125636eucas1p287a67bd7af2fd7ef6913e538ac291291~2fzl9m0Kx2830728307eucas1p2j; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230102125636eusmtrp1d1f27e99408de71c5749a266d3948dd9~2fzl9Anp11458914589eusmtrp1E; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) X-AuditID: cbfec7f2-ab5ff7000000db74-49-63b2d484d314 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id A4.19.23420.484D2B36; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230102125636eusmtip1724777d2e0da0bd151dea41d35dbd564~2fzlp8V482231322313eusmtip1F; Mon, 2 Jan 2023 12:56:36 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2023 13:56:17 +0100 Message-Id: <20230102125617.562-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87otVzYlG6z/bGnx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGWcXn2KqeAGT8XFplbWBsZ97F2M nBwSAiYSWzb2snQxcnEICaxglJj77A0ThPOFUeLe/RmsEM5nRolVry8wwbT8uvCbHSKxnFGi cesDRginnUni95/3YFVsAroSLz88ArNFBEwlTjbvZQOxmQW0Jdbd/Q5mCwvYS9w6PhuomYOD RUBVYubWBJAwr4ClxKqXH1khlmlKTNgyhwkiLihxcuYTFog4t8S6WZdYIUbKSzRvnc0McoOE wEd2iQ+L70AVuUi0/e9ig7CFJV4d3wL1tIzE6ck9LCB7JQSKJQ71O0CYNRKHfqRDVFhLvG08 DnYZM9AJ63fpQ4QdJXoOT2aFqOaTuPFWEOIAPolJ26YzQ4R5JTrahCBMFYm+TjGIRimJp8vm MEPYHhI3jm1nn8CoOAvJV7OQfDILYe0CRuZVjOKppcW56anFhnmp5XrFibnFpXnpesn5uZsY genh9L/jn3Ywzn31Ue8QIxMH4yFGCQ5mJRHey5/XJQvxpiRWVqUW5ccXleakFh9ilOZgURLn nbF1frKQQHpiSWp2ampBahFMlomDU6qBKc3HNDV7570tTIdX+q9Jv8fJP/EIJ9/D6Q+ZZ68I 2vu861F4dZZXxdTdtprBMdfnLAsSTNw5++9s0WN71sgxMlQErttR3fdgksHkCSsSbjN4++9+ r7dbcQ9rpniO1XSTgxXKmjsS3s1aLvSrI1Nn48zQH1LJD+Udpq5Td/y5XazxZetk85iyjywF NRNa7W8slOFirZ75K9E++/X0O5/3HZ1rL/Tp+bPefbUz2g//fvB1Xmf6QyMtjk9q+VMndn+6 +39Oi+viJ5l7mfcUrTZZtOvbDMWE+O5v3r1CE7Yf+T+VrZGRdzPH/liZ4NbdDh22LMvlb7m8 /SvC+v3X489zF2YuqkrP1CpOm+T9bq3BAnElluKMREMt5qLiRAAC6NvdfgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xu7otVzYlG0z9LGXx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GWcXn2KqeAGT8XFplbWBsZ97F2MnBwSAiYSvy78BrOFBJYySlze rgIRl5JYunQRI4QtLPHnWhcbRE0rk8TEfX4gNpuArsTLD4+YQGwRAXOJi+tugdUzC2hLrLv7 HaxeWMBe4tbx2UBxDg4WAVWJmVsTQMK8ApYSq15+ZIUYrykxYcscJoi4oMTJmU9YIOLcEutm XWKFGCkv0bx1NvMERv5ZSMpmIUktYGRaxSiSWlqcm55bbKhXnJhbXJqXrpecn7uJERiy2479 3LyDcd6rj3qHGJk4GA8xSnAwK4nwXv68LlmINyWxsiq1KD++qDQntfgQoynQqROZpUST84FR k1cSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwKTXvb1j0/bujuu7 nCTCmc+fbVn6/+Hm0o1fzvH4MnjUFv+0vHLc7+8SxsjQGZnyteW6p+7N+lJ05ueDgDtlpqt6 XosnyNhN8q3zE1VL+VW5xO+QSlTAa7tVm7Y0qM55cllj6QNR5zfGJt+YTnoormz5+u+B/mc7 xSCZv1sTL4r6Pmd64KtlXbZdP09RqtOQsY0rIfRb5Le6fNta/5dP3LIP+J80CSqfJeItGeJW nWlVL/LnX2L6+x3pexKf3TqQmm7cfvtNzyJt/iPuikG7nx1gjHfS1p0j+SKRPYCZc+4Zz4jE P5bv1u9J6z1/R2JJ6LT90/1KZ214vnTfBg33Sw83HVtUFVN7VctVSu2btxJLcUaioRZzUXEi ALIoD6niAgAA X-CMS-MailID: 20230102125636eucas1p287a67bd7af2fd7ef6913e538ac291291 X-Msg-Generator: CA X-RootMTR: 20230102125636eucas1p287a67bd7af2fd7ef6913e538ac291291 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230102125636eucas1p287a67bd7af2fd7ef6913e538ac291291 References: Subject: [FFmpeg-devel] [PATCH v16 9/9] avcodec/evc: Changes in Changelog file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dskCxQu74qU/ - Changelog update - MAINTAINERS file update Signed-off-by: Dawid Kozinski --- Changelog | 2 ++ MAINTAINERS | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Changelog b/Changelog index f3a6abb9cd..ab6a8d2f1e 100644 --- a/Changelog +++ b/Changelog @@ -55,6 +55,8 @@ version 5.1: - remap_opencl filter - added chromakey_cuda filter - added bilateral_cuda filter +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 5.0: diff --git a/MAINTAINERS b/MAINTAINERS index 48e2ec4fd4..565bd03b5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -199,6 +199,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Samsung (Dawid Kozinski) + libxeve.c Samsung (Dawid Kozinski) libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -419,6 +421,7 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc* Samsung (Dawid Kozinski) ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer