simplify f_inner calculation a little

by incorporating the is_4x4 flag at init

Change-Id: I042e04aacb15181db0bf86f3212c880087519189
This commit is contained in:
Pascal Massimino 2013-10-28 01:46:11 -07:00
parent 241d11f141
commit 18f992ec0f
2 changed files with 2 additions and 2 deletions

View File

@ -145,7 +145,7 @@ static void PrecomputeFilterStrengths(VP8Decoder* const dec) {
} }
} }
info->f_ilevel_ = (level < 1) ? 1 : level; info->f_ilevel_ = (level < 1) ? 1 : level;
info->f_inner_ = 0; info->f_inner_ = i4x4;
} }
} }
} }

View File

@ -630,7 +630,7 @@ int VP8DecodeMB(VP8Decoder* const dec, VP8BitReader* const token_br) {
if (dec->filter_type_ > 0) { // store filter info if (dec->filter_type_ > 0) { // store filter info
VP8FInfo* const finfo = dec->f_info_ + dec->mb_x_; VP8FInfo* const finfo = dec->f_info_ + dec->mb_x_;
*finfo = dec->fstrengths_[dec->segment_][block->is_i4x4_]; *finfo = dec->fstrengths_[dec->segment_][block->is_i4x4_];
finfo->f_inner_ = !skip || block->is_i4x4_; finfo->f_inner_ |= !skip;
} }
return !token_br->eof_; return !token_br->eof_;