From patchwork Sun Oct 23 19:35:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38919 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1859719pzb; Sun, 23 Oct 2022 12:36:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6qxxnY2ClcW/ejzc2VOP45Ru8e4eCVUpO58naVW9qIGxbKYpWC6645M/FCTfZG0kYDxsKC X-Received: by 2002:a17:907:2bd5:b0:76f:591c:466b with SMTP id gv21-20020a1709072bd500b0076f591c466bmr23292811ejc.504.1666553775391; Sun, 23 Oct 2022 12:36:15 -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 i5-20020a17090639c500b00781d302d5e9si21589757eje.166.2022.10.23.12.36.15; Sun, 23 Oct 2022 12:36:15 -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=FVaBXRqm; 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 2955368BCAE; Sun, 23 Oct 2022 22:36:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2080.outbound.protection.outlook.com [40.92.50.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3341468BBBC for ; Sun, 23 Oct 2022 22:36:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ln/Rd4ZW5u2bIuRm8tRoXWweBdNqFRqcrzybQshut0mnbCjgeAYYmriFqNhip3OxTXmoEGcEipCVk3S0nj3JbdTQpn9A0eJwBFzj6WLn8MxTli6CqkGOJ7Doc6fy4sy9koZrakZB/VMBD4+ypfq6jB4VXIf79hAl81B+jqdofOtd9wVlFG5KqR5DCLBXJU8+aoZhaYJapZBACpdik9UmGNKzTWWGB/RNirkiSDEyubAOohjmw+6GKfsV32a/Mfx1B9iVjigiCJGRvNU9clweH2hhbdhhSjI9159xFysWBoPi1ewIS83nHUY4hn6eNDirjtfe4LoLGBZ323ms0K3iXw== 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=xI7KSO+RAJcpKqlX7RWXixv8Clb7KAIoPuIaFsjalTs=; b=PVNF+VWmsJ6cNkMT1uYUoy5h0vJIyoIBra0dbO5lwBrZeJ6YAChCMgBBDUsNpS18Wszfe1tz6CoGKQaqoN4bX0CzoA8P/43R7gQohzFQS4hzxsunvOcql/9zyMMkTx74036rEj9KNdpTplgBp6TkPPWnLgwL3RCAPznvC4NLqmMe53Wk3MKxX/i7KgVlq9di+4fdUkS7WsIuccBEY+k3lucErMY6ZBF606gZCfBMQ/3bbd9D95F/Uw7UhOc4jlqChDDIrfhz0ZPIZTua9C7jS2nr/sJOn4OKiAqaQvBoDuxVfjHtIJlWKWUCemLgCvAMfYjqdcZMqQE2A5Rs8CazRg== 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=xI7KSO+RAJcpKqlX7RWXixv8Clb7KAIoPuIaFsjalTs=; b=FVaBXRqmmYz4yN0HP2XKPg0Vgigu6f4u5Tf5Tu4D3DKf+ctO9oz8FZOb/I8E6PomCtIyqj+zPg8WBGLvERB/6r5iC3rdnrVLfHTVqGYxdCW52Esw7qddcBl7Uk/x5onvVJuEYmiAyi+pLsn9wilTg8g7ojiop0KkNeMJlyTr06X4GFHwupZ0XJCVxEF8kcTj1bedFdFCS7NJtm4QITXyGuG5CsGqDVdJp1j1ZwDeGd/0mVpXtweEkxqtyqAd/+WUjzFDBs6UYsw947tQWG0Mv84cEM1aWWFKMBoukCpoihNtQxpanjYostHKpGgf5+NrQQwrBs//rKznI4pV1mmw7A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0825.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:aa::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Sun, 23 Oct 2022 19:36:05 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 23 Oct 2022 19:36:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 21:35:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oI0twS3yhoATaNiOoprT1QJFakof/LAliph1prTmtzE=] X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221023193610.674990-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0825:EE_ X-MS-Office365-Filtering-Correlation-Id: 20844988-b79e-434b-bbee-08dab52dd36d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqH3kRfXJefTqIxzT/YbMNW2T3cUSQzMp2VmnVUesNnZabFqHxwdJq0dJd2UFzCkpF2ttd8DeQWzEpikuspurv0/X6S1e4t6vulhzyBt2wJZE6MR95ArdzYq5dFrMvvclAgJ6CVyquzPW3bDQEny+7pqObg/JoG1DfGHFN5zHiIzN3qb+Z3TA5FEOjYks7RV/nuF5tyC+DzVHKx4+m1sIGZezWG1/gEYwFr4dFCCKBEiRotvFzR7N9hdSJS0hegfMHbU6dVQdAb2kevWZSJcb6m/EBtV3J3LKEX36I1odNGLDEXFJ1HXT/nqjQwyuoZlUudfYr18BVg2f5iekfE5aUD/Zw0/wjTZ1Gd1pYB7sK8S54GdzK+DF3E3HNVh6JUrdbreoA9NFd3c+DjMWif3Q9qh6huF9MtRtIWpQE5f1TdIt7bFhJTFc1L/f8d0z8eadG2cqph1MaYjawtHzPcZeNYyfyr4AndEjNkKwI8d1ugWkFpNWj7hFEARr86L00xulnINdgMwFNFujR2448dm7OytUiPiviqWmLEcNevhtAmsffprWfDk4smSortyTjY5xArz3X0aOqvXelDMCfKZXGLQrjEmRJYMIeJEnkep3pNxdexZOPJUNfPzqE9gvYgXSk7n1UULump+ojACvEp2uR5Mm+kadekVrpH3SVv5YRQaBfsvwbE8hIU3xr5z6WjvL6r3Di+Y4iUxETS81ta9OClBmwDRaRDHcwrivuRVC06tdWx39yMyeD384aNDjqPIUI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /iPTMInLlOyv0RTAafMn+2Jq5ijjYyfM8ivzVbpl+IdmCgYXxNDljr88BtfuDKUi831iSer52Yu1LlaIIkMG5h+zPlPEInhqoYiiwrAj6TkOQjgXKoH/tp0e0J5TcPZ5zXvSx0v5FKSaKFADp7GwTiNxeYuAUP6U1Rrzh+X8INXpdVwNSr0DygVhvsWVBZfbqKu+yJowcbtD3gzDy2Wxrde1HwZwx6gyO7dk4yD0YF6uZetkZ2j6SLu6NmOCTFBSfuo+JaSoWsgHlsKSKkbBRa4/VzRW9352T7tM1XmXAFnE2t+hZEs+e3lwz2NZ0avUtN/Be96aH3LocBzwluDiQwqC7difCZsDwmmhpyKg8hzOT/Gx363lkLL/nYjKP54lTvitgFmTYRd5HZzGbe5mn2xQQd7PelKt3QN82WS+HCfYP2peHUXgpfy7Of43Qanlg7WN1v/5hXrcApco6CaCryMjb+oJa9+us9QYmW1ONgGwOq7Kg0UmCfpfj7deCxFparXocHA6T85O6c2VYUo6ifRDrOnmIpsrgk9Kv+zO8cDWnLreVOUlZBNu+ofX5UtQoCvNjXvuMzLcM6Dkn0aJ5UllatW11oFZzmShCH/e/UzsE+t/8c5zfiTt8bCZyFR2GA0SZEOyePcO2AeDlauNkuvPkP2/YAnL6wV2BHtNPZ0aW1qp/xnOcWJ6B01a0VKo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RSIBI4uDta74FwiAZ/4DRxeI+Vyz9B22qFoXlV6iFiksMrJ4fuzFNHllyVjxteDRt7n5gu8IZaZgKxeC9ajZNNhLsxVoc04rslBxHUETj17tnm3Bt7iDmRKC6N61l9D0Qr2whGt7XHFC5mhMAGdPb5V8uwDXDYiabMbHvB/3cRULv/XerVmznpFPZLGcDLKt7pMyxESZ9+teApHafAdm9MDelS+QJCw+tcDCINMYfaAnwZk4Yrz1XKgWRu+ok9nmQo/mn6PVxfDUVn5B1rcMmTg7ZgX/jsxN/T9qgYvvjY1SPHSWiVLNL+0IpTLOmhVd4hoZiHPJQCuuXVQYlFZ2YC1SNOUt4+4RH0pcaJeOBi4j+7bbwr8KXvj7YzvQARzXNZrSSdBnHyPM3PulMY5Ftkn5pndD39XEGmctRUXnBfOXauVQmFIRs6mpsGJy7Z4yyaKugsZYPuaTZn+cdz5sf04ETyDaqzk2peB1vyNfJCYfIP2n2wc6uuePJzqiva+TEkK6wY2fOb3MfN6KxmjSt9fR8J5mhnvKQl+O6sUZ0VGiiVj12RkmnD/4DpepkwE4LHoFcLZd7MWMiKg1reidBAC0Abo+osvOWTvddMZ6QmT5HuB4JCkwaYZcyAL9h938ftOgd2vNWU9z6rEQgvv0YnqjIaybyGqyOPUV7poABNXZf+En24iQtPJCtduWeCGgBBFb5g5DiNz8VvwHJBX44RKPOK4WjrMT9B9CiBKlO2LrR4AZ96xgGvldNOf2NbM7F6Rn5Zs2igj62FRBHG72og7sAaXHu4x/v4NRQtJLig5cNXsuPdExBT0kiBUM42OlZ1sWDGJuA9/c1HPat2ZkD1jQ7URLjEHbaFetcF2WUaRR3CuFlJio0FiEkNWJz9BZkuBmFeViX1RQHud6W3l/PlAVxzf+8e/ShU1SJpwRmoIzfHGJzkhFF8KXJqUypbx78Y09DnwxRBwRcSMeJxFG35lEfgGAadIw17u0OopUoyEl8a4S0dr9PL3YSPzheOPx8bcnlXl995Rw30PIeg7MVkD4IFpx4eiMzuJq4jJYr8CtWBoj8G+NlPcfopTRYLTl5gEALOHFhZxLfRP7xlLCi08mKmTCjoKHFY+s5R5R56ad/mcLFZY6Zu5qQKsAywrDIem6ExYvo6O0HUExQJUv31e+SgDDjjCpGOVOm1QFjhtJUiEaMP+RvgIkDg6f3pEAQVXArYqUsfwV0GAEtdxqK99UlFmFV2UnMiYh+2Oi2dKvcm0R5JjQtvojrt9fI5Z51ZEypICLBENjjmasSsd8QDU81hI8JdonHRM52IAPLYiI/DE8cZcF87XaRh6eucuF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20844988-b79e-434b-bbee-08dab52dd36d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2022 19:36:05.4028 (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: GV2P250MB0825 Subject: [FFmpeg-devel] [PATCH 02/17] avformat/mux: Don't call ff_toupper4() unnecessarily 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: SmkvVgNu3WnZ Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 5d89458f82..a7517dae0a 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -148,6 +148,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) { const AVCodecTag *avctag; enum AVCodecID id = AV_CODEC_ID_NONE; + unsigned uppercase_tag = ff_toupper4(st->codecpar->codec_tag); int64_t tag = -1; /** @@ -159,7 +160,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) for (int n = 0; s->oformat->codec_tag[n]; n++) { avctag = s->oformat->codec_tag[n]; while (avctag->id != AV_CODEC_ID_NONE) { - if (ff_toupper4(avctag->tag) == ff_toupper4(st->codecpar->codec_tag)) { + if (ff_toupper4(avctag->tag) == uppercase_tag) { id = avctag->id; if (id == st->codecpar->codec_id) return 1;