shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing dr[16] from VP8D_COMP" into experimental

--- a/vp8/decoder/onyxd_if.c

+++ b/vp8/decoder/onyxd_if.c

@@ -471,38 +471,6 @@

   pbi->last_time_stamp = time_stamp;

   pbi->source_sz = 0;

-#if 0

-  {

-    int i;

-    int64_t earliest_time = pbi->dr[0].time_stamp;

-    int64_t latest_time = pbi->dr[0].time_stamp;

-    int64_t time_diff = 0;

-    int bytes = 0;

-

-    pbi->dr[pbi->common.current_video_frame & 0xf].size = pbi->bc.pos + pbi->bc2.pos + 4;;

-    pbi->dr[pbi->common.current_video_frame & 0xf].time_stamp = time_stamp;

-

-    for (i = 0; i < 16; i++) {

-

-      bytes += pbi->dr[i].size;

-

-      if (pbi->dr[i].time_stamp < earliest_time)

-        earliest_time = pbi->dr[i].time_stamp;

-

-      if (pbi->dr[i].time_stamp > latest_time)

-        latest_time = pbi->dr[i].time_stamp;

-    }

-

-    time_diff = latest_time - earliest_time;

-

-    if (time_diff > 0) {

-      pbi->common.bitrate = 80000.00 * bytes / time_diff;

-      pbi->common.framerate = 160000000.00 / time_diff;

-    }

-

-  }

-#endif

-

 #if HAVE_ARMV7

 #if CONFIG_RUNTIME_CPU_DETECT

   if (cm->rtcd.flags & HAS_NEON)

--- a/vp8/decoder/onyxd_int.h

+++ b/vp8/decoder/onyxd_int.h

@@ -33,11 +33,6 @@

 } MB_ROW_DEC;

 typedef struct {

-  int64_t time_stamp;

-  int size;

-} DATARATE;

-

-typedef struct {

   int const *scan;

   int const *scan_8x8;

   UINT8 const *ptr_block2leftabove;

@@ -78,8 +73,6 @@

   vp8_reader *mbc;

   int64_t last_time_stamp;

   int   ready_for_new_data;

-

-  DATARATE dr[16];

   DETOK detoken;

-- 

⑨