commit 8adee1086cfa9bb7f3db6a37e9f2af7df37e6e32
author Debargha Mukherjee <debargha@google.com> Tue Sep 25 11:01:00 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Wed Sep 26 20:30:32 2018 +0000
tree 31a0fd1e494f39a1f13a2b54b255f4760b4ad561
parent abff671e291fe253f9cf7e42114356d1a86dea0d

Correct setting droppable frames

Change-Id: I471419759777e8494d19ee8f9d339263462bc548

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 12e8f8b..8541eb7 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5419,16 +5419,6 @@
   return res;
 }
 
-static int frame_is_reference(const AV1_COMP *cpi) {
-  const AV1_COMMON *cm = &cpi->common;
-
-  return cm->frame_type == KEY_FRAME || cpi->refresh_last_frame ||
-         cpi->refresh_golden_frame || cpi->refresh_bwd_ref_frame ||
-         cpi->refresh_alt2_ref_frame || cpi->refresh_alt_ref_frame ||
-         !cm->error_resilient_mode || cm->lf.mode_ref_delta_update ||
-         cm->seg.update_map || cm->seg.update_data;
-}
-
 static void adjust_frame_rate(AV1_COMP *cpi,
                               const struct lookahead_entry *source) {
   int64_t this_duration;
@@ -6194,7 +6184,7 @@
   }
 
   if (*size > 0) {
-    cpi->droppable = !frame_is_reference(cpi);
+    cpi->droppable = is_frame_droppable(cpi);
   }
 
   aom_usec_timer_mark(&cmptimer);