From patchwork Wed Jan 24 08:16:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1130666pzf; Wed, 24 Jan 2024 00:21:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+UiZK1a9XrOt0zjz2YUmbiwn+vVlT+d+FNXzmdvXnsoZLmJdMECzF2eTxpCnNmsKn1Qsl X-Received: by 2002:ac2:4e95:0:b0:510:fdf:2c77 with SMTP id o21-20020ac24e95000000b005100fdf2c77mr292101lfr.130.1706084495963; Wed, 24 Jan 2024 00:21:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706084495; cv=none; d=google.com; s=arc-20160816; b=uQQEGXbceJDGxN0xQ5bc/KeNL9Z7SCJ2Vw6MCk6Tp+zidJ2+wg8IuR2QaY8CwXg+ST RQNYNZmqQ5HMLRYA4PrfJAQneoF95Xvufr/F3COINqUdCSXhssdy2RiYPZJx8R9b3SM8 0f04iuf0sH05o7w4lxihPn/ljxr/rdMq4dRQ6caOVF3M34r5ghWMcJdaikCJ0O/aCIj5 3RLYj8WV91xXft1pY5fLVRv2DuncsT1s09hOQN/WjpIEXV7WcrM4QhM8xIoyYt5syy3R VDzewY3coaNUHnbInLEk009CySbtdv24u0Z2IFndCFN/lkFBCNMwTLELovyXHnr4gSuQ cifQ== 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:dkim-signature:delivered-to; bh=OBBX9MxY4bCupgYFZugVEnDGH0Bd7HV50Pe8dwgxtFA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0tAk4pBseLTUJtmyXJFDm7iT/VHRrqT6teRnCfRX9OrcIYOs89toeZuBdQLxm9YWq7 5iNK2L6Cm/6C7Y7j+ed0Sziw4MueI3MpNoSR96Eb4xS/ylQu2EhQC7QBAQTOxj0/t7Te LmiELQLamtkWa86ossB0dQSdhDHhErJhKtR4nz6hQVxFp9Wg/z2V9+MGEbFwiwgRtg/z bSRx5oesDJRsfHBFXv5J1993uFT3hD90mvfn4QPLl5BGGT5m570zLssvcVSLISpbKPTY 9fwW5OLhFxGG7MajMWb/j5rz+9LfOagOguFQ5WItvv40k7/3V7qkga48MQMJJRwC0k3H KwLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=XB8gcsNN; 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 bx20-20020a170906a1d400b00a2d48666e85si10442426ejb.524.2024.01.24.00.21.35; Wed, 24 Jan 2024 00:21:35 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=XB8gcsNN; 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 9B11868D1FE; Wed, 24 Jan 2024 10:17:59 +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 7AB7F68D13F for ; Wed, 24 Jan 2024 10:17:26 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=XB8gcsNN; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 039B71A37 for ; Wed, 24 Jan 2024 09:17:22 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id PvrNT_nh_9Lx for ; Wed, 24 Jan 2024 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084239; bh=ITFe6XIuViFsCJtyh/f0cqi/mBk0mDoNjXSplfATOKA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=XB8gcsNNAgJ6tXmTz20GqHF45tcG4uY6x/OudoAQIg53HvnThPy+xKGngoaE/AVFv EBViDvs2IgHfkSfpKk9Ge57lOQUIMWDwv57NZx2BTjYeRJHDADEkeVx9Xp4D3j7HLa PIsH1A+wFqWaKL/zGePGgehAJUDFzwn+pTnSwIa8Xl+qILo2JP8brrP1pwfIvBkW/E mKNqGlvxbW4Q6OEqPDjBhx7YNCAAoXtJhQRlcfkx7wk6svp5EJiIaj92oEWfTRquK6 kEFMVPYG0CGdvpKespz049YZeX07tu5eMHYQQ3nQY91jzgp8LASGe7cBMLFG+9pEAA HqUbD3KA/mELA== 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 9F0291A2F for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6B1023A07D6 for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:16:37 +0100 Message-ID: <20240124081702.4759-7-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/31] fftools/ffmpeg_dec: move decoding counters from InputStream to Decoder 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: +gLjGu4cbeza This is a step towards decoupling Decoder and InputStream. --- fftools/ffmpeg.h | 11 +++++------ fftools/ffmpeg_dec.c | 16 ++++++++-------- fftools/ffmpeg_demux.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 227929b022..db9bd8cc7a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -285,6 +285,11 @@ typedef struct Decoder { const uint8_t *subtitle_header; int subtitle_header_size; + + // number of frames/samples retrieved from the decoder + uint64_t frames_decoded; + uint64_t samples_decoded; + uint64_t decode_errors; } Decoder; typedef struct InputStream { @@ -346,12 +351,6 @@ typedef struct InputStream { enum AVHWDeviceType hwaccel_device_type; char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; - - /* stats */ - // number of frames/samples retrieved from the decoder - uint64_t frames_decoded; - uint64_t samples_decoded; - uint64_t decode_errors; } InputStream; typedef struct InputFile { diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 15d49d0d69..4a59a4b392 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -445,14 +445,14 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Error decoding subtitles: %s\n", av_err2str(ret)); - ist->decode_errors++; + dp->dec.decode_errors++; return exit_on_error ? ret : 0; } if (!got_output) return pkt ? 0 : AVERROR_EOF; - ist->frames_decoded++; + dp->dec.frames_decoded++; // XXX the queue for transferring data to consumers runs // on AVFrames, so we wrap AVSubtitle in an AVBufferRef and put that @@ -512,7 +512,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) pkt ? "packet" : "EOF", av_err2str(ret)); if (ret != AVERROR_EOF) { - ist->decode_errors++; + dp->dec.decode_errors++; if (!exit_on_error) ret = 0; } @@ -537,7 +537,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) return ret; } else if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret)); - ist->decode_errors++; + dp->dec.decode_errors++; if (exit_on_error) return ret; @@ -567,7 +567,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) frame->time_base = dec->pkt_timebase; if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { - ist->samples_decoded += frame->nb_samples; + dp->dec.samples_decoded += frame->nb_samples; audio_ts_process(dp, frame); } else { @@ -579,7 +579,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } } - ist->frames_decoded++; + dp->dec.frames_decoded++; ret = sch_dec_send(dp->sch, dp->sch_idx, frame); if (ret < 0) { @@ -707,8 +707,8 @@ void *decoder_thread(void *arg) } ret = 0; - err_rate = (ist->frames_decoded || ist->decode_errors) ? - ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f; + err_rate = (dp->dec.frames_decoded || dp->dec.decode_errors) ? + dp->dec.decode_errors / (dp->dec.frames_decoded + dp->dec.decode_errors) : 0.f; if (err_rate > max_error_rate) { av_log(dp, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n", err_rate, max_error_rate); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index b2cbde2aa5..5a58bb735a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -796,9 +796,9 @@ static void demux_final_stats(Demuxer *d) if (ist->decoding_needed) { av_log(f, AV_LOG_VERBOSE, "%"PRIu64" frames decoded; %"PRIu64" decode errors", - ist->frames_decoded, ist->decode_errors); + ist->decoder->frames_decoded, ist->decoder->decode_errors); if (type == AVMEDIA_TYPE_AUDIO) - av_log(f, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->samples_decoded); + av_log(f, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->decoder->samples_decoded); av_log(f, AV_LOG_VERBOSE, "; "); }