From: John Koleszar <jkoleszar@google.com>
Date: Thu, 21 Oct 2010 21:28:34 +0000 (-0400)
Subject: vpxdec: use the same output for --progress and --summary
X-Git-Tag: v0.9.5~22^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d12e04d16f6127c66b54a1a62b9192b9d880f54;p=libvpx

vpxdec: use the same output for --progress and --summary

Update the timing information in-place for the --progress
option.

Change-Id: I8efea57050db72963c0bc5c994425e7e692d1502
---

diff --git a/vpxdec.c b/vpxdec.c
index 0de072e8b..2d96b28b6 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -577,6 +577,15 @@ fail:
     return 0;
 }
 
+
+void show_progress(int frame_in, int frame_out, unsigned long dx_time)
+{
+    fprintf(stderr, "%d decoded frames/%d showed frames in %lu us (%.2f fps)\r",
+            frame_in, frame_out, dx_time,
+            (float)frame_out * 1000000.0 / (float)dx_time);
+}
+
+
 int main(int argc, const char **argv_)
 {
     vpx_codec_ctx_t          decoder;
@@ -812,12 +821,12 @@ int main(int argc, const char **argv_)
 
         ++frame_in;
 
-        if (progress)
-            fprintf(stderr, "decoded frame %d.\n", frame_in);
-
         if ((img = vpx_codec_get_frame(&decoder, &iter)))
             ++frame_out;
 
+        if (progress)
+            show_progress(frame_in, frame_out, dx_time);
+
         if (!noblit)
         {
             if (img)
@@ -869,10 +878,10 @@ int main(int argc, const char **argv_)
             break;
     }
 
-    if (summary)
+    if (summary || progress)
     {
-        fprintf(stderr, "%d decoded frames/%d showed frames in %lu us (%.2f fps)\n",
-                frame_in, frame_out, dx_time, (float)frame_out * 1000000.0 / (float)dx_time);
+        show_progress(frame_in, frame_out, dx_time);
+        fprintf(stderr, "\n");
     }
 
 fail: