generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Change dx_time data type in vpxdec.c"

Browse Source
This commit is contained in:
Tom Finegan
2014-02-25 09:44:31 -08:00
committed by Gerrit Code Review
parent da6b224e3c 6d15132742
commit 008ef8dd0d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vpxdec.c
View File

@@ -298,10 +298,11 @@ int file_is_raw(struct VpxInputContext *input) {
return is_raw; return is_raw;
} }
void show_progress(int frame_in, int frame_out, unsigned long dx_time) { void show_progress(int frame_in, int frame_out, uint64_t dx_time) {
fprintf(stderr, "%d decoded frames/%d showed frames in %lu us (%.2f fps)\r", fprintf(stderr,
"%d decoded frames/%d showed frames in %"PRId64" us (%.2f fps)\r",
frame_in, frame_out, dx_time, frame_in, frame_out, dx_time,
(float)frame_out * 1000000.0 / (float)dx_time); (double)frame_out * 1000000.0 / (double)dx_time);
} }
struct ExternalFrameBuffer { struct ExternalFrameBuffer {
@@ -493,7 +494,7 @@ int main_loop(int argc, const char **argv_) {
int ec_enabled = 0; int ec_enabled = 0;
const VpxInterface *interface = NULL; const VpxInterface *interface = NULL;
const VpxInterface *fourcc_interface = NULL; const VpxInterface *fourcc_interface = NULL;
unsigned long dx_time = 0; uint64_t dx_time = 0;
struct arg arg; struct arg arg;
char **argv, **argi, **argj; char **argv, **argi, **argj;
@@ -803,7 +804,7 @@ int main_loop(int argc, const char **argv_) {
} }
vpx_usec_timer_mark(&timer); vpx_usec_timer_mark(&timer);
dx_time += (unsigned int)vpx_usec_timer_elapsed(&timer); dx_time += vpx_usec_timer_elapsed(&timer);
} }
} }