From patchwork Wed Aug 10 16:25:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1012409pzi; Wed, 10 Aug 2022 09:26:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR5LrzeV3e+FZVkRIbXxkKyGHRBjtby6DNFZZrd4tsTsFSMTqalh4m+rFWwAutO07JBYOULO X-Received: by 2002:a17:907:6092:b0:731:59f0:49ac with SMTP id ht18-20020a170907609200b0073159f049acmr10853046ejc.383.1660148808245; Wed, 10 Aug 2022 09:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660148808; cv=none; d=google.com; s=arc-20160816; b=chK6nbP311SMa0/p6ENQwgqtDQYz+kITK9gDwU3bP2PZmlrY5tDMeGgJPPkx1cZ7Ch YuDUJKbdKAB4hVJjkFRFLLDCO0X/L3wKxoxhrUryJWUs0b55z5NgoZbYmsacKUyDOSNw u4QB7l1G+fCYovvYHdARjjm2ayv+6T24wfL0U/bxIHRZnc5hP7sqxu6IdPcMHgwpE8E6 /xZ/EiCySQRGnT4so0J56FphOd8IUbDv4aimaVMSjw3jUSPTh4MY17OFMO/cj3CL4V42 Nkka3qC7vr24KDALKJZksI6SnYWdv9P4/VreRDxvenhNNrHwyi4Bi3aBWu8rR/MhkrH6 3xaA== 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=tCij85526CxqxrIhE+eU2BBj5NKBfXdOVaFRIURlo5o=; b=08OiU5hPJqwjaW7GIMFTdE9xenIySMvsZfNE7BCTslhO67gv1oyjKTottMfyGOSVcr Vnkuh47431LfL4tXNvsJlJw45oT17ZcgdHOsxDnHTBRVEx4pKIew+9NCKQFFJi2Dawf8 ZkjbJiRlb2/azrCPIHNN+OKOeksWPmQDCNIrLYR0d6pSaNujhh9zfGu4d50UMQVxXTir T7zj1zJsek0Kj9lhQTpLfWT5EBiLqWmiqiDgPeRDxn60hMZAn2YD8FkAQHs5n8L2T6L5 2k292wh5oIDP9wMiiNaRlZet7IYrhAP1Ypa9e0ynnT6Qq/iS28DwpCreEaIKsONWX31b XS0g== 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 hq16-20020a1709073f1000b0072ed45a17dbsi5385397ejc.267.2022.08.10.09.26.34; Wed, 10 Aug 2022 09:26:48 -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 3E5C468B371; Wed, 10 Aug 2022 19:26:08 +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 ECEFB68B590 for ; Wed, 10 Aug 2022 19:25:58 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7D2072404AF for ; Wed, 10 Aug 2022 18:25:58 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 8pArh97Tm3TN for ; Wed, 10 Aug 2022 18:25:57 +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 31C67240179 for ; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 339233A03FD; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 18:25:39 +0200 Message-Id: <20220810162545.21382-3-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 3/9] fftools/ffmpeg: move stream-dependent starttime correction to transcode_init() 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: sSrAVk7lq68k Currently this code is located in the discontinuity handling block, where it does not belong. --- fftools/ffmpeg.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 16b1ba8af7..6f822de97d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3313,6 +3313,27 @@ static int transcode_init(void) input_streams[j + ifile->ist_index]->start = av_gettime_relative(); } + // Correct starttime based on the enabled streams + for (i = 0; i < nb_input_files; i++) { + InputFile *ifile = input_files[i]; + AVFormatContext *is = ifile->ctx; + int64_t new_start_time = INT64_MAX; + + if (!(is->iformat->flags & AVFMT_TS_DISCONT)) + continue; + + for (int j = 0; j < is->nb_streams; j++) { + AVStream *st = is->streams[j]; + if(st->discard == AVDISCARD_ALL || st->start_time == AV_NOPTS_VALUE) + continue; + new_start_time = FFMIN(new_start_time, av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q)); + } + if (new_start_time > is->start_time) { + av_log(is, AV_LOG_VERBOSE, "Correcting start time by %"PRId64"\n", new_start_time - is->start_time); + ifile->ts_offset = -new_start_time; + } + } + /* init input streams */ for (i = 0; i < nb_input_streams; i++) if ((ret = init_input_stream(i, error, sizeof(error))) < 0) @@ -3752,24 +3773,6 @@ static int process_input(int file_index) if(!ist->wrap_correction_done && is->start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64){ int64_t stime, stime2; - // Correcting starttime based on the enabled streams - // FIXME this ideally should be done before the first use of starttime but we do not know which are the enabled streams at that point. - // so we instead do it here as part of discontinuity handling - if ( ist->next_dts == AV_NOPTS_VALUE - && ifile->ts_offset == -is->start_time - && (is->iformat->flags & AVFMT_TS_DISCONT)) { - int64_t new_start_time = INT64_MAX; - for (i=0; inb_streams; i++) { - AVStream *st = is->streams[i]; - if(st->discard == AVDISCARD_ALL || st->start_time == AV_NOPTS_VALUE) - continue; - new_start_time = FFMIN(new_start_time, av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q)); - } - if (new_start_time > is->start_time) { - av_log(is, AV_LOG_VERBOSE, "Correcting start time by %"PRId64"\n", new_start_time - is->start_time); - ifile->ts_offset = -new_start_time; - } - } stime = av_rescale_q(is->start_time, AV_TIME_BASE_Q, ist->st->time_base); stime2= stime + (1ULL<st->pts_wrap_bits);