From patchwork Mon May 8 09:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2181540pzb; Mon, 8 May 2023 02:21:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5RjKrxvWvhNass3aUnrf/Yk3AWqvk1CyzyrexoeYMcM6Kw+fhgs6aJRg1kyBG01e0U7VSO X-Received: by 2002:a17:907:934a:b0:958:772e:e926 with SMTP id bv10-20020a170907934a00b00958772ee926mr7699231ejc.24.1683537668233; Mon, 08 May 2023 02:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683537668; cv=none; d=google.com; s=arc-20160816; b=rh3SFW8XCdKOTftuf/Y0woiyEQQ7wDk7qKilRk1qkH0ZzCLnszUZ+Amo9ZruiJVJtP yW/rQXeNKANWiNTa5tQC+CH3Wvp2TsOQtZL+ad2E4mw28ISpYt49sG9eKC9KK3OiNxu7 ZIKxHoR4GBb7uZMBhTzMguvmACwN/6e9EAC5lk2tf3t5m8lxyPpKm0iNMgl58Hy8DoaS 6WtQC4YUA3fCcnykZbLA7QTeme3D7wthX1lzSMRWqMoxsqbH4c9bgvtnoTPHtY/uW4NF Sfe5ucWV753x0Fy6bwvW1XgoXZY+3oYbXUtW8O861OCpA2fGLhNAlvj6VA6hA0vUOvz7 d+Eg== 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=0AvLSxmYx8oTlMQ+bnOguN2H18uVxnnDSYLfelN1i10=; b=z1BnOV/YZGHHfj4spv1fed69j7fV9ap6cdvAsslmOxnPO7vzgxMBZVVEOQ/QB9vCLb R6luI8F44nvAv4jvxtK40weBhAAxG2mBIIxX1JOVvSMcujBemkvArOpE2F3tmjPUMlbe vEQTlwgJepPrZISjPJLift7sbOsB8XRBdUcc+JFLALHPYX8w+rlnVLMLLsM7dBw4FkLd 1t0HJ5rKd+6JaQXePn8GPVE3X49MhvJuz1AZiIOkt1TDiewiAA6KOZ9CrsREupBSOXTh ZxLp7ATv1t51xn67L+9fnHrARxgL7OdOq3HAXnh6mPOUN1z8ZOMymVLvwg6R0cxDxW+v RSow== 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 ca2-20020aa7cd62000000b005067c88a41dsi9380579edb.318.2023.05.08.02.21.07; Mon, 08 May 2023 02:21:08 -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 0CFBE68C1F8; Mon, 8 May 2023 12:18:26 +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 6004E68C17A for ; Mon, 8 May 2023 12:18:05 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0D4852406CB for ; Mon, 8 May 2023 11:18:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id e1QP5PrBG9J4 for ; Mon, 8 May 2023 11:18:00 +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 4F1932405F9 for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 418603A01C0 for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 May 2023 11:17:27 +0200 Message-Id: <20230508091738.20813-11-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508091738.20813-1-anton@khirnov.net> References: <20230508091738.20813-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/22] fftools/ffmpeg_demux: move InputStream.[next_]dts 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: kImfQPOFTH8Y They are no longer used outside of ffmpeg_demux. --- fftools/ffmpeg.h | 4 --- fftools/ffmpeg_demux.c | 59 +++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e4a697af54..b8c0e7db84 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -364,10 +364,6 @@ typedef struct InputStream { AVRational framerate_guessed; int64_t start; /* time when read started */ - /* predicted dts of the next packet read for this stream or (when there are - * several frames in a packet) of the next frame in current packet (in AV_TIME_BASE units) */ - int64_t next_dts; - int64_t dts; ///< dts of the last packet read for this stream (in AV_TIME_BASE units) // pts/estimated duration of the last decoded frame // * in decoder timebase for video, diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 0b27d54870..7e34292b3a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -64,6 +64,12 @@ typedef struct DemuxStream { ///< dts of the first packet read for this stream (in AV_TIME_BASE units) int64_t first_dts; + /* predicted dts of the next packet read for this stream or (when there are + * several frames in a packet) of the next frame in current packet (in AV_TIME_BASE units) */ + int64_t next_dts; + ///< dts of the last packet read for this stream (in AV_TIME_BASE units) + int64_t dts; + int64_t min_pts; /* pts with the smallest value in a current stream */ int64_t max_pts; /* pts with the higher value in a current stream */ @@ -197,25 +203,26 @@ static int seek_to_start(Demuxer *d) static void ts_discontinuity_detect(InputFile *ifile, InputStream *ist, AVPacket *pkt) { + DemuxStream *ds = ds_from_ist(ist); const int fmt_is_discont = ifile->ctx->iformat->flags & AVFMT_TS_DISCONT; int disable_discontinuity_correction = copy_ts; int64_t pkt_dts = av_rescale_q_rnd(pkt->dts, pkt->time_base, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX); - if (copy_ts && ist->next_dts != AV_NOPTS_VALUE && + if (copy_ts && ds->next_dts != AV_NOPTS_VALUE && fmt_is_discont && ist->st->pts_wrap_bits < 60) { int64_t wrap_dts = av_rescale_q_rnd(pkt->dts + (1LL<st->pts_wrap_bits), pkt->time_base, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - if (FFABS(wrap_dts - ist->next_dts) < FFABS(pkt_dts - ist->next_dts)/10) + if (FFABS(wrap_dts - ds->next_dts) < FFABS(pkt_dts - ds->next_dts)/10) disable_discontinuity_correction = 0; } - if (ist->next_dts != AV_NOPTS_VALUE && !disable_discontinuity_correction) { - int64_t delta = pkt_dts - ist->next_dts; + if (ds->next_dts != AV_NOPTS_VALUE && !disable_discontinuity_correction) { + int64_t delta = pkt_dts - ds->next_dts; if (fmt_is_discont) { if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || - pkt_dts + AV_TIME_BASE/10 < ist->dts) { + pkt_dts + AV_TIME_BASE/10 < ds->dts) { ifile->ts_offset_discont -= delta; av_log(NULL, AV_LOG_WARNING, "timestamp discontinuity for stream #%d:%d " @@ -229,19 +236,23 @@ static void ts_discontinuity_detect(InputFile *ifile, InputStream *ist, } } else { if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { - av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt->dts, ist->next_dts, pkt->stream_index); + av_log(NULL, AV_LOG_WARNING, + "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", + pkt->dts, ds->next_dts, pkt->stream_index); pkt->dts = AV_NOPTS_VALUE; } if (pkt->pts != AV_NOPTS_VALUE){ int64_t pkt_pts = av_rescale_q(pkt->pts, pkt->time_base, AV_TIME_BASE_Q); - delta = pkt_pts - ist->next_dts; + delta = pkt_pts - ds->next_dts; if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { - av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt->pts, ist->next_dts, pkt->stream_index); + av_log(NULL, AV_LOG_WARNING, + "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", + pkt->pts, ds->next_dts, pkt->stream_index); pkt->pts = AV_NOPTS_VALUE; } } } - } else if (ist->next_dts == AV_NOPTS_VALUE && !copy_ts && + } else if (ds->next_dts == AV_NOPTS_VALUE && !copy_ts && fmt_is_discont && ifile->last_ts != AV_NOPTS_VALUE) { int64_t delta = pkt_dts - ifile->last_ts; if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE) { @@ -285,39 +296,39 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt) if (!ds->saw_first_ts) { ds->first_dts = - ist->dts = ist->st->avg_frame_rate.num ? - ist->par->video_delay * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0; + ds->dts = ist->st->avg_frame_rate.num ? - ist->par->video_delay * AV_TIME_BASE / av_q2d(ist->st->avg_frame_rate) : 0; if (pkt->pts != AV_NOPTS_VALUE) { ds->first_dts = - ist->dts += av_rescale_q(pkt->pts, pkt->time_base, AV_TIME_BASE_Q); + ds->dts += av_rescale_q(pkt->pts, pkt->time_base, AV_TIME_BASE_Q); } ds->saw_first_ts = 1; } - if (ist->next_dts == AV_NOPTS_VALUE) - ist->next_dts = ist->dts; + if (ds->next_dts == AV_NOPTS_VALUE) + ds->next_dts = ds->dts; if (pkt->dts != AV_NOPTS_VALUE) - ist->next_dts = ist->dts = av_rescale_q(pkt->dts, pkt->time_base, AV_TIME_BASE_Q); + ds->next_dts = ds->dts = av_rescale_q(pkt->dts, pkt->time_base, AV_TIME_BASE_Q); - ist->dts = ist->next_dts; + ds->dts = ds->next_dts; switch (par->codec_type) { case AVMEDIA_TYPE_AUDIO: av_assert1(pkt->duration >= 0); if (par->sample_rate) { - ist->next_dts += ((int64_t)AV_TIME_BASE * par->frame_size) / + ds->next_dts += ((int64_t)AV_TIME_BASE * par->frame_size) / par->sample_rate; } else { - ist->next_dts += av_rescale_q(pkt->duration, pkt->time_base, AV_TIME_BASE_Q); + ds->next_dts += av_rescale_q(pkt->duration, pkt->time_base, AV_TIME_BASE_Q); } break; case AVMEDIA_TYPE_VIDEO: if (ist->framerate.num) { // TODO: Remove work-around for c99-to-c89 issue 7 AVRational time_base_q = AV_TIME_BASE_Q; - int64_t next_dts = av_rescale_q(ist->next_dts, time_base_q, av_inv_q(ist->framerate)); - ist->next_dts = av_rescale_q(next_dts + 1, av_inv_q(ist->framerate), time_base_q); + int64_t next_dts = av_rescale_q(ds->next_dts, time_base_q, av_inv_q(ist->framerate)); + ds->next_dts = av_rescale_q(next_dts + 1, av_inv_q(ist->framerate), time_base_q); } else if (pkt->duration) { - ist->next_dts += av_rescale_q(pkt->duration, pkt->time_base, AV_TIME_BASE_Q); + ds->next_dts += av_rescale_q(pkt->duration, pkt->time_base, AV_TIME_BASE_Q); } else if (ist->par->framerate.num != 0) { AVRational field_rate = av_mul_q(ist->par->framerate, (AVRational){ 2, 1 }); @@ -328,7 +339,7 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt) av_stream_get_parser(ist->st)) fields = 1 + av_stream_get_parser(ist->st)->repeat_pict; - ist->next_dts += av_rescale_q(fields, av_inv_q(field_rate), AV_TIME_BASE_Q); + ds->next_dts += av_rescale_q(fields, av_inv_q(field_rate), AV_TIME_BASE_Q); } break; } @@ -342,7 +353,7 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt) return AVERROR(ENOMEM); pd = (DemuxPktData*)pkt->opaque_ref->data; - pd->dts_est = ist->dts; + pd->dts_est = ds->dts; } return 0; @@ -502,7 +513,7 @@ static void readrate_sleep(Demuxer *d) DemuxStream *ds = ds_from_ist(ist); 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(ist->dts, 1000000, AV_TIME_BASE); + pts = av_rescale(ds->dts, 1000000, AV_TIME_BASE); now = (av_gettime_relative() - ist->start) * f->readrate + stream_ts_offset; if (pts - burst_until > now) av_usleep(pts - burst_until - now); @@ -983,7 +994,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) st->discard = AVDISCARD_ALL; ist->nb_samples = 0; ds->first_dts = AV_NOPTS_VALUE; - ist->next_dts = AV_NOPTS_VALUE; + ds->next_dts = AV_NOPTS_VALUE; ds->min_pts = INT64_MAX; ds->max_pts = INT64_MIN;