From patchwork Wed Sep 21 01:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2314981pzh; Tue, 20 Sep 2022 18:35:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7q+g8wWvMKBHgHpA3S+PAWrwWC03C+qXF2lLazRV7HRcdZqhWX50QHkFR1j5l3rtZ4jbeM X-Received: by 2002:a05:6402:1283:b0:44f:2daa:d423 with SMTP id w3-20020a056402128300b0044f2daad423mr23085238edv.52.1663724154183; Tue, 20 Sep 2022 18:35:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb39-20020a170907962700b007804e2f5bffsi1533637ejc.721.2022.09.20.18.35.53; Tue, 20 Sep 2022 18:35:54 -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=@outlook.com header.s=selector1 header.b=aWlhrcqo; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F310668BB28; Wed, 21 Sep 2022 04:35:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073069.outbound.protection.outlook.com [40.92.73.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3744B68B962 for ; Wed, 21 Sep 2022 04:35:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ca7fL1urK+qIbHGyA18etFVwvi9zHw8pzeL8QwsBwXZGOwzQ525+qAu/uzSC21KfOodPYNQ/SwSfN4lmpsRu019YYCVF43zZhGtBbaa00ObyieFJdPrtslHGBltCkvGGuZQE8r5wpdLvA/+ie6VqBazDCrsNFiRY0HSZmW9SZqEbBkhrDooTDSyLn36wq0qbSzOT84kqUodA6PQFTh3+GCf8ArnbxgiuQn7OPFPu9enhUK+5DOTe9QNu+TasyrDvb2dJKzZN1X8CZH5tQ4dbKBt5+SdcyXQ5L5c2IZUvjQHzicwqWxOZF92AbGaYNJ0p/CTQRSvs54bMNx8fVTkheQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JpMl/RV72VzKw/g/Km074hs8+S9pEPPgGbzbO2oqRYw=; b=BmPN/vWirXEblZO9WeJ4D9bqPmmTl7D6tOzjZssnNv0OLNHRQSEtTcFbOaRqqOXD6w7IfAx4SZTM0+izUj4+RtRdGWdVUb8Stax2tStn1V47Nw5Q0HKTSuyhHmVuwgscQT/VAPseeLspPdHJYizLD0/VUE0bG7xXLDyNR+USNiV9wz01pK3Ro8uqeJjz6Z8eqJp402L6z2HlyiQy0Q958GJ8x4/iLTGQ5PMTqfq3WcjdH7t199g6je6th/QyEBoOgLaqPXA4pe/kgW1G8kDrS6zk6H+GU782bvQ5icGMu4LLN+3JPRlRcziRTm9EdHv6UF/J/7JlLQijPOxK1/F9LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JpMl/RV72VzKw/g/Km074hs8+S9pEPPgGbzbO2oqRYw=; b=aWlhrcqoVAYW/j5c2rEwaGYwPDBGcnUveCdIkinHse9K2V2yXyxpCTJpZbcjEZsnh5r/I02COpa/MGln5LcNp8xaGGwXGQ/W5NfqsZgE15Me2vQNFsFFXDHAf3T2oUvGuPjCeRNW1uup0fzGCxAdT5Q0OJ/OjvyTD/DV1PfWBD+vUEZo6wulDHqTgkHDBNwRYTczmD+zRcRmMFzWs3PPDLAY2ePwLqVkaxeiVCG8Y39wZWqnnw0B9Sa7jMtI0IQ/TvFVBhZG5qF0Aq15Fq1PxbxZG53fE0Rj5opxwfwgO03bhyCQRUibQpaQWuOqo/9pp4trs39BoAdTkgVqeEriug== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0206.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Wed, 21 Sep 2022 01:35:43 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Wed, 21 Sep 2022 01:35:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 03:35:39 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [VMno8twCb9/krzxGzcCVCNonGgEI6vPelGeolbJji54=] X-ClientProxiedBy: ZR2P278CA0044.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220921013541.245789-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0206:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a81b7fc-5e26-4bf9-e03e-08da9b719989 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rOHknB/H9spYzfduPzIXwshBKsKCh4tfCdCVjQ2vfK+oFZwApxs8nXw3fDy+WS6FO7OePHUSWNCMgM6l+R7x49FU8CoMiK4mCscSTEHIs6xruMk1uJaMzh5LMcfEBWTHFMkFku/T0dsAliM58DKXeI7HpJX/olhfsHEbPlRigU2weon5gJSXWtzq8LXqMhyV45wMeFNSOLBfrUb2soknnfM3bPMPcnMdiYqkE1V1GzFPUKe33Rm2kQsryoemdUpRFa4JNXCO0E2239g8E8YKOyQ2NicYb9+cPGWK5blFwbpuSoycLvBRbCbKOx1BOF6xIjH43CHrd63eUrCJ3/7aSdiFmqnEO9xI/qIuAvFb3DUYr1O6ApvPFaeNZImy8TnkQuWWl+7xAYrggyb9lpVZNeSvYOCVGnu4AGXdKeRhVfvjUVFzhI+6d1kOtKDEB9NPu41bwn0WiUTUfwgb2eG6tUwaXJsv59p4VxiIRhSkny2A6ChCmeUR5RqrVSUHLa9xhlFzKhBEZC3Mp7bmJZ9QPrRmxirsB+LnfecEs24NlENP05SPDeKeX3lcaHoByosI35pqlyo0MxQjsYyH6FUszKg42AxGCFot69eMpVJMme+wDQNYzpLaxT83c6FUr/PgG+yUR5Si8aFa7aNd7t0PZ1L+/PaWX1fyHG7FiCh49dCtTHSaw7p4FNND8j8PoCamQ4S2iiTwVGGyHTBc30OUuhh2GUjSezdKGskyXYZyx008NJGWc5ddyY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w3ecjjHZvlPYqxxeucBsbHVu9v6+ueUKBiy8gF69oQcpffMAJXiQLswR02LHp+cJPJBjvE6UN8QaeY5Nz+NxjvT5EFQb39tfDwre+vIDDj9MTxTAlbkU9R0MOfD1yGgbRoXCmxgMnzoMnL+Ps2diAAdFRm5b5auO5jZ2ykPyl45BzstFlLrI+sqRARC0PSNda5G4AijrpOj6U+ZrPCPHENHcNLZiHAKGdiFp2jg1cvnBoeWQivsQqp5PR89aAdyrauE0VOKcGWLOIjQDS22ZO6vHZXTid4A4r6XJFNXgNTZCOe2OmrooNlv2AnR1oG9tq/iCdfdJplFmtLVGImLrn1ONi+twlfOuPJWixohL8Kpg9Q7f0o6bd6d2/+y076qFs7B52Kl751nOq2iimWaWDQYuZQSSyOg0qlK/65suQhdwr376kz9HcAsc2z27P8pOhG7/rwZICsgfXkXKT6rli/X9ZfCzgX7cN6hXl3e/lVF+pOeXrmQhp70tGRAvDlJU3o5xhFcONu6OWhu8EireHibpIMF9ZJSMRa46kuvA9FcsfZhL216Im3eimMmIk5Cf8c84PDGTy1n0/loIscKEkVIEuGSywQRupFD0bnDRJf6ZSaMphzJ3WiGmnowWwteFkuHI+Cjxw+s0PjP/84/rQA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ijCd9yBBTv3cDjLf7zbb54lMVZPG2pFF431ejS70FFAxSB1xNg1PNlGo9preU5FiXLFX6LINWJDbSNck3EHs61R77Zn7vI9iNvAMofL89ZfUEgOU4cAtWlvu0VzMjZ6WgM32FnwGySQ6jeMMJes4IWyralUWX3wgV+5H45T0NFFETqY333AEE2I/8hFs8Kx6cECHYs0I4VlwgQnex7j58JI3j8GWeJkkX6XKxcJ/BO2ttvyQaSxRmHbM3bf9fIpmoaro3kTY6Mwv27NMqNlkEPfBIEWjAon5yrjsA7nzUl1Nc/aK/lCwqJTH4em1vj8eSQw5U28cZXmOEmHRyhFcK7IbV7i3b9qARezJqOzW/JEW7oocdZ31eAN6PCnH10PBtdZ0lG1a1JQ8qK0eSfNP5QjILTLYv5lP3PXMVkr31yIVrsay+hXvEOMb81/P/ij/p9XwJ2viSkctxngjwgqX4ThNS3vsdg++NirZpXxtuJXnjt3AotdTith2zcb3I4FcYg23b8O0DlZRNwUrYcGJxKz9SGWsq0A+FEzs4FjJb6dFubt97F2jBjbFgwuQ7W19Xos0aQe+kNdJuWeKJ97WlCVk23TmszdjelKC3uVEFT2VkBIu4E16djWBA4eyRRVJEGXM53qsImfWpIuYMokE+T/3vSQjCi064ddFujK16ZZO4seXCLMbo/wCqFMyxHjM/R4s0mmAZyCzewDtRFDH7bf7x5biZwLeojHdwnPBbTEAlbGnPAGNwHYiYEqN9vFNXBnDH33gyaWIFS7HoJxriRK8miP54MA6lFablc64NsmwBofK5klL1OS+70uVs9KIacs5NfgFuGyws7hkgRMsDNZ/SnyTxpxIPlTYhJ6TyPK81DaSURPrlhMZ9BJkRIB8QpB0n86i1r/+Ao+Fzp5JzGGCh1fRZM5fl3ej8cOHxk06vWddaSExdVPu9t+7zIzxMW0FtrvWunTP714B3+oo9kCjVd5v1yds4nL1ZiZI2HP84qMB99oUJ5IRuViN7OF2Z/i/1fHaidUCS+qzX3XJwB2lcVUOVFgSJMHrxQwhxqdaOc0ejlSMFYbzNVoRVbYFZ7vk+uzrZ9fCghbJrV6r6vczoczdEuO7FQOs5e3foK42gm1KVSSZzZdqmIGLT8WNAbIM6twbeU7f425Nw14jCQaPoCzLFFbnp4Tj0bzXGlbnXBR0rsaMdEAuWi+o3TWDUo/PyjuUh3t5w3KuoOpvzc+zGrUuYI1Pbu0JYch5G/+eHiq/3KFl1cLjV8EYipravV0/aS2ygHDdG3Xi6VtRjlhsDKyZdlGeOodYVydoT0YuTsHs4vRSsJOWvZRV2Dk8 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a81b7fc-5e26-4bf9-e03e-08da9b719989 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 01:35:43.7781 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0206 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/matroska*: Use av_chroma_location_(pos_to_enum|enum_to_pos) 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SJa5V587xp0Y Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 +++-- libavformat/matroskaenc.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 16a3e93611..aa59f73d00 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -46,6 +46,7 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" +#include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" #include "libavutil/spherical.h" @@ -2184,8 +2185,8 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { color->chroma_siting_horz < MATROSKA_COLOUR_CHROMASITINGHORZ_NB && color->chroma_siting_vert < MATROSKA_COLOUR_CHROMASITINGVERT_NB) { st->codecpar->chroma_location = - avcodec_chroma_pos_to_enum((color->chroma_siting_horz - 1) << 7, - (color->chroma_siting_vert - 1) << 7); + av_chroma_location_pos_to_enum((color->chroma_siting_horz - 1) << 7, + (color->chroma_siting_vert - 1) << 7); } if (color->max_cll && color->max_fall) { size_t size = 0; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index ed1ad5039d..147f29988e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -51,6 +51,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" +#include "libavutil/pixdesc.h" #include "libavutil/random_seed.h" #include "libavutil/rational.h" #include "libavutil/samplefmt.h" @@ -1322,7 +1323,7 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st, par->chroma_location <= AVCHROMA_LOC_TOP) { int xpos, ypos; - avcodec_enum_to_chroma_pos(&xpos, &ypos, par->chroma_location); + av_chroma_location_enum_to_pos(&xpos, &ypos, par->chroma_location); ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ, (xpos >> 7) + 1); ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT,