Bug 1186358. Part 2 - remove unnecessary/insufficient includes. r=kinetik.

This commit is contained in:
JW Wang 2015-07-23 19:58:30 +08:00
parent 683b8fea66
commit f930b414c5
2 changed files with 18 additions and 5 deletions

View File

@ -3,9 +3,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "AudioSink.h"
#include "AudioStream.h"
#include "prenv.h"
#include "MediaQueue.h"
#include "VideoUtils.h"
#include "mozilla/CheckedInt.h"
namespace mozilla {
@ -20,7 +24,9 @@ static const int64_t AUDIO_FUZZ_FRAMES = 1;
AudioSink::AudioSink(MediaQueue<AudioData>& aAudioQueue,
ReentrantMonitor& aMonitor,
int64_t aStartTime, AudioInfo aInfo, dom::AudioChannel aChannel)
int64_t aStartTime,
const AudioInfo& aInfo,
dom::AudioChannel aChannel)
: mAudioQueue(aAudioQueue)
, mDecoderMonitor(aMonitor)
, mStartTime(aStartTime)
@ -395,7 +401,7 @@ AudioSink::GetEndTime() const
void
AudioSink::AssertOnAudioThread()
{
MOZ_ASSERT(IsCurrentThread(mThread));
MOZ_ASSERT(NS_GetCurrentThread() == mThread);
}
} // namespace mozilla

View File

@ -6,15 +6,20 @@
#if !defined(AudioSink_h__)
#define AudioSink_h__
#include "MediaInfo.h"
#include "nsRefPtr.h"
#include "nsISupportsImpl.h"
#include "MediaDecoderReader.h"
#include "mozilla/dom/AudioChannelBinding.h"
#include "mozilla/Atomics.h"
#include "mozilla/MozPromise.h"
#include "mozilla/ReentrantMonitor.h"
namespace mozilla {
class AudioData;
class AudioStream;
template <class T> class MediaQueue;
class AudioSink {
public:
@ -22,7 +27,9 @@ public:
AudioSink(MediaQueue<AudioData>& aAudioQueue,
ReentrantMonitor& aMonitor,
int64_t aStartTime, AudioInfo aInfo, dom::AudioChannel aChannel);
int64_t aStartTime,
const AudioInfo& aInfo,
dom::AudioChannel aChannel);
// Return a promise which will be resolved when AudioSink finishes playing,
// or rejected if any error.