commit b148537c0ec10454c57377e622a575bd30a49304
author Hui Su <huisu@google.com> Thu Apr 16 23:31:39 2020 -0700
committer Hui Su <huisu@google.com> Fri Apr 17 17:33:02 2020 +0000
tree e49fc961c17b6bf2e23f20223f5d35b07e753b89
parent ca5d099e5465b8d0f4ca83a34083ce93aea25f27

Fix unit test ThreadTestLarge.EncoderResultTest/49

Encoder behavior changes were introduced unexpectedly by 028ad7dd.
This patch fixes the problem.

BUG=aomedia:2648

Change-Id: Id6ae4dac3ccc1fd5df908b57ebb08f63f9a6e9ec

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 000b863..f8440de 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -927,11 +927,12 @@
     aom_remove_metadata_from_frame_buffer(frame_input->source);
     aom_copy_metadata_to_frame_buffer(frame_input->source,
                                       source_kf_buffer->metadata);
+  }
 
-    if (oxcf->enable_tpl_model && oxcf->lag_in_frames > 0 &&
-        frame_params->show_frame) {
-      av1_tpl_setup_stats(cpi, 0, frame_params, frame_input);
-    }
+  if (frame_params->frame_type == KEY_FRAME && !is_stat_generation_stage(cpi) &&
+      oxcf->enable_tpl_model && oxcf->lag_in_frames > 0 &&
+      frame_params->show_frame) {
+    av1_tpl_setup_stats(cpi, 0, frame_params, frame_input);
   }
 
   if (av1_encode(cpi, dest, frame_input, frame_params, frame_results) !=