Merge "Avoid scaling last_source, unless needed."

cd9ae6d7 · Marco Paniconi · Gerrit Code Review · f79f71fc · e8a4a3e2 · cd9ae6d7
Commit cd9ae6d7 authored Sep 11, 2015 by Marco Paniconi Committed by Gerrit Code Review Sep 11, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

vp9/encoder/vp9_encoder.c vp9/encoder/vp9_encoder.c +7 -1

No files found.
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3201,7 +3201,13 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
  cpi->Source = vp9_scale_if_required(cm,
                                      cpi->un_scaled_source,
                                      &cpi->scaled_source);
-  if (cpi->unscaled_last_source != NULL)
+
+  // Avoid scaling last_source unless its needed.
+  // Last source is currently only used for screen-content mode,
+  // or if partition_search_type == SOURCE_VAR_BASED_PARTITION.
+  if (cpi->unscaled_last_source != NULL &&
+      (cpi->oxcf.content == VP9E_CONTENT_SCREEN ||
+      cpi->sf.partition_search_type == SOURCE_VAR_BASED_PARTITION))
    cpi->Last_Source = vp9_scale_if_required(cm,
                                             cpi->unscaled_last_source,
                                             &cpi->scaled_last_source);