From patchwork Tue Apr 18 10:29:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 41232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp3037633pzb; Tue, 18 Apr 2023 03:30:12 -0700 (PDT) X-Google-Smtp-Source: AKy350ZNqplHKIXZ/RE98i7+FmicRl5rVzP/xIxgXlUp/zliT0Xh3n98ulGRIt41moeBKtKLIj40 X-Received: by 2002:a17:906:364b:b0:94e:4586:f135 with SMTP id r11-20020a170906364b00b0094e4586f135mr10711314ejb.6.1681813812438; Tue, 18 Apr 2023 03:30:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681813812; cv=none; d=google.com; s=arc-20160816; b=jRRpFbyxeQf8ETJA6nxEV3NOn4k+WQhg0xJA1n8kllP3I/yd7ahJj7ZEi71nHE3yrR OVRcjRLme5SfDvInEEhGzCE0OYbJHJyiXZxYn2G/fvhco087/JwCE5PcFEFQ0YAv3HbR YK9GxJ/z2vFr99xyWh0fLFjzud5pbCXHoch86m5hQJmMEwKu+LmbwjBCF0y5CtH6+edP 4vCnDdnXgXIdaZhegavI1C4M3G/VdYLlYaHmDGpHT0E5k1dLeXrl8t7LzP5eiH+seVOl /Gx+Le9IQOXXG+FAgOjuvTOgCs9Rk50d+ehmgH7TZoutOyj863ntpD0BqsDzwkEwzSyy iVXg== 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=ws/8JOQwyr9qFe0UKkPj21mobxvwZ1bJbK+7xbQUOZs=; b=euYnTkjBtbhcaLU75HTmZ4wQFL6OaHF/QgFHSc0UIRJIqbauKpGmoHefnCFBj9GMRz CtUZ0s+74n7DtsMN4x3jxV3Sr1b6IUfXgqkmx9rIXtGK9pL7Rmwk24VOVTF/wo226zPF pxO44efnKXulZdXsreeBhAjMXJg5o5ZwjlFpK6ve8tiDg3BU4+KtwCWkn8MzgzTljC3M xBYwAD9FZFx+gk239wnZvpJMGJth1hqoKM9ZmUuxj1xQ7m/o3D0QbKDQh3/u007ndqmA gwQUFdm4n/h2LEgpmeXjTBp4ef5D90h8qDqbBXNXAHaIx63QJsLP7TrdgPi0s3E/pstk uYdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b="bF4E/WCJ"; 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 gc31-20020a1709072b1f00b0094ee0495c04si8535512ejc.286.2023.04.18.03.30.11; Tue, 18 Apr 2023 03:30:12 -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="bF4E/WCJ"; 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 5EE3768BE25; Tue, 18 Apr 2023 13:30:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F8D668BD1E for ; Tue, 18 Apr 2023 13:29:59 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230418102957euoutp018f07dfe581eaad1d84c2d21c35354b1d~XALzf3hxs1131111311euoutp01q for ; Tue, 18 Apr 2023 10:29:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230418102957euoutp018f07dfe581eaad1d84c2d21c35354b1d~XALzf3hxs1131111311euoutp01q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1681813797; bh=gG0AXIOQTmcA+MeXwa4gwJZPHRBfcrLVsKFzmJTNQGs=; h=From:To:Cc:Subject:Date:References:From; b=bF4E/WCJivxiPsaEsA+4wHx+b5eiHYZhZ72S28mpSnyEqfrknA4NHbu1IabOVlbux 53uP+pPiwr8+npHiPxvTRKiem7Cozab+MZ6I7z4gW+CppW3DC9Ud2J24/597zowUIv jjhiupKYnKG+GYUHs44fztD/jW5Xzvxd/bBaz/5U= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230418102956eucas1p1ec4d1d3c5e55239eea7d405b67dfc9bb~XALzVzeSv2952229522eucas1p18; Tue, 18 Apr 2023 10:29:56 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 0F.5B.10014.4217E346; Tue, 18 Apr 2023 11:29:56 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230418102956eucas1p16e14d45966619ad29b8a154436ea4d40~XALzBsFat2101021010eucas1p1c; Tue, 18 Apr 2023 10:29:56 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230418102956eusmtrp2bda0010adcdbd7bdacdc018625e603b0~XALzBDKMV1681416814eusmtrp2w; Tue, 18 Apr 2023 10:29:56 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-30-643e71247f44 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 9F.D5.22108.4217E346; Tue, 18 Apr 2023 11:29:56 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230418102956eusmtip1139e04f4dc234005b543f6f4b174a649~XALyscQhN2245322453eusmtip1O; Tue, 18 Apr 2023 10:29:56 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 18 Apr 2023 12:29:42 +0200 Message-Id: <20230418102942.594-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+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87oqhXYpBk+e61t8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBk/P59iKpgnU3Fz8yX2BsYvol2M nBwSAiYSm2ecZ+pi5OIQEljBKLHn8C4WCOcLo8SxyfuhMp8ZJc5/38wI0/JyQgs7iC0ksJxR 4s5cdoiidiaJYxvesoEk2AR0JV5+eMQEYosImEqcbN4LFmcW0JZYd/c7mC0s4Crxa8ZpFhCb RUBVYub7aWALeAUsJY7Pf8EMsUxTYsKWOUwQcUGJkzOfsEDEuSXWzbrECjFTXqJ562xmkCMk BL6yS5x/eQiqyEXiwPK5TBC2sMSr41vYIWwZif875wPFOYDsYolD/Q4QZo3EoR/pEBXWEm8b jzOChJmBTli/Sx8i7CjRfm0+K0Q1n8SNt4IQB/BJTNo2nRkizCvR0SYEYapI9HWKQTRKSTxd NgfqJQ+J0z+nMU1gVJyF5KtZSD6ZhbB2ASPzKkbx1NLi3PTUYuO81HK94sTc4tK8dL3k/NxN jMD0cPrf8a87GFe8+qh3iJGJg/EQowQHs5II7xlXqxQh3pTEyqrUovz4otKc1OJDjNIcLEri vNq2J5OFBNITS1KzU1MLUotgskwcnFINTFV167fs7YvZtSApNTfF3e5/R/zpd6EPvX50zeLJ uS95PS8/XXr9NrXMvqMVx2cs37nB//OtqQ/3Li8xbJIQ3+AoqfCvWTZebqKVCNc01nLpdfHT P7unvA889uDqrWT+8/c2FnDL31Fp/BS9TsHcNZnhdk6vR8eJNXcF9ZaFil52c5peFW/lpvbo 1JdddiI5GyQKDtx3uLPErFbhy5RjWiq10YvfvlRjdV/2PnTxqvXyCb+OzasLWntF8pjv+6rV nQtZ80z1cnSmMcYmRM95btUSGHSSgfemmQTT+XRruXVKpupRUosPM195r9E3n/HVp43bVQ9s 9Hst5nuj+IK+r1q124HpJkuOLLzx20pxuhJLcUaioRZzUXEiAFa6OX5+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7oqhXYpBps+SFt8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehk/P59iKpgnU3Fz8yX2BsYvol2MnBwSAiYSLye0sHcxcnEICSxl lDj9ZgMzREJKYunSRYwQtrDEn2tdbBBFrUwSbauWMIEk2AR0JV5+eARmiwiYS1xcdwusgVlA W2Ld3e9sILawgKvErxmnWUBsFgFViZnvp4HV8ApYShyf/wJqmabEhC1zmCDighInZz5hgYhz S6ybdYkVYqa8RPPW2cwTGPlnISmbhSS1gJFpFaNIamlxbnpusaFecWJucWleul5yfu4mRmDg bjv2c/MOxnmvPuodYmTiYDzEKMHBrCTCe8bVKkWINyWxsiq1KD++qDQntfgQoynQrROZpUST 84Gxk1cSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwGT5zOfrcoar 7HGuIoasX3pV7X4zJy0yY5he7PLtaMBHoXfhnEsvGfee3lbjrudTfDNEzO/Bq99dVyN9V0ss Nj2tc/QUU6/BrWiXnswLE9Y22v2Sv7xHS2x7e9x66UfPvrkyP9BYdnvzZIcem1u1IjP/b+r1 VmlZK8CQfiDlupjMXVZJL3Z7zsAHOaseLQpn//OrubapRu5EVdtsy+514s4fdvPwMGbOlcnO 4ZVYJfuiceE740PiMj/aJWJF9x3UVFYJvd7NGx0S5FOz1OvEGXk5TnWmb6eKKp98eb1jX+3n +mu6RrrrG5pmC6Z0TN7vVnDxptzmPdW+jhv/qi6f96CF9Yfr1u+qlj6Gku+VlViKMxINtZiL ihMB4jSn4OUCAAA= X-CMS-MailID: 20230418102956eucas1p16e14d45966619ad29b8a154436ea4d40 X-Msg-Generator: CA X-RootMTR: 20230418102956eucas1p16e14d45966619ad29b8a154436ea4d40 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230418102956eucas1p16e14d45966619ad29b8a154436ea4d40 References: Subject: [FFmpeg-devel] [PATCH v20 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: CTWHhupOviBy 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 efdcb59bc9..06454849c7 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 64df9699f4..c6c07bd18c 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 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 230d5fa13e..35947dad28 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 9 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \