]> granicus.if.org Git - libvpx/commitdiff
VP9: Pass NULL scale_factors ptr when not scaling
authorScott LaVarnway <slavarnway@google.com>
Wed, 10 Feb 2016 19:43:23 +0000 (11:43 -0800)
committerScott LaVarnway <slavarnway@google.com>
Wed, 10 Feb 2016 19:43:23 +0000 (11:43 -0800)
to vp9_setup_pre_planes(), preventing the function
unscaled_value() from being called.  unscaled_value()
returns the same value that was passed in.  See
scaled_buffer_offset() in vp9_reconinter.h.

Change-Id: I2a6fbaf07972c2f212834929d29a2cbe72e399c3

vp9/decoder/vp9_decodeframe.c

index 39710c830f7fac4e05070d399c7facd2ae98a07b..8a492d56237a4d410358974c23ea403eb3da5fa2 100644 (file)
@@ -737,7 +737,8 @@ static void dec_build_inter_predictors_sb(VP9Decoder *const pbi,
                          "Reference frame has invalid dimensions");
 
     is_scaled = vp9_is_scaled(sf);
-    vp9_setup_pre_planes(xd, ref, ref_buf->buf, mi_row, mi_col, sf);
+    vp9_setup_pre_planes(xd, ref, ref_buf->buf, mi_row, mi_col,
+                         is_scaled ? sf : NULL);
     xd->block_refs[ref] = ref_buf;
 
     if (sb_type < BLOCK_8X8) {