From patchwork Fri Aug 27 14:27:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29826 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1513922iov; Fri, 27 Aug 2021 07:30:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmUv20DblTyRPsjM9Jd3sbZSlAjITpx2ZIsGDliGrvNogu4cqY7pcbi4T27dGJuNCejXqY X-Received: by 2002:a17:907:1dcf:: with SMTP id og15mr10075261ejc.470.1630074624569; Fri, 27 Aug 2021 07:30:24 -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 g18si6069956eds.512.2021.08.27.07.30.24; Fri, 27 Aug 2021 07:30:24 -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=h6eeouxD; 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 04D8068A569; Fri, 27 Aug 2021 17:28:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4EB568A408 for ; Fri, 27 Aug 2021 17:27:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AF8093QyX5kfSqi6fT4QL8GSMwiHQ2BIRsP5CD186i7c2szF8/jWHGEkyJPNnUgjD+EnVhNrCEjE8saDA9F9q4wSN4xqChcxPemx5NPH+nE38zmCcc6x3tx5eijUPvPesPFHAkCr93vvLM1dNNRrsgMFXpVt4Y1fUQYkU7o3pRELYmJeDXM1PQQ+L+HYxyIkwHsELrXlRQkhLlcMCCdtyQidJCK0hlVZLhvz/ftK12q+HWehcXX1vJ+uCasi1SLxxilJ8e6UtQxEKDQuWhqHqeLXwZCFYDuk+eVATD5StciyWE6C3pym5HkSI4YrdO5er1KxuGApg03jK651MUR8gw== 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-SenderADCheck; bh=VGeFSj6pHjYleE6eZG7oHpqPvDLGArlM3/63+lG1iTE=; b=UC4QU+MR58gdkTi/mgGG1XuR1xAK3aZIeKZ3On2h3ThIeDk+hINQ7YFIf18vlwwWQeFx8r227nkNyP7s3TzU8d/wkOBRW1tou3jT4t0Tp0nrH3YTIPu25c2pBV74SfrJKPR4WxqKWEDt+1CSKxw/NaE+GjMqM/zlgNBHQluZPqs09e6kNqST7Q1haE/dgOwtFw1qutjbL7J0eQ3qwc277BtK5crI3RgwOhVBLfwSmArTFbk1y/y6Sl8oRIMgz048jerqdQlAsZGWdTUB2bLClewBIfNHfHFUW32BSBfAXoJI3aomPX3+xHraAke33/AnphPkc38OUiYxnIx5KwfAgg== 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=VGeFSj6pHjYleE6eZG7oHpqPvDLGArlM3/63+lG1iTE=; b=h6eeouxD3es+uO1QVnTxHD0dHh/0InAxMdXlTbDvn+FbzcGgDHPSl12Lzz0yQp54DLXvprYxLZ53Vuxq3ONvpGBiw5I5+5vVXjjdLKa+L32w1kAR+u8gL9mttqOf6O4OjDXO64mqs6S++xaaZUty3KOW7riiYorseJBHVrMShiCUrbcvD1bo0dA+EpZvMVZx+1EjNMpjaJT/seYXtp34u3YXkLDb1TH6mLK/QawOotnFgNDnyoIR06dgmnkgHunyr3sNxQKtBquXiUVkt3xc11GSUpXSzN2fTkZ9gEJjL2tAfYoJexRCfvketAHlBdIayhcOqn+e/jtsdEUm5z0rPQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3687.eurprd03.prod.outlook.com (2603:10a6:209:30::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 27 Aug 2021 14:27:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [bbGiBhXqS3c/DWhNYkXZm56Al8/QPwCB] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3aaf0f2b-eb01-44b8-4b00-08d96966da0d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7h4qpQ6owituG0lcXzi5lqvZnwPRtP3V3P3B0SClef5WJ3oDFMw4H2WEZUM743lAGDjjtuzZLJFlaj/33k4yFMDngsun7cRYGTgVeN2YfNdLBubTejn6agSKFFGdOL2oBmYShb/yGKVhseLp7oLhaD56fcG57FTQiwie8CgiLm3sgQ3cb81PUOS2ztPT7IPbJSBiAWtl71fwcjp+p2TaH4GTRg9fiptBzn8XU/m7PXWVc/dmaXxK0j69qF1sb7q/6urXyLntmx160SksuhiimFUt+MyomRryXdEfa0tx/An0PdXgKzRtIWJhU/ru/Mi84swjluPdoCByCl/ZsLNX4CIJpqUffH3MZOkBhCEIsGWekzptrGaBO74PKyMqyzowf2y0mfQ6TPx4yZPS5FrcZhCkpiSut8tW5H0VHy+iGRAvV5gJf+pBgwbtfB+DV1e58Wrm++FRuBXaLg0EFPFOBfZvfSVM26BGruiCGHBu8a/a6rkTcLfoIb/2dUbhiFF3vUjHvBnXfIyQD5tZvoWOydMUJQVq3NADNKBxV1cRs42cMK9jP8X0zdy5Eaa5vTmYHUj6rqrFLh9C2V57D9Jog5KGaPh6B2wL1cG0qNM++GparBW6CtPw08O/NZgU+B5lUcK7UKRPsbzp4vYFDUBx1stAb/3YKl2bVkNC7QPGppZyf7b+iOFr/pW7pILAE7USYt4r8sxO7utRBJKvCRyPnrYZeNH3TkxQ8LgEzV26m0o4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJA89/na5SNHOjwv+sKG9ljnFebFry6QaumG7npFIZCqsVK7kM1bt0zJ2itT4BSzuLTX0tfCv2QBtUZeWZhA0GFrOodoraaKIlOhaS1gU0YML+hvDBPTHrS6T93FAPnWZiCIjqaqTuzjXbAFKh96joS4JG55mc4vEiW7hmJv9CJE3nfliqgE4b0DldLfYOeZJ/Ak8qP4pfb5JU2bo8nOmAc8cwD/rHMj1IPHQ3gS/VSrhX942B20fYRT8skYRYT84PfEFmikDayyrpNSsV00HKkmUyXTwEYUpm/NmrOkb4jiMP0XUU0GQIlTl8UD3wl1ipKnCWlqu9SUNYNfqQ9B3M+OKIm20X1ECluhTY7kxwIson4YGeWJGNUL5X2Wux39uD8hcdiiNpwpyR1gxQCHBAyJ5y5hMuSsuQYNT3WrbC1ffsVvb1Jak7MwqAebsL2L X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2XSkC7lehm5sQ6vfnRcILoaibIIRduUFzSCk79Wi5yQu59Oalms4PeMt9RIhipMpzavgEWCX5LC+ztq82F478d1qlsWw4HdbxsBA9/VT07RfuNGA5Vusn09SsKCtre5J/CWWwGqjnf/zalcH5fZBEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aaf0f2b-eb01-44b8-4b00-08d96966da0d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:51.7741 (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: AM6PR03MB3687 Subject: [FFmpeg-devel] [PATCH 14/25] avformat/utils: Only allocate FFStream.info for input streams 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: ZjzhCxR+ydh3 This structure is only used for demuxers (mostly in avformat_find_stream_info()), so only allocate it for them. Signed-off-by: Andreas Rheinhardt --- Yes, when demuxing this structure was freed in avformat_find_stream_info(), but for muxers it was always kept. libavformat/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 8cbe2a0278..78bfb36cd0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4368,10 +4368,6 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) if (!st->internal) goto fail; - st->internal->info = av_mallocz(sizeof(*st->internal->info)); - if (!st->internal->info) - goto fail; - st->codecpar = avcodec_parameters_alloc(); if (!st->codecpar) goto fail; @@ -4381,6 +4377,16 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) goto fail; if (s->iformat) { + st->internal->info = av_mallocz(sizeof(*st->internal->info)); + if (!st->internal->info) + goto fail; + +#if FF_API_R_FRAME_RATE + st->internal->info->last_dts = AV_NOPTS_VALUE; +#endif + st->internal->info->fps_first_dts = AV_NOPTS_VALUE; + st->internal->info->fps_last_dts = AV_NOPTS_VALUE; + /* default pts setting is MPEG-like */ avpriv_set_pts_info(st, 33, 1, 90000); /* we set the current DTS to 0 so that formats without any timestamps @@ -4407,12 +4413,6 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) st->sample_aspect_ratio = (AVRational) { 0, 1 }; -#if FF_API_R_FRAME_RATE - st->internal->info->last_dts = AV_NOPTS_VALUE; -#endif - st->internal->info->fps_first_dts = AV_NOPTS_VALUE; - st->internal->info->fps_last_dts = AV_NOPTS_VALUE; - st->internal->inject_global_side_data = s->internal->inject_global_side_data; st->internal->need_context_update = 1;