From patchwork Thu Apr 27 07:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 41335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp298482pzb; Thu, 27 Apr 2023 00:26:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ414zGWVWDuh/9FMnUu6+eNga2eZ73WrfRiSkw7ztlftgYKW0AbvosJXzdpIKWphzVR2XZj X-Received: by 2002:a17:907:3e9f:b0:953:7e25:2156 with SMTP id hs31-20020a1709073e9f00b009537e252156mr776542ejc.51.1682580387892; Thu, 27 Apr 2023 00:26:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682580387; cv=none; d=google.com; s=arc-20160816; b=AdEDvUtdpbdnjFB9NlgrrKW+32EJ2jtMAT+Tu9W2J0z9eleXvQoyvemB7SQHNKuZ5R bUZv1V03GPnuXw7BE+g5UVj/kLg560HQaL9XGNJa1Y46bwnbgZvfo/amXUPG7VQ/fPLg l0D+7h4rJ52xg8KG3momcP3wn2dCIr5xGmZxWOzdoG4qA1hErkahm5GkPOlPmAZ1vayd oAFRj2u4WTVvtR4rJvfwTWbF5zG82GMc1cyJ3CUj7ErD7YH1f6q/7ZWwKqLq2IjqxUlD D7DbrxVgv7YK+Aj3fnFElhGPM1Iv7if42Z5Xd4m9ScUixo87RPHs4Ex5Cr+OHJAQJFAe 8Mcw== 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=gblMgBA38+8sYKVMR8wuB4L0eP58cAC5Xoh377uSOW0=; b=NrNMChf33N/vb/stIdwuE6fCwkIVQf3J4ynOqVyjeRvmfuUDV7jyJYTIyBC1zzaJNW Qs5wLBIArjS2gowt4K/nGjHfeDC2WMrF2QMMrxZcRl2yMYtLyFhL2Qbxruiyv4Hrflti QPWdq5jD2Si/a5Kzh3ujz55p+Yen/FbkNJMKIzfiI+2loRAHHTVwbuggUbBGjHwsiPx0 IIAZLy/QsFKRTLIoUVMTiEBdwwn2WQctzO0aGtpkfFcqBGtQVlB+3yxTEehKbdg4c67G B3jwzoglDj3fqQfmtICzQ1cPRtFRiX1p7soOAQRL8BcZIZ6rFlLPo0+1GUqD395Y26Ch ydzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ZZqN+jnw; 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 hy16-20020a1709068a7000b0094ede583e34si12530583ejc.229.2023.04.27.00.26.27; Thu, 27 Apr 2023 00:26:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ZZqN+jnw; 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 338F768BF1B; Thu, 27 Apr 2023 10:26:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB7ED68AD39 for ; Thu, 27 Apr 2023 10:26:16 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230427072613euoutp02c0df2d7f77727d09b4e66f2cc5a57e77~Zue9PRAtk0637106371euoutp02h for ; Thu, 27 Apr 2023 07:26:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230427072613euoutp02c0df2d7f77727d09b4e66f2cc5a57e77~Zue9PRAtk0637106371euoutp02h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1682580373; bh=TGl/IIeHfE4Jc+4Rdg9ehRZVGKNIvsdnOawoByDXhBQ=; h=From:To:Cc:Subject:Date:References:From; b=ZZqN+jnwk/bPW5N9UMafTdF/uID3zWdkUFP0lLTpNld4eo3EHQdSabyZ2Jh6fx5Df htB4WcbdFTiX567aSPRtUDVPaz06t9n3HP9NR5+eTD2B1l2ESfDne9aNUMCqdrksLq PUCnhbQq0h9CMra1TUmIxKj4NpsbwDmFrN3+MruI= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230427072612eucas1p11753db5403ef61f9f2629b335c9d4c4b~Zue85oGGD0514305143eucas1p1i; Thu, 27 Apr 2023 07:26:12 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id ED.CD.37758.4932A446; Thu, 27 Apr 2023 08:26:12 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230427072612eucas1p10bb8de94a942381f45709e0858012053~Zue8oEmOm0963309633eucas1p1O; Thu, 27 Apr 2023 07:26:12 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230427072612eusmtrp20286813044c338ecc8ca59fca08519fb~Zue8nhEs-1701317013eusmtrp2R; Thu, 27 Apr 2023 07:26:12 +0000 (GMT) X-AuditID: cbfec7f5-815ff7000002937e-96-644a2394fd7c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 49.00.14344.4932A446; Thu, 27 Apr 2023 08:26:12 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230427072612eusmtip1dfe8cfddf0540a7aabbdb620282fa322~Zue8WAmnO0155701557eusmtip15; Thu, 27 Apr 2023 07:26:12 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 27 Apr 2023 09:26:02 +0200 Message-Id: <20230427072602.1827-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+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7pTlL1SDFomGFp8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBlPn95iK1giU9F5+x5TA+Mv0S5G Tg4JAROJ15smMXYxcnEICaxglOjvX88K4XxhlNj6ZBcLhPOZUeLGn/+sMC0T5/YxQSSWM0oc 3f0Yqr+VSWL6liVMIFVsAroSLz88ArNFBEwlTjbvZQOxmQW0Jdbd/Q5mCwu4Siz/9ocFxGYR UJVoXryBEcTmFbCSuLJyHxvENk2JCVvmMEHEBSVOznzCAhHnllg36xIrxEx5ieats5lBjpAQ +MoucbDxDzNEkYvEy67dTBC2sMSr41vYIWwZif875wPFOYDsYolD/Q4QZo3EoR/pEBXWEm8b jzOChJmBTli/Sx8i7Cix+UwPI0Q1n8SNt4IQB/BJTNo2nRkizCvR0SYEYapI9HWKQTRKSTxd NgfqKg+Jjn9tTBMYFWch+WoWkk9mIaxdwMi8ilE8tbQ4Nz212DgvtVyvODG3uDQvXS85P3cT IzBBnP53/OsOxhWvPuodYmTiYDzEKMHBrCTCy1vpniLEm5JYWZValB9fVJqTWnyIUZqDRUmc V9v2ZLKQQHpiSWp2ampBahFMlomDU6qBySLOKCuh6+Z82+Bf1rsEpqizib5Pj/xrpZEan6OQ 3Lws4+SZXYduSjpfr/vNxmhtV3jATGej8kyztpm92lO7pp6YEPXPyJnN5KZyRt0GtvqzFxk9 snhmzrXmmOtjb7RE//SGpAm3totPk9AIn+KUclO161u/rcEMc9ftU7UZxVTa9uhFrdzV7CPY 8ETMRjL0IsN2ZdPjeZNO5/08Pz0r4++mCRe/CIfMS84MYlJV+rcg7JPTpUU7Df65+O8JEIj8 vnHxGY+GT8XNQTbOrcvWrBY8s9rkUqY4k37ARnYXgRZdl4eKmuHrvrKd8F+8zc65cPX/3YLT 8xqbmFXuHLpxROPBSZUjclZZm2InSSsosRRnJBpqMRcVJwIAzFlW3n8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7pTlL1SDDrPKVl8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehlPn95iK1giU9F5+x5TA+Mv0S5GTg4JAROJiXP7mEBsIYGljBI3 nupBxKUkli5dxAhhC0v8udbF1sXIBVTTzCTxduoVNpAEm4CuxMsPj8CaRQTMJS6uuwXWwCyg LbHu7newGmEBV4nl3/6wgNgsAqoSzYs3gNXwClhJXFm5jw1igabEhC1zmCDighInZz5hgYhz S6ybdYkVYqa8RPPW2cwTGPlnISmbhSS1gJFpFaNIamlxbnpusZFecWJucWleul5yfu4mRmDY bjv2c8sOxpWvPuodYmTiYDzEKMHBrCTCy1vpniLEm5JYWZValB9fVJqTWnyI0RTo1onMUqLJ +cDIySuJNzQzMDU0MbM0MLU0M1YS5/Us6EgUEkhPLEnNTk0tSC2C6WPi4JRqYCqss1w7Y33I Hs7dD5+Unk3YHGH0/+iB+F7xXo6IarHc489urn1SMz34af7RFb17Jyyr1jbsM62cZMr80eOc r6NEzJq57TExda57TdRnlwvlMs7Qkw8TaQj5+1qh+dbDGUXbb4bZycTV3rt+cPHk/QtSn7Lz THi3xjDu9YLtdR8Pxsv9/XzWNj34XHI5o5KTIrvTLas8nsiisyV1AQ4vb/zTKntyvDMojPNU ybTbvtGrD2/9Pt+QV4bXf4HJvoDoH/9LMt2fpOV1yaoo/z0UYLya+awNa/L0LcpaR61+hH3b cT3QUdb4c7rOpr/6LSmJ9hm8BwTjN/8Oe1xnGZjz/Avzxc9LJVu9/SoLL7PGKbEUZyQaajEX FScCAOBI1c/kAgAA X-CMS-MailID: 20230427072612eucas1p10bb8de94a942381f45709e0858012053 X-Msg-Generator: CA X-RootMTR: 20230427072612eucas1p10bb8de94a942381f45709e0858012053 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230427072612eucas1p10bb8de94a942381f45709e0858012053 References: Subject: [FFmpeg-devel] [PATCH v21 01/10] avcodec/evc: MPEG-5 EVC codec registration X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: so+NeGmw8HOa Added prerequisites that must be met before providing support for the MPEG-5 EVC codec - Added new entry to codec IDs list - Added new entry to the codec descriptor list - Bumped libavcodec minor version - Added profiles for EVC codec Signed-off-by: Dawid Kozinski --- libavcodec/avcodec.h | 3 +++ libavcodec/codec_desc.c | 8 ++++++++ libavcodec/codec_id.h | 1 + libavcodec/profiles.c | 6 ++++++ libavcodec/profiles.h | 1 + libavcodec/version.h | 2 +- 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1e91b9cb53..ffc07af862 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1707,6 +1707,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_KLVA_SYNC 0 #define FF_PROFILE_KLVA_ASYNC 1 +#define FF_PROFILE_EVC_BASELINE 0 +#define FF_PROFILE_EVC_MAIN 1 + /** * level * - encoding: Set by user. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index d40977d6b3..68e000e475 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1930,6 +1930,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("PDV (PlayDate Video)"), .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 70800ec20b..9f621afff0 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -321,6 +321,7 @@ enum AVCodecID { AV_CODEC_ID_MEDIA100, AV_CODEC_ID_VQC, AV_CODEC_ID_PDV, + AV_CODEC_ID_EVC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 545626337c..c646a3f54d 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -194,4 +194,10 @@ const AVProfile ff_arib_caption_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_evc_profiles[] = { + { FF_PROFILE_EVC_BASELINE, "Baseline" }, + { FF_PROFILE_EVC_MAIN, "Main" }, + { FF_PROFILE_UNKNOWN }, +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 1d523992fc..c0eacae5c1 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -74,5 +74,6 @@ extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; extern const AVProfile ff_mjpeg_profiles[]; extern const AVProfile ff_arib_caption_profiles[]; +extern const AVProfile ff_evc_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 80e2ae630d..c576ee1520 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 10 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \