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 252CF4729C for ; Mon, 4 Sep 2023 11:32:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A92268C7E5; Mon, 4 Sep 2023 14:32:08 +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 CC85768C756 for ; Mon, 4 Sep 2023 14:32:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lvMACxjeQsJEsKP4bgAMai6O3bystv7rNcJ4Ckw2GV5vRp+ycJHXRnhME2tphDPjAe+vcsCW5cb+wOghpkmdb31fBLju8CyyON5eyv4ZvkSKBrfB5/KS8TkV+Im1nLYMbW87fKkQGl63UZwkqMnaS49ja24VqMsELvjl/S2Utwe8IMeazDkeStUina2DJen7FOg1uK2fhQNOi2olMMLRT9oHT+L3azGOoUpfvZ6QplQcVyyYGI04oTtTh7/oGs2RcASdLAbIsSV7PqRdDlxwKPPXfabk4unDdOKYkA48JiI2T3N3KwO8wi57V8/S6lG0ZPEGf7cB8o12W17gqAb3Dw== 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=AU/4PTrNVJbwinPar/j33QovclPGimFjXxJhVlKm7To=; b=bC0geRSUegxwwmudIxso/3Djs4m15P37nvKG/fRJQDyoDMcMMKPLuUqXmtxcVPmFI7xQaXOl9YlpWp3Sk6/ieYYJknL0zJIDytlivD6koY5WalhWQNyjXMTfvsLq1y++tAFKdx59vIwDKv+z4yesZhVBOatey5oCw7IxDZm89hipDQlnv8h4x7x8azwhrG/gKNDf7BcqpVH2B+R6i1PrUBs7PXiRhBdzEifuaBnk/Ra3F4E/X0jmqOLzHnZnMRDI+N8I+ACh5NSmaYEQmJCIkNRRO2msW3sK/1KH1CQ7lvWuxqqil5f633IdIhrGLxwGOd5x1XdQ+yAfbg8/jeqB7A== 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=AU/4PTrNVJbwinPar/j33QovclPGimFjXxJhVlKm7To=; b=dxbskqBhg/s6yQsNpoERPCRvPHmQzuprENP2mJ31WKKMdNhSub2MdPbCW3CmKhGgnow33ggQDWS6Mo1AQhcsa8mPJ/f4nVeOZS+8gFNzsOZLi7QiDg6HzwboUDtzS1BfA/mucyg4CXk1h024IeqGgVf5FhehjdoMtQu7fEA38LHNsRU6STpZY3CGFxfD69Wf9C+ZoZk6OKUVnPym4IK8vBJ022OfYi2hl4j6m8PK1YK4RkQPLHNRPzM/e3PzgdM7HAEsTouC6x2twy/ewDCu8jUUdZZSxGQvV0w7+ZNdL8uBvTXzrzAJXaKRZe0ceGGKrlEjIw3VNMV2F/tLSBu1vQ== 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:26:46 +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:26:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [G5pZVSp4+N9vuReAS63olov7RTlVHxCVNcToqBGSBVw=] 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-1-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: bd0260b4-75d6-4ba3-7fa5-08dbad39d2b5 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoMVsOfPDm+Ti0pT1wmmxtpDkirr8S8+7TPhbdRSc3BwPwEpGapD+84Bel0e7rMkjxRIrxa4dI1mTN4nEqnlpuri2YcP5O+lgGB0SZBCwV6U0n+Le8m3polW7n2lOA5nhjLe7i9aSwzQ4hSX3/RbmqqM/RMcTlAHcDW9SCd6MOysauH1UIXa0BnIRsbAYYGbSVcEuZtrCAZ3GEWdC+KwnUCZFbLj++PT5ycENdMasrZIEkC5f4t9i/G/zLfjhK6hzY0+B1LEsDSKACsUSc7XenBGCHggeTbOez59cr8jiVHPI6WMee6T02QlC+GX4M+uZghceFGlvW3OIyNtfNYXP8gSosXK21CxllDSraSLCLWAtVUDigJR6THyO7I3V6zeOC2kfBWGoq3BGX1CnQTT9GM3DDCg/Te4Dd62q99e97gSyd0CWQZti4NLB55KI7dC8E6beXhMplcUNVnJlPRvNJHmv1wVEYWavF2T+u23eKs/qFwPvAK8PEI61O8ioaPOUj/6MtkA9qVFzacBcvl6cRBksYH/DIgyewGooVB1pups+R5jAG9ttAtyTcw0pgsL4g+gMyJ5WDMVHznND1Ccws5N7RfEhop8+CV0+AxSrriKCiyn79pKVd/Cve5ItRQKGw8c0yEIJE2b58zHvoybvT01EWt+eYqYn7ygar/vN1VnXiB7LzTDeBVc3uSxyPhDi9CzL5IWRvOJB2NouDBWRnfYWqrXbijiP4BZ2yCRsMfsTo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /KLg4XGawAcJBucvZxzTgE7PRme7pxt3TWzMYkoHRYKrlZdJqcsTa8T/5yOqmNXS8+EfrNkcpJ0VWdlYuyxgdMF36ccV/GmnNWqN/I2BWHoQa6sgnQvFlfolchR+DB1VJsNyoEoQzUbV7mcR/h2Nf9yMBT3NPvu+1TzhiJKd9R07yRbocTCpt6kGDwy1+3h3lOAfFoDt586YWePY3ybu7VwFuBRGuwu+6jTHtZVN3c75jm6VObaCR8aNBRzvULOAu8p/dlW3qS237KXzUcWRloeAh23hzjr3tKFJ3d68DSFwhJxuXc9DgrbUw4tQfCcY6N0Y/Odk+XCyynbwWkwgsE+6b8BndRJJ2RkACSgMqmJgvTO+Z0RkUjji7STeUbWPCV0PbiFEylsh+LJaS7o9w2hD757ZO42x3y2I2ZaN32XldFjoquZH2d/erxWJuc7yMdHDGBBYCJmHom+3KeAWLF7ZHggTE5hOkluGgd90V46eRHmnOqCPJrhka4w8cvnUsjuaAe6gEbLUehSFIBtwna7kUM/EW8hNfHuLLyt4zoxG71PD+L11KbYRzCD+2aQA9ITGo3pxVCwTjW/UItWPNlThQnrIeliiBSWiDEvq3K4TJzPU+U15d7hhpqj4tuk5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wLeC78CAy66DXGbOmTJBX+n2vz+GMFSY7jCjm4Q9G+UJRvFQGf+dCAeQRQjJ?= =?us-ascii?Q?skAuf3qwRD+FxS5ynMKmiOaN8a83iQIiKnIoP3ZuCxrWDDZqv6d6VR3E0E0N?= =?us-ascii?Q?6veLPnZaFLuBhNZaxQRguewSGDjc6T1zR/e5BIiOD1g7fSMzdFxB6HU5zRw2?= =?us-ascii?Q?BzmM8XOR49V+DAKupJj3Nfy3FRdySSNqfQXpYKVZPjytWPeWbRgJLUbh/vbq?= =?us-ascii?Q?l6KQ4QbGyq5vQRHYFadAvwB890NumLKq+uNag8hP4HMQmrD+H3g2D+pJkclg?= =?us-ascii?Q?2PYa3Z9EOvVIZ3KuRsg7EUkYj3DJsI9ls8KXbfVHJNRQVtLuHOCSSdPKuQ7g?= =?us-ascii?Q?sPaaw6lWYiYDAqfXIK5iYfVv9HCugCRb8rqvGIqB0Gf7U0ILmfttg/g5YReo?= =?us-ascii?Q?4pHFlkBi3NQ/jNpNwPcDVWK8GoJxYRrzaKi1ctvltJBthgX2C8QoWAE8koTQ?= =?us-ascii?Q?DSzTwGACk0KGaOin589rgTYzZUxosnMSDTWJyoTX4xALZYWJHE6bvK50ijBH?= =?us-ascii?Q?wm61/3du01l6PAhlxOL8PuqnNng3+mpBo/Uza8nbmCODs8PphlBH9eJdsTOA?= =?us-ascii?Q?7tnPQCYV9zUVi76p/MKzz4GTVmHGdijehj4XEwCk1MXqcvClXBb3ZWB8Kqc0?= =?us-ascii?Q?8WhF4Aredb0rgUXsmzO4lWOJn56dgfys4avMgaKpx1KjW3CRgia6lTJLdsgc?= =?us-ascii?Q?ym5mX8t9aKGBF+KDI7bbP2FReWNCGb/uk573dhYrU03JPiBXN0Gyvo4W2ISZ?= =?us-ascii?Q?pyZWpG9rcbOhVPh3bUJkTKPVKzIklKb1iAJTUZtEygkc79ujjigMUTBuhfr0?= =?us-ascii?Q?CbhQ6W03afA1z8+TPUxnJ9MK8U/bnMNAQb80TuaqWVaFVAe+6cpMSehIP2kT?= =?us-ascii?Q?hGBSlkb2eC4Z/8sDXTBKmo1QNIKNOy1Lk4Gr9mHI/o3oN0d4uObA4XfMjR2L?= =?us-ascii?Q?ebw/OZaQlRFbiBc+n45dzeTvWHTatNScmgTziikLM40fgjPFh5Oi3qw9TgXi?= =?us-ascii?Q?zUBDBv4rDZMBNDkIZCErpSDjcBgWlI4e21t29o1KVo+qTaiJQ/8UShiAu3yI?= =?us-ascii?Q?k3ZjKhY1K9RUfC+cP/fRcKxWfZzUjNwTfu3j2Rfzy7lNu+wIYcgTMe/8EdO/?= =?us-ascii?Q?g91jSsdJbdfo80eN+HgbZ8vRaLUi2ycN/B1g+hmIYstcDZGRvqb0/chOtzfO?= =?us-ascii?Q?9Qa4+cQsrhB/mgVTr1jolZ6rxTMdKXzIV63Ibox5bgQIFFtY4hMaLR0WORfo?= =?us-ascii?Q?GkelZuwVKkGmbu39Dv2A?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd0260b4-75d6-4ba3-7fa5-08dbad39d2b5 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:26:46.5249 (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 02/20] avformat/matroskadec: Set several stream parameters earlier 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: Don't do it in between parsing and setting extradata. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index fda77b0b89..ac3800b880 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2654,12 +2654,44 @@ static int matroska_parse_tracks(AVFormatContext *s) } sti = ffstream(st); + if (track->flag_default) + st->disposition |= AV_DISPOSITION_DEFAULT; + if (track->flag_forced) + st->disposition |= AV_DISPOSITION_FORCED; + if (track->flag_comment) + st->disposition |= AV_DISPOSITION_COMMENT; + if (track->flag_hearingimpaired) + st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED; + if (track->flag_visualimpaired) + st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED; + if (track->flag_original.count > 0) + st->disposition |= track->flag_original.el.u ? AV_DISPOSITION_ORIGINAL + : AV_DISPOSITION_DUB; + if (key_id_base64) { /* export encryption key id as base64 metadata tag */ av_dict_set(&st->metadata, "enc_key_id", key_id_base64, AV_DICT_DONT_STRDUP_VAL); } + if (strcmp(track->language, "und")) + av_dict_set(&st->metadata, "language", track->language, 0); + av_dict_set(&st->metadata, "title", track->name, 0); + + if (track->time_scale < 0.01) { + av_log(matroska->ctx, AV_LOG_WARNING, + "Track TimestampScale too small %f, assuming 1.0.\n", + track->time_scale); + track->time_scale = 1.0; + } + avpriv_set_pts_info(st, 64, matroska->time_scale * track->time_scale, + 1000 * 1000 * 1000); /* 64 bit pts in ns */ + + /* convert the delay from ns to the track timebase */ + track->codec_delay_in_track_tb = av_rescale_q(track->codec_delay, + (AVRational){ 1, 1000000000 }, + st->time_base); + if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && track->codec_priv.size >= 40 && track->codec_priv.data) { @@ -2923,40 +2955,8 @@ static int matroska_parse_tracks(AVFormatContext *s) av_log(matroska->ctx, AV_LOG_INFO, "Unknown/unsupported AVCodecID %s.\n", track->codec_id); - if (track->time_scale < 0.01) { - av_log(matroska->ctx, AV_LOG_WARNING, - "Track TimestampScale too small %f, assuming 1.0.\n", - track->time_scale); - track->time_scale = 1.0; - } - avpriv_set_pts_info(st, 64, matroska->time_scale * track->time_scale, - 1000 * 1000 * 1000); /* 64 bit pts in ns */ - - /* convert the delay from ns to the track timebase */ - track->codec_delay_in_track_tb = av_rescale_q(track->codec_delay, - (AVRational){ 1, 1000000000 }, - st->time_base); - st->codecpar->codec_id = codec_id; - if (strcmp(track->language, "und")) - av_dict_set(&st->metadata, "language", track->language, 0); - av_dict_set(&st->metadata, "title", track->name, 0); - - if (track->flag_default) - st->disposition |= AV_DISPOSITION_DEFAULT; - if (track->flag_forced) - st->disposition |= AV_DISPOSITION_FORCED; - if (track->flag_comment) - st->disposition |= AV_DISPOSITION_COMMENT; - if (track->flag_hearingimpaired) - st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED; - if (track->flag_visualimpaired) - st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED; - if (track->flag_original.count > 0) - st->disposition |= track->flag_original.el.u ? AV_DISPOSITION_ORIGINAL - : AV_DISPOSITION_DUB; - if (!st->codecpar->extradata) { if (extradata) { st->codecpar->extradata = extradata; -- 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".