Remove the has_no_coeffs corner case BUG=webm:1277 Change-Id: I052239e8a6c468da8704bdbbb663b59533c01be2
diff --git a/av1/common/blockd.h b/av1/common/blockd.h index 3ff4943..7e3533f 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h
@@ -191,7 +191,6 @@ TX_SIZE inter_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE]; #endif int8_t skip; - int8_t has_no_coeffs; int8_t segment_id; #if CONFIG_SUPERTX // Minimum of all segment IDs under the current supertx block.
diff --git a/av1/common/loopfilter.c b/av1/common/loopfilter.c index c8022f2..d0b897c 100644 --- a/av1/common/loopfilter.c +++ b/av1/common/loopfilter.c
@@ -753,7 +753,7 @@ // If the block has no coefficients and is not intra we skip applying // the loop filter on block edges. - if ((mbmi->skip || mbmi->has_no_coeffs) && is_inter_block(mbmi)) return; + if (mbmi->skip && is_inter_block(mbmi)) return; // Here we are adding a mask for the transform size. The transform // size mask is set to be correct for a 64x64 prediction block size. We @@ -818,7 +818,7 @@ *above_y |= above_prediction_mask[block_size] << shift_y; *left_y |= left_prediction_mask[block_size] << shift_y; - if ((mbmi->skip || mbmi->has_no_coeffs) && is_inter_block(mbmi)) return; + if (mbmi->skip && is_inter_block(mbmi)) return; *above_y |= (size_mask[block_size] & above_64x64_txform_mask[tx_size_y]) << shift_y;
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 0fbf659..59cd670 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -1163,7 +1163,6 @@ #endif // CONFIG_EXT_PARTITION_TYPES BLOCK_SIZE bsize, int bwl, int bhl) { AV1_COMMON *const cm = &pbi->common; - const int less8x8 = bsize < BLOCK_8X8; const int bw = 1 << (bwl - 1); const int bh = 1 << (bhl - 1); const int x_mis = AOMMIN(bw, cm->mi_cols - mi_col); @@ -1383,9 +1382,6 @@ row, col, tx_size); #endif } - - if (!less8x8 && eobtotal == 0) - mbmi->has_no_coeffs = 1; // skip loopfilter } }