| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 | 11 | 
| 12 #ifndef __INC_PICKINTER_H | 12 #ifndef __INC_PICKINTER_H | 
| 13 #define __INC_PICKINTER_H | 13 #define __INC_PICKINTER_H | 
| 14 #include "vpx_ports/config.h" | 14 #include "vpx_ports/config.h" | 
| 15 #include "vp8/common/onyxc_int.h" | 15 #include "vp8/common/onyxc_int.h" | 
| 16 | 16 | 
| 17 #define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) | 17 extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
     int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); | 
| 18 extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, 
    int *Rate, int *Distortion); | 18 extern void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate); | 
| 19 extern int vp8_pick_intra_mbuv_mode(MACROBLOCK *mb); |  | 
| 20 extern int vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, 
    int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); |  | 
| 21 #endif | 19 #endif | 
| OLD | NEW | 
|---|