From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CEE8B45AF5 for ; Wed, 13 Dec 2023 19:30:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8353E68D09F; Wed, 13 Dec 2023 21:30:30 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF60268CF9B for ; Wed, 13 Dec 2023 21:30:22 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 0F1141CCB for ; Wed, 13 Dec 2023 20:30:22 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 4euX1nmOq3fi for ; Wed, 13 Dec 2023 20:30:21 +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 4F430163E 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 334803A0613 for ; Wed, 13 Dec 2023 20:30:14 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2023 20:29:59 +0100 Message-ID: <20231213193007.17471-4-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 04/12] fftools/ffmpeg: move InputStream.discard 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is not used outside of ffmpeg_demux. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_demux.c | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 63e72e4fbc..0bab44cefc 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -339,7 +339,6 @@ typedef struct InputStream { int index; AVStream *st; - int discard; /* true if stream data should be discarded */ int user_set_discard; int decoding_needed; /* non zero if the packets must be decoded in 'raw_fifo', see DECODING_FOR_* */ #define DECODING_FOR_OST 1 diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 61fb856106..9779580819 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -63,6 +63,9 @@ typedef struct DemuxStream { double ts_scale; + /* true if stream data should be discarded */ + int discard; + // scheduler returned EOF for this stream int finished; @@ -136,7 +139,8 @@ static Demuxer *demuxer_from_ifile(InputFile *f) InputStream *ist_find_unused(enum AVMediaType type) { for (InputStream *ist = ist_iter(NULL); ist; ist = ist_iter(ist)) { - if (ist->par->codec_type == type && ist->discard && + DemuxStream *ds = ds_from_ist(ist); + if (ist->par->codec_type == type && ds->discard && ist->user_set_discard != AVDISCARD_ALL) return ist; } @@ -556,11 +560,14 @@ static void discard_unused_programs(InputFile *ifile) AVProgram *p = ifile->ctx->programs[j]; int discard = AVDISCARD_ALL; - for (int k = 0; k < p->nb_stream_indexes; k++) - if (!ifile->streams[p->stream_index[k]]->discard) { + for (int k = 0; k < p->nb_stream_indexes; k++) { + DemuxStream *ds = ds_from_ist(ifile->streams[p->stream_index[k]]); + + if (!ds->discard) { discard = AVDISCARD_DEFAULT; break; } + } p->discard = discard; } } @@ -637,7 +644,7 @@ static void *input_thread(void *arg) dynamically in stream : we ignore them */ ds = pkt->stream_index < f->nb_streams ? ds_from_ist(f->streams[pkt->stream_index]) : NULL; - if (!ds || ds->ist.discard || ds->finished) { + if (!ds || ds->discard || ds->finished) { report_new_stream(d, pkt); av_packet_unref(pkt); continue; @@ -689,7 +696,7 @@ static void demux_final_stats(Demuxer *d) DemuxStream *ds = ds_from_ist(ist); enum AVMediaType type = ist->par->codec_type; - if (ist->discard || type == AVMEDIA_TYPE_ATTACHMENT) + if (ds->discard || type == AVMEDIA_TYPE_ATTACHMENT) continue; total_size += ds->data_size; @@ -777,8 +784,8 @@ static int ist_use(InputStream *ist, int decoding_needed) ds->sch_idx_stream = ret; } - if (ist->discard) { - ist->discard = 0; + if (ds->discard) { + ds->discard = 0; d->nb_streams_used++; } @@ -1024,7 +1031,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ist = &ds->ist; - ist->discard = 1; + ds->discard = 1; st->discard = AVDISCARD_ALL; ds->first_dts = AV_NOPTS_VALUE; ds->next_dts = AV_NOPTS_VALUE; -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".