shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removed unused dr from VP8D_COMP"

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

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

@@ -502,39 +502,6 @@

     pbi->last_time_stamp = time_stamp;

     pbi->num_fragments = 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_NEON

 #if CONFIG_RUNTIME_CPU_DETECT

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

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

@@ -33,13 +33,6 @@

     MACROBLOCKD  mbd;

 } MB_ROW_DEC;

-typedef struct

-{

-    int64_t time_stamp;

-    int size;

-} DATARATE;

-

-

 typedef struct VP8D_COMP

 {

     DECLARE_ALIGNED(16, MACROBLOCKD, mb);

@@ -87,8 +80,6 @@

     vp8_reader *mbc;

     int64_t last_time_stamp;

     int   ready_for_new_data;

-

-    DATARATE dr[16];

     vp8_prob prob_intra;

     vp8_prob prob_last;

-- 

⑨