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

Merge "Avoid a potential assertion fail in optimize_b()"

Browse Source
This commit is contained in:
Hui Su
2016-06-08 00:33:48 +00:00
committed by Gerrit Code Review
parent dd217d3df1 a554bd8dac
commit 28a93d6588
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_encodemb.c
View File

@@ -913,7 +913,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan, pd->dequant, eob, scan_order->scan,
scan_order->iscan); scan_order->iscan);
} }
if (args->ctx != NULL) { if (args->ctx != NULL && !x->skip_recode) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; *a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
} }
if (!x->skip_encode && *eob) if (!x->skip_encode && *eob)
@@ -929,7 +929,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan, pd->dequant, eob, scan_order->scan,
scan_order->iscan); scan_order->iscan);
} }
if (args->ctx != NULL) { if (args->ctx != NULL && !x->skip_recode) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; *a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
} }
if (!x->skip_encode && *eob) if (!x->skip_encode && *eob)
@@ -945,7 +945,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan, pd->dequant, eob, scan_order->scan,
scan_order->iscan); scan_order->iscan);
} }
if (args->ctx != NULL) { if (args->ctx != NULL && !x->skip_recode) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; *a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
} }
if (!x->skip_encode && *eob) if (!x->skip_encode && *eob)
@@ -964,7 +964,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
pd->dequant, eob, scan_order->scan, pd->dequant, eob, scan_order->scan,
scan_order->iscan); scan_order->iscan);
} }
if (args->ctx != NULL) { if (args->ctx != NULL && !x->skip_recode) {
*a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0; *a = *l = optimize_b(x, plane, block, tx_size, entropy_ctx) > 0;
} }
if (!x->skip_encode && *eob) { if (!x->skip_encode && *eob) {