Commit 1aa07fa1 authored by Urvang Joshi's avatar Urvang Joshi
Browse files

build_intra_preds: Remove unnecessary variable.

'const_above_row' was same as 'above_row' and 'above_row' pointer was
never modified.

Change-Id: Ib0c2524b1afc75967cfa7d3da8e59cfc66299ff4
parent cd0f6c4d
...@@ -1842,9 +1842,8 @@ static void build_intra_predictors_high( ...@@ -1842,9 +1842,8 @@ static void build_intra_predictors_high(
uint16_t *ref = CONVERT_TO_SHORTPTR(ref8); uint16_t *ref = CONVERT_TO_SHORTPTR(ref8);
DECLARE_ALIGNED(16, uint16_t, left_data[MAX_TX_SIZE * 2 + 16]); DECLARE_ALIGNED(16, uint16_t, left_data[MAX_TX_SIZE * 2 + 16]);
DECLARE_ALIGNED(16, uint16_t, above_data[MAX_TX_SIZE * 2 + 16]); DECLARE_ALIGNED(16, uint16_t, above_data[MAX_TX_SIZE * 2 + 16]);
uint16_t *above_row = above_data + 16; uint16_t *const above_row = above_data + 16;
uint16_t *left_col = left_data + 16; uint16_t *const left_col = left_data + 16;
const uint16_t *const_above_row = above_row;
const int bs = tx_size_wide[tx_size]; const int bs = tx_size_wide[tx_size];
int need_left = extend_modes[mode] & NEED_LEFT; int need_left = extend_modes[mode] & NEED_LEFT;
int need_above = extend_modes[mode] & NEED_ABOVE; int need_above = extend_modes[mode] & NEED_ABOVE;
...@@ -1970,7 +1969,7 @@ static void build_intra_predictors_high( ...@@ -1970,7 +1969,7 @@ static void build_intra_predictors_high(
#if CONFIG_FILTER_INTRA #if CONFIG_FILTER_INTRA
if (filter_intra_mode_info->use_filter_intra_mode[plane != 0]) { if (filter_intra_mode_info->use_filter_intra_mode[plane != 0]) {
highbd_filter_intra_predictors(filter_intra_mode, dst, dst_stride, bs, highbd_filter_intra_predictors(filter_intra_mode, dst, dst_stride, bs,
const_above_row, left_col, xd->bd); above_row, left_col, xd->bd);
return; return;
} }
#endif // CONFIG_FILTER_INTRA #endif // CONFIG_FILTER_INTRA
...@@ -1982,7 +1981,7 @@ static void build_intra_predictors_high( ...@@ -1982,7 +1981,7 @@ static void build_intra_predictors_high(
if (plane == 0 && av1_is_intra_filter_switchable(p_angle)) if (plane == 0 && av1_is_intra_filter_switchable(p_angle))
filter = xd->mi[0]->mbmi.intra_filter; filter = xd->mi[0]->mbmi.intra_filter;
#endif // CONFIG_INTRA_INTERP #endif // CONFIG_INTRA_INTERP
highbd_dr_predictor(dst, dst_stride, bs, const_above_row, left_col, highbd_dr_predictor(dst, dst_stride, bs, above_row, left_col,
#if CONFIG_INTRA_INTERP #if CONFIG_INTRA_INTERP
filter, filter,
#endif // CONFIG_INTRA_INTERP #endif // CONFIG_INTRA_INTERP
...@@ -1994,10 +1993,9 @@ static void build_intra_predictors_high( ...@@ -1994,10 +1993,9 @@ static void build_intra_predictors_high(
// predict // predict
if (mode == DC_PRED) { if (mode == DC_PRED) {
dc_pred_high[n_left_px > 0][n_top_px > 0][tx_size]( dc_pred_high[n_left_px > 0][n_top_px > 0][tx_size](
dst, dst_stride, const_above_row, left_col, xd->bd); dst, dst_stride, above_row, left_col, xd->bd);
} else { } else {
pred_high[mode][tx_size](dst, dst_stride, const_above_row, left_col, pred_high[mode][tx_size](dst, dst_stride, above_row, left_col, xd->bd);
xd->bd);
} }
} }
#endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_HIGHBITDEPTH
...@@ -2012,9 +2010,8 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref, ...@@ -2012,9 +2010,8 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
const uint8_t *above_ref = ref - ref_stride; const uint8_t *above_ref = ref - ref_stride;
DECLARE_ALIGNED(16, uint8_t, left_data[MAX_TX_SIZE * 2 + 16]); DECLARE_ALIGNED(16, uint8_t, left_data[MAX_TX_SIZE * 2 + 16]);
DECLARE_ALIGNED(16, uint8_t, above_data[MAX_TX_SIZE * 2 + 16]); DECLARE_ALIGNED(16, uint8_t, above_data[MAX_TX_SIZE * 2 + 16]);
uint8_t *above_row = above_data + 16; uint8_t *const above_row = above_data + 16;
uint8_t *left_col = left_data + 16; uint8_t *const left_col = left_data + 16;
const uint8_t *const_above_row = above_row;
const int bs = tx_size_wide[tx_size]; const int bs = tx_size_wide[tx_size];
int need_left = extend_modes[mode] & NEED_LEFT; int need_left = extend_modes[mode] & NEED_LEFT;
int need_above = extend_modes[mode] & NEED_ABOVE; int need_above = extend_modes[mode] & NEED_ABOVE;
...@@ -2138,8 +2135,8 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref, ...@@ -2138,8 +2135,8 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
#if CONFIG_FILTER_INTRA #if CONFIG_FILTER_INTRA
if (filter_intra_mode_info->use_filter_intra_mode[plane != 0]) { if (filter_intra_mode_info->use_filter_intra_mode[plane != 0]) {
filter_intra_predictors(filter_intra_mode, dst, dst_stride, bs, filter_intra_predictors(filter_intra_mode, dst, dst_stride, bs, above_row,
const_above_row, left_col); left_col);
return; return;
} }
#endif // CONFIG_FILTER_INTRA #endif // CONFIG_FILTER_INTRA
...@@ -2150,7 +2147,7 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref, ...@@ -2150,7 +2147,7 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
if (plane == 0 && av1_is_intra_filter_switchable(p_angle)) if (plane == 0 && av1_is_intra_filter_switchable(p_angle))
filter = xd->mi[0]->mbmi.intra_filter; filter = xd->mi[0]->mbmi.intra_filter;
#endif // CONFIG_INTRA_INTERP #endif // CONFIG_INTRA_INTERP
dr_predictor(dst, dst_stride, tx_size, const_above_row, left_col, dr_predictor(dst, dst_stride, tx_size, above_row, left_col,
#if CONFIG_INTRA_INTERP #if CONFIG_INTRA_INTERP
filter, filter,
#endif // CONFIG_INTRA_INTERP #endif // CONFIG_INTRA_INTERP
...@@ -2165,14 +2162,14 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref, ...@@ -2165,14 +2162,14 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
// CFL predict its own DC_PRED for Chromatic planes // CFL predict its own DC_PRED for Chromatic planes
if (plane == AOM_PLANE_Y) { if (plane == AOM_PLANE_Y) {
#endif #endif
dc_pred[n_left_px > 0][n_top_px > 0][tx_size](dst, dst_stride, dc_pred[n_left_px > 0][n_top_px > 0][tx_size](dst, dst_stride, above_row,
const_above_row, left_col); left_col);
#if CONFIG_CFL #if CONFIG_CFL
} }
#endif #endif
} else { } else {
pred[mode][tx_size](dst, dst_stride, const_above_row, left_col); pred[mode][tx_size](dst, dst_stride, above_row, left_col);
} }
} }
......
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