From patchwork Wed Dec 13 19:30:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45125 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4501939pzf; Wed, 13 Dec 2023 11:32:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHF7XT6mTy4M4u97ZwKL29y12JC0xt8TDC7Z4aJdgA82QnPcHo6bT56BzldxpouIbvA//fP X-Received: by 2002:a17:907:d404:b0:a01:b8e5:d4b7 with SMTP id vi4-20020a170907d40400b00a01b8e5d4b7mr8138777ejc.1.1702495924913; Wed, 13 Dec 2023 11:32:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702495924; cv=none; d=google.com; s=arc-20160816; b=RURl9DKcMkZDnu9sOxk1GoeDNxrGKaS1cq6jD814XHU1ShJNTa+uCVbRf55j61slZv 6ubcRE0z6JVFgzFAU1bzWpPvkF6ONdh7JT0jVRvV9A6n4XBL0W4EG1TUeQ4QiMW6N1QI jQzkCDntH4Y0ZwboALpX42fMo7sFORELXTpatlqauGHk3GbxKPYwfIfemdUlvNMAwEcK EYZb2E+dAfc9QGP5hJi2UR83oPYcEWZ//z9knS6z1eai1Yll7c2ca90KtQW2TboYKt5e lespTxSg+5qHEK+dZy8VccgPe12dsjpzH8285QNnT2sNUfSIRgKjBKT4Y/ICpfIpxvQm eqcw== 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=LM4YclmzIz4Uj7LUGkprPRsidBmnfUvdfd38h8n+m9o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UGA8P3RKsyt2ktHp8wsU/F415gMfl4O8E2oDkZ4O/GTyOi8LEFDNPtrhrzLIVRzYJV wBZBhbfF+Mp8WwJnhnFaVrWQbB9B26+uUyOYP3eULvINHMPGNEplc699XxxbDKqXuhIJ L/hDHFa4dJzMjMyl1k1cS8OBqo7egeqewjFn0Hsq/314We9lXCaaFf2rzyM5uwky5SD1 zQUQ6Elk76dzazHHvagJeDrbKzwb4vdpxO2IXxQo17HQIUUs+s5SddGrRGxTCLw7d/hm etH48fUHcv8j5LPakB9Vukon4yM3At4IJNPykzMHx07Q/X9BdH60hUStCTMwc9OlNeYk cukQ== 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 x20-20020a1709065ad400b00a1db8b87c58si5500478ejs.243.2023.12.13.11.32.04; Wed, 13 Dec 2023 11:32:04 -0800 (PST) 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 8A58B68D1DA; Wed, 13 Dec 2023 21:30:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A4DD68D0FE for ; Wed, 13 Dec 2023 21:30:28 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AC5951BA1 for ; Wed, 13 Dec 2023 20:30:23 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 8MJA9ihvhZK0 for ; Wed, 13 Dec 2023 20:30:23 +0100 (CET) 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 mail1.khirnov.net (Postfix) with ESMTPS id 70C821BA4 for ; Wed, 13 Dec 2023 20:30:21 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6342B3A0706 for ; Wed, 13 Dec 2023 20:30:14 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2023 20:30:03 +0100 Message-ID: <20231213193007.17471-8-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231213193007.17471-1-anton@khirnov.net> References: <20231213193007.17471-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/12] fftools/ffmpeg_mux: move OutputStream.sq_idx_mux 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: y1wICQeFgNe0 It should not be accessed outside of ffmpeg_mux* --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_mux.c | 12 ++++++------ fftools/ffmpeg_mux.h | 2 ++ fftools/ffmpeg_mux_init.c | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2963d2d5d4..5c061ef0f4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -586,8 +586,6 @@ typedef struct OutputStream { /* packet quality factor */ atomic_int quality; - int sq_idx_mux; - EncStats enc_stats_pre; EncStats enc_stats_post; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index fdedc550e1..06db55a6d4 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -168,12 +168,12 @@ fail: return ret; } -static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int *stream_eof) +static int sync_queue_process(Muxer *mux, MuxStream *ms, AVPacket *pkt, int *stream_eof) { OutputFile *of = &mux->of; - if (ost->sq_idx_mux >= 0) { - int ret = sq_send(mux->sq_mux, ost->sq_idx_mux, SQPKT(pkt)); + if (ms->sq_idx_mux >= 0) { + int ret = sq_send(mux->sq_mux, ms->sq_idx_mux, SQPKT(pkt)); if (ret < 0) { if (ret == AVERROR_EOF) *stream_eof = 1; @@ -198,7 +198,7 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int return ret; } } else if (pkt) - return write_packet(mux, ost, pkt); + return write_packet(mux, &ms->ost, pkt); return 0; } @@ -268,14 +268,14 @@ static int mux_packet_filter(Muxer *mux, MuxThreadContext *mt, if (!bsf_eof) ms->bsf_pkt->time_base = ms->bsf_ctx->time_base_out; - ret = sync_queue_process(mux, ost, bsf_eof ? NULL : ms->bsf_pkt, stream_eof); + ret = sync_queue_process(mux, ms, bsf_eof ? NULL : ms->bsf_pkt, stream_eof); if (ret < 0) goto mux_fail; } *stream_eof = 1; return AVERROR_EOF; } else { - ret = sync_queue_process(mux, ost, pkt, stream_eof); + ret = sync_queue_process(mux, ms, pkt, stream_eof); if (ret < 0) goto mux_fail; } diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index 5d7cf3fa76..d0be8a51ea 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -50,6 +50,8 @@ typedef struct MuxStream { int sch_idx_enc; int sch_idx_src; + int sq_idx_mux; + int64_t max_frames; // timestamp from which the streamcopied streams should start, diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 455876d456..f527a083db 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1923,7 +1923,7 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u MuxStream *ms = ms_from_ost(ost); enum AVMediaType type = ost->type; - ost->sq_idx_mux = -1; + ms->sq_idx_mux = -1; nb_interleaved += IS_INTERLEAVED(type); nb_av_enc += IS_AV_ENC(ost, type); @@ -1992,13 +1992,13 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u if (!IS_INTERLEAVED(type)) continue; - ost->sq_idx_mux = sq_add_stream(mux->sq_mux, - of->shortest || ms->max_frames < INT64_MAX); - if (ost->sq_idx_mux < 0) - return ost->sq_idx_mux; + ms->sq_idx_mux = sq_add_stream(mux->sq_mux, + of->shortest || ms->max_frames < INT64_MAX); + if (ms->sq_idx_mux < 0) + return ms->sq_idx_mux; if (ms->max_frames != INT64_MAX) - sq_limit_frames(mux->sq_mux, ost->sq_idx_mux, ms->max_frames); + sq_limit_frames(mux->sq_mux, ms->sq_idx_mux, ms->max_frames); } }