From patchwork Fri Jan 21 10:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp342633iog; Fri, 21 Jan 2022 02:15:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9ZLs0TEduaJd3BTMAXubnidnXsq/J22aSA0gw11janXr0syeiv3y0QrYDJQvnrdZnea4g X-Received: by 2002:a05:6402:5112:: with SMTP id m18mr3703486edd.45.1642760158462; Fri, 21 Jan 2022 02:15:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e13si4969889edz.216.2022.01.21.02.15.50; Fri, 21 Jan 2022 02:15:58 -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=@outlook.com header.s=selector1 header.b=BWNkkLNJ; 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 6A47768B276; Fri, 21 Jan 2022 12:15:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068038.outbound.protection.outlook.com [40.92.68.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 526AE68B0E6 for ; Fri, 21 Jan 2022 12:15:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jmCLJ76U66ycKCKSD00Ob2L8Eg1l0GMrpMXGiOcsM2wVSceUs4gLoFHTRR/MQSO/MF/8wF3BZ7JI64XPDIBsvFjZzW6v0XZsy40P8sysAfoNEpvWq4yvh6cNheF7cEWOpy4lg0iV/rv40jqF6qpb1h+3UMud67VCjnbMMtKdJxOxcTSmcoebi9ZnB71oooIQ4AuKYOp1mSzK1u+1Pc9d76/O+kI0U4xAZ73dSnBE2cN4O68edA4JPhVx2ZBble2ZaV/0Hm/PtADk99yh1TlzgcjIEpgHqv69nCQI38aJmUo/pVQ1vy8YJkm/azGt74bhFTQnF4paQM6mpqjmlPzOxw== 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=M93o96mXzowwVfbTs+PN3YFk6Feyz8Q8U3i2u8aCA9Q=; b=OedwPMYjt1vdCQe1hGGp6s5gxF5Tzsla5GDn5gQMUWENPN4mGA10x8ZgTWhr5U9DRz9nmWEVfGRznT+da5bUWWZMOHM/f07sWx9+Z8himuqJd7SragaPB2ncVywxURoXNERYPDif2dka4YTEDC2aecNAKlDcXsLDZPOaBMoLST5LL9Fx+Ykus/5jfpDhP9xXpdeYxAKPGIU7cutrJSc9tlCJHt7gTeRLsdpmpqfiUtK3V1Of4WICgh4WB1GK+Hj68LJrXY8D/7JK4Nm7HWTPBf2UxYugL6PQstYeIKYVPIiZjGQ/UN8bWAfi3yP0/vn2WwcNurbjnlk7Koye4jhe1Q== 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=M93o96mXzowwVfbTs+PN3YFk6Feyz8Q8U3i2u8aCA9Q=; b=BWNkkLNJyimoEeBWoWMP766AKZWklD0+6ywbqJkJQpEgR2+VtQZ6ENjQLZ70LdAlG9b64rhkpomtCuUfSJcdbfAHz8ULEkS9hMZie0kK5de2yUV5DmMb5zjws26JK19su6RHYlTqOm0hE/52xYksexWiwMPGwPFEUVk1prg828dqKoy/43qvQS9NyVSXmdxJVxbfhCR26LBrt9Ye/ixBQQCdzXGuTztBzIfEIl8F1SVyXUL5py+0mtO5AhkKUpIdySoJnPeM8z8Tr6YjTvRoAIHZvS2sNMKFws5Jjbw7R29E3zm/JTVMLtYzMCZ+jV38zYX7Qx1XzFtszacM3dMS5Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7987.eurprd03.prod.outlook.com (2603:10a6:20b:42a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8; Fri, 21 Jan 2022 10:15:38 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 10:15:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jan 2022 11:08:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [2592QVwMiPT05sp6DICjMrd4PEGLW9sQ] X-ClientProxiedBy: AS8P251CA0013.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220121100802.1395396-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62f0a0bb-d2a0-4088-f901-08d9dcc6f83b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvTQeIjQRbdAAe0VAPuEqhdyO/UHbSJptJqifXBkYfCusb/XXrQ2tJ3hKUxaRQzosMvEbt/reJX7HA2lpDFYDtWcTQ1Z/UaXhBJZNjwynZPbZ+OPus1Jhw2+k4jwi8bCYEdJ0CIOcW6wx5QLDH6oVtWSysOf+tQs1IhWuXoyRcd0HW8OxA9OEtBh4CS7XDrZc7tHS2HFJOqNMGHTipmT94TcPrf+NrpuIeyvxJLwXK4oGKH7sAtqEZhQ2nzhCq28ydD4IY/bRHUqHvdcykK84KH7Y4RouIeBxpyKtGjKC0yKaoT1//jZ7D5YnHrVTjeFnoWll/P5JRZVU7Dz2z6Ws+ujeqk3gloFFzxyiEQtGNBSfJB3JS2ixVvfu93M1E9dNAxEdHshfIKMcXXFPVHjwokcEu4hGWsX9wknIpmRwobW0v16lNXsx1cAi2uB9J3eciw0vnT88MvrwaLZte786LCZTLQaCW3Cd5EqpO4I+lWCJF7IB+KXDac7qD7YWvDFSRB0443r2QImpM4cuqIYNR/elX18GxkR6xYo5IH50L9VyWH3TQF53ltQMjGxIFo/Vb+lGsKYV3LXmckx8l+c3GaWTeW3F3C/N5sB0NpOhLXkdALf9Tewf79hQzrYFV0KYylBJDZeJ4IlMlYORRDUgVbTFJ6SuyxAaim195AtsuBQi7I3rQssnkGcmDrQPUHoHVFkWQ1/MOWpj9fMiE/5y867jP58NKntIC5Ir0EPWXsQFNUE7oWNZR0PzSMaDRSbAPkXNaHg7CAbUc8MW6gVlYv X-MS-TrafficTypeDiagnostic: AS8PR03MB7987:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6PHJrze7e10E1qkE7EIXKwXecn3v7v2lpgPT7cuux5uhxtOT3wyWQd9cDOU4mUfnXW7Hk6HURq3Tje7j09x4mvRAsCSw0jdWFe3EgoSx7XSTXeyG6rdbolgmX2rUJB3nnXoTxiFLG7vwObzwgPO65mt+h53IK9Tl0rbBD8O7rBJeVg5UbYCpK9mTCf+9G4IRAjEiifk79cR8GTtO3ijF2uMDo2aHOhmI+RrQAl64maaDgGQC5fmQjmfpcIQukrTgwD4xpo8HdJJ4kBGseX3MEdwWl+sEyRG3qVQ7bh4fZFKP8hpyN9LE0WYvaxOLFPJlk5uYhirDrN5G35DFqsCTWp+YuSTakJi8TeRLJYA7xPg0FrWC+UH3FLdlpiLSxz/WVEAXYpn5Kcr3tZLi5bX75nrFcoU5pyDFX16jgay/cE8/N6Y6H3+w00UiF8ybN1yFyk50VHLWQcpGD9dDl2e8l/Si4EBIDRNVhxT8xFYEZcvfwLN62XwPVhbHPl0bC6refCQTnvJeLvr7zbBOObeXvYdcphFuNuXqBvFOJVXnMHNOljl5K969GZ5IFOLK752b7fc/+q8PeLDRXitSU8kyawdycksSqg6/n/zBP0r7TdO4qQlPZA56jaktYTDgVK7u X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LgV/5sXgz01b8UgjRBzzuXCUCcVMjRMyashMkCeusZG+xCxVuD7pU7Up+peJ5q46YJgQS6ySbZDq1565Ttj6U/Xrx26MiNzMmEpbN2qtEkuvizqA7oVJpjZ585J1nPdNTdcZlUZw8rQxPBMEErR68ZSpLZ2AmlgnSklaDBHQPzHpC4pD0bVt/ym3iMrUpu7EnlbujLRYC6/ZtUbZyC/uBXIhRQJrbxmTRnAaS6WLqQmWKg5v7zy7FuEd5AtTJugDvfk5PQbyNpoCqxwXZjb7wScBMPtpQbRVAfp4MwHVRhEWje2AaEYyRaPR+lNtt23ziZPlD7O25+h1L0otQMdzYRbMn1uMVBNor62Jjine5b+bmTszFZpjlx1ed68wYjuQ7h1dnX6qC74+4RhEhzYs3ImbdS9zf0OtYtkrH/pBMkyRa7oLspYmd7DnYtENRiXOrozphqpOpMin5fyVFmTtgziJxzdH+bB9wACciNx2t6Xv/rb5Q9r8K4bx2ELOSLG3Uxn+b+kSgDSSgNUtJx6CzIxwSWl4/nMNViCuw2G5eJO+0B7Q3E1pmt/9G6tF34Gp4QqW9x8dENnsWIq2e5JWVUWzowgoX/8P3aHYciD+U2Ld8n/ehQSlXC5SZIWKBfLifDCjQPrD5BnWxqoxK2aM1JSxLKH8sQn+12Z/5+aaeS/jWYu8qFbuxT5gXkYIOaSOAlRsDVyCfQH5RSzy323BjJ6vwTq3XvsdcDgw8I11Zgt6Pk2AL1ocSWvBG5n1BB9k2zVG8LJZa68HW7TKFt7LgGiwH8YYgyAkMwVtFrsBPdPjbCzry65DZR6Xe9BjKX2ZSUlPhpYsO1AMVZoTaZuv/hY4WlfXs96GY+BJYZGPVnmcYTryH4AzVayLnTLoIuKrQP7lqQdcndk/O4IWwfc2xhbuIx8+yJ38w2dKg5ShxGKCOSeRP+rnima24PGWIUOuIY8PLtWW38QyQfnrm0ieYQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62f0a0bb-d2a0-4088-f901-08d9dcc6f83b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 10:15:38.2384 (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: AS8PR03MB7987 Subject: [FFmpeg-devel] [PATCH] avformat/mov: Fix endian-dependent parsing 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: meNhnMsWNA3E MOVAtom.type is always read as a little-endian number (despite MOV/ISOBMFF being big-endian). Fixes the matroska-dovi-write-config8 FATE-test on big-endian arches (which runs into the "index out of range" warning message). Signed-off-by: Andreas Rheinhardt --- A few days ago I sent a patch using the dv84.mov sample that also failed on the PPC BE endian FATE box, yet this test reencoded the audio and so I blamed this (despite encoder and decoder being fixed-point); see [1]. Seems like I was wrong and the fixed-point codecs are indeed bitexact. [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291792.html libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e401cd39b5..1437d160f8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -407,7 +407,7 @@ retry: atom.size -= 16; if (!key && c->found_hdlr_mdta && c->meta_keys) { - uint32_t index = AV_RB32(&atom.type); + uint32_t index = av_bswap32(atom.type); // BE number has been read as LE if (index < c->meta_keys_count && index > 0) { key = c->meta_keys[index]; } else if (atom.type != MKTAG('c', 'o', 'v', 'r')) {