From patchwork Mon Mar 27 10:46:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 40860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp1220007pzh; Mon, 27 Mar 2023 03:46:55 -0700 (PDT) X-Google-Smtp-Source: AKy350aYIK3R2w5EpSH/qV0s4UB4NiWL85Xtyc1BcuqPtLbF+pbfiTi26RocwVB0uRHy/qtXhSom X-Received: by 2002:aa7:c516:0:b0:502:2395:c3c5 with SMTP id o22-20020aa7c516000000b005022395c3c5mr9886567edq.37.1679914015414; Mon, 27 Mar 2023 03:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679914015; cv=none; d=google.com; s=arc-20160816; b=jWSTaXGVtI/D3Fi39ACoqzsAX9aunZGrHzCrSvo5ewyZ6fzYvuROcC/POSnY8cp8mK AykljqZRajQkT9Z04XCKKoPUNo5BhC1evfWdz4KChuDkZ7sx1OeVagrjhJ4UNm2oomyV RegMEldevLcBVmoLd6Hp4u1wkcx/0V4XUeokg7alzSTk2Nef1KItrSS8+hfEtmzjS8Ho SNDXDEa9ufTe5httPdBfGMbUwDRW4DqzuZbLkD3Yue0XltMkDsNozon/XLsY2MAFsNzw DyP1nekrkME8qMmkFErlmGoR4J6TXvfiK3vJ9jlE6JxTSv7XWkhRdcmUGYbwF59kK9qP +SSA== 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=KBFKsnKl2uaLIjhlCXZBH7r3/enf1+ISdah6x1WpoRU=; b=TlCD2H0t/+1doD11dTvjx2F6hzmAqb6NuU1gBcRg9MrY2mlt8wBTdDlr4dkl5elWQ3 g2/bMk8svsz64BsU0j0uVwA482rKR4RJYVo6aEvgDPQlFDt3iETU8YqOTTEYXTx8+4u3 KgN5qhOnarn6C3KGnuKZf2992UaU7crsHaouJDQ9AYgyflasC0I9hFtdRYIKysD9LKlZ ULJfWFu5fj5V9o4PMQfVQJ+IZBCDhiQu4rUM6/JUWJwRkamY92ql8AtIeBLbrd7yYjuk MQiZVZXPRqtXKM0HqOzSze1BJjdUxzcA1qo58HEwFX5vl2XdmbrtpjSZWxcQix8O/cpA dRIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=g5j5QBi8; 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 u12-20020a05640207cc00b0050202fbb587si12525370edy.352.2023.03.27.03.46.54; Mon, 27 Mar 2023 03:46:55 -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=g5j5QBi8; 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 3D83568C9ED; Mon, 27 Mar 2023 13:46:51 +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 A0D7368C99A for ; Mon, 27 Mar 2023 13:46:44 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230327104642euoutp01ab98ccbdeed29deb79f004453c3f1f88~QQOKR69OB0851108511euoutp01d for ; Mon, 27 Mar 2023 10:46:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230327104642euoutp01ab98ccbdeed29deb79f004453c3f1f88~QQOKR69OB0851108511euoutp01d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1679914002; bh=VTwYPTRkkgawvEtZWW38nu2ClnnPBGkBUTTUDOAyxtA=; h=From:To:Cc:Subject:Date:References:From; b=g5j5QBi89hKylqK3w37SD3YfDVFzCxU64mJk+DKgnuzk4/Ziu7K6JYWAOeLY3kVuN 4RoEkErwPhwlbeqjH7eb/ggeoLfTxJ49yBBdmUWG10/7nzDDfxZNgMpC0PZlmY1rNa INdU2Bh804X4SuwIamPdlM3+nvrARDdMwCkfleAw= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230327104642eucas1p2efc8bf1d9d183f80512619597b448558~QQOKF-9jN0315503155eucas1p2l; Mon, 27 Mar 2023 10:46:42 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 18.32.10014.21471246; Mon, 27 Mar 2023 11:46:42 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230327104642eucas1p18807289552c0824846334b0061303dd3~QQOJw3F-30556505565eucas1p1w; Mon, 27 Mar 2023 10:46:42 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230327104642eusmtrp2538af038d4e9b1555726043ab06735cc~QQOJwW9Z30071800718eusmtrp2Q; Mon, 27 Mar 2023 10:46:42 +0000 (GMT) X-AuditID: cbfec7f5-b8bff7000000271e-a0-6421741252f4 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 81.8A.08862.21471246; Mon, 27 Mar 2023 11:46:42 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230327104642eusmtip129d7351caa49718dce4d9a4f6b0f3316~QQOJfh1Yp1039710397eusmtip1d; Mon, 27 Mar 2023 10:46:41 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2023 12:46:30 +0200 Message-Id: <20230327104630.1709-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87pCJYopBl87lC2+XPvCbLHy228W i2+fzjA7MHv8WbSZxaNvyyrGAKYoLpuU1JzMstQifbsErozt31YyFTyRrjj54hlTA+NB0S5G Tg4JAROJR/9/MncxcnEICaxglOh6cJERwvnCKPH8+hpGkCohgc+MEpOOycJ07F7yix2iaDmj xLdrx1kgitqZJObM4gOx2QR0JV5+eMQEYosImEqcbN7LBmIzC2hLrLv7HcwWFnCW2LD0IzOI zSKgKvH40h2wel4BK4mjH94wQizTlJiwZQ5UXFDi5MwnLBBxbol1sy6xQsyUl2jeOhvsBQmB n+wSj/e3QzW7SGx//J0ZwhaWeHV8CzuELSPxf+d8oKEcQHaxxKF+BwizRuLQj3SICmuJt43H GUHCzEAnrN+lD1HhKPHuBj+EySdx460gxH4+iUnbpjNDhHklOtqEIEwVib5OMYhxUhJPl82B OsRDouXoHrYJjIqzkDw1C8kjsxC2LmBkXsUonlpanJueWmycl1quV5yYW1yal66XnJ+7iRGY Gk7/O/51B+OKVx/1DjEycTAeYpTgYFYS4d3srZgixJuSWFmVWpQfX1Sak1p8iFGag0VJnFfb 9mSykEB6YklqdmpqQWoRTJaJg1OqgSnzERsza4qPazVLnJu80bGOK8cT3M335P58d/yX1qkF t7fVhotHzD7Ty7totsoz3WffNhZbhRfG7Zb8ZXDv/44PHC2LX4lFrM6Z5/Lc+iibcY7RsfrZ x45KHNb10o8WiX/r+J5t5d7M58fun9vyQ9Tr48mOvBVHYgz+5/3q5uvzndr/c/qNJp2X/9gs Z+hsE5GcYmCglX3Pd8ZbE1u5FNel/HUJlzbtlT900l7R8P6cloq/fJ2rP940vP2x/F7hnrWM LnwGq/fXbA959+D4z8saW+fkB3YpRZ5/4t325sDGbsmdz7SdDRe19Dc3uWQpRe/qcVrUwV1R aNwUHNp7aP5Bq0VnlBZu0JEL75d8rqrEUpyRaKjFXFScCAAXSUnxfAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7pCJYopBo+/C1h8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehnbv61kKngiXXHyxTOmBsaDol2MnBwSAiYSu5f8Yu9i5OIQEljK KPGt6zcrREJKYunSRYwQtrDEn2tdbBBFrUwSZ94uACtiE9CVePnhEROILSJgLnFx3S2wBmYB bYl1d7+zgdjCAs4SG5Z+ZAaxWQRUJR5fugNWzytgJXH0wxuoBZoSE7bMgYoLSpyc+YQFIs4t sW7WJVaImfISzVtnM09g5J+FpGwWktQCRqZVjCKppcW56bnFhnrFibnFpXnpesn5uZsYgYG7 7djPzTsY5736qHeIkYmD8RCjBAezkgjvZm/FFCHelMTKqtSi/Pii0pzU4kOMpkC3TmSWEk3O B8ZOXkm8oZmBqaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QDk8ztZ/dfzLk+ Zb1l4+2HZ7/658Ym6u+x/SD+bOv6bdPiNJt3+b7RnVYmnxmxtmjO1hdP42xdjnTPV/yl4bui 8sv/Ze5X/r1aFnR3pg3vxo1nrl023eGbd/jIJb+tiQn7A7M//FQ0f7kvXUBk/1ON60416Q84 1IXeBgZ6hOg6KrxO3i9voPz1W1ncgep/2bd1bqYHz3I6F7PlUObn/N8PNO27C39bvL5XdjlQ ua2960Zf34trxoFB1gK/tx5+cW0x49aqTA27aF/1G8FcqdzW5qf0Fs4V7yl6xW5V0nWUNbKO 9Ufitgqu28uWNR1wFrOZED7vd8SUDSw6HKWPZjz47nre/ZtB2Jb4lI1cciVbPymxFGckGmox FxUnAgCgXO8o5QIAAA== X-CMS-MailID: 20230327104642eucas1p18807289552c0824846334b0061303dd3 X-Msg-Generator: CA X-RootMTR: 20230327104642eucas1p18807289552c0824846334b0061303dd3 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230327104642eucas1p18807289552c0824846334b0061303dd3 References: Subject: [FFmpeg-devel] [PATCH v17 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: MskvlBfUGdMW 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 --- 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 30f1d312f4..be2a8a1a65 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1695,6 +1695,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 d912704891..e59a1a30ff 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 7acb261bb3..ecb096f38b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \