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

Merge "Bitwise to logical & in rdopt ext tx prune function" into nextgenv2

Browse Source
This commit is contained in:
Sarah Parker
2016-10-28 21:43:03 +00:00
committed by Gerrit Code Review
parent d64eaf138e 68a26b6b4a
commit d722f71ed8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
av1/encoder/rdopt.c
View File

@@ -707,17 +707,17 @@ static int prune_tx_types(const AV1_COMP *cpi, BLOCK_SIZE bsize, MACROBLOCK *x,
switch (cpi->sf.tx_type_search.prune_mode) { switch (cpi->sf.tx_type_search.prune_mode) {
case NO_PRUNE: return 0; break; case NO_PRUNE: return 0; break;
case PRUNE_ONE: case PRUNE_ONE:
if ((tx_set >= 0) & !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D])) if ((tx_set >= 0) && !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D]))
return 0; return 0;
return prune_one_for_sby(cpi, bsize, x, xd); return prune_one_for_sby(cpi, bsize, x, xd);
break; break;
#if CONFIG_EXT_TX #if CONFIG_EXT_TX
case PRUNE_TWO: case PRUNE_TWO:
if ((tx_set >= 0) & !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D])) { if ((tx_set >= 0) && !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D])) {
if (!(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D])) return 0; if (!(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D])) return 0;
return prune_two_for_sby(cpi, bsize, x, xd, 0, 1); return prune_two_for_sby(cpi, bsize, x, xd, 0, 1);
} }
if ((tx_set >= 0) & !(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D])) if ((tx_set >= 0) && !(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D]))
return prune_two_for_sby(cpi, bsize, x, xd, 1, 0); return prune_two_for_sby(cpi, bsize, x, xd, 1, 0);
return prune_two_for_sby(cpi, bsize, x, xd, 1, 1); return prune_two_for_sby(cpi, bsize, x, xd, 1, 1);
break; break;