rtc: Fix condition on using golden for var_part
Condition should not be based on use_nonrd_pick_mode,
so speed 5 and 6 may use this, if golden is chosen
as a reference in speed features.
No change in behavior, as golden is not currently
used as reference. If golden reference is set/used,
then small bdrate gain on rtc_derf for speed 6: ~0.05%.
Change-Id: Ibfa7c62e1c7fbae254ca1c46cd8fd09d75c111d2
diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index 7aae655..74a409f 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -822,8 +822,7 @@
// For non-SVC GOLDEN is another temporal reference. Check if it should be
// used as reference for partitioning.
- if (!cpi->ppi->use_svc && (cpi->ref_frame_flags & AOM_GOLD_FLAG) &&
- cpi->sf.rt_sf.use_nonrd_pick_mode) {
+ if (!cpi->ppi->use_svc && (cpi->ref_frame_flags & AOM_GOLD_FLAG)) {
yv12_g = get_ref_frame_yv12_buf(cm, GOLDEN_FRAME);
if (yv12_g && yv12_g != yv12) {
av1_setup_pre_planes(xd, 0, yv12_g, mi_row, mi_col,
