| Index: source/libvpx/vp8/decoder/onyxd_int.h
|
| ===================================================================
|
| --- source/libvpx/vp8/decoder/onyxd_int.h (revision 96967)
|
| +++ source/libvpx/vp8/decoder/onyxd_int.h (working copy)
|
| @@ -17,6 +17,9 @@
|
| #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
|
| {
|
| @@ -35,23 +38,15 @@
|
|
|
| typedef struct
|
| {
|
| - INT64 time_stamp;
|
| + int64_t 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;
|
|
|
| @@ -80,13 +75,10 @@
|
|
|
| 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 */
|
|
|
| @@ -117,7 +109,7 @@
|
| #endif
|
|
|
| vp8_reader *mbc;
|
| - INT64 last_time_stamp;
|
| + int64_t last_time_stamp;
|
| int ready_for_new_data;
|
|
|
| DATARATE dr[16];
|
| @@ -134,6 +126,18 @@
|
| 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);
|
|
|