From patchwork Sun Apr 9 14:08:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1591396pzb; Sun, 9 Apr 2023 07:10:45 -0700 (PDT) X-Google-Smtp-Source: AKy350Yx9pZibERvh/AfA82sdwl3bmEVzzsB8vjvEJGDNkvIJ0rfJCCRIzO0dO1gm50s5rh4B38t X-Received: by 2002:a17:907:7e95:b0:94a:88aa:93b3 with SMTP id qb21-20020a1709077e9500b0094a88aa93b3mr478138ejc.44.1681049444835; Sun, 09 Apr 2023 07:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681049444; cv=none; d=google.com; s=arc-20160816; b=BSZDkzKmK+6fzl5E8u/jILWuiTRbl8LYXja9Ts16N+tFGSnUvMMmKwXgaWb91RcFAB U73SCPNnDGO7hdv0VJOiCWGvT+EHcBgXHMmn4ujYSQJAW+Hf/4OCxJ6FV7uPgNml5T5D L43d326fNRGdJMRwc9VITcaeO1atH0rSXVzvB/5lmHqq7UuQaCxCJzUGMmh0SYvwhlto NG7hW47u0d9FqxkLDOs1KWiOzvFfZkhi68ViH2wturxZRn0QvnM5WXFD4NvI/nBrU1qo wn5dI+j4NgZ7KxDZORQpzTQkZr7TEcRtHLx7mAsxEdrqSU8LEwasIurMS0re0erBmnjh hkOQ== 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=n2LMfcpOH9oezO4x4+9K3y3eLux/i8CGMiwye7XYYuk=; b=AddDijbxDzfN9qJxth+Addu9XYavTTWn6amfqSPqS1BknV4XHLJYbpFiH0DlCoD1g0 swJIGgze8ftC826b2AVxlIFo/1zF2whiUen6Fs2VafB/4GRjZd+OsKx4ZZLopv3hi9o4 1Fq+7zoaImKYyRv+baGSlY5hk92TqrAiI7fPLFwEwyqSV4fB2DrJaO9/WTVv9488m4q6 fiV9fqZStjlH5gKJDk0nmS4GSY3etoV5YwcY0pXYJBZkj0ZP1eyLP2zPgnWby5na/rbo 8pgcLfRLp9unRrOlwaTdOBXm2+lAWPAaWxw3RCPQ1ZZ5jX1cXp/Oz6G0xzFsr73AmqXZ Y4Bw== 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 o10-20020a056402038a00b00504a27c35cbsi397562edv.313.2023.04.09.07.10.44; Sun, 09 Apr 2023 07:10:44 -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 C071168BE02; Sun, 9 Apr 2023 17:09:27 +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 589D968BB8E for ; Sun, 9 Apr 2023 17:09:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0CC81240705 for ; Sun, 9 Apr 2023 16:09:17 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id iVc8fdaYyIR3 for ; Sun, 9 Apr 2023 16:09:16 +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 976E2240D03 for ; Sun, 9 Apr 2023 16:09:10 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 852253A039B for ; Sun, 9 Apr 2023 16:09:10 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Apr 2023 16:08:42 +0200 Message-Id: <20230409140853.28858-18-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230409140853.28858-1-anton@khirnov.net> References: <20230409140853.28858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/29] fftools/ffmpeg_demux: log final stats to demuxer context 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: kHfahiq0aFNU --- fftools/ffmpeg_demux.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index a2bfd0ab95..93eed28809 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -485,7 +485,7 @@ static void demux_final_stats(Demuxer *d) InputFile *f = &d->f; uint64_t total_packets = 0, total_size = 0; - av_log(NULL, AV_LOG_VERBOSE, "Input file #%d (%s):\n", + av_log(f, AV_LOG_VERBOSE, "Input file #%d (%s):\n", f->index, f->ctx->url); for (int j = 0; j < f->nb_streams; j++) { @@ -495,23 +495,23 @@ static void demux_final_stats(Demuxer *d) total_size += ist->data_size; total_packets += ist->nb_packets; - av_log(NULL, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", + av_log(f, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", f->index, j, av_get_media_type_string(type)); - av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", + av_log(f, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", ist->nb_packets, ist->data_size); if (ist->decoding_needed) { - av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" frames decoded", + av_log(f, AV_LOG_VERBOSE, "%"PRIu64" frames decoded", ist->frames_decoded); if (type == AVMEDIA_TYPE_AUDIO) - av_log(NULL, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->samples_decoded); - av_log(NULL, AV_LOG_VERBOSE, "; "); + av_log(f, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->samples_decoded); + av_log(f, AV_LOG_VERBOSE, "; "); } - av_log(NULL, AV_LOG_VERBOSE, "\n"); + av_log(f, AV_LOG_VERBOSE, "\n"); } - av_log(NULL, AV_LOG_VERBOSE, " Total: %"PRIu64" packets (%"PRIu64" bytes) demuxed\n", + av_log(f, AV_LOG_VERBOSE, " Total: %"PRIu64" packets (%"PRIu64" bytes) demuxed\n", total_packets, total_size); }