diff options
| author | Jingning Han <jingning@google.com> | 2015-03-16 11:52:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-16 11:52:12 -0700 |
| commit | 09e0b38a861ded62e2b44eaa72a06c8efb879ebe (patch) | |
| tree | 166a5ac0c2d273738c3e1d943a96fb523f4d6c70 | |
| parent | 51d529a5786ef5654ac318c14971eb6857c420e3 (diff) | |
| parent | 7cf383d17f41d570deb4d5d2c9153b080483fcc2 (diff) | |
| download | libvpx-09e0b38a861ded62e2b44eaa72a06c8efb879ebe.tar libvpx-09e0b38a861ded62e2b44eaa72a06c8efb879ebe.tar.gz libvpx-09e0b38a861ded62e2b44eaa72a06c8efb879ebe.tar.bz2 libvpx-09e0b38a861ded62e2b44eaa72a06c8efb879ebe.zip | |
Merge "Fix indent in choose_partitioning"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 186c6e0f4..1344b5bcb 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -658,29 +658,29 @@ static void choose_partitioning(VP9_COMP *cpi, for (k = 0; k < 4; k++) { int x8_idx = x16_idx + ((k & 1) << 3); int y8_idx = y16_idx + ((k >> 1) << 3); - unsigned int sse = 0; - int sum = 0; - if (x8_idx < pixels_wide && y8_idx < pixels_high) { - int s_avg, d_avg; + unsigned int sse = 0; + int sum = 0; + if (x8_idx < pixels_wide && y8_idx < pixels_high) { + int s_avg, d_avg; #if CONFIG_VP9_HIGHBITDEPTH - if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { - s_avg = vp9_highbd_avg_8x8(s + y8_idx * sp + x8_idx, sp); - d_avg = vp9_highbd_avg_8x8(d + y8_idx * dp + x8_idx, dp); - } else { - s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp); - d_avg = vp9_avg_8x8(d + y8_idx * dp + x8_idx, dp); - } -#else + if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { + s_avg = vp9_highbd_avg_8x8(s + y8_idx * sp + x8_idx, sp); + d_avg = vp9_highbd_avg_8x8(d + y8_idx * dp + x8_idx, dp); + } else { s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp); d_avg = vp9_avg_8x8(d + y8_idx * dp + x8_idx, dp); -#endif - sum = s_avg - d_avg; - sse = sum * sum; } - // If variance is based on 8x8 downsampling, we stop here and have - // one sample for 8x8 block (so use 1 for count in fill_variance), - // which of course means variance = 0 for 8x8 block. - fill_variance(sse, sum, 0, &vst->split[k].part_variances.none); +#else + s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp); + d_avg = vp9_avg_8x8(d + y8_idx * dp + x8_idx, dp); +#endif + sum = s_avg - d_avg; + sse = sum * sum; + } + // If variance is based on 8x8 downsampling, we stop here and have + // one sample for 8x8 block (so use 1 for count in fill_variance), + // which of course means variance = 0 for 8x8 block. + fill_variance(sse, sum, 0, &vst->split[k].part_variances.none); } fill_variance_tree(&vt.split[i].split[j], BLOCK_16X16); // For low-resolution, compute the variance based on 8x8 down-sampling, |