From patchwork Mon Feb 26 16:09:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 7743 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp1525787jaj; Mon, 26 Feb 2018 08:09:35 -0800 (PST) X-Google-Smtp-Source: AH8x226j3SSnhCDZ+Y/OLVfNJ0hDPPLZddR7YuMQEbzZ4GZofFs6+VfLTJpDOC2vS3JrsOp2fhNc X-Received: by 10.223.196.211 with SMTP id o19mr9557271wrf.256.1519661375635; Mon, 26 Feb 2018 08:09:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519661375; cv=none; d=google.com; s=arc-20160816; b=a9tNm/FWIAeHWyqy4T0WV7wmzJv+nmJjzxv4WHJ5d9wpOiFPvwQuBTC1bJ3RQouyWT 8i2m6LLmbWowDhAQnvr+2Skrc+kCCYUKe9etiiLAIx3NFVEgpln6QPcznGRi1+ZfKDuH 3qnwO51sCqvgkMjX75nwNOdAV9mL5ujSGiNHq8fEq0NclM3f7ndbAkFM12tdyL9girp9 VL3O4NkIlu8EWX/of+CjsfjU2ouP2wWBxyriWYznfK+o8AR0PnjyHtoFZcgL3LKwvuNf zNduKcjnTs0M/U6dYu0fGVRw9AezGuAgu47God9hNbCSV5ZU7daHqSg8kvM/zNrxZtZl D2dQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=a6Z3N47dG+V+yuObTNiyN077Xw/kbezozviA4ODfFzU=; b=xfYJeHsvAFvL3XFZIo/3GSbXIymQi3kpvQoTpyK7XVXC/LjnnEiER+uZ1zfm8QHJLa A57de1h+WnCjdEWMdmxpMltbWinAt344K2sbETGQVRqGsNnnlMBoo1ky9ptc4BXKI4Iy sIVgieSyyQRpteBTYsjggTELKh/dlvbxGZoETHA6uKwcLB6PrADkN6q4Cjyruz12LwHy /mPTvtMsBhUWHEnUqJLdKarlJgZzvvMkhmlApdgGxosCOjaOL442hEiC1soJPSeu/l6U HKn5A+XvaKqQGLgcZSm6fWOVrNrc+zyrpjuYfUwnBahzlWuLnRABCPb8I4ZH+xjxJfHq Basg== 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 x7si254108wrg.243.2018.02.26.08.09.34; Mon, 26 Feb 2018 08:09: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; 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 A006668A34E; Mon, 26 Feb 2018 18:09:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx02.mail.netstorage.at (mx02.mail.netstorage.at [89.207.146.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BA67689F57 for ; Mon, 26 Feb 2018 18:09:21 +0200 (EET) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx02.mail.netstorage.at (Postfix) with ESMTPS id 75A0DACC0D for ; Mon, 26 Feb 2018 17:09:06 +0100 (CET) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 092F7806F9 for ; Mon, 26 Feb 2018 17:09:06 +0100 (CET) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Mon, 26 Feb 2018 17:09:06 +0100 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2018 17:09:04 +0100 Message-Id: <1519661345-16991-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20180226151155.4cffd3fc@debian> References: <20180226151155.4cffd3fc@debian> X-PPP-Message-ID: <20180226160906.18861.19994@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: 75A0DACC0D.A8849 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 v2 1/2] 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" Move time string formatting into inline function. Also fixes out_time sign prefix for progress report. Signed-off-by: Tobias Rapp --- fftools/ffmpeg.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 32caa4b..0097a7d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1518,6 +1518,27 @@ static int reap_filters(int flush) return 0; } +static inline char *pts_to_hms_str(char *buf, int64_t pts, unsigned int digits) +{ + const char *hours_sign; + int hours, mins; + double secs; + + if (pts == AV_NOPTS_VALUE) { + snprintf(buf, AV_TS_MAX_STRING_SIZE, "N/A"); + } else { + hours_sign = (pts < 0) ? "-" : ""; + secs = (double)FFABS(pts) / AV_TIME_BASE; + mins = (int)secs / 60; + secs = secs - mins * 60; + hours = mins / 60; + mins %= 60; + snprintf(buf, AV_TS_MAX_STRING_SIZE, "%s%02d:%02d:%0*.*f", + hours_sign, hours, mins, digits+3, digits, secs); + } + return buf; +} + static void print_final_stats(int64_t total_size) { uint64_t video_size = 0, audio_size = 0, extra_size = 0, other_size = 0; @@ -1649,7 +1670,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti int64_t pts = INT64_MIN + 1; static int64_t last_time = -1; static int qp_histogram[52]; - int hours, mins, secs, us; + char buf_pts[AV_TS_MAX_STRING_SIZE] = {0}; int ret; float t; @@ -1751,25 +1772,15 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti nb_frames_drop += ost->last_dropped; } - secs = FFABS(pts) / AV_TIME_BASE; - us = FFABS(pts) % AV_TIME_BASE; - mins = secs / 60; - secs %= 60; - hours = mins / 60; - mins %= 60; - bitrate = pts && total_size >= 0 ? total_size * 8 / (pts / 1000.0) : -1; speed = t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1; if (total_size < 0) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "size=N/A time="); + "size=N/A "); 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), "-"); + "size=%8.0fkB ", total_size / 1024.0); snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "%02d:%02d:%02d.%02d ", hours, mins, secs, - (100 * us) / AV_TIME_BASE); + "time=%s ", pts_to_hms_str(buf_pts, pts, 2)); if (bitrate < 0) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),"bitrate=N/A"); @@ -1781,9 +1792,12 @@ 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"); + } else { + av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts); + } + av_bprintf(&buf_script, "out_time=%s\n", pts_to_hms_str(buf_pts, pts, 6)); if (nb_frames_dup || nb_frames_drop) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",