ref: 7f99844e919065ed1380e012234c139ffdefd482
parent: 4852a8023d0e8562fba338f20a064b40304f7858
parent: 548f90d2ced8de4d56f8a9fe581f76ea0fb4b5f2
author: Yaowu Xu <yaowu@google.com>
date: Mon Jun 10 04:56:38 EDT 2013
Merge "Loopfilter: bug fix in sb_type usage" into experimental
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -680,12 +680,12 @@
const int skip_this = mi[c].mbmi.mb_skip_coeff
&& mi[c].mbmi.ref_frame != INTRA_FRAME;
// left edge of current unit is block/partition edge -> no skip
- const int block_edge_left = b_width_log2(mi->mbmi.sb_type) ?
- !(c & ((1 << (b_width_log2(mi->mbmi.sb_type)-1)) - 1)) : 1;
+ const int block_edge_left = b_width_log2(mi[c].mbmi.sb_type) ?
+ !(c & ((1 << (b_width_log2(mi[c].mbmi.sb_type)-1)) - 1)) : 1;
const int skip_this_c = skip_this && !block_edge_left;
// top edge of current unit is block/partition edge -> no skip
- const int block_edge_above = b_height_log2(mi->mbmi.sb_type) ?
- !(r & ((1 << (b_height_log2(mi->mbmi.sb_type)-1)) - 1)) : 1;
+ const int block_edge_above = b_height_log2(mi[c].mbmi.sb_type) ?
+ !(r & ((1 << (b_height_log2(mi[c].mbmi.sb_type)-1)) - 1)) : 1;
const int skip_this_r = skip_this && !block_edge_above;
const TX_SIZE tx_size = plane ? get_uv_tx_size(xd) : mi[c].mbmi.txfm_size;