From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 635EF472A7 for ; Mon, 4 Sep 2023 11:32:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D97268C7CF; Mon, 4 Sep 2023 14:32:07 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2012.outbound.protection.outlook.com [40.92.74.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9351E68C756 for ; Mon, 4 Sep 2023 14:32:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j3Wf4xF50u6TzlpuSO2D50ndy1KZe9Q2ex4D6hARInrfhwsRLFQL2nPzANIEoLRmtL1pzXmgxL2Q7AUZc0ut5CuHXGcnGrEvgJlt+LDTkMGeH3XsMB7rJ9K9qjCw9hQ8860hkxRR/aiDtwBCS6HEPq4UAlepjCrcbIB6uss3pYt+Ce4eBe2mcQ+7pke+y0eIHoV3xpubA27ux+Dqvb2/FK8AKXMNWP65VsCW/oR8EWUOHdqEPfZjRQF5i9VcAiH+OncqDdUtMN/1M5CiniLojrAhG6NNOHHVrCwmtojqF+46iSZh3N6DXFHNZoY0Auu10GH6/kRVfL9rT5dpJEZLoA== 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=Dj5KaodVGjz+JM2aot5+YPUAMZ5llByVgNz26edMGuQ=; b=cwPc+tl75czsD5IBnAig2Iu/0pptbCDzpuH9Msy2iI/EidnaJrf/8/Lpl65gIUhLM7jruyiA0RZWUQ5lmm8y7wDp5/dOiz1vJK0+HlpmGsqCfK47wIP84U8zQm291KEiTmtO7piX7VDGf1VEFDKFSXj92nETpeAaeduQ7gN6DyALC4I2zpjimCyY2UgumQ9fSyHo1yeHsb29v07XMzfb5MsN5RFsyHK0/cgJS6r3O6fudYr1hPIElZPLOINkO3cvWmZlUy4vTrWB6XWuMv9c6A196XGYzTOhbVMCC53FVnerK3yFz8M1CBqbDXVBIdlVXOydswlDiJH+gy74mK2RLQ== 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=Dj5KaodVGjz+JM2aot5+YPUAMZ5llByVgNz26edMGuQ=; b=GVRtF6IFVAgecMv9+KsWCd6nUwv4kxRuWLKWvTSYPRqeAzTr8mpVSgw+WXe+YDClAgKgIbeXsh3tTd4BeQMGgqr9Me6Yge3CBm6lbir3ge2Vm8r4YpEXh76O1CaGwmLQVWk5DSoks1JGPGMvIlAmpjNibrkWrPK6iN4Q4W6GxevRNCFFc6gOS3cUem83vaB1zZjiprnld+F4NykrC7QiYf3TxnOhW5AxCZsOqchr98h8S0CVM9qRKgngID2bGbtr8fWDP5j3cpsRlWz4UV0Bn2eITDpIwAKPj1ntO/g8N/TrfimQ3OampN3hxYPCyd4MXnNEAanWYb968pqifG3idA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0333.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.30; Mon, 4 Sep 2023 11:30:32 +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:30:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ISI3hqJ1PdCbbmVIAmbq6Vab+6vOQp1/ovAUbpHs7uU=] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0333:EE_ X-MS-Office365-Filtering-Correlation-Id: d4e3585f-158a-4819-8b1e-08dbad3a594e X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoMVsOfPDm+Ti0pT1wmmxtpDvkcZsAvU3rfuKI5u/Cw4NyRAQcLrBqmLvhxvMBQXWfv3C6ki/1m5bx7ZLaIfCSCwRA31nX1IZZJPVu2ZAbNCrfiMu4sSUV47fz39SurL3zVu5hzpZw63Y/sHKEvpe+NStfs9BdAqtoevDfOGJexD5zS9VX+Tj7SXst3MvgBw7PQbVQdYfytOWbpkhyfU/E3tusj/ckLOMO1EayhUxpznpR8U0o2tp4D+RFFt55SGvYAwMY8s66FUa9lNKHCqnROuSVTLh0UftRVX9yM1mhNqUt0vJ/lgphrJq5b/gaVZcdwlL3o0xTY3duh6zVFWWBhNmOENrbIyWBLRQxh4E83UUYq8cxUu5EYu7tp/d5pLKlKZYA8ms5qwAZgid1a2SBx3d89ygw1PqonoVCE7ENYG564S8bVvyclTzPqShhlX3z/yXfkwAMNLKgzHHHY2QHBlF0PddUinL/Kk+Jgm8qtlTUK5TWrPyl7z8G0PlMa/oV9VbCrWcniKS98UeNeYFKsZ2p2fBhXKVoIjjIezfTbaGx+rD5Qxwszkfa7c6g9nLjzClwl1Gc0tUYYjxa32/etGEgtL/y4TOvKRwoPP3MBbvTpUkVwukumZ3/B7zciQzKcQMcXIFUVo+fT1+HYXgiOUK/GQYfyRSz3Xn+udEbxGZSFMsrW9zT0EypbvDw3F2tDSlBuo34lNzCrjXqwAYK2UrUsMR395/xxbydNcEcBJr0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 36GFbsevAXovKlLW0naevmyYIqZtl3kXDQh165xdS5zLkAyAtlb7nEy7b2gQ8C5J6MDfFeFNgzxX7i6euN/Q+mGwgSL6J7l92y09xLI7UbWGVzt8I299f/BXF5P7cwJpVG67MDAp+9hPw4ZbtNTu1W4t6SE11YSsGZgJTnBlQ26abnm61GycJpuKCFlyWi5ekmDm5Dcz7gOQI9ueMYbvblqBo3LFynb04FeGxicx0uf5oRk2wfUuwbFsTbdu0U6er/RRcISu7PhG7/nJOaVNh/+kDvhqcoMBEE530K8oBqhKOmbFtbzw1lBuat4Di/Njji7jrbD2i4XOtK1fdt4t8YtFrMmo18zcQS+Bmcj4y3k0z3Jm1SgRsDtZho6EEQBQtdwrtvDoYHxY27OI9NadAYHhIyBkH99jqVGemSrYBZQsogO1hq1lbW/0OY/5CYv/HfPU7xLvHBPGmsbeRBjSv270W8X3JKvP7pd20zoAdj//qAPS/IexAgoj3rUOWVcN0TZJEevBlr6+Cwwz4w45tsP1v8QzgQfPWaGV1nbUjmMeAwN3gvCqnfjcs6WkoPgb5/XJG0eQuIR1xxAzMdYdbzLA2tXfztpyI9E+eh+dgczA5KjAQs0oFtJ5EEy2Co10 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xqrWEEtSZyHRRL1Zu56OixXhc1awMG5WxX5LWmUmOG3/AIiokgXFD+ToPcvg?= =?us-ascii?Q?QLFuV/2VHTBFyaer7JJvvhfJjundVj8uEgjCzoL7NpJGqtiCabbEZTSdVwNK?= =?us-ascii?Q?1kQddlES/jcC8n45ZJUgAQLS390GnoI9b94Xp/e+/kbKK10cpQ9DwxI8NW9e?= =?us-ascii?Q?mPVKqAsjnR8r7pQvAXrPoFBRH5szSSZ52Rx6S6vSzOptnHT21ndw1IKEC3iq?= =?us-ascii?Q?wbWwQH/PqQU4RvW4P0IqkSen2V35h/4Vxuyf3z/th8V5Gu9kyBHEUpangjAl?= =?us-ascii?Q?rO7D1PtaJitYdSUZr7gnU/D8szErYC9McPZ6zy8VWjxmj1qyT18WaIYBZgM5?= =?us-ascii?Q?SG02J0gDll9pfS+BNtuDq0DAsslFnj61QBWtstRKYkw1ZxxUW7KO6Sekrtx0?= =?us-ascii?Q?kFxCtMoxX+0jAXrdnk4LXRPtSZ8JxWbDVTppjo8a0ZGIges2Q4R8LjNuqyxg?= =?us-ascii?Q?KAC9qZ9iUcb5LuJ8iAMw1riP6fhllhaSbMbH71wSCixGpnBqWzaNcA35e/wm?= =?us-ascii?Q?7x5e6HfA6BGJd8C4g4f770y2Av0oJvOsIzgW4ODJjfWR2s9i9jQT/CWmP1DA?= =?us-ascii?Q?oBVNtOsBvZp8vsDmvH4E9L6F2cW3om0CqQXkljcAilBFf8rbuhg2y3kcMZV1?= =?us-ascii?Q?iKdhatI+Kq/fGWjqSU7vCn8n76CvWOnOdHoJ1RcxV8ysw+gj2Nj/HtorM0uU?= =?us-ascii?Q?nZ3hWMhFtWvPMEdTfa/VzqTOfEJYvRgevEnWYSYWK8r8msrnc8my8YrD8d35?= =?us-ascii?Q?CD4a7UuqNEAuA2qg9XZVGwe6cdUZ1NGJh2D0M3rPi+Fb+Ofi5yCPVg9gFyga?= =?us-ascii?Q?nJFiRpjQuixR2w+IkFA0wvdoKcKxB1RBynoI4px6pmEmD4sjewxoWyytJ/ZO?= =?us-ascii?Q?oNrV2aA6Iieyrnpw5KG+1XFRE/DJ6V61hXbrSLxYP2FkV9pTn3t2kT+ScmNq?= =?us-ascii?Q?Ntq2pbCBaP+XgxduLVczhCir9/i56L2QNEs4scVFDBmOmcgRdJ5qg08gHHkX?= =?us-ascii?Q?i1PGWxIubz9Yh934dWmWI1XBeEtfFFgRNoESUe1ZRzc0bSg5CA/qO+qEV4HD?= =?us-ascii?Q?6khl6tdGrGBiWOwwy7bBAMpn9ZK3vSif54GL9KX0PbcQTazIn2OYCHi3Z4ZT?= =?us-ascii?Q?OeuIk8vy4qFjqIjde0+Hzjy9wNh2+22QoCXyhQFKANwQhGvN82SZXFKBgcCe?= =?us-ascii?Q?ercPfxavwUygInlBgUKwMxNTbl3n71uHIJJNeh4AE2vsmyc99m8+/KNons0C?= =?us-ascii?Q?Dl798b69Q74een+KDyj5?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4e3585f-158a-4819-8b1e-08dbad3a594e 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:30:32.3460 (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: DU2P250MB0333 Subject: [FFmpeg-devel] [PATCH 16/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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 157 +++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ec6ecb33cc..1bbdb6b980 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2810,94 +2810,95 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, int *extradata_offset) { FFStream *const sti = ffstream(st); - MatroskaTrackPlane *planes = track->operation.combine_planes.elem; - int display_width_mul = 1; - int display_height_mul = 1; + MatroskaTrackPlane *planes; + int display_width_mul = 1; + int display_height_mul = 1; int ret; - if (track->video.color_space.size == 4) - par->codec_tag = AV_RL32(track->video.color_space.data); + 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) - return ret; - - - par->codec_type = AVMEDIA_TYPE_VIDEO; - par->width = track->video.pixel_width; - par->height = track->video.pixel_height; - - if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) - par->field_order = mkv_field_order(matroska, track->video.field_order); - else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE) - par->field_order = AV_FIELD_PROGRESSIVE; - - if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) - mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); + ret = mkv_parse_video_codec(track, par, matroska, + extradata_offset); + if (ret < 0) + return ret; - if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { - if (track->video.display_width && track->video.display_height && - par->height < INT64_MAX / track->video.display_width / display_width_mul && - par->width < INT64_MAX / track->video.display_height / display_height_mul) - av_reduce(&st->sample_aspect_ratio.num, - &st->sample_aspect_ratio.den, - par->height * track->video.display_width * display_width_mul, - par->width * track->video.display_height * display_height_mul, - INT_MAX); - } - if (par->codec_id != AV_CODEC_ID_HEVC) - sti->need_parsing = AVSTREAM_PARSE_HEADERS; + par->codec_type = AVMEDIA_TYPE_VIDEO; + par->width = track->video.pixel_width; + par->height = track->video.pixel_height; + + if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) + par->field_order = mkv_field_order(matroska, track->video.field_order); + else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE) + par->field_order = AV_FIELD_PROGRESSIVE; + + if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) + mkv_stereo_mode_display_mul(track->video.stereo_mode, + &display_width_mul, &display_height_mul); + + if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { + if (track->video.display_width && track->video.display_height && + par->height < INT64_MAX / track->video.display_width / display_width_mul && + par->width < INT64_MAX / track->video.display_height / display_height_mul) + av_reduce(&st->sample_aspect_ratio.num, + &st->sample_aspect_ratio.den, + par->height * track->video.display_width * display_width_mul, + par->width * track->video.display_height * display_height_mul, + INT_MAX); + } + if (par->codec_id != AV_CODEC_ID_HEVC) + sti->need_parsing = AVSTREAM_PARSE_HEADERS; - if (track->default_duration) { - int div = track->default_duration <= INT64_MAX ? 1 : 2; - av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, - 1000000000 / div, track->default_duration / div, 30000); + if (track->default_duration) { + int div = track->default_duration <= INT64_MAX ? 1 : 2; + av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, + 1000000000 / div, track->default_duration / div, 30000); #if FF_API_R_FRAME_RATE - if ( st->avg_frame_rate.num < st->avg_frame_rate.den * 1000LL - && st->avg_frame_rate.num > st->avg_frame_rate.den * 5LL) - st->r_frame_rate = st->avg_frame_rate; + if ( st->avg_frame_rate.num < st->avg_frame_rate.den * 1000LL + && st->avg_frame_rate.num > st->avg_frame_rate.den * 5LL) + st->r_frame_rate = st->avg_frame_rate; #endif - } + } - /* export stereo mode flag as metadata tag */ - if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) - av_dict_set(&st->metadata, "stereo_mode", ff_matroska_video_stereo_mode[track->video.stereo_mode], 0); - - /* export alpha mode flag as metadata tag */ - if (track->video.alpha_mode) - av_dict_set_int(&st->metadata, "alpha_mode", 1, 0); - - /* if we have virtual track, mark the real tracks */ - for (int j = 0; j < track->operation.combine_planes.nb_elem; j++) { - MatroskaTrack *tracks = matroska->tracks.elem; - char buf[32]; - if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT) - continue; - snprintf(buf, sizeof(buf), "%s_%d", - matroska_video_stereo_plane[planes[j].type], st->index); - for (int k = 0; k < matroska->tracks.nb_elem; k++) - if (planes[j].uid == tracks[k].uid && tracks[k].stream) { - av_dict_set(&tracks[k].stream->metadata, - "stereo_mode", buf, 0); - break; - } - } - // add stream level stereo3d side data if it is a supported format - if (track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB && - track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED && - track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG) { - int ret = mkv_stereo3d_conv(st, track->video.stereo_mode); - if (ret < 0) - return ret; + /* export stereo mode flag as metadata tag */ + if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) + av_dict_set(&st->metadata, "stereo_mode", ff_matroska_video_stereo_mode[track->video.stereo_mode], 0); + + /* export alpha mode flag as metadata tag */ + if (track->video.alpha_mode) + av_dict_set_int(&st->metadata, "alpha_mode", 1, 0); + + /* if we have virtual track, mark the real tracks */ + planes = track->operation.combine_planes.elem; + for (int j = 0; j < track->operation.combine_planes.nb_elem; j++) { + MatroskaTrack *tracks = matroska->tracks.elem; + char buf[32]; + if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT) + continue; + snprintf(buf, sizeof(buf), "%s_%d", + matroska_video_stereo_plane[planes[j].type], st->index); + for (int k = 0; k < matroska->tracks.nb_elem; k++) + if (planes[j].uid == tracks[k].uid && tracks[k].stream) { + av_dict_set(&tracks[k].stream->metadata, + "stereo_mode", buf, 0); + break; } + } + // add stream level stereo3d side data if it is a supported format + if (track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB && + track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED && + track->video.stereo_mode != MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG) { + int ret = mkv_stereo3d_conv(st, track->video.stereo_mode); + if (ret < 0) + return ret; + } - ret = mkv_parse_video_color(st, track); - if (ret < 0) - return ret; - ret = mkv_parse_video_projection(st, track, matroska->ctx); - if (ret < 0) - return ret; + ret = mkv_parse_video_color(st, track); + if (ret < 0) + return ret; + ret = mkv_parse_video_projection(st, track, matroska->ctx); + if (ret < 0) + return ret; return 0; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".