Commit 69d2fb85 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Change to use proper type"

parents c80287f0 26cb7bee
...@@ -806,7 +806,7 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -806,7 +806,7 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
{INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MAX},
{INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MAX},
{INT64_MAX, INT64_MAX}}; {INT64_MAX, INT64_MAX}};
int n, m; TX_SIZE n, m;
int s0, s1; int s0, s1;
const TX_SIZE max_mode_tx_size = tx_mode_to_biggest_tx_size[cm->tx_mode]; const TX_SIZE max_mode_tx_size = tx_mode_to_biggest_tx_size[cm->tx_mode];
int64_t best_rd = INT64_MAX; int64_t best_rd = INT64_MAX;
...@@ -889,7 +889,7 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -889,7 +889,7 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x,
{INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MAX},
{INT64_MAX, INT64_MAX}, {INT64_MAX, INT64_MAX},
{INT64_MAX, INT64_MAX}}; {INT64_MAX, INT64_MAX}};
int n, m; TX_SIZE n, m;
int s0, s1; int s0, s1;
double scale_rd[TX_SIZES] = {1.73, 1.44, 1.20, 1.00}; double scale_rd[TX_SIZES] = {1.73, 1.44, 1.20, 1.00};
const TX_SIZE max_mode_tx_size = tx_mode_to_biggest_tx_size[cm->tx_mode]; const TX_SIZE max_mode_tx_size = tx_mode_to_biggest_tx_size[cm->tx_mode];
......
...@@ -176,7 +176,7 @@ typedef struct SPEED_FEATURES { ...@@ -176,7 +176,7 @@ typedef struct SPEED_FEATURES {
// a log search that iterates 4 times (check around mv for last for best // a log search that iterates 4 times (check around mv for last for best
// error of combined predictor then check around mv for alt). If 0 we // error of combined predictor then check around mv for alt). If 0 we
// we just use the best motion vector found for each frame by itself. // we just use the best motion vector found for each frame by itself.
int comp_inter_joint_search_thresh; BLOCK_SIZE comp_inter_joint_search_thresh;
// This variable is used to cap the maximum number of times we skip testing a // This variable is used to cap the maximum number of times we skip testing a
// mode to be evaluated. A high value means we will be faster. // mode to be evaluated. A high value means we will be faster.
......
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