Skip to content

GitLab

Commit 8c70a0fc authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Fix tile independency issue in sb8x8" into experimental

parents aede2a1a 35e80726
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
vp9/decoder/vp9_decodemv.c
View file @ 8c70a0fc
...@@ -144,7 +144,8 @@ static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m, ...@@ -144,7 +144,8 @@ static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m,
int i; int i;
for (i = 0; i < (16 >> (2 * CONFIG_SB8X8)); ++i) { for (i = 0; i < (16 >> (2 * CONFIG_SB8X8)); ++i) {
const B_PREDICTION_MODE a = above_block_mode(m, i, mis); const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
const B_PREDICTION_MODE l = xd->left_available || (i & 3) ? const B_PREDICTION_MODE l = xd->left_available ||
(i & (3 >> CONFIG_SB8X8)) ?
left_block_mode(m, i) : B_DC_PRED; left_block_mode(m, i) : B_DC_PRED;
m->bmi[i].as_mode.first = read_kf_bmode(r, cm->kf_bmode_prob[a][l]); m->bmi[i].as_mode.first = read_kf_bmode(r, cm->kf_bmode_prob[a][l]);
} }
......
vp9/encoder/vp9_bitstream.c
View file @ 8c70a0fc
...@@ -914,7 +914,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, ...@@ -914,7 +914,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi,
int i = 0; int i = 0;
do { do {
const B_PREDICTION_MODE a = above_block_mode(m, i, mis); const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
const B_PREDICTION_MODE l = (xd->left_available || (i & 3)) ? const B_PREDICTION_MODE l = (xd->left_available ||
(i & (3 >> CONFIG_SB8X8))) ?
left_block_mode(m, i) : B_DC_PRED; left_block_mode(m, i) : B_DC_PRED;
const int bm = m->bmi[i].as_mode.first; const int bm = m->bmi[i].as_mode.first;
......
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