diff options
| author | Marco <marpan@google.com> | 2014-12-12 14:27:31 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-12 14:27:31 -0800 |
| commit | 7f59cff53d4053c0765d9a01781bde0e050b62c0 (patch) | |
| tree | 6ae9f30e6032459d06d4326d36bac11639c71cd2 /vp9 | |
| parent | 5ccff43292075fb22be861c31c920d1ae778cfab (diff) | |
| parent | 7e99cd2a9b7ecc3cbb5ca83d5c8ec696f0ea7293 (diff) | |
| download | libvpx-7f59cff53d4053c0765d9a01781bde0e050b62c0.tar libvpx-7f59cff53d4053c0765d9a01781bde0e050b62c0.tar.gz libvpx-7f59cff53d4053c0765d9a01781bde0e050b62c0.tar.bz2 libvpx-7f59cff53d4053c0765d9a01781bde0e050b62c0.zip | |
Merge "Allow for 4x4 prediction blocks for key frame, speed 6."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 756393f31..0f9be4b3d 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -423,8 +423,9 @@ static int set_vt_partitioning(VP9_COMP *cpi, if (cm->frame_type == KEY_FRAME) { bsize_ref = BLOCK_8X8; - // Choose lower thresholds for key frame variance to favor split. - threshold_bsize_ref = threshold >> 1; + // Choose lower thresholds for key frame variance to favor split, but keep + // threshold for splitting to 4x4 block still fairly high for now. + threshold_bsize_ref = threshold << 2; threshold_low = threshold >> 2; } @@ -646,8 +647,6 @@ static void choose_partitioning(VP9_COMP *cpi, for (k = 0; k < 4; ++k) { const int x8_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 (!set_vt_partitioning(cpi, xd, &vt.split[i].split[j].split[k], @@ -660,12 +659,11 @@ static void choose_partitioning(VP9_COMP *cpi, BLOCK_4X4); } } else { - */ set_block_size(cpi, xd, (mi_row + y32_idx + y16_idx + y8_idx), (mi_col + x32_idx + x16_idx + x8_idx), BLOCK_8X8); - // } + } } } } |