Commit 4aad30a3 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Always initialize values in sb/mb_partitioning.

This doesn't affect the output, because in previous cases where the
values were uninitialized, this was because the mb_row/col is outside
the codable area, and thus encode_sb will test them for the next
decomposition-level, but return right after that on size-check. All
this does is prevent a warning in valgrind.

Change-Id: I90d8a29e6f8ebb2b0143684e08fe77ae3a0816b1
parent 704fb486
...@@ -1013,6 +1013,7 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1013,6 +1013,7 @@ static void encode_sb_row(VP9_COMP *cpi,
int j; int j;
ENTROPY_CONTEXT l2[8 * MAX_MB_PLANE], a2[8 * MAX_MB_PLANE]; ENTROPY_CONTEXT l2[8 * MAX_MB_PLANE], a2[8 * MAX_MB_PLANE];
sb_partitioning[i] = BLOCK_SIZE_MB16X16;
if (mi_row + y_idx >= cm->mi_rows || mi_col + x_idx >= cm->mi_cols) if (mi_row + y_idx >= cm->mi_rows || mi_col + x_idx >= cm->mi_cols)
continue; continue;
...@@ -1033,7 +1034,6 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1033,7 +1034,6 @@ static void encode_sb_row(VP9_COMP *cpi,
} }
/* Encode MBs in raster order within the SB */ /* Encode MBs in raster order within the SB */
sb_partitioning[i] = BLOCK_SIZE_MB16X16;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
const int x_idx_m = x_idx + ((j & 1) << CONFIG_SB8X8); const int x_idx_m = x_idx + ((j & 1) << CONFIG_SB8X8);
const int y_idx_m = y_idx + ((j >> 1) << CONFIG_SB8X8); const int y_idx_m = y_idx + ((j >> 1) << CONFIG_SB8X8);
...@@ -1041,6 +1041,8 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1041,6 +1041,8 @@ static void encode_sb_row(VP9_COMP *cpi,
#if CONFIG_SB8X8 #if CONFIG_SB8X8
int r2, d2, mb16_rate = 0, mb16_dist = 0, k; int r2, d2, mb16_rate = 0, mb16_dist = 0, k;
ENTROPY_CONTEXT l3[4 * MAX_MB_PLANE], a3[4 * MAX_MB_PLANE]; ENTROPY_CONTEXT l3[4 * MAX_MB_PLANE], a3[4 * MAX_MB_PLANE];
mb_partitioning[i][j] = BLOCK_SIZE_SB8X8;
#endif #endif
if (mi_row + y_idx_m >= cm->mi_rows || if (mi_row + y_idx_m >= cm->mi_rows ||
...@@ -1066,7 +1068,6 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1066,7 +1068,6 @@ static void encode_sb_row(VP9_COMP *cpi,
sizeof(ENTROPY_CONTEXT) * 4 >> xd->plane[p].subsampling_x); sizeof(ENTROPY_CONTEXT) * 4 >> xd->plane[p].subsampling_x);
} }
mb_partitioning[i][j] = BLOCK_SIZE_SB8X8;
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
xd->b_index = k; xd->b_index = k;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment