shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove unused DETOK structure"

--- a/vp8/decoder/asm_dec_offsets.c

+++ b/vp8/decoder/asm_dec_offsets.c

@@ -14,20 +14,6 @@

 BEGIN

-DEFINE(detok_scan,                              offsetof(DETOK, scan));

-DEFINE(detok_ptr_block2leftabove,               offsetof(DETOK, ptr_block2leftabove));

-DEFINE(detok_coef_tree_ptr,                     offsetof(DETOK, vp8_coef_tree_ptr));

-DEFINE(detok_norm_ptr,                          offsetof(DETOK, norm_ptr));

-DEFINE(detok_ptr_coef_bands_x,                  offsetof(DETOK, ptr_coef_bands_x));

-

-DEFINE(detok_A,                                 offsetof(DETOK, A));

-DEFINE(detok_L,                                 offsetof(DETOK, L));

-

-DEFINE(detok_qcoeff_start_ptr,                  offsetof(DETOK, qcoeff_start_ptr));

-DEFINE(detok_current_bc,                        offsetof(DETOK, current_bc));

-DEFINE(detok_coef_probs,                        offsetof(DETOK, coef_probs));

-DEFINE(detok_eob,                               offsetof(DETOK, eob));

-

 DEFINE(bool_decoder_user_buffer_end,            offsetof(BOOL_DECODER, user_buffer_end));

 DEFINE(bool_decoder_user_buffer,                offsetof(BOOL_DECODER, user_buffer));

 DEFINE(bool_decoder_value,                      offsetof(BOOL_DECODER, value));

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

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

@@ -42,26 +42,7 @@

     int size;

 } DATARATE;

-typedef struct

-{

-    int const *scan;

-    UINT8 const *ptr_block2leftabove;

-    vp8_tree_index const *vp8_coef_tree_ptr;

-    unsigned char *norm_ptr;

-    UINT8 *ptr_coef_bands_x;

-    ENTROPY_CONTEXT_PLANES *A;

-    ENTROPY_CONTEXT_PLANES *L;

-

-    INT16 *qcoeff_start_ptr;

-    BOOL_DECODER *current_bc;

-

-    vp8_prob const *coef_probs[4];

-

-    UINT8 eob[25];

-

-} DETOK;

-

 typedef struct VP8Decompressor

 {

     DECLARE_ALIGNED(16, MACROBLOCKD, mb);

@@ -113,8 +94,6 @@

     int   ready_for_new_data;

     DATARATE dr[16];

-

-    DETOK detoken;

 #if CONFIG_RUNTIME_CPU_DETECT

     vp8_dequant_rtcd_vtable_t        dequant;