Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vp8/decoder/onyxd_int.h

Index: libvpx/source/libvpx/vp8/decoder/onyxd_int.h
diff --git a/libvpx/source/libvpx/vp8/decoder/onyxd_int.h b/libvpx/source/libvpx/vp8/decoder/onyxd_int.h
index 4ece4312a0b6fa45d6e795cee76c049bfae6c7f7..ac1e332e8bcf53223af44c5efdeec055b3564529 100644
--- a/libvpx/source/libvpx/vp8/decoder/onyxd_int.h
+++ b/libvpx/source/libvpx/vp8/decoder/onyxd_int.h
@@ -17,9 +17,6 @@
 #include "vp8/common/onyxc_int.h"
 #include "vp8/common/threading.h"
 #include "dequantize.h"
-#if CONFIG_ERROR_CONCEALMENT
-#include "ec_types.h"
-#endif
 
 typedef struct
 {
@@ -38,15 +35,23 @@ typedef struct
 
 typedef struct
 {
-    int64_t time_stamp;
+    INT64 time_stamp;
     int size;
 } DATARATE;
 
 typedef struct
 {
+    INT16         min_val;
+    INT16         Length;
+    UINT8 Probs[12];
+} TOKENEXTRABITS;
+
+typedef struct
+{
     int const *scan;
     UINT8 const *ptr_block2leftabove;
     vp8_tree_index const *vp8_coef_tree_ptr;
+    TOKENEXTRABITS const *teb_base_ptr;
     unsigned char *norm_ptr;
     UINT8 *ptr_coef_bands_x;
 
@@ -75,9 +80,12 @@ typedef struct VP8Decompressor
 
     const unsigned char *Source;
     unsigned int   source_sz;
-    const unsigned char *partitions[MAX_PARTITIONS];
-    unsigned int   partition_sizes[MAX_PARTITIONS];
-    unsigned int   num_partitions;
+
+
+    unsigned int CPUFreq;
+    unsigned int decode_microseconds;
+    unsigned int time_decoding;
+    unsigned int time_loop_filtering;
 
 #if CONFIG_MULTITHREAD
     /* variable for threading */
@@ -109,7 +117,7 @@ typedef struct VP8Decompressor
 #endif
 
     vp8_reader *mbc;
-    int64_t last_time_stamp;
+    INT64 last_time_stamp;
     int   ready_for_new_data;
 
     DATARATE dr[16];
@@ -126,18 +134,6 @@ typedef struct VP8Decompressor
     vp8_prob prob_gf;
     vp8_prob prob_skip_false;
 
-#if CONFIG_ERROR_CONCEALMENT
-    MB_OVERLAP *overlaps;
-    /* the mb num from which modes and mvs (first partition) are corrupt */
-    unsigned int mvs_corrupt_from_mb;
-#endif
-    int ec_enabled;
-    int ec_active;
-    int input_partition;
-    int decoded_key_frame;
-    int independent_partitions;
-    int frame_corrupt_residual;
-
 } VP8D_COMP;
 
 int vp8_decode_frame(VP8D_COMP *cpi);