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

Merge "vp9: Use nonrd_pick_partition on scene-cut, for speed 5 vbr mode."

Browse Source
This commit is contained in:
Marco Paniconi
2016-06-09 00:49:02 +00:00
committed by Gerrit Code Review
parent 77ffea92c5 3fc01f95da
commit 5aeadbb4f6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_encodeframe.c
View File

@@ -3797,8 +3797,14 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi,
break; break;
case REFERENCE_PARTITION: case REFERENCE_PARTITION:
set_offsets(cpi, tile_info, x, mi_row, mi_col, BLOCK_64X64); set_offsets(cpi, tile_info, x, mi_row, mi_col, BLOCK_64X64);
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled && // Use nonrd_pick_partition on scene-cut for VBR, or on qp-segment
xd->mi[0]->segment_id) { // if cyclic_refresh is enabled.
// nonrd_pick_partition does not support 4x4 partition, so avoid it
// on key frame for now.
if ((cpi->oxcf.rc_mode == VPX_VBR && cpi->rc.high_source_sad &&
cm->frame_type != KEY_FRAME) ||
(cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled &&
xd->mi[0]->segment_id)) {
// Use lower max_partition_size for low resoultions. // Use lower max_partition_size for low resoultions.
if (cm->width <= 352 && cm->height <= 288) if (cm->width <= 352 && cm->height <= 288)
x->max_partition_size = BLOCK_32X32; x->max_partition_size = BLOCK_32X32;