From patchwork Mon Sep 4 11:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1137129pzb; Mon, 4 Sep 2023 04:28:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKQozX7v7j+bI/V69otF2qKjMw5OZDL48mzjerVVpP/yqnQte+iIZsRHnHv04KUbB8Mo1j X-Received: by 2002:a05:6402:12d7:b0:51d:d390:143f with SMTP id k23-20020a05640212d700b0051dd390143fmr7241456edx.5.1693826938679; Mon, 04 Sep 2023 04:28:58 -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 g22-20020a50ee16000000b005257711dad3si6206785eds.419.2023.09.04.04.28.53; Mon, 04 Sep 2023 04:28:58 -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=ldc25DCo; 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 5DCE068C7CF; Mon, 4 Sep 2023 14:28:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2071.outbound.protection.outlook.com [40.92.90.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53CE668C65B for ; Mon, 4 Sep 2023 14:28:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZfjP+0Iq3OjVNAlb56GTIKUsmaTZLyPAJfJ+lnkAylKPwFeqktpZRmbtle3TaBMKJERd/N3+Rkp3Dj84b9IZ5kRrgN4cYu3UC0uzZyZ0oi2TfR71O/7eSfIdk0QJeXuxq1Xko1KNzwap+FFclekff/Naslg5v7LVFTOYmiLZCSGdnRfrJVmInIrsRtuhmKi+kwHCSJLWmz+J+X7dbXGqHaA5cYJhAlwPB5Hqv4bu0JVIacGZdfiWp9SP0RgcYwOvo4EU2FYAZ0QTvp5D/IdWp4tmTDxhgoJjUUCTjyLm5WJWx8UM2nhVsB81NsEICmdfVgrq7GAqaC4LAXZAjZXC6w== 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=4AvsCm9tY8yN38E022pnyqHDqWkPToeuzmHKxp63fxU=; b=UfwnwqELMaS+wn8nf2hfA1tNgHm4JIrUgQwOnVcyob30HPEPYzEexatQk4mkAlUdO55TinP9k1GbOS/2v9ltvDkgM1c/lLobxw5rtOJA2ZvLQCy5vlQ9nVTNaF2xFmp97dIKpG5YghY2kWW2T6sEmGoyHsLOU28vOGKm97q3eXpwvMCDZQRdWcbcGLV5vXfNFPX1k+nImZF08jjNLqOqDUFHOngUK7ugx0FB6f5iB4/mEvffrwhMu6URfmLUgDUtUVdawbVmMc+/ZeMMZgW9Sn9gJiRY5g7ecv4siooE2ALRAsefidJvGqiBisSFn2tbztonpKpcr4WOS76CGW6a4Q== 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=4AvsCm9tY8yN38E022pnyqHDqWkPToeuzmHKxp63fxU=; b=ldc25DCo/303+j4kRZt/Kird9bFfKKR4ZYVY0+h2B72JN/F4PyOXTKGGRWLBO/Wem/2vntxjOg7WiadkUnQM3Uafa7KnmaPDpXX20GvzllDj7/7w71vpZHDF1niBbc7MvMnDjSZM3ofIA+sEaOfZXLy1siiJgsLRBKEkoUaKPp+V4yXMYH1AVwxHKKsmQFK+9yQHRyvE3zW8F6wSevHeAyBVZ66LqmkWnB9D7k8/zu7F9lN+7BmcG8OJpjg3qrcNCv2zyquXOcLkBwt40ncQz/dfFBXAh52R7mthSWPMe3zYeWW9BOvTJLMVZ4FTlNKLnU6zR5cFLbDzcJ1cZixgcA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0280.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:28:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 11:28:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [P1Xg6g5fESaW1QC4+D3+0qGxRFp6AwTYC46iAYP0lPc=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0280:EE_ X-MS-Office365-Filtering-Correlation-Id: 11ce6953-d74b-40a1-5f38-08dbad3a14b5 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoM0dFwGPinMxKcq+F34LPw1cGJiTDfkV8DIT0y/NFoVlXP38OpZCCy0BTgCLdKHOx+DxdqeE/mZsVpZmEYluOsoQEU/XEUyJM5GkkrUealZsLm+VIwqGlSi8b3BpJqKqQLB1C/RBW6qpPnqwB7JBYnl0o0ilkYdsCwcxN2vJcVcmNoC/vGEJ1B0aJhRP3b3n7KhkZqPTymOhX5zzuTGCl5aSYFJpo8hDBc3dZ4r3xmG6yp66PfFsNBbOPXvmt9KtH4F28XJ9fh6B9OYHwvcH3l/5cLScG9IJroWtHhlIi1hPmb2sGEHwyfItuEy+mNftyeZaPdevvwmk837LDgagUzVxTi6MGTn5LirIKUlsSJKvUK63QcihREy/DDyiGiMkQY/NKJV0P1Q2bY0m+oG2Sdpwk29Q5cZ032d0Cd1eScaOH0ux4t3PH2XhMCtPpHD/Ur0QA2SsOvMIwOJefqmM9Sy11detS4YLtJNs8O3E3yCd6WKe7MNXBXZU4lMJVFUP8psG7jGlSGQMTteezisszuSDcjrEkKffRAh+GakRGNAKGES80ZAKfyGm4xOtxWkzrSe3uO0BpWwQIHsbiGE35KO4rwAcqtyebIDzVUcN7j6OEqtp9Rr/HYi5Z5uG9nxZEj0AjCc3jPrULXnx5fqoHP8YA1EZGfe8qrqIm7SZ7xajUWUOaDIlBsChK9CW82mER/daw8SLd5SL5sNKIXD18s2P4kc0yDpLyIhuK7jVLgSlc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FpBQ10mPLPMBmZSAiN6cpceMSXXGSc30+HknzLj/beenXK6SQ2z9NifnWJrXGIhpJmait9Or9pQwF1C26X5mtdo74+xpFCocd7MqnZKBHt648utpMzaq+qoHdpw5MYcPjHq/ILsuSaShKFK3WJd11iBh94eqIGy+Wn05uyWW92PR5zSACviHZAS8iDlQe9YuteIpgWjJB+KUjFgDJZULlrHA7BJzF+kGDjrIrHa1avFteMk3CEWQcw0K3wjKXGQ0oEY0iZfIBUTuz8g3ogKR9aaUAhB1civPRZ2EhlkFpZHDLPcoyBgShO6UUN6Ij11zvK8x0DlfitXOTj3O9swLrrIhIoqSFamxHvtjs+qKNZxkN+0IuXsRdJ1UqIZcgzcYeGhSwO1AUHfGBSxrnPnVLsDnPSbtpCEqx1BPknBT8INvgk+p636Mpy3k+sFkAq3Feit+dYBVeiaSRiNx7J6vMJaJExSPLimftv6xexjpquefG6BVPc3FouyrRXFb+m84MB+TuFFXzJGtBWkwpBmxuFspCbGkpssX5Q9nCHhvhbZMZHOEMZ/Qx1IvF1QMdb6X6ytMdB3PYBHwT6+2NZV1EcFusNuawLgOyDANZEfftbP085LjgvC1y8acb4G+n8P8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UHLAZ1byG0xikm4c5sk/zLMwLlQI93FQbnMOKcmhaxYRds2ohHYAzE/ccbPXEECuG44yKYs4Q1UUSMjqv2jnxDGp9CUbSGQIwrHUgQkvoqZFPTXzDg/MOdEkfjSS6yjweZmeEeH86q7ciQiWQcsB7ywMOMpatNGPnujVTm80mNHki1jiGIHbxgQLNDdPuhQXmDfWRRuYDez0dmXJ9QNFjD4Ybf0VQMoj1tNhXVQOrRop1kCEuk1s/n1m1gX81mnT1/EmJuh6C2FPzXIMDQc19qL4AB68tpta8AKtHLGXiMToxZFyW/IN6pzl7H9V0Nc1dnwJ4SKUcKLKMJrrR5jblVNlhiDuuiueIHdjEMTyV5t/PBBtGlPZI8raqEEX7aS9XNTL0rvDOqnZTLznVa16iw1Qn6ywi+NUp9Y0G+d8K45qn4SwvW4emofiFZ8uNoW0c6EgEw7rps2DzeR3+MOXN636E3f1aZ2CPjJ8Clyf+lYqx3izAmPBWatqsKR1Y6od3xXOuiJ6uEvB2DnaYnUjFJUc5HEz53Niuj6KSsXnXaMDE9En2WyjnWc/Jf4/ECdekaj7gIReEcdIZjIxg2DRX474dAvvSGwyjzJMRioDQQgNvHlc/042FeeDMFaW0nJHmoj1afIUyIRVdnoU9Y8U43UPeJFwXQJK+HbxI6Wa9ZIFL5nT9/svtnrLRRRVbaReBE0G4XQfH7flKTPvBf46PgC49qs+x1lVvU5Eo22IL2RU31C98p0J5JZpIRjqtAxNAXkX/Wsmipme0j01oHQIHgX6rcXDFt/xF+mpIPXsbmgjmaJ+suK79mrKqSXVPqUWUNiymMLRfEVFxHW8NPYEo7FXynUpWsSiwkkZEiH8P3sbv7hGPWMeDmeXeYj91lnopVL6iP9zqpuyxbXYhQw4jnJruxeOzIUQ6E7Tud1Fj8+VOVWUHF9jwMWb8lpj+siMDdLO3Rn4eOgftsjxojhJJJXl8HBUHJlzJoTN6AISHmsCdu2W3bGeysNgd5RVZnjONIuW+IWmik7xFhNXNprcBorUXBLS5WFyXsmJIrRODsitndoLTQrMV0ifIZ7wQL7jJoRFEnk2MU75vsV/ZgPFNciJgdHniSZNidUg/jXKYHnqK1E9huHlmBPIVVJRrE0x7nCGkEKDzasG8WWoHRI5BgKC8V9PdV67t9DhcuLH19yJI4ZvA0qv/cuQQJ0VZKy0M0Ry//73700UD7I85uWvq7qNms86aNRz1o8beKFOGi+LTs+J5sVATBF3euHx+mx8 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11ce6953-d74b-40a1-5f38-08dbad3a14b5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:28:37.2352 (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: AM8P250MB0280 Subject: [FFmpeg-devel] [PATCH 11/20] avformat/matroskadec: Move reading color space to a better place 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: JpN0M3C06dnq Namely to a place after the AVStream has already been created, so that it can be directly attached to it. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 854b225c9e..21a0a1ecd5 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2817,7 +2817,6 @@ static int matroska_parse_tracks(AVFormatContext *s) MatroskaTrackEncoding *encodings = encodings_list->elem; AVCodecParameters *par; int extradata_offset = 0; - uint32_t fourcc = 0; AVStream *st; FFStream *sti; char* key_id_base64 = NULL; @@ -2867,8 +2866,6 @@ static int matroska_parse_tracks(AVFormatContext *s) track->video.display_width = track->video.pixel_width; if (track->video.display_height == -1) track->video.display_height = track->video.pixel_height; - if (track->video.color_space.size == 4) - fourcc = AV_RL32(track->video.color_space.data); } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { if (!track->audio.out_samplerate) track->audio.out_samplerate = track->audio.samplerate; @@ -2955,7 +2952,6 @@ static int matroska_parse_tracks(AVFormatContext *s) par = st->codecpar; par->codec_id = codec_id; - par->codec_tag = fourcc; if (track->flag_default) st->disposition |= AV_DISPOSITION_DEFAULT; @@ -3003,6 +2999,9 @@ static int matroska_parse_tracks(AVFormatContext *s) if (ret == SKIP_TRACK) continue; } else if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { + if (track->video.color_space.size == 4) + par->codec_tag = AV_RL32(track->video.color_space.data); + ret = mkv_parse_video_codec(track, par, matroska, &extradata_offset); if (ret < 0)