commit 8d0a946f554d5fc9225f9f50e45354925645a2c1
author Jingning Han <jingning@google.com> Mon Jun 22 15:11:58 2020 -0700
committer Jingning Han <jingning@google.com> Tue Jun 23 16:58:26 2020 +0000
tree 516187508a0a2cedf9218186af5af103d509dfa2
parent 8c3f2750d4d5c803451c8714b2f847d7e52619bd

Remove ENABLE_KF_TPL flag

The functionality has been subsumed by a speed feature.

Change-Id: I631f5d134eed445422982de4ffcc3b52391763b5

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0b6b358..e93d2fd 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -2816,7 +2816,6 @@
 #define MAX_GFUBOOST_FACTOR 10.0
 #define MIN_GFUBOOST_FACTOR 4.0
 
-#define ENABLE_KF_TPL 1
 #define MAX_PYR_LEVEL_FROMTOP_DELTAQ 0
 
 static INLINE int is_frame_kf_and_tpl_eligible(AV1_COMP *const cpi) {
@@ -2831,12 +2830,8 @@
 }
 
 static INLINE int is_frame_tpl_eligible(AV1_COMP *const cpi) {
-#if ENABLE_KF_TPL
   return is_frame_kf_and_tpl_eligible(cpi) ||
          is_frame_arf_and_tpl_eligible(&cpi->gf_group);
-#else
-  return is_frame_arf_and_tpl_eligible(&cpi->gf_group);
-#endif  // ENABLE_KF_TPL
 }
 
 // Get update type of the current frame.