From patchwork Mon Feb 26 12:14:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 7742 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp1295449jaj; Mon, 26 Feb 2018 04:15:21 -0800 (PST) X-Google-Smtp-Source: AH8x224wteFTxy8D32g3tahvZgrDhrDPJoK5o5waAmlUPmWO6kQhGqn6diyDzeea2aNBpOuNyhwE X-Received: by 10.223.173.131 with SMTP id w3mr9718508wrc.195.1519647321612; Mon, 26 Feb 2018 04:15:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519647321; cv=none; d=google.com; s=arc-20160816; b=usw+R8GU5KRAj86txdoV1hdj2ARYhquDJ2ixikkSgNyJCLzY/GNiCxOc7+XWKfUXRJ o76GEOJV4Qyq9dDViSSJwzmfOoZKhcVM3N5FiCfxwlqga6Nx1uWtwaF7KK/N2VRDN1pA GNfBd8sMHRBf5Vf66iOl8lH2bKjOmcowx11Pbpa7uNxAnAHbnP4Q8RuI3RUCsHJRZ5sw 8VxaWqcmx7s6AfTrXN4RSmB1CGIazq5I0MVBwyDbx2pXgs+/XZg1Z/LUxm/w0WHg3Zd9 k/eF9n4ccW/KIo/jSDjxAiOC/mUV2dlPcZhOLSAyBzZZIC5qf/SVvWO7ngeL4xojupG4 MiZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Dx7aH/Jl4O1zfMK91yzll1BVsE+Smpgu37Eu4vjdeIg=; b=QkMIN7LF5KIiBSt0lYGkQnINsSj3IjevjlPQK5mwhwXWiMkccDP3i58rmWL0jvRyUD LWMUJfNpXgee5ZtJUebeOzRU/9Cge0TwUPEA8bW4arV59NjyBntscdnH5hbFU0omL4vG rEc46Ey3EBdR+eO3hJkwOwN6rlO0jjzRus4rWPzeuyFfpUg/iJvhUjK/qnCfc5OzdYvl GW0MESJCtkwxpquz5byOaWJSUWjQ0+gWFIbNryBGn49BgjWNBPJyMPLHYTpsWxEeR6F0 jQPZIIqLZEfdXwksCwS7jY3yK1RTCdf5ilzN/kpG86MPbJblOMA8J57O9Qw2h4ccbL0D gZGQ== 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 y1si644925wrg.216.2018.02.26.04.15.20; Mon, 26 Feb 2018 04:15:21 -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; 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 CAEBC68A1CB; Mon, 26 Feb 2018 14:15:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx01.mail.netstorage.at (mx01.mail.netstorage.at [89.207.144.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DAAA68A114 for ; Mon, 26 Feb 2018 14:15:08 +0200 (EET) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx01.mail.netstorage.at (Postfix) with ESMTPS id BEC8AA071D for ; Mon, 26 Feb 2018 13:14:59 +0100 (CET) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 5A49980961 for ; Mon, 26 Feb 2018 13:14:59 +0100 (CET) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Mon, 26 Feb 2018 13:14:59 +0100 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2018 13:14:58 +0100 Message-Id: <1519647298-19378-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 X-PPP-Message-ID: <20180226121459.25873.29339@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: BEC8AA071D.A82BB X-NetStorage-MailScanner: Found to be clean X-NetStorage-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (nicht zwischen gespeichert, Wertung=-0.5, benoetigt 6, autolearn=not spam, BAYES_00 -0.50) X-NetStorage-MailScanner-From: t.rapp@noa-archive.com X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: fix progress log message in case pts is not available X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also fixes sign prefix for progress report. Signed-off-by: Tobias Rapp --- fftools/ffmpeg.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 32caa4b..51f27bf 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1650,6 +1650,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti static int64_t last_time = -1; static int qp_histogram[52]; int hours, mins, secs, us; + const char *hours_sign; int ret; float t; @@ -1757,6 +1758,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti secs %= 60; hours = mins / 60; mins %= 60; + hours_sign = (pts < 0) ? "-" : ""; bitrate = pts && total_size >= 0 ? total_size * 8 / (pts / 1000.0) : -1; speed = t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1; @@ -1765,11 +1767,13 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti "size=N/A time="); else snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "size=%8.0fkB time=", total_size / 1024.0); - if (pts < 0) - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "-"); - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "%02d:%02d:%02d.%02d ", hours, mins, secs, - (100 * us) / AV_TIME_BASE); + if (pts == AV_NOPTS_VALUE) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "N/A"); + } else { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), + "%s%02d:%02d:%02d.%02d ", hours_sign, hours, mins, secs, + (100 * us) / AV_TIME_BASE); + } if (bitrate < 0) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),"bitrate=N/A"); @@ -1781,9 +1785,14 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti if (total_size < 0) av_bprintf(&buf_script, "total_size=N/A\n"); else av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size); - av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts); - av_bprintf(&buf_script, "out_time=%02d:%02d:%02d.%06d\n", - hours, mins, secs, us); + if (pts == AV_NOPTS_VALUE) { + av_bprintf(&buf_script, "out_time_ms=N/A\n"); + av_bprintf(&buf_script, "out_time=N/A\n"); + } else { + av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts); + av_bprintf(&buf_script, "out_time=%s%02d:%02d:%02d.%06d\n", + hours_sign, hours, mins, secs, us); + } if (nb_frames_dup || nb_frames_drop) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",