From patchwork Fri Aug 27 14:27:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29833 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1513344iov; Fri, 27 Aug 2021 07:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhyse31LY8HQNYdala5VItiZapuf7CtpSaAUbF6LmXPc2kbbXqMzVqE2JKKcZCvHBkUKJf X-Received: by 2002:a17:906:2dcf:: with SMTP id h15mr10800574eji.320.1630074584633; Fri, 27 Aug 2021 07:29:44 -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 v3si5907856eji.473.2021.08.27.07.29.43; Fri, 27 Aug 2021 07:29:44 -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="D652/0Xc"; 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 C5FE968A56C; Fri, 27 Aug 2021 17:28:04 +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 6BBA068A36E 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=SNN5SYlQa++ckYxKw2mMz3skmodS03W/ppUV+1NmXO6OTW3ZyI170kTzl0P7F+uG/g3OCyUM5JRc2wTXwqxX4nIoAAN3Zm04SJshc9cyQnFIRcqS1PA5evpFfMpZ9yBCtlNpO0PuwoCLrxYc3504j8ImVIeZ5RKkpkf90Iqigrm5Fkskvzgzh/ScLcKOK4PMmAOSbHnaFwKOEd5Xxa6TRsXBQkMgAhB/x/ykTFHjK9ZP+7ONQOtLu4FK3CthlF0pCrB6W0hCu6wUPl8xbOFcOpIYlKQFlKMvb5s8kUWG17l6xZ8LJMycZIqyzNdVHX00ezKxoTFMZdjwu6VeYZd7Og== 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=E2/T+p255FTwA4nZH5bHUqJoRx/MvM+oabNRpiSUfws=; b=S6XIOIIGxBwJ2p0UdJhkClUo2FVwJSFyzAnAF3t3mfXqhuPoWPnCwozs/Sz4ughrOuh+kwuVYwPvBnhOLiEysPHNn/AH8piMr+arrDBSCutQSCKtx1lwVS5c1TRquOgUlvNOYlyLcgbgqDXmjej1Uj8EM1iVbERkBxWLss6PwbsM0j4VmgwouyMO4tKnmO2BLQgqYjjuiNCcgX5m5niNdIlknKPprL5qvVI6fxkY9BuPQzoLuGEli3uPFmqqWYpWsAzIim3soonxchHxIF+DBobYVWkiZzznKZxDD/5Ro3t2pGlioZBeWV9D34butgPnsyBPd8UESxDxh/sfZgKunQ== 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=E2/T+p255FTwA4nZH5bHUqJoRx/MvM+oabNRpiSUfws=; b=D652/0XcBCvX+O3Z+EXGnqXJvdwqtcfYabLN+ACATteFkhYkmIKIa1K6AZIrlPg55T/W6ovC3EnQQlmam9TQLCxV/R4l1f2BT2ekiUBJsivEFqsFTwV1+LXCRmRcpla2xuLP/nTwnAvMHtmH++Hb9CF6QFvMqhQCrYFo12lqw7C+aqSd5mGL2F1C7POUlkl+nUVuXg+VV27T4NPGNQIKEObCcNnAw2Jwq4Nbdx/pM1tq5eAeGS2AVe/1i+TyUkH/KagweqafE7tkxfkgka3/KBdh9mK403EeOnALdSeDtPuTle+ih8Q0NoCAk6f6TV0F8HfPpPljNA2aJWyVXfB5aw== 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:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kvvW+EAABlEWNuJKXvh/bQ1AqXrVrwU8] 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-9-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:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b8bfffa-daee-4c35-17ae-08d96966d6dc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7ZQMwCaRHR1Pio3id876YrSZcorD1CssxZMIrCrJ2Pb8Yub6xfxNXIzMMErZR95SDMtgB5HfpHoOofnmAAi4yoMFrDaRa1UVRHIi9tnW9SJTL+QmJNyCyv7aXIKzHvLw2HCaBLFFOHPZisyMj1Us0z+9Q+5Ph1zc0LWCAVNAu+rHSzFAtuNv12IJHArFfG0BD3G+z9LK1/pRa+ZqinrtFKfLPV/igHam0pcgwFy0lm2MUV+19Iz2BAfjwkKDmIBe1YJujvVogzqGD80kaGCSod2qq9NZSuWcfOQpGmeR3jE5ETG6LGZIMtCKqlV2w6rm+BakPNJ3d+JV4ei7g2oT1ju6Jj6xpyf5ZeT0Gl+TM9bxoJSikjDmgkrWUnGHj+6acFoQ/6MSS+6szgIPCZqMl396WiEWTfRPxEuzhtDo18jQvgY1omwGlsb1DLQoKBJkQWFQsofiql0UYp1rhbOe3jttVfFjP60RRLWRKa6w6a2euu6tKyZMGNtXY5HVaB3Bg2B1fBCD81KOHxKSQ30MbitUwPKmXKzwReqt9dHY+imSdghKB1MHxI7vL87myEb5VuBMAcy7lFGKcBu0+xFYfPnJNPRbNGT78foGzgygQTRFpZW4VpUGqcsEzotwb2b5yuYu3wlGY44TWUTZEKKwI1eojpvCKFUj8rzLEANaM0ZVQ2Xvy5wHnYKergCYzCM/uGBUC0AFOXzHhYIQkVFGFTIW7d1/mNIDkIsr/QFtscKg= X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OKPmVCSj5PFie/cVi8g1G6zqFkEPpD6tH/W51+3DK8HYcj+AIxDQEZGwTEkOPLwjAIXd4c26yxUEeioM3PZLXvUAkVfoIpkDqfAAuaSrQ9vLVQ9DWGvbxv8tS3+0wXgMg/NjgHJOUOSk14KDbWFT8YsVKrQvGBffrJ84VOanepCwz1uNbvvXPj7Aqhq65D6PcrCUuYcSUhMYVzHBBIWYEI0IRn1U/jU7/bz0T9p55tbVOY1KtVlADVCihmRGwo9RRcnqBbOwwamiItI5Pb/OAaFE0i/RI4q0ZaJpltrJkVPqiJrQU0svNfUUOoT/sjez3t5767LzJPCkc00Y60CVpwUzhZW6H3Tvg49UNT5SJ/jQfSEvLBvbnPwxSKj1oE7xkYkzUekMMP1AGYPEgsSF6rBv6cVfgvG7UppAgOwrBP8hW/fahVOmH8M8RGadCE3s X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y2egscISRWqI5CxkO4FY1cBVRp5tnCWaRcksU8hJ34Uikw/fJHdz0pIScVTwggdLplfx8G8tFRU6oe7X6U5JtMb2Vmk3dNdg4RBVKDC66PVKKTd7JCTbMUWgNxh3+ex+boH0g5FQfCq7k7LcZwJB/w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b8bfffa-daee-4c35-17ae-08d96966d6dc 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:46.4135 (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 10/25] avformat/utils: Make ff_compute_frame_duration() static 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: +zgWgCDm6WRQ Since 1c0885334dda9ee8652e60c586fa2e3674056586 ff_compute_frame_duration is only called from within utils.c and only for demuxers. So make it static and remove the code in it that deals with muxers. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 6 ------ libavformat/utils.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 002aeb6601..4fc1154b9d 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -715,12 +715,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, void ff_free_stream(AVFormatContext *s, AVStream *st); -/** - * Return the frame duration in seconds. Return 0 if not available. - */ -void ff_compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, AVStream *st, - AVCodecParserContext *pc, AVPacket *pkt); - unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); diff --git a/libavformat/utils.c b/libavformat/utils.c index ad8e26d3a3..67a1d158b4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -873,18 +873,18 @@ static int determinable_frame_size(AVCodecContext *avctx) /** * Return the frame duration in seconds. Return 0 if not available. */ -void ff_compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, AVStream *st, - AVCodecParserContext *pc, AVPacket *pkt) +static void compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, + AVStream *st, AVCodecParserContext *pc, + AVPacket *pkt) { - AVRational codec_framerate = s->iformat ? st->internal->avctx->framerate : - av_mul_q(av_inv_q(st->internal->avctx->time_base), (AVRational){1, st->internal->avctx->ticks_per_frame}); + AVRational codec_framerate = st->internal->avctx->framerate; int frame_size, sample_rate; *pnum = 0; *pden = 0; switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: - if (st->r_frame_rate.num && !pc && s->iformat) { + if (st->r_frame_rate.num && !pc) { *pnum = st->r_frame_rate.den; *pden = st->r_frame_rate.num; } else if (st->time_base.num * 1000LL > st->time_base.den) { @@ -898,7 +898,6 @@ void ff_compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, AVStrea INT_MAX); if (pc && pc->repeat_pict) { - av_assert0(s->iformat); // this may be wrong for interlaced encoding but its not used for that case av_reduce(pnum, pden, (*pnum) * (1LL + pc->repeat_pict), (*pden), @@ -1225,7 +1224,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, duration = av_mul_q((AVRational) {pkt->duration, 1}, st->time_base); if (pkt->duration <= 0) { - ff_compute_frame_duration(s, &num, &den, st, pc, pkt); + compute_frame_duration(s, &num, &den, st, pc, pkt); if (den && num) { duration = (AVRational) {num, den}; pkt->duration = av_rescale_rnd(1, @@ -2761,7 +2760,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) (st->start_time != AV_NOPTS_VALUE || st->internal->first_dts != AV_NOPTS_VALUE)) { if (pkt->duration == 0) { - ff_compute_frame_duration(ic, &num, &den, st, st->internal->parser, pkt); + compute_frame_duration(ic, &num, &den, st, st->internal->parser, pkt); if (den && num) { pkt->duration = av_rescale_rnd(1, num * (int64_t) st->time_base.den,