From patchwork Wed Dec 13 19:30:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4501847pzf; Wed, 13 Dec 2023 11:31:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqHVqPvva8c7Gnr88D8NF67rro5Dl0CSzLGPNRddop6BajkMPT6aXr+UryV0q2Wsr5tAJ5 X-Received: by 2002:a50:f691:0:b0:552:65d5:e6e5 with SMTP id d17-20020a50f691000000b0055265d5e6e5mr57601edn.55.1702495916259; Wed, 13 Dec 2023 11:31:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702495916; cv=none; d=google.com; s=arc-20160816; b=x6zjd4xtSp/dLjQ3r+Ets9a53keKhRe91bvTIBDJIxL84IboEy1WgIHcjIEkpnMo6Z HZKHVjGgs5SQ2lPFcpQpCOjYEASd9yEmGyku4ez0dP0pMaj3OM/ldBPFagB9Kljzjg22 mmEJefE5GzLMGLxZi9MvTB9d7r8z/CbifsO6aO4j8zzCesIZsQFiGC8npZBb5v2zHQUw xBvBpa6DN6KSRQ4f9jC8j3zpuDC6cr0mspR4fffJRTrhN+JXkEwJns6B9wxKoyoPVxfA hJ7OHZRH/HP3PVFVpLqs91HbQRpyz/VCNhV6kQ76ivhegJGkjZphdqWhqAirfdBaENRy 43AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=rRNCg/ew/N2MlhdkpJV0tqXfI9Dw/tvpCRoyWZZwgBY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XERQAL+Z/t0GWXSNEfgqxjJbijC4eyFt3OTxRlbM5EXX7o8Wz6pFVodBrCVa+bMTC2 8PI6nA5oYue85g0I0kvWliuhQP3q3+fz1/22dXeHJMqGj7k4swkmX/3LDP1IE2xEaV4e sC131s92lQRMkEKeXowfkwiynOUghRm9/P8wZglXU5IJyrbCmCk5c7VN2yAH9qt9us92 T1WL0ZUUFKwT48dHIl8TqcU2E8i0w29PritWPPiwUNdqxdc/RpfMkGsirG3VJLpfQluA uOPkOad/HyT1u3cJkMhhJl0iUT0dXZjCEH2N2Ez1yK1DkX9bx7vMOnSgnhsunWvTtwnY NY4A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s19-20020a50d493000000b0055121bd26b1si3040576edi.620.2023.12.13.11.31.55; Wed, 13 Dec 2023 11:31:56 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EEA168D1CC; Wed, 13 Dec 2023 21:30:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FE0968D0EF for ; Wed, 13 Dec 2023 21:30:28 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7FF9F1783 for ; Wed, 13 Dec 2023 20:30:23 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id lKYKi8auf7cn for ; Wed, 13 Dec 2023 20:30:23 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 6FCFB1BA2 for ; Wed, 13 Dec 2023 20:30:21 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 575823A06A6 for ; Wed, 13 Dec 2023 20:30:14 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2023 20:30:02 +0100 Message-ID: <20231213193007.17471-7-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231213193007.17471-1-anton@khirnov.net> References: <20231213193007.17471-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/12] fftools/ffmpeg_demux: move InputFile.readrate to private data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k0RdGBDOG2KE It is not used outside of ffmpeg_demux. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_demux.c | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 3db3d87dfe..2963d2d5d4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -423,7 +423,6 @@ typedef struct InputFile { InputStream **streams; int nb_streams; - float readrate; int accurate_seek; } InputFile; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 865c1e7d2f..f9c71f5b9a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -117,6 +117,7 @@ typedef struct Demuxer { /* number of streams that the user was warned of */ int nb_streams_warn; + float readrate; double readrate_initial_burst; Scheduler *sch; @@ -491,7 +492,7 @@ static void readrate_sleep(Demuxer *d) int64_t stream_ts_offset, pts, now; stream_ts_offset = FFMAX(ds->first_dts != AV_NOPTS_VALUE ? ds->first_dts : 0, file_start); pts = av_rescale(ds->dts, 1000000, AV_TIME_BASE); - now = (av_gettime_relative() - d->wallclock_start) * f->readrate + stream_ts_offset; + now = (av_gettime_relative() - d->wallclock_start) * d->readrate + stream_ts_offset; if (pts - burst_until > now) av_usleep(pts - burst_until - now); } @@ -667,7 +668,7 @@ static void *input_thread(void *arg) if (ret < 0) break; - if (f->readrate) + if (d->readrate) readrate_sleep(d); ret = demux_send(d, ds, pkt, send_flags); @@ -1582,19 +1583,19 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch) f->format_nots = !!(ic->iformat->flags & AVFMT_NOTIMESTAMPS); - f->readrate = o->readrate ? o->readrate : 0.0; - if (f->readrate < 0.0f) { - av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", f->readrate); + d->readrate = o->readrate ? o->readrate : 0.0; + if (d->readrate < 0.0f) { + av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", d->readrate); return AVERROR(EINVAL); } if (o->rate_emu) { - if (f->readrate) { - av_log(d, AV_LOG_WARNING, "Both -readrate and -re set. Using -readrate %0.3f.\n", f->readrate); + if (d->readrate) { + av_log(d, AV_LOG_WARNING, "Both -readrate and -re set. Using -readrate %0.3f.\n", d->readrate); } else - f->readrate = 1.0f; + d->readrate = 1.0f; } - if (f->readrate) { + if (d->readrate) { d->readrate_initial_burst = o->readrate_initial_burst ? o->readrate_initial_burst : 0.5; if (d->readrate_initial_burst < 0.0) { av_log(d, AV_LOG_ERROR,