From patchwork Mon May 8 09:17:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2181240pzb; Mon, 8 May 2023 02:20:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6IEV52zfmrxMztfBns6kEV7oIkZcaKw9is6w9fssVEDpdcOq+g8VjKhfpdqA7bBFGppivx X-Received: by 2002:a17:907:2ce1:b0:959:c07b:84e0 with SMTP id hz1-20020a1709072ce100b00959c07b84e0mr9000826ejc.50.1683537624694; Mon, 08 May 2023 02:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683537624; cv=none; d=google.com; s=arc-20160816; b=HPUlJApr5ZRuvapemGsPHYUMAA3r2z8O9af7Qy6gW69LZPBdqdO+wbioHJIZ2mZpVU t+AYWY2Jo11mcKwjc7eyQ/36VGy8X9u5BHwLNq4DxtjDO6Z1DQeUt4NYyfRd4vGhIY/l t7fRu3BIvz6vgBDqZmCxPO1KykOAtwGdxS7n/hq8eGZtqW/G2FWmeTQ6s+E20iGV71+X lKa6gbdmBWM/W9ZgHO02PiHCMM8g9I9MT85NBLIFJ1oW7oIyJWDTNUbG2gF4TW+hrTKe aM6Jh40IRnX10TpOhgauhkE8uq60Dlb5O6NzuL9Ul2mLcEf586kYqZGr0lRxNSWUUsT3 jiBA== 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=a825XE1sQ6vVi4UvgmLyEWUvLqN45nCSUM4QiPmptWo=; b=nXSXY1HU3sXfGVMNchmWP5O6kS1t8rGatKmDCJ2HgkPUntNETVOmgaq38EPR2SDw6b 1VDhEdBx6kGaSlHBKjLgC/VuyE8lx+1v2XijS9hB03hk8vIiLtyIAXYVK/GliLMC5Vlr qjyUD5dVMX+kl5GyE+ourwZr/xsoBRBm9sK4L4K4jHoWRQYGtyeeUQ6qU/fnB9RVm7Ug UN7ibZ+9TdtALE15KVtXdIKfn3LxaRRqRj3uTE1ZIFUw7lV2AzFHds67z9vbpdXkLbVp xeK63IHVJUxWOE2LuerHJBLvPfDaA74h1OMjrwQfaAjXT6XqmpzGkvyMNaooP1Uoapnv x5aA== 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 jg25-20020a170907971900b00965efc3031esi5057987ejc.859.2023.05.08.02.20.24; Mon, 08 May 2023 02:20:24 -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 3302F68C1D8; Mon, 8 May 2023 12:18:21 +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 5187568C104 for ; Mon, 8 May 2023 12:18:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B57DB2404EE for ; Mon, 8 May 2023 11:18:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id TTW4Td_vmkyJ for ; Mon, 8 May 2023 11:18:00 +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 411092405EC for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2B1223A1571 for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 May 2023 11:17:25 +0200 Message-Id: <20230508091738.20813-9-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508091738.20813-1-anton@khirnov.net> References: <20230508091738.20813-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/22] fftools/ffmpeg_demux: move InputStream.{nb_packets, data_size} 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: gcbl1+xLf0mT They are no longer used outside of ffmpeg_demux. --- fftools/ffmpeg.h | 4 ---- fftools/ffmpeg_demux.c | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 1900f3deb6..8e96f27d5d 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -436,10 +436,6 @@ typedef struct InputStream { enum AVPixelFormat hwaccel_pix_fmt; /* stats */ - // combined size of all the packets read - uint64_t data_size; - /* number of packets successfully read for this stream */ - uint64_t nb_packets; // number of frames/samples retrieved from the decoder uint64_t frames_decoded; uint64_t samples_decoded; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index d49bb8317c..3c0d67fe00 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -62,6 +62,11 @@ typedef struct DemuxStream { int64_t min_pts; /* pts with the smallest value in a current stream */ int64_t max_pts; /* pts with the higher value in a current stream */ + + /* number of packets successfully read for this stream */ + uint64_t nb_packets; + // combined size of all the packets read + uint64_t data_size; } DemuxStream; typedef struct Demuxer { @@ -419,6 +424,7 @@ static int input_packet_process(Demuxer *d, DemuxMsg *msg, AVPacket *src) { InputFile *f = &d->f; InputStream *ist = f->streams[src->stream_index]; + DemuxStream *ds = ds_from_ist(ist); AVPacket *pkt; int ret = 0; @@ -433,11 +439,11 @@ static int input_packet_process(Demuxer *d, DemuxMsg *msg, AVPacket *src) if (ret < 0) goto fail; - ist->data_size += pkt->size; - ist->nb_packets++; + ds->data_size += pkt->size; + ds->nb_packets++; /* add the stream-global side data to the first packet */ - if (ist->nb_packets == 1) { + if (ds->nb_packets == 1) { for (int i = 0; i < ist->st->nb_side_data; i++) { AVPacketSideData *src_sd = &ist->st->side_data[i]; uint8_t *dst_data; @@ -710,15 +716,16 @@ static void demux_final_stats(Demuxer *d) for (int j = 0; j < f->nb_streams; j++) { InputStream *ist = f->streams[j]; + DemuxStream *ds = ds_from_ist(ist); enum AVMediaType type = ist->par->codec_type; - total_size += ist->data_size; - total_packets += ist->nb_packets; + total_size += ds->data_size; + total_packets += ds->nb_packets; av_log(f, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", f->index, j, av_get_media_type_string(type)); av_log(f, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", - ist->nb_packets, ist->data_size); + ds->nb_packets, ds->data_size); if (ist->decoding_needed) { av_log(f, AV_LOG_VERBOSE, "%"PRIu64" frames decoded",