From patchwork Thu Apr 13 14:12:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1291455pzb; Thu, 13 Apr 2023 07:21:42 -0700 (PDT) X-Google-Smtp-Source: AKy350Z8rgvuzgQA+J0GF3psWp+F5dYC9pArh5yWouMb3TercsfDC+n6Ev3zmgkqmmetnt/KP0IV X-Received: by 2002:a17:906:8e8e:b0:93e:5baa:d443 with SMTP id ru14-20020a1709068e8e00b0093e5baad443mr2834709ejc.63.1681395701989; Thu, 13 Apr 2023 07:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681395701; cv=none; d=google.com; s=arc-20160816; b=fCkzX0z9lbAuf/tLnPokgJ8PW27PIJ9fFHMeUvsblBUiOLhY3gj7i9mxeWj9eFDMke gAOLgxeSVK30Y9dK2fdDTFjH8eVJhliYpXKAqPcr9PZZb3gvSmQ6bdBp13hK4goGgyag hXXiy7fsqv2Jt8jWrYRKySFfBmRtWq1+ABw/pgFbJZOjIcG0kCkekeJXxYmyNZwGj/Px Rd1i0txgrkVdOqekzQo3Xrgv+7nZzezU1AE963KTgj78FAgDL2HngF9Guoa9K0ygihLz PVgO5Z45oUeD+U8TyDcNJtVabHTv0cPn8t5U83yC3ld6jqKgR0CCd0+kiOcnziGS5mVm 5cyw== 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=qJ3F09cxp+mRLfwv4lWv5i2aYqPr6mixs1W8vSjsz14=; b=kJsE5Wo6BWuBoFac/PKQFmRPCAsDLQ0Pjy22YiJ7hj27f/4kjocLEYpuO00QQ9Nh3D RqErCO9Zsk4AUzRBnk6tXf/KDbnjbyihUNmDyOohmnTJqQxpEe/eum7t9cQTA8W8bkCr dWRir2VcS9dHkT+DFyC+/Pnrlic8N07LwW2WXuMXRfNoKKxfAu63kjTSTmDynpJ/0AAP 8sSJNjzG9mbsWnVYjjy7hFR+yffXE002/6NtedYHW5HmKpsJMny++Gd7e/R9GMmQkQlP 5rrfIbQRQy7+ws2ctyY1VKVUwKOi9PXyIrljp7/kEaezws0EnFRZEz0OpLwgrfJhi91z 1tfQ== 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 fc10-20020a1709073a4a00b0094e8adc1eb7si1808855ejc.672.2023.04.13.07.21.41; Thu, 13 Apr 2023 07:21:41 -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 914BC68BF18; Thu, 13 Apr 2023 17:16:24 +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 A8E2C68BE34 for ; Thu, 13 Apr 2023 17:16:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6ED3B2406CF 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 C045EE9Gj96v 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 D2D43240D1C 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 C45393A039B 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:20 +0200 Message-Id: <20230413141223.17245-22-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 22/25] fftools/ffmpeg_mux: make streamcopy_started 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: YN7FUWMMJtZD It is no longer used outside of ffmpeg_mux* --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_mux.c | 6 +++--- fftools/ffmpeg_mux.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e626fac18a..cc72b1cb6e 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -658,7 +658,6 @@ typedef struct OutputStream { int inputs_done; const char *attachment_filename; - int streamcopy_started; int copy_initial_nonkeyframes; int copy_prior_start; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index d832116c12..01ccac55ce 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -393,11 +393,11 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) return; } - if (!ost->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && + if (!ms->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && !ost->copy_initial_nonkeyframes) return; - if (!ost->streamcopy_started) { + if (!ms->streamcopy_started) { if (!ost->copy_prior_start && (pkt->pts == AV_NOPTS_VALUE ? dts < ms->ts_copy_start : @@ -451,7 +451,7 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) of_output_packet(of, opkt, ost, 0); - ost->streamcopy_started = 1; + ms->streamcopy_started = 1; } static int thread_stop(Muxer *mux) diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index 25cf1b547f..0938a261ee 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -74,6 +74,8 @@ typedef struct MuxStream { // combined size of all the packets sent to the muxer uint64_t data_size_mux; + + int streamcopy_started; } MuxStream; typedef struct Muxer {