commit a7bb3360bcac5aee2071028c50678c7a4e1700e9
author Yaowu Xu <yaowu@google.com> Thu May 27 10:32:40 2010 -0700
committer Yaowu Xu <yaowu@google.com> Thu May 27 19:56:18 2010 -0700
tree 6f50390797fe266ac0f99d53d6515e0c5e878bb7
parent 8caa5c2d30601130dbbbd3f1a0b1dbcc79fc4343

Fix stats format and correct data size and bit rate output

Change-ID: I093abe6094589a0d73f6ca85b825678a19e68285

ivfenc.c

diff --git a/ivfenc.c b/ivfenc.c
index 65d11fa..4dc7082 100644
--- a/ivfenc.c
+++ b/ivfenc.c
@@ -991,7 +991,6 @@
             while ((pkt = vpx_codec_get_cx_data(&encoder, &iter)))
             {
                 got_data = 1;
-                nbytes += pkt->data.raw.sz;
 
                 switch (pkt->kind)
                 {
@@ -1001,6 +1000,7 @@
                            (unsigned long)pkt->data.frame.sz);
                     write_ivf_frame_header(outfile, pkt);
                     fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz, outfile);
+                    nbytes += pkt->data.raw.sz;
                     break;
                 case VPX_CODEC_STATS_PKT:
                     frames_out++;
@@ -1009,6 +1009,7 @@
                     stats_write(&stats,
                                 pkt->data.twopass_stats.buf,
                                 pkt->data.twopass_stats.sz);
+                    nbytes += pkt->data.raw.sz;
                     break;
                 case VPX_CODEC_PSNR_PKT:
 
@@ -1035,7 +1036,7 @@
         printf("\rPass %d/%d frame %4d/%-4d %7ldB %7ldb/f %7"PRId64"b/s"
                " %7lu %s (%.2f fps)\033[K", pass + 1,
                arg_passes, frames_in, frames_out, nbytes, nbytes * 8 / frames_in,
-               nbytes * 8 *(int64_t)cfg.g_timebase.den / cfg.g_timebase.num / frames_in,
+               nbytes * 8 *(int64_t)cfg.g_timebase.den/2/ cfg.g_timebase.num / frames_in,
                cx_time > 9999999 ? cx_time / 1000 : cx_time,
                cx_time > 9999999 ? "ms" : "us",
                (float)frames_in * 1000000.0 / (float)cx_time);