Commit 49e1aaac authored by Urvang Joshi's avatar Urvang Joshi
Browse files

EXT_INTRA experiment: fix shadowed declarations.

Change-Id: Ie3a29e9b23ebf5d658fad2b797d34208890f4e2a
parent 6391fd67
...@@ -1375,16 +1375,16 @@ static void angle_estimation(const uint8_t *src, const int src_stride, ...@@ -1375,16 +1375,16 @@ static void angle_estimation(const uint8_t *src, const int src_stride,
for (i = 0; i < DIRECTIONAL_MODES; ++i) hist_sum += hist[i]; for (i = 0; i < DIRECTIONAL_MODES; ++i) hist_sum += hist[i];
for (i = 0; i < INTRA_MODES; ++i) { for (i = 0; i < INTRA_MODES; ++i) {
if (i != DC_PRED && i != TM_PRED) { if (i != DC_PRED && i != TM_PRED) {
int index = mode_to_angle_bin[i]; const uint8_t angle_bin = mode_to_angle_bin[i];
uint64_t score = 2 * hist[index]; uint64_t score = 2 * hist[angle_bin];
int weight = 2; int weight = 2;
if (index > 0) { if (angle_bin > 0) {
score += hist[index - 1]; score += hist[angle_bin - 1];
weight += 1; ++weight;
} }
if (index < DIRECTIONAL_MODES - 1) { if (angle_bin < DIRECTIONAL_MODES - 1) {
score += hist[index + 1]; score += hist[angle_bin + 1];
weight += 1; ++weight;
} }
if (score * angle_skip_thresh < hist_sum * weight) { if (score * angle_skip_thresh < hist_sum * weight) {
directional_mode_skip_mask[i] = 1; directional_mode_skip_mask[i] = 1;
...@@ -1429,16 +1429,16 @@ static void highbd_angle_estimation(const uint8_t *src8, const int src_stride, ...@@ -1429,16 +1429,16 @@ static void highbd_angle_estimation(const uint8_t *src8, const int src_stride,
for (i = 0; i < DIRECTIONAL_MODES; ++i) hist_sum += hist[i]; for (i = 0; i < DIRECTIONAL_MODES; ++i) hist_sum += hist[i];
for (i = 0; i < INTRA_MODES; ++i) { for (i = 0; i < INTRA_MODES; ++i) {
if (i != DC_PRED && i != TM_PRED) { if (i != DC_PRED && i != TM_PRED) {
int index = mode_to_angle_bin[i]; const uint8_t angle_bin = mode_to_angle_bin[i];
uint64_t score = 2 * hist[index]; uint64_t score = 2 * hist[angle_bin];
int weight = 2; int weight = 2;
if (index > 0) { if (angle_bin > 0) {
score += hist[index - 1]; score += hist[angle_bin - 1];
weight += 1; ++weight;
} }
if (index < DIRECTIONAL_MODES - 1) { if (angle_bin < DIRECTIONAL_MODES - 1) {
score += hist[index + 1]; score += hist[angle_bin + 1];
weight += 1; ++weight;
} }
if (score * angle_skip_thresh < hist_sum * weight) if (score * angle_skip_thresh < hist_sum * weight)
directional_mode_skip_mask[i] = 1; directional_mode_skip_mask[i] = 1;
......
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