From patchwork Mon Sep 4 11:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1137082pzb; Mon, 4 Sep 2023 04:28:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEh8Fm/U5acGEm3wmgvWkPi7qCYK749mkHpqFvEXiU+O3Bv4SVmleke0N0AOohmDuZnCtVA X-Received: by 2002:a05:6402:687:b0:525:7da7:af10 with SMTP id f7-20020a056402068700b005257da7af10mr7433496edy.23.1693826931410; Mon, 04 Sep 2023 04:28:51 -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 b23-20020aa7df97000000b0052369c1025bsi6310418edy.459.2023.09.04.04.28.44; Mon, 04 Sep 2023 04:28:51 -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=rmc479HE; 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 393CB68C7E9; Mon, 4 Sep 2023 14:28:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2080.outbound.protection.outlook.com [40.92.66.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AD2068C775 for ; Mon, 4 Sep 2023 14:28:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cb9fdC3v9F05PJQRDj7N9Luf5Okr1KKHXIEzMFEF3IKZQWHZopykMMpu+/JIpW0ftnpZVSmT6a3sHUaBoDfcbX2BDectf41VjgmYk8i2sIZuGRQ7dr+KLfqLtyN7kTRYCbjHJM+WPNRfl2Yx+/4DcNfd+REYSG2VUivyrNian7aLcxeFeo6MpvI+iQt+7N3Pkolh2Y9X6thQdjKqJzG2kDtYXkRU1VjH8OxeJaAiY+/3KP0hWsqy2KRthEdt/h1Iod4ZZxxLSZmqW2irg/2CTJuV3mxeaZEvvXcQ+SzY39wKEUBlPUL35bQNrOpgcR94WTJkBrEliuGYe4Gopa330Q== 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=Lqwxa53QJzatcEitCdohCl+WGCTzNUUZm1FKKtOKB9s=; b=HbHpC3ELTqPrHDxQQQXD3KM9JA1RVVkuMBH6Aqten7Ol7sqN0WPBuQLF/+Y7tcgapTJ08EcXqX85o4b9OurzSKKWJT6COGs3PBqMc+YR3Ia2tTW3dPimPh/rvKNxbdaqdsHDfGna816Jj/C3879Viwkoy8mWfjSJJAIiO1zKWNiiH06tkvVXjH9K90+5OyiqKN38bKn11Ld45SDZsbfCt/D6gIhkfPbm0ZHzz3uWQT9aeS/F/pLTImc1acYXO3ODWKo+YQ6ney1/XV62M3t7pXI6BehWaJSMzP0ZpBJkevSvq+jq+vY9xmVdg1n3Gzig6XNna8uFOu7WnH8Wp00TXA== 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=Lqwxa53QJzatcEitCdohCl+WGCTzNUUZm1FKKtOKB9s=; b=rmc479HEeNLx6DlW5ktyxHTPvm6x+Ppc9OyDzhx7h5bA0lhHjh36ppHZ4qVMN1cSuAAXOft8+wg6hKYxCGMv20k+wuVS/p4mPq0pgjJC3rvFh/MmiF5izE1YceK8YaGC1n4pjaLoV7Gn7iOZytXUBLKrkDlmZjs7Y+MkD5XEv+ZIrOrdswcB7Rc5DV6PD6CCemqZybB6DS52XHobIYfpIf8ddAmTtc7QbijL1PhNEER8Lv/BQc6tMqslhfTYymqL3U/w4tVIHLNMLyvCx4RbwQ6I678z8BDzO+gby2/KJrovMNEcftCNlVpQaQrembU6FGrJNTYsplWTmOs/L/SwHg== 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oyl3wojW7+NeLBbo6PzPpxLTYPEO2baS] 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-9-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: b7db61ba-d9c1-4640-67f8-08dbad3a069c X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoMVsOfPDm+Ti0pT1wmmxtpDvkcZsAvU3rfuKI5u/Cw4NyRAQcLrBqmLvhxvMBQXWfv3C6ki/1m5byxxJ9NmjYtKutfi0FSX+GggFPlCjm4pYyzZpK77Ez2hsoi1iSpPKizazE9vxVzQCej08//T6hN709t8LhCX43AEVA2KTpG5/lW1LHUa5uyDPWAplXBVP0Q9mBo99CqLaHn4CRs7ceureeUpIGnyhQS4TOcFrVsFRQaj2a5w3OnmpxLucrxtzF7qth5cABcThtkGQGv+bYjBtcr7OQXxeEwMngesMUeCyxgRpCJBKNnjPm3cplz4h/kU3iBEyiN4D9ZiAK9tgo2YOjbRLVlLfnDyxcn2E20oA2KLca/ITCSWE8gOZbyd5o+ubnluEix0KURyAxae8QMTiSOwDr12rKvR6OojhxRyAnBTGaf6+/l6vGTFd2gKq7Xld8in1gaaTEY27WpcDgGrnNsNZ7b5jqQDMD7PKUI5SNjFo4yWeDUFKI1oNcBflYIcD5GgNjuHYHGFUocXEy9lDzCNBfGw9v3458oLEfFyKjwzSIVXMFuVwJToEe8eA84ayKKm6DsYKbkedpSr0AWub8X1sqx/Z0Q9b5cgiZ94WWqn8pwil9zEuQ4aEphHd+cJJBo0e7gRbwo0Pa3krGqRRrRu33HgJUcU5IsxS4wK4rXdc5RYJqi/Kx4h8XYhzY0UYBX07D6XwsPHYKCFJplztzyvpoC2fz6dvD6sZScuhk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ykZ9gPgiYmGmYzkPxm0G8gceE61nZ6Mfk0lTLCdy+ZFUYmxkdAHBjblZdbomVZ6l+6jnDl/2XHMDkFCfX8q/184qMJGEDxIboO6RHSK5Tdy7AWXRi41SWcfOWNpJnu2XMx+tRaSP0TmwbNlE6pUs+vFZG8Qyx1kgspzL5JTeyHT0d2AhFyARklfgvp26l3R/qyYVJriESXt/1FNJjKZT/7Mht0ChHn8vbIQL+oJJWRF1jZq2xisedWo7B0H3MyvbNcmI3TRghv8Et0fdO5seNY1HvWckBtIlULscuSmYD+g77xEc3MiWfcWI7iMmN3usg+sEMNwQkcowmTrxtZT+0Yq+ykiUu9U6AJpBO8ofYnNwdwFblxwyEWhzqx368wUQjMdQXULYBuBWwG8O86XgdHJxz/SNVE6KHv80fw2N4rrHWK1x4sKIV3lPCarbk7OCj/9wY5FlPPGoJAjLzn1avF/Iqp377r/KcHnI26NsuX2KcvwM7a0ODGs2VNmjvmSzH8AWojT7icHOt7QDKVwACAv/uVYMtykGBUALtkM5OyMigpDnw2H2NUYP5bGyz/GJnSR0dPVfytAC/8dF1M7S6oN5hJIEdXBFdn823xlvOu+XrY4waX62Hea+ZuWBycQj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0UfgFlHFYqCJj8ShGQA2kcofCdQIp+NNK+t+W39gaTdEit6q3ekXszBOjsTfmvbVlWtbS6ImiDkagF8YHEpHvxFBMmrXOdCTiMTn00FYuf+5hJiCNvXTnkTv2EdC+bYAimQeWf/6pgee4FQWbjqpfLpsN6ykMY4kWyvQgXXWNKu7jBQ1p6znMEO7kD8WDnsFG2Px79LC4ivdfStwlY5y0sHHtuTS/mGuVyUMWec6kxIajI2Yz63fyYJ665NzkL4fYyw/5pHQcfBLDvsxIf3GCT4+M4QEoW0wqVvdXpzrMI0RQPdC4oDwDAr5998Fto5GPZzMyqRFxZplEtK3388PfEk1OeNCu8HUJI4C7wPkLSac789Z+QJsOMmtaFsdOnkpooHhp6PahsmAGRmI9MMk+M7wDqf6871YiPNoPjSJsKXDZDCjb327q4QxXnVsRtLZItTwI3lxH0HO3n60mpewBoL+Ew2gI95bHP+or2hvcrmyLEvuwyHCJKD6pkTWxUKtgExdYH3XivdVLJFvyBB2VccECyGgLyjKYbiGB1Px1kc8klshtTAX/88facBKfvjqcPZXJeRhO8J/Jz74XWSqw7qV4TqDsIvkDpW4hGgagDm5uPYO3PbmWl1tNXtTureNwh3uGIGuZLXSt9EEA6MesamRUPkCyoSPF0eNTh8B5nVSEdvvB05MEKiL76o0hdXWciniag2oz8Hl9hlzAdwii8IH0SiwYUTVbPHA5eMD52dsWHnFntlhhiVUwen1zTJ5m1zi5Lwq1kTaVkh1YxA/KRq2OgOXyah/xkgZvvce1sbAhP2jGFiY/Vhlp2iPuuuuFFJ90N2c/KbU48tfcJBfzjW77ovwLrdaZgw9jHjNnnPwu86C9IvOf6UUERQV3Q7UaXd5bx2VWafApHiqcIflbIjcFOdkNgS1B9yHFDj03eYNs3sHmPEDzWvQXN2OYsBFxikM+72lHbRK5BpV2PNHUH3Y2Fkj5bSVgwtWsUHSdFpkGZcgS7h0MOlLOug2Rmi/TR/6XVn4MmoJpodd0D4ndbfOhBLhemOrGC42pF5LvlMKDUPQDxVM+xG5BSqN3RYl1oPfs+m3WwUWzmtn36Pm5Cy24VY5tX1N8kSOHXTl43r042gYxrRhyGOBPaEbCQItk/yCzCqNtoOE2FtlL+HOO6hMMx8Cuzt/TpB9FsVUpkphhKwYa5Nt8P0GI39OeA6Jg1HbqPPo/bGZ6zIltzJDqDzmDm/noYDtagSBeKq3zhojg0n0sbRDxYXxwWFzJrmk X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7db61ba-d9c1-4640-67f8-08dbad3a069c 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:13.6512 (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 10/20] avformat/matroskadec: Reindent after the previous commit 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: 3zD3n7J+LzSX Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 86 +++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3348ce161e..854b225c9e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2739,48 +2739,48 @@ static int mkv_parse_video_codec(MatroskaTrack *track, AVCodecParameters *par, const MatroskaDemuxContext *matroska, int *extradata_offset) { - if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && - track->codec_priv.size >= 40) { - track->ms_compat = 1; - par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); - par->codec_tag = AV_RL32(track->codec_priv.data + 16); - par->codec_id = ff_codec_get_id(ff_codec_bmp_tags, - par->codec_tag); - if (!par->codec_id) - par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, - par->codec_tag); - *extradata_offset = 40; - return 0; - } else if (!strcmp(track->codec_id, "V_QUICKTIME") && - track->codec_priv.size >= 21) { - enum AVCodecID codec_id; - uint32_t fourcc; - int ret = get_qt_codec(track, &fourcc, &codec_id); - if (ret < 0) - return ret; - if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) { - fourcc = MKTAG('S','V','Q','3'); - codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); - } - par->codec_id = codec_id; - if (codec_id == AV_CODEC_ID_NONE) - av_log(matroska->ctx, AV_LOG_ERROR, - "mov FourCC not found %s.\n", av_fourcc2str(fourcc)); - if (track->codec_priv.size >= 86) { - FFIOContext b; - unsigned bit_depth = AV_RB16(track->codec_priv.data + 82); - ffio_init_context(&b, track->codec_priv.data, - track->codec_priv.size, - 0, NULL, NULL, NULL, NULL); - if (ff_get_qtpalette(codec_id, &b.pub, track->palette)) { - bit_depth &= 0x1F; - track->has_palette = 1; - } - par->bits_per_coded_sample = bit_depth; + if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && + track->codec_priv.size >= 40) { + track->ms_compat = 1; + par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); + par->codec_tag = AV_RL32(track->codec_priv.data + 16); + par->codec_id = ff_codec_get_id(ff_codec_bmp_tags, + par->codec_tag); + if (!par->codec_id) + par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, + par->codec_tag); + *extradata_offset = 40; + return 0; + } else if (!strcmp(track->codec_id, "V_QUICKTIME") && + track->codec_priv.size >= 21) { + enum AVCodecID codec_id; + uint32_t fourcc; + int ret = get_qt_codec(track, &fourcc, &codec_id); + if (ret < 0) + return ret; + if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) { + fourcc = MKTAG('S','V','Q','3'); + codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); + } + par->codec_id = codec_id; + if (codec_id == AV_CODEC_ID_NONE) + av_log(matroska->ctx, AV_LOG_ERROR, + "mov FourCC not found %s.\n", av_fourcc2str(fourcc)); + if (track->codec_priv.size >= 86) { + FFIOContext b; + unsigned bit_depth = AV_RB16(track->codec_priv.data + 82); + ffio_init_context(&b, track->codec_priv.data, + track->codec_priv.size, + 0, NULL, NULL, NULL, NULL); + if (ff_get_qtpalette(codec_id, &b.pub, track->palette)) { + bit_depth &= 0x1F; + track->has_palette = 1; } - par->codec_tag = fourcc; - return 0; + par->bits_per_coded_sample = bit_depth; } + par->codec_tag = fourcc; + return 0; + } switch (par->codec_id) { case AV_CODEC_ID_RV10: @@ -2794,9 +2794,9 @@ static int mkv_parse_video_codec(MatroskaTrack *track, AVCodecParameters *par, par->codec_tag = AV_RL32(track->codec_priv.data); break; case AV_CODEC_ID_VP9: - /* we don't need any value stored in CodecPrivate. - make sure that it's not exported as extradata. */ - track->codec_priv.size = 0; + /* we don't need any value stored in CodecPrivate. + * make sure that it's not exported as extradata. */ + track->codec_priv.size = 0; break; }