From patchwork Mon Apr 4 11:30:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35203 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a02:aa92:0:0:0:0:0 with SMTP id u18csp3587437jai; Mon, 4 Apr 2022 04:39:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy34c5H52jIG5oOhWTkz5c/toas6jtzeCs1l3qfDo21kZv7Ge/hWrpBEiM+JGETrptCIErv X-Received: by 2002:a05:6402:2549:b0:419:6545:62af with SMTP id l9-20020a056402254900b00419654562afmr32663220edb.120.1649072352539; Mon, 04 Apr 2022 04:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072352; cv=none; d=google.com; s=arc-20160816; b=aTrCEsbYnoJq1jNWLGuMGqniHKZ3YpOOmRHke3rPQXy/ZyzZF9vKFXCkaNBQlUCD7m UY+ojbyrRhipwZ3Dnl9ZAObzVtkbv4bPd8Y2BXeWC/NQOzdUUatnwHVil0bj0+p4d5sZ iUCD3PZFXEMncKwgy+lCu4JuznZil+TR1nAhBBZ3fQRJgw/b6pib6DGIHRFO7U200FXt K27ciw2Jc4T3cUmgoh3jpKXgSvhvwd8fxFvnxTm01DTT4N/R6W0cpJVXd0yoWWYD6VgK Kcoi1xos9B3L5Ym7olFRWQokM+UV2wUv0NgmUUXRv7KWXeIfe8mMNYrdqfgxQDxMsw6U uYuw== 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=4Vk4mWG1WZJm7DdG1jNAhXssk6M0Em7rQMDNIuAQzIM=; b=sH/fLC3lci06T+eOCyAD/DAwEOzGeUJt18xu8eeRZEi7FLG1df0j9B9RqA1Zru+egv sh4E/QkmCsJ3h5CTZzrklnw/wVKA6RT+oWRLz7oJ3rSrBx319ccg/NvwIo22q3MiwaR+ 34s39VtO5hpCUkUwnjrQ7njuQSM8SHVBJ8La06ocxsgcCfjXx1wBcf76B3il3VvrLtgA P/zK29AKLP10vRbcGNojWDh1mAnLZ5eBsuvmD0AfCQFaumVPrpCPQouQQdD2oxa0cT9M VhISlklZO4iGoL1R89gE7+xSJEhfgzYYXouhYrIuRC3ph8jOTAhQFAZnXCnB82n+G8zQ sqvA== 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 y2-20020a50d8c2000000b00418eee96003si6239268edj.315.2022.04.04.04.39.12; Mon, 04 Apr 2022 04:39:12 -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 A746B68B311; Mon, 4 Apr 2022 14:37:51 +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 F31A768B2BC for ; Mon, 4 Apr 2022 14:37:44 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B00112404FE for ; Mon, 4 Apr 2022 13:37:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id WSzR8gDDUgDG for ; Mon, 4 Apr 2022 13:37:44 +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 A096C24050B for ; Mon, 4 Apr 2022 13:37:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 18C4B3A0D21; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:20 +0200 Message-Id: <20220404113037.13070-33-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 32/49] fftools/ffmpeg: reindent after previous commit 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: XRiPCE4ClCGS Content-Length: 4044 --- fftools/ffmpeg.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index adf69cb43e..e0f15c0f61 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -830,15 +830,15 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) int ret; if (frame) { - ost->frames_encoded++; + ost->frames_encoded++; - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder <- type:%s " - "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", - type_desc, - av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base), - enc->time_base.num, enc->time_base.den); - } + if (debug_ts) { + av_log(NULL, AV_LOG_INFO, "encoder <- type:%s " + "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", + type_desc, + av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base), + enc->time_base.num, enc->time_base.den); + } } update_benchmark(NULL); @@ -866,29 +866,29 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) output_packet(of, pkt, ost, 1); return ret; } else { - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " - "duration:%s duration_time:%s\n", - type_desc, - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); - } + if (debug_ts) { + av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " + "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " + "duration:%s duration_time:%s\n", + type_desc, + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); + } - av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); + av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " - "duration:%s duration_time:%s\n", - type_desc, - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); - } + if (debug_ts) { + av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " + "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " + "duration:%s duration_time:%s\n", + type_desc, + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); + } - output_packet(of, pkt, ost, 0); + output_packet(of, pkt, ost, 0); } /* if two pass, output log */