Index: source/libvpx/vp9/encoder/vp9_encodemb.h |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_encodemb.h (revision 177019) |
+++ source/libvpx/vp9/encoder/vp9_encodemb.h (working copy) |
@@ -8,20 +8,16 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
- |
#ifndef VP9_ENCODER_VP9_ENCODEMB_H_ |
#define VP9_ENCODER_VP9_ENCODEMB_H_ |
-#include "vpx_ports/config.h" |
+#include "./vpx_config.h" |
#include "vp9/encoder/vp9_block.h" |
typedef struct { |
MB_PREDICTION_MODE mode; |
MV_REFERENCE_FRAME ref_frame; |
MV_REFERENCE_FRAME second_ref_frame; |
-#if CONFIG_PRED_FILTER |
- int pred_filter_flag; |
-#endif |
} MODE_DEFINITION; |
@@ -47,18 +43,25 @@ |
void vp9_transform_mby_16x16(MACROBLOCK *x); |
void vp9_optimize_mby_16x16(MACROBLOCK *x); |
+void vp9_transform_sby_32x32(MACROBLOCK *x); |
+void vp9_transform_sbuv_16x16(MACROBLOCK *x); |
+ |
void vp9_fidct_mb(MACROBLOCK *x); |
void vp9_subtract_4b_c(BLOCK *be, BLOCKD *bd, int pitch); |
-#if CONFIG_SUPERBLOCKS |
-void vp9_subtract_mbuv_s_c(short *diff, const unsigned char *usrc, |
- const unsigned char *vsrc, int src_stride, |
- const unsigned char *upred, |
- const unsigned char *vpred, int dst_stride); |
-void vp9_subtract_mby_s_c(short *diff, const unsigned char *src, |
- int src_stride, const unsigned char *pred, |
+void vp9_subtract_mbuv_s_c(int16_t *diff, const uint8_t *usrc, |
+ const uint8_t *vsrc, int src_stride, |
+ const uint8_t *upred, |
+ const uint8_t *vpred, int dst_stride); |
+void vp9_subtract_mby_s_c(int16_t *diff, const uint8_t *src, |
+ int src_stride, const uint8_t *pred, |
int dst_stride); |
-#endif |
+void vp9_subtract_sby_s_c(int16_t *diff, const uint8_t *src, int src_stride, |
+ const uint8_t *pred, int dst_stride); |
+void vp9_subtract_sbuv_s_c(int16_t *diff, const uint8_t *usrc, |
+ const uint8_t *vsrc, int src_stride, |
+ const uint8_t *upred, |
+ const uint8_t *vpred, int dst_stride); |
-#endif |
+#endif // VP9_ENCODER_VP9_ENCODEMB_H_ |