Commit 135428e9 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Code cleanup.

Removing redundant 'extern' keyword, lowercase variable names.

Change-Id: I608e8d8579aba8981f5fac3493f77b4481b13808
parent e189edfe
......@@ -15,12 +15,12 @@
struct yv12_buffer_config;
struct VP9_COMP;
extern void vp9_pick_filter_level_fast(struct yv12_buffer_config *sd,
struct VP9_COMP *cpi);
void vp9_pick_filter_level_fast(struct yv12_buffer_config *sd,
struct VP9_COMP *cpi);
extern void vp9_set_alt_lf_level(struct VP9_COMP *cpi, int filt_val);
void vp9_set_alt_lf_level(struct VP9_COMP *cpi, int filt_val);
extern void vp9_pick_filter_level(struct yv12_buffer_config *sd,
struct VP9_COMP *cpi);
void vp9_pick_filter_level(struct yv12_buffer_config *sd,
struct VP9_COMP *cpi);
#endif // VP9_ENCODER_VP9_PICKLPF_H_
......@@ -193,19 +193,17 @@ void vp9_init_me_luts() {
}
static int compute_rd_mult(int qindex) {
int q;
q = vp9_dc_quant(qindex, 0);
int q = vp9_dc_quant(qindex, 0);
return (11 * q * q) >> 6;
}
void vp9_initialize_me_consts(VP9_COMP *cpi, int QIndex) {
cpi->mb.sadperbit16 = sad_per_bit16lut[QIndex];
cpi->mb.sadperbit4 = sad_per_bit4lut[QIndex];
void vp9_initialize_me_consts(VP9_COMP *cpi, int qindex) {
cpi->mb.sadperbit16 = sad_per_bit16lut[qindex];
cpi->mb.sadperbit4 = sad_per_bit4lut[qindex];
}
void vp9_initialize_rd_consts(VP9_COMP *cpi, int QIndex) {
void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
int q, i;
vp9_clear_system_state(); // __asm emms;
......@@ -214,16 +212,16 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int QIndex) {
// for key frames, golden frames and arf frames.
// if (cpi->common.refresh_golden_frame ||
// cpi->common.refresh_alt_ref_frame)
QIndex = (QIndex < 0) ? 0 : ((QIndex > MAXQ) ? MAXQ : QIndex);
qindex = (qindex < 0) ? 0 : ((qindex > MAXQ) ? MAXQ : qindex);
cpi->RDMULT = compute_rd_mult(QIndex);
cpi->RDMULT = compute_rd_mult(qindex);
if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {
if (cpi->twopass.next_iiratio > 31)
cpi->RDMULT += (cpi->RDMULT * rd_iifactor[31]) >> 4;
else
cpi->RDMULT +=
(cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
(cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
}
if (cpi->RDMULT < 7)
......@@ -234,8 +232,8 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int QIndex) {
vp9_set_speed_features(cpi);
q = (int)pow(vp9_dc_quant(QIndex, 0) >> 2, 1.25);
q = q << 2;
q = (int)pow(vp9_dc_quant(qindex, 0) >> 2, 1.25);
q <<= 2;
cpi->RDMULT = cpi->RDMULT << 4;
if (q < 8)
......
......@@ -15,34 +15,34 @@
#define RDCOST(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
#define RDCOST_8x8(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
extern void vp9_initialize_rd_consts(VP9_COMP *cpi, int Qvalue);
void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex);
extern void vp9_initialize_me_consts(VP9_COMP *cpi, int QIndex);
void vp9_initialize_me_consts(VP9_COMP *cpi, int qindex);
extern void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
int *r, int *d);
void vp9_rd_pick_intra_mode(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);
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);
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 mb_row, int mb_col,
int *r, int *d);
void vp9_pick_mode_inter_macroblock(VP9_COMP *cpi, MACROBLOCK *x,
int mb_row, int mb_col,
int *r, int *d);
extern int64_t vp9_rd_pick_inter_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x,
int mb_row, int mb_col,
int *r, int *d);
int64_t vp9_rd_pick_inter_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x,
int mb_row, int mb_col,
int *r, int *d);
extern int64_t vp9_rd_pick_inter_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x,
int mb_row, int mb_col,
int *r, int *d);
int64_t vp9_rd_pick_inter_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x,
int mb_row, int mb_col,
int *r, int *d);
extern void vp9_init_me_luts();
void vp9_init_me_luts();
extern void vp9_set_mbmode_and_mvs(MACROBLOCK *x,
MB_PREDICTION_MODE mb, int_mv *mv);
void vp9_set_mbmode_and_mvs(MACROBLOCK *x,
MB_PREDICTION_MODE mb, int_mv *mv);
#endif // VP9_ENCODER_VP9_RDOPT_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment