From 6a3c5ff8549d5904ee6f8a99e7a9b5ba953b3484 Mon Sep 17 00:00:00 2001
From: Jonathan Hao <jhao@mozilla.com>
Date: Wed, 14 Oct 2015 15:25:00 +0800
Subject: [PATCH] Bug 1207964 - Remove workaround from bug 1080461. r=jwwang

--HG--
extra : rebase_source : b7955be8bce9aebb82707cbf42d405a3c308fb7e
---
 dom/media/MediaDecoderStateMachine.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 45cc233d9252..7f1c442a6de8 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1783,12 +1783,6 @@ int64_t MediaDecoderStateMachine::AudioDecodedUsecs()
   // already decoded and pushed to the hardware, plus the amount of audio
   // data waiting to be pushed to the hardware.
   int64_t pushed = mMediaSink->IsStarted() ? (AudioEndTime() - GetMediaTime()) : 0;
-
-  // Currently for real time streams, AudioQueue().Duration() produce
-  // wrong values (Bug 1114434), so we use frame counts to calculate duration.
-  if (IsRealTime()) {
-    return pushed + FramesToUsecs(AudioQueue().FrameCount(), mInfo.mAudio.mRate).value();
-  }
   return pushed + AudioQueue().Duration();
 }