Index: source/libvpx/vp9/encoder/vp9_rdopt.h |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_rdopt.h (revision 177019) |
+++ source/libvpx/vp9/encoder/vp9_rdopt.h (working copy) |
@@ -22,20 +22,27 @@ |
extern void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, |
int *r, int *d); |
-extern void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, |
- int *r, int *d); |
+extern void vp9_rd_pick_intra_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x, |
+ int *r, int *d); |
+extern void vp9_rd_pick_intra_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x, |
+ int *r, int *d); |
+ |
extern void vp9_pick_mode_inter_macroblock(VP9_COMP *cpi, MACROBLOCK *x, |
- int recon_yoffset, |
- int recon_uvoffset, int *r, int *d); |
+ int ref_yoffset, int ref_uvoffset, |
+ int *r, int *d); |
-extern int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, |
- int recon_yoffset, int recon_uvoffset, |
- int *returnrate, int *returndist); |
+extern int64_t vp9_rd_pick_inter_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x, |
+ int ref_yoffset, int ref_uvoffset, |
+ int *r, int *d); |
+extern int64_t vp9_rd_pick_inter_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x, |
+ int ref_yoffset, int ref_uvoffset, |
+ int *r, int *d); |
+ |
extern void vp9_init_me_luts(); |
extern void vp9_set_mbmode_and_mvs(MACROBLOCK *x, |
MB_PREDICTION_MODE mb, int_mv *mv); |
-#endif |
+#endif // VP9_ENCODER_VP9_RDOPT_H_ |