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

Merge "Allow for 4x4 prediction blocks for key frame, speed 6."

Browse Source
This commit is contained in:
Marco 2014-12-12 14:27:31 -08:00 committed by Gerrit Code Review
commit 7f59cff53d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_encodeframe.c
View File

@ -423,8 +423,9 @@ static int set_vt_partitioning(VP9_COMP *cpi,
if (cm->frame_type == KEY_FRAME) { if (cm->frame_type == KEY_FRAME) {
bsize_ref = BLOCK_8X8; bsize_ref = BLOCK_8X8;
// Choose lower thresholds for key frame variance to favor split. // Choose lower thresholds for key frame variance to favor split, but keep
threshold_bsize_ref = threshold >> 1; // threshold for splitting to 4x4 block still fairly high for now.
threshold_bsize_ref = threshold << 2;
threshold_low = threshold >> 2; threshold_low = threshold >> 2;
} }
@ -646,8 +647,6 @@ static void choose_partitioning(VP9_COMP *cpi,
for (k = 0; k < 4; ++k) { for (k = 0; k < 4; ++k) {
const int x8_idx = (k & 1); const int x8_idx = (k & 1);
const int y8_idx = (k >> 1); const int y8_idx = (k >> 1);
// TODO(marpan): Allow for setting 4x4 partition on key frame.
/*
if (cm->frame_type == KEY_FRAME) { if (cm->frame_type == KEY_FRAME) {
if (!set_vt_partitioning(cpi, xd, if (!set_vt_partitioning(cpi, xd,
&vt.split[i].split[j].split[k], &vt.split[i].split[j].split[k],
@ -660,12 +659,11 @@ static void choose_partitioning(VP9_COMP *cpi,
BLOCK_4X4); BLOCK_4X4);
} }
} else { } else {
*/
set_block_size(cpi, xd, set_block_size(cpi, xd,
(mi_row + y32_idx + y16_idx + y8_idx), (mi_row + y32_idx + y16_idx + y8_idx),
(mi_col + x32_idx + x16_idx + x8_idx), (mi_col + x32_idx + x16_idx + x8_idx),
BLOCK_8X8); BLOCK_8X8);
// } }
} }
} }
} }