commit cba7da742e07a3db1efecd18f5a2860409c8201f
author David Barker <david.barker@argondesign.com> Thu Sep 14 11:24:27 2017 +0100
committer David Barker <david.barker@argondesign.com> Mon Sep 18 13:37:38 2017 +0000
tree e393ddc0b1b57e71462a2138ef3256280e28155c
parent 0fbd2b79b575a2b3ad09f6a4206146ab1de01214

Save global motion params even in error-resilient-mode

The error-resilient-mode flag is currently set per frame,
so we can encode a non-error-resilient frame immediately
after an error-resilient frame.

As of https://aomedia-review.googlesource.com/c/21783 , this
case causes the decoder to read uninitialized memory. This
happens because the error-resilient frame no longer sets up
cm->cur_frame->global_motion. Then, on the non-error-resilient
frame, that is renamed to cm->prev_frame->global_motion and we
try to use it as a reference for delta encoding.

Fix this by always writing cm->cur_frame->global_motion.

Change-Id: I0d4f13bf413ca15da210e06d5ce1780331c005da

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index fc50e73..f9cb46a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4400,9 +4400,8 @@
            cm->global_motion[frame].wmmat[3]);
            */
   }
-  if (!cm->error_resilient_mode)
-    memcpy(cm->cur_frame->global_motion, cm->global_motion,
-           TOTAL_REFS_PER_FRAME * sizeof(WarpedMotionParams));
+  memcpy(cm->cur_frame->global_motion, cm->global_motion,
+         TOTAL_REFS_PER_FRAME * sizeof(WarpedMotionParams));
 }
 #endif  // CONFIG_GLOBAL_MOTION
 

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 0ea1d56..c87916d 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5328,9 +5328,8 @@
     }
     cpi->global_motion_search_done = 1;
   }
-  if (!cm->error_resilient_mode)
-    memcpy(cm->cur_frame->global_motion, cm->global_motion,
-           TOTAL_REFS_PER_FRAME * sizeof(WarpedMotionParams));
+  memcpy(cm->cur_frame->global_motion, cm->global_motion,
+         TOTAL_REFS_PER_FRAME * sizeof(WarpedMotionParams));
 #endif  // CONFIG_GLOBAL_MOTION
 
   for (i = 0; i < MAX_SEGMENTS; ++i) {