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 E9C4748526 for ; Sat, 6 Jan 2024 11:44:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D79468CC5B; Sat, 6 Jan 2024 13:44:37 +0200 (EET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD0DC68C463 for ; Sat, 6 Jan 2024 13:44:30 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-55763e01a23so239657a12.0 for ; Sat, 06 Jan 2024 03:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704541469; x=1705146269; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:from:to:cc:subject :date:message-id:reply-to; bh=D8PnLehXbcI/lqiF/u/qn1oYQQNcm6eBulrn3LF7XLM=; b=am/Kz7LR6/tnCncUF5U8C0JlupWkFusb2By5G+nBr40kYAMAGVDhycngMq+VOLm1zo RMjn0FiIvaRZZzO9ODJ9k/uHSE6059nfNGIl6azx05RclhoMm4kNjtD0bJuY+6t7tweL cJgQAVC7OaU9YIVocblcNZg0ERT03n/BGF6VaWj+iAjbw52qlAAPdZOv4S49aU9g9hyt qD/P8vzgnrw7n+w96dDxi5kOyHKWxNooGn3abzRj4zJltQ/2cSEQ8O1jvVIDTCnU8KC1 zXmxb8igVNjXd3sBwXoyVYe5xpTiYl+evUlQDn+xFQtVJzw3Wbn2OywyYI/Zsw/6wcCX 943g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704541469; x=1705146269; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=D8PnLehXbcI/lqiF/u/qn1oYQQNcm6eBulrn3LF7XLM=; b=D613McdMmA27p4X/U1um32wThkFrJGo+vuE0Ee9kYDxsSg/vq2j9zgFmllLlwaXn7w ejzTQ3EqdSak6RgAg3BLG9QxfHb+83eVTtyVmN/tMqP64W2Zt8L5Pqxmh2NiYFhAQAdc xs8jR3kr86+70lezoDRAr5YbAYrQrNie7GYyf1AySiqKQDddD5/t9Vnk+WlzeqHwpUqV SgyfIz0xfKF5bT+zjwbo4CQx9tX/wm6l0we9Qe61hNhAoIsTwYc7paaAU9cEw+3NW9ox t7qp1JCRUd67WF0o76lhcZvUhhLx6Dmihl/iv9QCUxepwJK3v5PfwQMPT/eB6AbRGlQV pDDQ== X-Gm-Message-State: AOJu0Yyckzkvq//+TROYUfz7bS9q57EuKy8jWR55cKZFjwc3Iia0/9CS BkAb1B4TBQRqgp2drbxsMR7okTaOH58= X-Google-Smtp-Source: AGHT+IGhXTdwO6zv9u5RJlCbxsbU0v6fYtEKMTOTGLotIwqf2LwR6MOG8JVCx9R1eZFmqcNZjXgLAw== X-Received: by 2002:a17:906:2782:b0:a27:fba1:b5da with SMTP id j2-20020a170906278200b00a27fba1b5damr376854ejc.21.1704541469069; Sat, 06 Jan 2024 03:44:29 -0800 (PST) Received: from mariano (dynamic-adsl-84-220-189-10.clienti.tiscali.it. [84.220.189.10]) by smtp.gmail.com with ESMTPSA id lu20-20020a170906fad400b00a28a7f57223sm1862034ejb.127.2024.01.06.03.44.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 03:44:28 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 762A3BFCDC; Sat, 6 Jan 2024 12:44:27 +0100 (CET) Date: Sat, 6 Jan 2024 12:44:27 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches References: <20240105164251.28935-1-anton@khirnov.net> <20240105164251.28935-6-anton@khirnov.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240105164251.28935-6-anton@khirnov.net> User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [FFmpeg-devel] [PATCH 6/8] fftools/ffmpeg_demux: add demuxing thread 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: On date Friday 2024-01-05 17:42:49 +0100, Anton Khirnov wrote: > To be used for data that never needs to be visible outside of the > demuxer thread, similarly as was previously done for other components. > --- > fftools/ffmpeg_demux.c | 67 ++++++++++++++++++++++++++++-------------- > 1 file changed, 45 insertions(+), 22 deletions(-) > > diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c > index c51140b1c5..eae1f0bde5 100644 > --- a/fftools/ffmpeg_demux.c > +++ b/fftools/ffmpeg_demux.c > @@ -115,6 +115,11 @@ typedef struct Demuxer { > int nb_streams_finished; > } Demuxer; > > +typedef struct DemuxThreadContext { > + // packet used for reading from the demuxer > + AVPacket *pkt_demux; nit: you might drop the _demux suffix since this is already clear from the context and it's adding no information > +} DemuxThreadContext; > + > static DemuxStream *ds_from_ist(InputStream *ist) > { > return (DemuxStream*)ist; > @@ -565,18 +570,36 @@ static void thread_set_name(InputFile *f) > ff_thread_setname(name); > } > > +static void demux_thread_uninit(DemuxThreadContext *dt) > +{ > + av_packet_free(&dt->pkt_demux); > + > + memset(dt, 0, sizeof(*dt)); > +} > + > +static int demux_thread_init(DemuxThreadContext *dt) > +{ > + memset(dt, 0, sizeof(*dt)); > + > + dt->pkt_demux = av_packet_alloc(); > + if (!dt->pkt_demux) > + return AVERROR(ENOMEM); > + > + return 0; > +} > + > static void *input_thread(void *arg) > { > Demuxer *d = arg; > InputFile *f = &d->f; > - AVPacket *pkt; > + > + DemuxThreadContext dt; > + nit++: weird style, you might drop the empty lines around the declaration > int ret = 0; > > - pkt = av_packet_alloc(); > - if (!pkt) { > - ret = AVERROR(ENOMEM); > + ret = demux_thread_init(&dt); > + if (ret < 0) > goto finish; > - } > > thread_set_name(f); > > @@ -589,7 +612,7 @@ static void *input_thread(void *arg) > DemuxStream *ds; > unsigned send_flags = 0; > > - ret = av_read_frame(f->ctx, pkt); > + ret = av_read_frame(f->ctx, dt.pkt_demux); > > if (ret == AVERROR(EAGAIN)) { > av_usleep(10000); > @@ -598,12 +621,12 @@ static void *input_thread(void *arg) > if (ret < 0) { > if (d->loop) { > /* signal looping to our consumers */ > - pkt->stream_index = -1; > + dt.pkt_demux->stream_index = -1; > > - ret = sch_demux_send(d->sch, f->index, pkt, 0); > + ret = sch_demux_send(d->sch, f->index, dt.pkt_demux, 0); > if (ret >= 0) > - ret = seek_to_start(d, (Timestamp){ .ts = pkt->pts, > - .tb = pkt->time_base }); > + ret = seek_to_start(d, (Timestamp){ .ts = dt.pkt_demux->pts, > + .tb = dt.pkt_demux->time_base }); > if (ret >= 0) > continue; > > @@ -622,39 +645,39 @@ static void *input_thread(void *arg) > } > > if (do_pkt_dump) { > - av_pkt_dump_log2(NULL, AV_LOG_INFO, pkt, do_hex_dump, > - f->ctx->streams[pkt->stream_index]); > + av_pkt_dump_log2(NULL, AV_LOG_INFO, dt.pkt_demux, do_hex_dump, > + f->ctx->streams[dt.pkt_demux->stream_index]); > } > > /* the following test is needed in case new streams appear > dynamically in stream : we ignore them */ > - ds = pkt->stream_index < f->nb_streams ? > - ds_from_ist(f->streams[pkt->stream_index]) : NULL; > + ds = dt.pkt_demux->stream_index < f->nb_streams ? > + ds_from_ist(f->streams[dt.pkt_demux->stream_index]) : NULL; > if (!ds || ds->discard || ds->finished) { > - report_new_stream(d, pkt); > - av_packet_unref(pkt); > + report_new_stream(d, dt.pkt_demux); > + av_packet_unref(dt.pkt_demux); > continue; > } > > - if (pkt->flags & AV_PKT_FLAG_CORRUPT) { > + if (dt.pkt_demux->flags & AV_PKT_FLAG_CORRUPT) { > av_log(d, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, > "corrupt input packet in stream %d\n", > - pkt->stream_index); > + dt.pkt_demux->stream_index); > if (exit_on_error) { > - av_packet_unref(pkt); > + av_packet_unref(dt.pkt_demux); > ret = AVERROR_INVALIDDATA; > break; > } > } > > - ret = input_packet_process(d, pkt, &send_flags); > + ret = input_packet_process(d, dt.pkt_demux, &send_flags); > if (ret < 0) > break; > > if (d->readrate) > readrate_sleep(d); > > - ret = demux_send(d, ds, pkt, send_flags); > + ret = demux_send(d, ds, dt.pkt_demux, send_flags); > if (ret < 0) > break; > } > @@ -664,7 +687,7 @@ static void *input_thread(void *arg) > ret = 0; > > finish: > - av_packet_free(&pkt); > + demux_thread_uninit(&dt); LGTM if useful for the following changes. _______________________________________________ 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".