mozilla-inbound: changeset 234216:8d51dbc085b58f46c2a77dccc1682c58f39cc25f

author	Benjamin Chen <bechen@mozilla.com>
	Tue, 10 Mar 2015 14:38:39 +0800
changeset 234216	8d51dbc085b58f46c2a77dccc1682c58f39cc25f
parent 234215	3d582311e619083d74ad4e118520fcc9312ad8c7
child 234217	54ab128ef1c058596198766ab4373c4d1a73432e
push id	57073
push user	cbook@mozilla.com
push date	Wed, 18 Mar 2015 11:00:37 +0000
treeherder	mozilla-inbound@b976b2dc1a26 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sotaro
bugs	1138825
milestone	39.0a1
first release with	nightly linux32 cf1060d8ce9f / 39.0a1 / 20150319030202 / files nightly linux64 cf1060d8ce9f / 39.0a1 / 20150319030202 / files nightly mac cf1060d8ce9f / 39.0a1 / 20150319030202 / files nightly win32 cf1060d8ce9f / 39.0a1 / 20150319030202 / files nightly win64 cf1060d8ce9f / 39.0a1 / 20150319030202 / files
last release without	nightly linux32 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly linux64 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly mac 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly win32 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly win64 1174ffb1696d / 39.0a1 / 20150318030202 / files

--- a/dom/media/omx/MediaCodecReader.cpp
+++ b/dom/media/omx/MediaCodecReader.cpp
@@ -452,18 +452,23 @@ MediaCodecReader::DecodeAudioDataSync()
   }
   mAudioTrack.mCodec->releaseOutputBuffer(bufferInfo.mIndex);
 
 }
 
 void
 MediaCodecReader::DecodeAudioDataTask()
 {
-  DecodeAudioDataSync();
+  if (AudioQueue().GetSize() == 0 && !AudioQueue().IsFinished()) {
+    DecodeAudioDataSync();
+  }
   MonitorAutoLock al(mAudioTrack.mTrackMonitor);
+  if (mAudioTrack.mAudioPromise.IsEmpty()) {
+    return;
+  }
   if (AudioQueue().GetSize() > 0) {
     nsRefPtr<AudioData> a = AudioQueue().PopFront();
     if (a) {
       if (mAudioTrack.mDiscontinuity) {
         a->mDiscontinuity = true;
         mAudioTrack.mDiscontinuity = false;
       }
       mAudioTrack.mAudioPromise.Resolve(a, __func__);