From patchwork Wed Sep 28 09:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp93752pzh; Wed, 28 Sep 2022 02:58:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Wi6BcFexPCRnqkTvvhkxi34sMb3Dm5I79tZ7lG+SUHC9HZfG5EOLyv+7wirKHz6jMttq7 X-Received: by 2002:a17:907:318b:b0:740:33f2:9e8 with SMTP id xe11-20020a170907318b00b0074033f209e8mr26551266ejb.138.1664359117877; Wed, 28 Sep 2022 02:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664359117; cv=none; d=google.com; s=arc-20160816; b=iIOEyM/ZyMSs7v18SGche0D1kvtab39GIV2m6bhgJ42jiNPjmECZ2FxQpi/ZpP8UyE xe982GAaIXp3I1/NRcf8t4Z7D0KqpYhZu4ckmRqr9WGrsN6qzvavdI1SNEb399JhZUEq EUA2a5g/aXKOUIc71Jq/85wjzNxUgqmNiaryDO5RkWCcknlcj7onF2Jw+O6d64KHpgQ7 l3VWyNbBSPNjBwrBLEUDjdLpUtwXMkLF/LGbNmIsauRscFtyL/v3QnLZvspnJdpoSxGW 1bEB3X0pa0+aR7lrTQ4Mb0PjN1ofKgdz3FEnV2cQjfwu5DF3Cq0kf0VLv8gn2rzZbZb1 GE8g== 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=HUlpByiD86zIHx7v3pHKqy8NLAzxTgeKxXIJqY9/1z4=; b=LgbCXs6Fdn8Mo/oFeOU5LiLadmyEryl1D8/8MyfNRfYbCWy/fiyS3N1qOQ+zL5IMdf utR7+XGyRyOoN3rMTCxjpG7aPpTnBj0dlDDN0pWuKS1cpxCqX3Uafxw/l+PjSaol6bly eRWeD2zIRvW8rCqS0G8G97BUMBx+mYLn7Ye2YH5Exww8O/ovhHadm3oFTwbNnQWAkC37 RXLrIm2dVct+F99sVkzpCRI7tHFGSPa6PnF8uzhpgHQOeb2gDnV4nq2t4oU4cWFUFwmQ BOr2GfIE+iXAxPSuhwSXnO+nroq4IPzFC1Q90OWczSi/PU0gpJrcVX8KaSNdxl4WzPa2 duzg== 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 g11-20020a170906c18b00b0072b7fac8a7asi3500232ejz.926.2022.09.28.02.58.37; Wed, 28 Sep 2022 02:58:37 -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 02C3768BBDD; Wed, 28 Sep 2022 12:58:13 +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 6231668BBE1 for ; Wed, 28 Sep 2022 12:58:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A4A122404F7 for ; Wed, 28 Sep 2022 11:58:02 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id udnIRlY52m1O for ; Wed, 28 Sep 2022 11:58:02 +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 053682404F8 for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 46BED3A168C for ; Wed, 28 Sep 2022 11:58:01 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 11:55:54 +0200 Message-Id: <20220928095556.28209-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928095556.28209-1-anton@khirnov.net> References: <20220928095556.28209-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] fftools/ffmpeg: pass the timestamp to check_recording_time() 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: Mi7jcpRP2WYK Stop setting OutputStream.sync_opts for subtitle encoding, as it is now unused. --- fftools/ffmpeg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1a6768f6c2..40c01b1c65 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -758,13 +758,12 @@ fail: } -static int check_recording_time(OutputStream *ost) +static int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb) { OutputFile *of = output_files[ost->file_index]; if (of->recording_time != INT64_MAX && - av_compare_ts(ost->sync_opts, ost->enc_ctx->time_base, of->recording_time, - AV_TIME_BASE_Q) >= 0) { + av_compare_ts(ts, tb, of->recording_time, AV_TIME_BASE_Q) >= 0) { close_output_stream(ost); return 0; } @@ -1045,7 +1044,7 @@ static void do_audio_out(OutputFile *of, OutputStream *ost, adjust_frame_pts_to_encoder_tb(of, ost, frame); - if (!check_recording_time(ost)) + if (!check_recording_time(ost, ost->sync_opts, ost->enc_ctx->time_base)) return; if (frame->pts == AV_NOPTS_VALUE) @@ -1091,8 +1090,7 @@ static void do_subtitle_out(OutputFile *of, for (i = 0; i < nb; i++) { unsigned save_num_rects = sub->num_rects; - ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base); - if (!check_recording_time(ost)) + if (!check_recording_time(ost, pts, AV_TIME_BASE_Q)) return; ret = av_new_packet(pkt, subtitle_out_max_size); @@ -1339,7 +1337,7 @@ static void do_video_out(OutputFile *of, in_picture->pts = ost->sync_opts; - if (!check_recording_time(ost)) + if (!check_recording_time(ost, in_picture->pts, ost->enc_ctx->time_base)) return; in_picture->quality = enc->global_quality;