summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2020-04-09 11:35:55 -0700
committerMarco Paniconi <marpan@google.com>2020-04-09 13:54:08 -0700
commitfc5ab625b5f8daa7f9f10667ca022fd404a71f61 (patch)
tree38b25483705a6b8b3da0b9d81ce85ec8dc0024e5
parent264a7ecfd8ed4938378928deb4233c187562dbe5 (diff)
downloadlibvpx-fc5ab625b5f8daa7f9f10667ca022fd404a71f61.tar
libvpx-fc5ab625b5f8daa7f9f10667ca022fd404a71f61.tar.gz
libvpx-fc5ab625b5f8daa7f9f10667ca022fd404a71f61.tar.bz2
libvpx-fc5ab625b5f8daa7f9f10667ca022fd404a71f61.zip
vp9-rtc: Fix to disable_16x16part speed feature
Condition on current_video_frame count, as the avg_frame_qindex needs some time to settle. Fixes psnr test failures. Change-Id: I462c45250becb55b72b6ffe2b7087094d6d58a01
-rw-r--r--vp9/encoder/vp9_speed_features.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 51b417418..dea17e124 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -791,10 +791,12 @@ static void set_rt_speed_feature_framesize_independent(
}
// Disable split to 8x8 for low-resolution at very high Q.
- // For variance partition (speed >= 6).
+ // For variance partition (speed >= 6). Ignore the first few frames
+ // as avg_frame_qindex starts at max_q (worst_quality).
if (cm->frame_type != KEY_FRAME && cm->width * cm->height <= 320 * 240 &&
sf->partition_search_type == VAR_BASED_PARTITION &&
- cpi->rc.avg_frame_qindex[INTER_FRAME] > 208)
+ cpi->rc.avg_frame_qindex[INTER_FRAME] > 208 &&
+ cpi->common.current_video_frame > 8)
sf->disable_16x16part_nonkey = 1;
if (sf->nonrd_use_ml_partition)