commit e9f90e7d5d622439df28d81309a681c54dbeea7d
author Yue Chen <yuec@google.com> Fri Aug 14 15:36:49 2020 -0700
committer Yue Chen <yuec@google.com> Fri Aug 14 15:36:49 2020 -0700
tree 6996f6f3027cbdbc7e3a7e5b807d93c3b8ea995d
parent a40c2813c6e787098beff3a08268041bf6a02a68

Set qp offset based on pyramid level

For regular inter frames, set offset index for qp solely based on
pyramid level, remove the dependency on update_type.

Change-Id: I3133930d606ebe2b99bcb2dece169ec49c80c55c

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index b98bfc5..337ca96 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1019,12 +1019,8 @@
       return qp;
     }
     offset_idx = 0;
-  } else if (update_type == ARF_UPDATE || update_type == GF_UPDATE) {
-    offset_idx = 1;
-  } else if (update_type == INTNL_ARF_UPDATE) {
-    offset_idx =
-        AOMMIN(gf_group->layer_depth[gf_index], FIXED_QP_OFFSET_COUNT - 1);
-  } else if (update_type == LF_UPDATE) {
+  } else if (update_type == ARF_UPDATE || update_type == GF_UPDATE ||
+             update_type == INTNL_ARF_UPDATE || update_type == LF_UPDATE) {
     if (gf_group->layer_depth[gf_index] >= FIXED_QP_OFFSET_COUNT) {  // Leaf.
       return qp;  // Directly Return worst quality allowed.
     }