diff options
Diffstat (limited to 'libvpx/vp9/decoder/vp9_onyxd_int.h')
-rw-r--r-- | libvpx/vp9/decoder/vp9_onyxd_int.h | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/libvpx/vp9/decoder/vp9_onyxd_int.h b/libvpx/vp9/decoder/vp9_onyxd_int.h index 8698570..4760066 100644 --- a/libvpx/vp9/decoder/vp9_onyxd_int.h +++ b/libvpx/vp9/decoder/vp9_onyxd_int.h @@ -10,13 +10,14 @@ #ifndef VP9_DECODER_VP9_ONYXD_INT_H_ #define VP9_DECODER_VP9_ONYXD_INT_H_ + #include "./vpx_config.h" -#include "vp9/decoder/vp9_onyxd.h" -#include "vp9/decoder/vp9_treereader.h" + #include "vp9/common/vp9_onyxc_int.h" -#include "vp9/decoder/vp9_idct_blk.h" -// #define DEC_DEBUG +#include "vp9/decoder/vp9_idct_blk.h" +#include "vp9/decoder/vp9_onyxd.h" +#include "vp9/decoder/vp9_treereader.h" typedef struct VP9Decompressor { DECLARE_ALIGNED(16, MACROBLOCKD, mb); @@ -28,35 +29,17 @@ typedef struct VP9Decompressor { const uint8_t *source; uint32_t source_sz; - vp9_reader *mbc; int64_t last_time_stamp; int ready_for_new_data; int refresh_frame_flags; - vp9_prob prob_skip_false; int decoded_key_frame; int initial_width; int initial_height; -} VP9D_COMP; - -#if CONFIG_DEBUG -#define CHECK_MEM_ERROR(lval,expr) do {\ - lval = (expr); \ - if(!lval) \ - vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ - "Failed to allocate "#lval" at %s:%d", \ - __FILE__,__LINE__);\ - } while(0) -#else -#define CHECK_MEM_ERROR(lval,expr) do {\ - lval = (expr); \ - if(!lval) \ - vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ - "Failed to allocate "#lval);\ - } while(0) -#endif + int do_loopfilter_inline; // apply loopfilter to available rows immediately +} VP9D_COMP; #endif // VP9_DECODER_VP9_TREEREADER_H_ |