Merge "Remove macroblock::skip_optimize." into nextgenv2

This commit is contained in:
Yaowu Xu
2016-10-18 19:52:50 +00:00
committed by Gerrit Code Review
2 changed files with 0 additions and 3 deletions

View File

@@ -81,7 +81,6 @@ struct macroblock {
MB_MODE_INFO_EXT *mbmi_ext;
int skip_block;
int select_tx_size;
int skip_optimize;
int q_index;
// The equivalent error at the current rdmult of one whole bit (not one

View File

@@ -2175,7 +2175,6 @@ static void encode_sb(AV1_COMP *cpi, ThreadData *td, const TileInfo *const tile,
if (!x->skip) {
int this_rate = 0;
x->skip_optimize = 0;
x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;
av1_encode_sb_supertx(x, bsize);
@@ -5019,7 +5018,6 @@ static void encode_superblock(AV1_COMP *cpi, ThreadData *td, TOKENEXTRA **t,
const int mi_width = num_8x8_blocks_wide_lookup[bsize];
const int mi_height = num_8x8_blocks_high_lookup[bsize];
x->skip_optimize = ctx->is_coded;
ctx->is_coded = 1;
x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;