shithub: libvpx

Download patch

ref: 008ef8dd0d667471592bb488829955913ed6cf3c
parent: da6b224e3cd1456fbf8ef984ed337092885ba41c
parent: 6d1513274296d0d7846604c29c94b51d36b8c0b6
author: Tom Finegan <tomfinegan@google.com>
date: Tue Feb 25 04:44:31 EST 2014 

Merge "Change dx_time data type in vpxdec.c"


--- a/vpxdec.c
+++ b/vpxdec.c
@@ -298,10 +298,11 @@
   return is_raw;
 }
 
-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",
+void show_progress(int frame_in, int frame_out, uint64_t dx_time) {
+  fprintf(stderr,
+          "%d decoded frames/%d showed frames in %"PRId64" us (%.2f fps)\r",
           frame_in, frame_out, dx_time,
-          (float)frame_out * 1000000.0 / (float)dx_time);
+          (double)frame_out * 1000000.0 / (double)dx_time);
 }
 
 struct ExternalFrameBuffer {
@@ -493,7 +494,7 @@
   int                    ec_enabled = 0;
   const VpxInterface *interface = NULL;
   const VpxInterface *fourcc_interface = NULL;
-  unsigned long          dx_time = 0;
+  uint64_t dx_time = 0;
   struct arg               arg;
   char                   **argv, **argi, **argj;
 
@@ -803,7 +804,7 @@
         }
 
         vpx_usec_timer_mark(&timer);
-        dx_time += (unsigned int)vpx_usec_timer_elapsed(&timer);
+        dx_time += vpx_usec_timer_elapsed(&timer);
       }
     }
 
-- 
⑨