shithub: libvpx

--- a/vp9/common/vp9_entropymv.h

+++ b/vp9/common/vp9_entropymv.h

@@ -25,7 +25,7 @@

 void vp9_init_mv_probs(struct VP9Common *cm);

-void vp9_adapt_mv_probs(struct VP9Common *cm, int usehp);

+void vp9_adapt_mv_probs(struct VP9Common *cm, int allow_hp);

 static INLINE int use_mv_hp(const MV *ref) {

   const int kMvRefThresh = 64;  // threshold for use of high-precision 1/8 mv

@@ -127,7 +127,7 @@

   nmv_component_counts comps[2];

 } nmv_context_counts;

-void vp9_inc_mv(const MV *mv, nmv_context_counts *mvctx);

+void vp9_inc_mv(const MV *mv, nmv_context_counts *counts);

 #ifdef __cplusplus

 }  // extern "C"

--- a/vp9/common/vp9_loopfilter.c

+++ b/vp9/common/vp9_loopfilter.c

@@ -880,12 +880,12 @@

 // This function sets up the bit masks for the entire 64x64 region represented

 // by mi_row, mi_col.

 void vp9_setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col,

-                    MODE_INFO **mi, const int mode_info_stride,

+                    MODE_INFO **mi8x8, const int mode_info_stride,

                     LOOP_FILTER_MASK *lfm) {

   int idx_32, idx_16, idx_8;

   const loop_filter_info_n *const lfi_n = &cm->lf_info;

-  MODE_INFO **mip = mi;

-  MODE_INFO **mip2 = mi;

+  MODE_INFO **mip = mi8x8;

+  MODE_INFO **mip2 = mi8x8;

   // These are offsets to the next mi in the 64x64 block. It is what gets

   // added to the mi ptr as we go through each loop. It helps us to avoid

--- a/vp9/common/vp9_loopfilter.h

+++ b/vp9/common/vp9_loopfilter.h

@@ -97,7 +97,7 @@

 // This function sets up the bit masks for the entire 64x64 region represented

 // by mi_row, mi_col.

 void vp9_setup_mask(struct VP9Common *const cm, const int mi_row,

-                    const int mi_col, MODE_INFO **mi_8x8,

+                    const int mi_col, MODE_INFO **mi8x8,

                     const int mode_info_stride, LOOP_FILTER_MASK *lfm);

 void vp9_filter_block_plane_ss00(struct VP9Common *const cm,

@@ -120,7 +120,7 @@

 void vp9_loop_filter_frame_init(struct VP9Common *cm, int default_filt_lvl);

 void vp9_loop_filter_frame(YV12_BUFFER_CONFIG *frame, struct VP9Common *cm,

-                           struct macroblockd *mbd, int filter_level,

+                           struct macroblockd *xd, int frame_filter_level,

                            int y_only, int partial_frame);

 // Get the superblock lfm for a given mi_row, mi_col.

--- a/vp9/common/vp9_postproc.h

+++ b/vp9/common/vp9_postproc.h

@@ -38,7 +38,7 @@

 #define MFQE_PRECISION 4

 int vp9_post_proc_frame(struct VP9Common *cm, YV12_BUFFER_CONFIG *dest,

-                        vp9_ppflags_t *flags, int unscaled_width);

+                        vp9_ppflags_t *ppflags, int unscaled_width);

 void vp9_denoise(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, int q,

                  uint8_t *limits);

--- a/vp9/common/vp9_reconinter.h

+++ b/vp9/common/vp9_reconinter.h

@@ -61,15 +61,15 @@

                                    BLOCK_SIZE bsize);

 void vp9_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,

-                               int dst_stride, const MV *mv_q3,

+                               int dst_stride, const MV *src_mv,

                                const struct scale_factors *sf, int w, int h,

-                               int do_avg, const InterpKernel *kernel,

+                               int ref, const InterpKernel *kernel,

                                enum mv_precision precision, int x, int y);

 #if CONFIG_VP9_HIGHBITDEPTH

 void vp9_highbd_build_inter_predictor(

     const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride,

-    const MV *mv_q3, const struct scale_factors *sf, int w, int h, int do_avg,

+    const MV *src_mv, const struct scale_factors *sf, int w, int h, int ref,

     const InterpKernel *kernel, enum mv_precision precision, int x, int y,

     int bd);

 #endif

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -62,7 +62,7 @@

 add_proto qw/void vp9_iht8x8_64_add/, "const tran_low_t *input, uint8_t *dest, int stride, int tx_type";

-add_proto qw/void vp9_iht16x16_256_add/, "const tran_low_t *input, uint8_t *output, int pitch, int tx_type";

+add_proto qw/void vp9_iht16x16_256_add/, "const tran_low_t *input, uint8_t *dest, int stride, int tx_type";

 if (vpx_config("CONFIG_EMULATE_HARDWARE") ne "yes") {

   # Note that there are more specializations appended when

@@ -100,7 +100,7 @@

   add_proto qw/void vp9_highbd_iht8x8_64_add/, "const tran_low_t *input, uint16_t *dest, int stride, int tx_type, int bd";

-  add_proto qw/void vp9_highbd_iht16x16_256_add/, "const tran_low_t *input, uint16_t *output, int pitch, int tx_type, int bd";

+  add_proto qw/void vp9_highbd_iht16x16_256_add/, "const tran_low_t *input, uint16_t *dest, int stride, int tx_type, int bd";

   if (vpx_config("CONFIG_EMULATE_HARDWARE") ne "yes") {

     specialize qw/vp9_highbd_iht4x4_16_add neon sse4_1/;

--- a/vp9/common/vp9_scale.h

+++ b/vp9/common/vp9_scale.h

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

 #if CONFIG_VP9_HIGHBITDEPTH

 void vp9_setup_scale_factors_for_frame(struct scale_factors *sf, int other_w,

                                        int other_h, int this_w, int this_h,

-                                       int use_high);

+                                       int use_highbd);

 #else

 void vp9_setup_scale_factors_for_frame(struct scale_factors *sf, int other_w,

                                        int other_h, int this_w, int this_h);