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

Merge "Fix indent in choose_partitioning"

Browse Source
This commit is contained in:
Jingning Han
2015-03-16 11:52:12 -07:00
committed by Gerrit Code Review
parent 51d529a578 7cf383d17f
commit 09e0b38a86
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vp9/encoder/vp9_encodeframe.c
View File

@@ -658,29 +658,29 @@ static void choose_partitioning(VP9_COMP *cpi,
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
int x8_idx = x16_idx + ((k & 1) << 3); int x8_idx = x16_idx + ((k & 1) << 3);
int y8_idx = y16_idx + ((k >> 1) << 3); int y8_idx = y16_idx + ((k >> 1) << 3);
unsigned int sse = 0; unsigned int sse = 0;
int sum = 0; int sum = 0;
if (x8_idx < pixels_wide && y8_idx < pixels_high) { if (x8_idx < pixels_wide && y8_idx < pixels_high) {
int s_avg, d_avg; int s_avg, d_avg;
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
s_avg = vp9_highbd_avg_8x8(s + y8_idx * sp + x8_idx, sp); 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); d_avg = vp9_highbd_avg_8x8(d + y8_idx * dp + x8_idx, dp);
} else { } 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
s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp); s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp);
d_avg = vp9_avg_8x8(d + y8_idx * dp + x8_idx, dp); 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 #else
// one sample for 8x8 block (so use 1 for count in fill_variance), s_avg = vp9_avg_8x8(s + y8_idx * sp + x8_idx, sp);
// which of course means variance = 0 for 8x8 block. d_avg = vp9_avg_8x8(d + y8_idx * dp + x8_idx, dp);
fill_variance(sse, sum, 0, &vst->split[k].part_variances.none); #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); fill_variance_tree(&vt.split[i].split[j], BLOCK_16X16);
// For low-resolution, compute the variance based on 8x8 down-sampling, // For low-resolution, compute the variance based on 8x8 down-sampling,