From patchwork Wed Dec 14 11:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 39693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp248473pzb; Wed, 14 Dec 2022 03:58:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf7c8DcErFZpYTOcMvzcqba8PqZZsGJdd4TivozmsPDXOAXLlp//LgvFhY69aJ6wX1XxsVeY X-Received: by 2002:a17:906:8d0e:b0:7c1:7cc2:1f1e with SMTP id rv14-20020a1709068d0e00b007c17cc21f1emr5648324ejc.35.1671019089351; Wed, 14 Dec 2022 03:58:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019089; cv=none; d=google.com; s=arc-20160816; b=M9p5N9BOM/xQ/OY+vP+NJnftN53+PqmCU8EKOTdMoI1fRVylBenzCXVfd6wwwb5xWB RBhMUx2VdIr6/QdJKWqWt7023Z9Vaq5vDmVN2j+BiLVmJ1Etc1AGCzsQx6ebfA1kTLQ7 u6QLex+LdB3X3VBl5fhLSsj1uXo2d6w60oMvP7NiXt/WUS2pCzEXZqfptH/h52Dm5Ddv k3UZVFBx8q+ystyQk7+V4vpVxI1cTUBuhWT1aB6wOSDBpg0FBFiGMtDRBJo0jshEmwJP v+OmY0JhPqCnsvf1vJrahuAy/53a8hx3a415UqTzkZPmfaM1gGTUfjHV4nS0EUz1HvZU 2tUA== 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=pOp2qV/q7bf7uFcq3fF/HePnrRYV7O09vTvz2B9xcEM=; b=GI5lFQ9I/6Stg9mUewv5B7FjRePkUTl4eWX4RRBT8ZIDU3tWjrgoHt4T6k1+UtG4L1 mzwucKhK3WkvZGBtxUDFx69OeKCB0FwFlhptrCzit+oE06zGrcI4d5T/aVlp9/zWBXRI ke0fJwFJysQa3gqiyaGy/ydb6z1ES811U9fshVtlZNZd04tVEqVZdlbgJ+3GSFLO3SUu +EeXUHCojuo5RFwApptX4u80wuIZZ/GRG9xujFv/LcIsnAQFYk0TdocMBut6pIPVkgsE KpFRaegu1PHHxohu/cE549y+ZczlhRBb5FVr6QDQr8pc3JbFaoHaMC1EYL2oa55KJT82 zSNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ACAjTbA0; 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 cs15-20020a170906dc8f00b007c31599251csi2025232ejc.590.2022.12.14.03.58.08; Wed, 14 Dec 2022 03:58:09 -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=ACAjTbA0; 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 2BFED68BA8D; Wed, 14 Dec 2022 13:58:05 +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 653EA68B9F1 for ; Wed, 14 Dec 2022 13:57:58 +0200 (EET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20221214115755euoutp02ff4f6537987f92508232c29d7e45a5d7~wpv7gfcLT1296112961euoutp02B for ; Wed, 14 Dec 2022 11:57:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20221214115755euoutp02ff4f6537987f92508232c29d7e45a5d7~wpv7gfcLT1296112961euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1671019075; bh=MkCkcGIBpV/SF1GLXVo8QLk/tAZbsaJxO8BodqjgisQ=; h=From:To:Cc:Subject:Date:References:From; b=ACAjTbA0OM6pT4q+Qk+PGeTE/QrtjmssOHWMWOSm3RWSGPr26s6LF6K/B9vE/Yxrz HupLDQb88SOhhJleI/xdd8pKe9e2502Zyua4s+NbwkFXmAJKhDhzlDAFmdLO62mefo ybEljDPdd7PKaK9gNLUFknvuxFtcgdr4gO0HGGl8= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20221214115754eucas1p1e74c9e1356aca1c6037d80fb8eb8c4dd~wpv6aYtPB2801228012eucas1p11; Wed, 14 Dec 2022 11:57:54 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 43.A7.09549.24AB9936; Wed, 14 Dec 2022 11:57:54 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78~wpv6IWjPf2801228012eucas1p1y; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20221214115753eusmtrp274bde22131855cf30ef8346dc7f82b49~wpv6HVQK91739717397eusmtrp2f; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) X-AuditID: cbfec7f5-f47ff7000000254d-f8-6399ba4220b9 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D5.4C.08916.14AB9936; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20221214115753eusmtip1cf53098743a10b025adb0ca7a78aebae~wpv5vVpVH1556215562eusmtip1e; Wed, 14 Dec 2022 11:57:53 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 12:57:07 +0100 Message-Id: <20221214115707.1352-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+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87pOu2YmG9y5yWbx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGUc2DGBseCKdEXP7gtsDYy3RLsY OTkkBEwkpj/8wNrFyMUhJLCCUWL9x5NMEM4XRomPzUuhnM+MErs/LGHvYuQAa+k6lg7SLSSw nFFi0xkJCLudSeLsFl8Qm01AV+Llh0dMILaIgKnEyea9bCA2s4C2xLq738FsYQFniT+t/Swg NouAqsT5hwcYQWxeASuJpfcfMUNcpykxYcscJoi4oMTJmU9YIOLcEutmXWKFmCkv0bx1NjPI nRICf9klDn/8wApR5CKx9uwzdghbWOLV8S1QtozE/53zmSB+KZY41O8AYdZIHPqRDlFhLfG2 8TgjSJgZ6IT1u/Qhwo4Sfft3MkJU80nceCsIcQCfxKRt05khwrwSHW1CEKaKRF+nGESjlMTT ZXOgXvKQaN7zi3UCo+IsJF/NQvLJLIS1CxiZVzGKp5YW56anFhvnpZbrFSfmFpfmpesl5+du YgSmhtP/jn/dwbji1Ue9Q4xMHIyHGCU4mJVEeFU1piUL8aYkVlalFuXHF5XmpBYfYpTmYFES 510xpSNZSCA9sSQ1OzW1ILUIJsvEwSnVwCT6KGJW62JP/RlP3htvPl8nFmYacX13+dqtjUJs PM5m1oEVC2r/XbjnctzJrKnWeY9y5aL8VjNlDd9DrPcsoq9VHHyUaLMtnFf59d6grn2zfL0+ SlWcrLnmoyKx6EzEH/+Vanse5ohYcP8ym7Q6dNuHLgEVJVa5A9Mmbby+zPlB9q5AOf6MaRbF oflCsXpV5tWvz1s/9pWVkGn1ONbgsfxkyxPW+88Wf30T8Z6XkWVGt/m7nnx2150e+Xav1ZyO mAkGKx/I+T951Q67OV5M2x6HshXZyHDPaa9xnDz79YqfFr6HA68uE9vyNDL5vJB0kdyHKXx/ f4a6HmY4/vWw8zc74z7+TazHFV1arxstUGIpzkg01GIuKk4EAIxHOiZ8AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qOu2YmG2xbYWDx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GUc2DGBseCKdEXP7gtsDYy3RLsYOTgkBEwkuo6ldzFycQgJLGWU OLCrm6mLkRMoLiWxdOkiRghbWOLPtS42iKJWJolrU5+xgCTYBHQlXn54BNYgImAucXHdLbAG ZgFtiXV3v7OB2MICzhJ/WvvB6lkEVCXOPzwAVsMrYCWx9P4jZogFmhITtsxhgogLSpyc+YQF Is4tsW7WJVaImfISzVtnM09g5J+FpGwWktQCRqZVjCKppcW56bnFhnrFibnFpXnpesn5uZsY gWG77djPzTsY5736qHeIkYmD8RCjBAezkgivqsa0ZCHelMTKqtSi/Pii0pzU4kOMpkC3TmSW Ek3OB0ZOXkm8oZmBqaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QD0+avl2Yr FDM93sXgKPb3CedMPiYzjsdTYpZOmCdU+IWhK/3sGpem3ld3k/dHVKUtCg283f67PPpE3Bf2 91zGk+vTd7Jsd36vkrq1qXPP0eon11w/sIov8BIwqhOerd1/UmLKsuxXK0rebLfsDhReEsIl nf52VYK75m7pOSf5P+Yc3ywq5a78+fupmQVSUzQ2fdtb1Hr29+LuNWvuJRf9v8s6eWrN6XnV a6sq7c7sL3ITtJe/w7z9itWPWXdTI85f6V/gf/pfh0zI5zqN7X3LT9rMfaFskr4s6+nRvQp1 /fIxkivY/05T2vcvfJ0+V3nKx672+N92DzW9/56Tf3BjuvDVBufkPTsanota3bWYvEGJpTgj 0VCLuag4EQDs+lYI5AIAAA== X-CMS-MailID: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 X-Msg-Generator: CA X-RootMTR: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20221214115753eucas1p1ee8c487d716aacdc4aa40e4d1c830b78 References: Subject: [FFmpeg-devel] [PATCH v15 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: YOszQNXsHT5G 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 9f42f09f4e..6b8a1dbb79 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 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \