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

Merge "Fix rollover and pass 1 time estimate" into experimental

Browse Source
This commit is contained in:
John Koleszar 2013-02-27 17:43:03 -08:00 committed by Gerrit Code Review
commit d962bd530d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vpxenc.c
View File

@ -2478,7 +2478,7 @@ int main(int argc, const char **argv_) {
struct global_config global; struct global_config global;
struct stream_state *streams = NULL; struct stream_state *streams = NULL;
char **argv, **argi; char **argv, **argi;
unsigned long cx_time = 0; uint64_t cx_time = 0;
int stream_cnt = 0; int stream_cnt = 0;
int res = 0; int res = 0;
@ -2618,7 +2618,7 @@ int main(int argc, const char **argv_) {
else else
fprintf(stderr, "frame %4d ", frames_in); fprintf(stderr, "frame %4d ", frames_in);
fprintf(stderr, "%7lu %s %.2f %s ", fprintf(stderr, "%7"PRId64" %s %.2f %s ",
cx_time > 9999999 ? cx_time / 1000 : cx_time, cx_time > 9999999 ? cx_time / 1000 : cx_time,
cx_time > 9999999 ? "ms" : "us", cx_time > 9999999 ? "ms" : "us",
fps >= 1.0 ? fps : 1000.0 / fps, fps >= 1.0 ? fps : 1000.0 / fps,
@ -2636,7 +2636,7 @@ int main(int argc, const char **argv_) {
frame_avail ? &raw : NULL, frame_avail ? &raw : NULL,
frames_in)); frames_in));
vpx_usec_timer_mark(&timer); vpx_usec_timer_mark(&timer);
cx_time += (unsigned long)vpx_usec_timer_elapsed(&timer); cx_time += vpx_usec_timer_elapsed(&timer);
FOREACH_STREAM(update_quantizer_histogram(stream)); FOREACH_STREAM(update_quantizer_histogram(stream));
@ -2645,7 +2645,7 @@ int main(int argc, const char **argv_) {
if (!got_data && input.length && !streams->frames_out) { if (!got_data && input.length && !streams->frames_out) {
lagged_count = global.limit ? frames_in : ftello(input.file); lagged_count = global.limit ? frames_in : ftello(input.file);
} else if (got_data && input.length) { } else if (input.length) {
int64_t remaining; int64_t remaining;
int64_t rate; int64_t rate;