From patchwork Wed Aug 10 16:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1012575pzi; Wed, 10 Aug 2022 09:27:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4fNKd+n5sGfDOaED+i6jHpD7IA204sZIEyOqZ69JBH0XXERrEdJVlQzPT8up/pHLBIRXtR X-Received: by 2002:a50:ec91:0:b0:440:9719:72ca with SMTP id e17-20020a50ec91000000b00440971972camr15117213edr.407.1660148827077; Wed, 10 Aug 2022 09:27:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660148827; cv=none; d=google.com; s=arc-20160816; b=lhIKOTiAAuZauBGMai/rqiWfhoP10zA+zWZvzcra7etAh6vIHs449SfANkhGPe0aza Qgk5GaKwvNMDzXlAYQf472I4zgFlv8dvae1mfnfabEXXZS+ACMCHCApIikBmVtig3joR nfJ6nt5NpTLV8eqx2jgZZ84O5pZ6hYOgMQ0j7QtYklDggoo/HuTAJb+0x8/Jc0Xg5Now Hhh2Be7m4Sq2cdAtWVxqKpglHONmsz8Kh18c03vhWyQU7cexSjEobTz/wFjSc7XTpz1g Nr64yHKxrZPn3PfIDTs1j2MJBcusJYLCagM+QnVVIPDJc4gekRpvOhB4mFcAPKKKvZxs uLmQ== 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=09SLcR99cETZy2SnTXfVrIhMsrk9Ix0IIZoOx0mR++c=; b=BI8fRHpvRqeaoVtZ/pvpSD3pNe89ktd2lwNAz23arlG48xPQXR7qCeyKql9GWwFiPl o0XTAf/lZTyjMF3HK8an52puelB3hJqbjBFr+0LdCa6VJm2zF8uG8j2Mv4ad2N7Pekzn iQxHoH8I9XnBYouWz7/DCyxVliXOYOIwQF/87SrF5liGdcA/9XetDqsRJmyA7QQBquhR QIyD9XROco6BfAUIK4Tzt6b0Eis3WZF4ndgpOMFXwXYHbKp4QEo8XWXMKaQl9KFtQDSB GhDYq2ADMm83ucEUrEANbkelxForEhVCpMJ7DIsh3e8v/mYUNwZFYs2pQ/J/kUOhPAwz DH9w== 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 nd17-20020a170907629100b0072f22d91836si5697146ejc.541.2022.08.10.09.27.06; Wed, 10 Aug 2022 09:27:07 -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 79DAE68B8CF; Wed, 10 Aug 2022 19:26:11 +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 EA5FE68B89B for ; Wed, 10 Aug 2022 19:26:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 47AE0240506 for ; Wed, 10 Aug 2022 18:25:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id uRJ0xQio7yA8 for ; Wed, 10 Aug 2022 18:25:58 +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 3867A2404FE for ; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4A9A83A046F; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 18:25:44 +0200 Message-Id: <20220810162545.21382-8-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810162545.21382-1-anton@khirnov.net> References: <20220810162545.21382-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] fftools/ffmpeg: use a separate variable for discontinuity offset 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: Ol/0OfasNWoV This will allow to move normal offset handling to demuxer thread, since discontinuities currently have to be processed in the main thread, as the code uses some decoder-produced values. --- fftools/ffmpeg.c | 39 ++++++++++++++++++++++++++++----------- fftools/ffmpeg.h | 4 ++++ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index dd45cb4516..8d85af1c97 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3693,8 +3693,8 @@ static void decode_flush(InputFile *ifile) } } -static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, - AVPacket *pkt) +static void ts_discontinuity_detect(InputFile *ifile, InputStream *ist, + AVPacket *pkt) { const int fmt_is_discont = ifile->ctx->iformat->flags & AVFMT_TS_DISCONT; int disable_discontinuity_correction = copy_ts; @@ -3715,13 +3715,13 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, if (fmt_is_discont) { if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) { - ifile->ts_offset -= delta; + ifile->ts_offset_discont -= delta; av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity for stream #%d:%d " "(id=%d, type=%s): %"PRId64", new offset= %"PRId64"\n", ist->file_index, ist->st->index, ist->st->id, av_get_media_type_string(ist->st->codecpar->codec_type), - delta, ifile->ts_offset); + delta, ifile->ts_offset_discont); pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); @@ -3744,10 +3744,10 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, 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) { - ifile->ts_offset -= delta; + ifile->ts_offset_discont -= delta; av_log(NULL, AV_LOG_DEBUG, "Inter stream timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", - delta, ifile->ts_offset); + delta, ifile->ts_offset_discont); pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); @@ -3757,6 +3757,26 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, ifile->last_ts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); } +static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, + AVPacket *pkt) +{ + int64_t offset = av_rescale_q(ifile->ts_offset_discont, AV_TIME_BASE_Q, + ist->st->time_base); + + // apply previously-detected timestamp-discontinuity offset + // (to all streams, not just audio/video) + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts += offset; + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts += offset; + + // detect timestamp discontinuities for audio/video + if ((ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || + ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) && + pkt->dts != AV_NOPTS_VALUE) + ts_discontinuity_detect(ifile, ist, pkt); +} + /* * Return * - 0 -- one packet was read and processed @@ -3897,11 +3917,8 @@ static int process_input(int file_index) if (pkt->dts != AV_NOPTS_VALUE) pkt->dts += duration; - // detect and correct timestamp discontinuities for audio/video - if ((ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || - ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) && - pkt->dts != AV_NOPTS_VALUE) - ts_discontinuity_process(ifile, ist, pkt); + // detect and try to correct for timestamp discontinuities + ts_discontinuity_process(ifile, ist, pkt); if (debug_ts) { av_log(NULL, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n", diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 8b2e73d642..6991ba7632 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -427,6 +427,10 @@ typedef struct InputFile { int input_sync_ref; int64_t ts_offset; + /** + * Extra timestamp offset added by discontinuity handling. + */ + int64_t ts_offset_discont; int64_t last_ts; int64_t start_time; /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */ int64_t recording_time;