generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Minor skip segment simplification."

Browse Source
This commit is contained in:
Alex Converse
2016-07-25 17:50:42 +00:00
committed by Gerrit Code Review
parent ad5fea03e6 9a62ecbd35
commit 511bf49b7e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_encodeframe.c
View File

@@ -4452,7 +4452,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
MODE_INFO *mi = xd->mi[0]; MODE_INFO *mi = xd->mi[0];
const int seg_skip = segfeature_active(&cm->seg, mi->segment_id, const int seg_skip = segfeature_active(&cm->seg, mi->segment_id,
SEG_LVL_SKIP); SEG_LVL_SKIP);
x->skip_recode = !x->select_tx_size && mi->sb_type >= BLOCK_8X8 && x->skip_recode = !x->select_tx_size && mi->sb_type >= BLOCK_8X8 &&
cpi->oxcf.aq_mode != COMPLEXITY_AQ && cpi->oxcf.aq_mode != COMPLEXITY_AQ &&
cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ && cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ &&
@@ -4508,10 +4507,14 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
VPXMAX(bsize, BLOCK_8X8)); VPXMAX(bsize, BLOCK_8X8));
} }
if (seg_skip) {
assert(mi->skip);
}
if (output_enabled) { if (output_enabled) {
if (cm->tx_mode == TX_MODE_SELECT && if (cm->tx_mode == TX_MODE_SELECT &&
mi->sb_type >= BLOCK_8X8 && mi->sb_type >= BLOCK_8X8 &&
!(is_inter_block(mi) && (mi->skip || seg_skip))) { !(is_inter_block(mi) && mi->skip)) {
++get_tx_counts(max_txsize_lookup[bsize], get_tx_size_context(xd), ++get_tx_counts(max_txsize_lookup[bsize], get_tx_size_context(xd),
&td->counts->tx)[mi->tx_size]; &td->counts->tx)[mi->tx_size];
} else { } else {