Commit 5d12e04d authored by John Koleszar's avatar John Koleszar
Browse files

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

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

Change-Id: I8efea57050db72963c0bc5c994425e7e692d1502
parent dea6193d
...@@ -577,6 +577,15 @@ fail: ...@@ -577,6 +577,15 @@ fail:
return 0; 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_) int main(int argc, const char **argv_)
{ {
vpx_codec_ctx_t decoder; vpx_codec_ctx_t decoder;
...@@ -812,12 +821,12 @@ int main(int argc, const char **argv_) ...@@ -812,12 +821,12 @@ int main(int argc, const char **argv_)
++frame_in; ++frame_in;
if (progress)
fprintf(stderr, "decoded frame %d.\n", frame_in);
if ((img = vpx_codec_get_frame(&decoder, &iter))) if ((img = vpx_codec_get_frame(&decoder, &iter)))
++frame_out; ++frame_out;
if (progress)
show_progress(frame_in, frame_out, dx_time);
if (!noblit) if (!noblit)
{ {
if (img) if (img)
...@@ -869,10 +878,10 @@ int main(int argc, const char **argv_) ...@@ -869,10 +878,10 @@ int main(int argc, const char **argv_)
break; break;
} }
if (summary) if (summary || progress)
{ {
fprintf(stderr, "%d decoded frames/%d showed frames in %lu us (%.2f fps)\n", show_progress(frame_in, frame_out, dx_time);
frame_in, frame_out, dx_time, (float)frame_out * 1000000.0 / (float)dx_time); fprintf(stderr, "\n");
} }
fail: fail:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment