From patchwork Thu Apr 13 14:12:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1291798pzb; Thu, 13 Apr 2023 07:22:04 -0700 (PDT) X-Google-Smtp-Source: AKy350a0SWVkxXkO/pkaUSTxMx9HenIdtv5c1aqWpP8iWgcPr0qkClUb3MyDcTfbwDiEAoVubTR0 X-Received: by 2002:a17:906:16c7:b0:931:f9f8:d4ea with SMTP id t7-20020a17090616c700b00931f9f8d4eamr2888008ejd.53.1681395724681; Thu, 13 Apr 2023 07:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681395724; cv=none; d=google.com; s=arc-20160816; b=KMoX/93ehPFkVRPEKH00Vm0jMhnvtcg4xco+kF4oqQAZnKv1ttq//QnIr89qTAW56j 8PTlJsTu+gPX9C37cL11W6BO4mxpCDOP/WELo+o1GH0lElscGjuNKVncb2+JXildw0gP Wa19ZQvdD2MIS4MOOJPwmA+OLBG8NtEfvv4sHY5rJGIJCnzCBb624PWTIu0X1lAByXAi ZEu3AEaqLqAdSOsIHeyJASQARQXaflEuHBuzDtRejbICb5zADqd9zVGJAwsG5wOWI2TH DCpGFa8AjBYLBki8Q8gaA689eHVmHD4qNpH+EoTrHUmJDzNQdiURnvMfwgdc7V9CTLvO vs4w== 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=sUySkzQqxhO4+RnpJZIbMDY2SjLt7AuTYKuA81Lf/Qg=; b=SyE4WIdJrQEFvSuWPlqBh6v6a2w2F1Uo/DYHlMHym1U+LDB+EzmZ593zBharO9dRjx E+dGWSD2CjsQT/xBW1ia0+NVqqBdM0eCsg9W1wXpumE1mKtopJgotWSsGNDQ0MkYBHCN qAc+hqKYUJmPhJFbFcteThHmlCXq0MCgEUCg3OwHJbxCo4hShWiVLqVkoM9QaC33Aoeo SRfhR7skKBY2+qjC7vDyCETwsZsMFlu3h2G/KohMqZraOIT4K3hgfD+52AKOiI31MQDV qFCg8Sfz3N1w7EaqI16+5NQXgh2ry/VfUNyLO7NAvEqtknO9Yh9smqP4f0NKUOOtivBs Az0g== 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 l15-20020a170907914f00b0094e3d6f1bc5si1834376ejs.297.2023.04.13.07.22.03; Thu, 13 Apr 2023 07:22:04 -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; 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 A1C9768BF1F; Thu, 13 Apr 2023 17:16:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ED5468BEB3 for ; Thu, 13 Apr 2023 17:16:04 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D57CC2406D0 for ; Thu, 13 Apr 2023 16:16:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id R_7GshfUWMxK for ; Thu, 13 Apr 2023 16:16:03 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id C937B240D1B for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B9A823A038E for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 16:12:19 +0200 Message-Id: <20230413141223.17245-21-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230413141223.17245-1-anton@khirnov.net> References: <20230413141223.17245-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/25] fftools/ffmpeg_mux: make ts_copy_start private to muxing code 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: f5PboLp4rfb0 It is no longer used outside of ffmpeg_mux* --- fftools/ffmpeg.h | 5 ----- fftools/ffmpeg_mux.c | 4 ++-- fftools/ffmpeg_mux.h | 5 +++++ fftools/ffmpeg_mux_init.c | 10 ++++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6ad3245166..e626fac18a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -598,11 +598,6 @@ typedef struct OutputStream { /* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */ int64_t last_mux_dts; - // timestamp from which the streamcopied streams should start, - // in AV_TIME_BASE_Q; - // everything before it should be discarded - int64_t ts_copy_start; - // the timebase of the packets sent to the muxer AVRational mux_timebase; AVRational enc_timebase; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 8c710c2eac..d832116c12 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -400,8 +400,8 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) if (!ost->streamcopy_started) { if (!ost->copy_prior_start && (pkt->pts == AV_NOPTS_VALUE ? - dts < ost->ts_copy_start : - pkt->pts < av_rescale_q(ost->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) + dts < ms->ts_copy_start : + pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) return; if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time) diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index e8c4ea4847..25cf1b547f 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -60,6 +60,11 @@ typedef struct MuxStream { /* Threshold after which max_muxing_queue_size will be in effect */ size_t muxing_queue_data_threshold; + // timestamp from which the streamcopied streams should start, + // in AV_TIME_BASE_Q; + // everything before it should be discarded + int64_t ts_copy_start; + /* dts of the last packet sent to the muxer, in the stream timebase * used for making up missing dts values */ int64_t last_mux_dts; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 33d5268949..48efaef664 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -841,6 +841,8 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o, static int streamcopy_init(const Muxer *mux, const OptionsContext *o, OutputStream *ost) { + MuxStream *ms = ms_from_ost(ost); + const InputStream *ist = ost->ist; const InputFile *ifile = input_files[ist->file_index]; @@ -907,11 +909,11 @@ static int streamcopy_init(const Muxer *mux, const OptionsContext *o, ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); if (!ost->copy_prior_start) { - ost->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? - 0 : mux->of.start_time; + ms->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? + 0 : mux->of.start_time; if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) { - ost->ts_copy_start = FFMAX(ost->ts_copy_start, - ifile->start_time + ifile->ts_offset); + ms->ts_copy_start = FFMAX(ms->ts_copy_start, + ifile->start_time + ifile->ts_offset); } }