Commit f24a35f8 authored by Luc Trudeau's avatar Luc Trudeau

Convert to PREDICTION_MODE for is_directional

Recent code added in EXT_INTRA wasn't compatible with CfL,
because it assumed that the PREDICTION_MODE was the same
for luma and chroma, which is not the case with CfL.

UV_PREDICTION_MODE must be converted to PREDICTION_MODE for
av1_is_directional_mode function.

Change-Id: I10e42e3f4a904905f41205d0018f97807959e841
parent cc711276
...@@ -10141,7 +10141,7 @@ static void pick_filter_intra_interframe( ...@@ -10141,7 +10141,7 @@ static void pick_filter_intra_interframe(
rate2 += write_uniform_cost( rate2 += write_uniform_cost(
FILTER_INTRA_MODES, mbmi->filter_intra_mode_info.filter_intra_mode[0]); FILTER_INTRA_MODES, mbmi->filter_intra_mode_info.filter_intra_mode[0]);
#if CONFIG_EXT_INTRA #if CONFIG_EXT_INTRA
if (av1_is_directional_mode(mbmi->uv_mode, bsize) && if (av1_is_directional_mode(get_uv_mode(mbmi->uv_mode), bsize) &&
av1_use_angle_delta(bsize)) { av1_use_angle_delta(bsize)) {
rate2 += write_uniform_cost(2 * MAX_ANGLE_DELTA + 1, rate2 += write_uniform_cost(2 * MAX_ANGLE_DELTA + 1,
MAX_ANGLE_DELTA + mbmi->angle_delta[1]); MAX_ANGLE_DELTA + mbmi->angle_delta[1]);
...@@ -10979,7 +10979,7 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data, ...@@ -10979,7 +10979,7 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
MAX_ANGLE_DELTA + mbmi->angle_delta[0]); MAX_ANGLE_DELTA + mbmi->angle_delta[0]);
} }
} }
if (av1_is_directional_mode(mbmi->uv_mode, bsize) && if (av1_is_directional_mode(get_uv_mode(mbmi->uv_mode), bsize) &&
av1_use_angle_delta(bsize)) { av1_use_angle_delta(bsize)) {
rate2 += write_uniform_cost(2 * MAX_ANGLE_DELTA + 1, rate2 += write_uniform_cost(2 * MAX_ANGLE_DELTA + 1,
MAX_ANGLE_DELTA + mbmi->angle_delta[1]); MAX_ANGLE_DELTA + mbmi->angle_delta[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