ref: c88ce84bb5785a228235a57e856d8d3a0c861cdd
parent: 90517b5e8596996bf41aec85f80bd5b20e13e140
parent: 0bb897211deb61bf76354330d8d9d9bf63ce7759
author: Yaowu Xu <yaowu@google.com>
date: Tue Apr 7 12:29:51 EDT 2015
Merge "Optimize the checking for transform skipping"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -391,10 +391,11 @@
var_uv[j] = cpi->fn_ptr[uv_bsize].vf(p->src.buf, p->src.stride,
pd->dst.buf, pd->dst.stride, &sse_uv[j]);
- if (var_uv[j] < uv_ac_thr || var_uv[j] == 0) {
- if (sse_uv[j] - var_uv[j] < uv_dc_thr || sse_uv[j] == var_uv[j])
- skip_uv[j] = 1;
- }
+ if ((var_uv[j] < uv_ac_thr || var_uv[j] == 0) &&
+ (sse_uv[j] - var_uv[j] < uv_dc_thr || sse_uv[j] == var_uv[j]))
+ skip_uv[j] = 1;
+ else
+ break;
}
// If the transform in YUV planes are skippable, the mode search checks
--
⑨