From b7f8c7606f4184e6484d09ecbe9f5d7e4c56181c Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Tue, 7 Jun 2016 16:20:24 +0200
Subject: [PATCH] Bug 1214710 - [3.1] Reset video decode suspend timer when
 resuming reader. r=jwwang

---
 dom/media/MediaDecoderStateMachine.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 2c80e5f33490..a9c832c03e63 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1482,6 +1482,12 @@ void MediaDecoderStateMachine::ReaderSuspendedChanged()
     return;
   }
 
+  if (mIsVisible && mVideoDecodeSuspended) {
+    // The media turned visible while the reader was suspended, reset timer.
+    mVideoDecodeSuspendTimer.Reset();
+    mVideoDecodeSuspended = false;
+  }
+
   InitiateDecodeRecoverySeek(MediaDecoderReader::AUDIO_VIDEO);
 }