Index: source/libvpx/vp9/common/vp9_loopfilter.h |
=================================================================== |
--- source/libvpx/vp9/common/vp9_loopfilter.h (revision 232232) |
+++ source/libvpx/vp9/common/vp9_loopfilter.h (working copy) |
@@ -12,7 +12,7 @@ |
#define VP9_COMMON_VP9_LOOPFILTER_H_ |
#include "vpx_ports/mem.h" |
-#include "vpx_config.h" |
+#include "./vpx_config.h" |
#include "vp9/common/vp9_blockd.h" |
#include "vp9/common/vp9_seg_common.h" |
@@ -46,12 +46,13 @@ |
// Need to align this structure so when it is declared and |
// passed it can be loaded into vector registers. |
typedef struct { |
- DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, |
- mblim[MAX_LOOP_FILTER + 1][SIMD_WIDTH]); |
- DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, |
- lim[MAX_LOOP_FILTER + 1][SIMD_WIDTH]); |
- DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, |
- hev_thr[4][SIMD_WIDTH]); |
+ DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, mblim[SIMD_WIDTH]); |
+ DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, lim[SIMD_WIDTH]); |
+ DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, hev_thr[SIMD_WIDTH]); |
+} loop_filter_thresh; |
+ |
+typedef struct { |
+ loop_filter_thresh lfthr[MAX_LOOP_FILTER + 1]; |
uint8_t lvl[MAX_SEGMENTS][MAX_REF_FRAMES][MAX_MODE_LF_DELTAS]; |
uint8_t mode_lf_lut[MB_MODE_COUNT]; |
} loop_filter_info_n; |