Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset aaae54a77270 (bug 1051658) for timeouts in test_bug465498.html on OS X

Browse Source
This commit is contained in:
Ed Morley 2014-09-30 16:48:29 +01:00
parent 3bbb8fd4bd
commit 18024b59af
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/media/AudioSink.cpp
View File

@ -55,18 +55,10 @@ AudioSink::Init()
nullptr, nullptr,
MEDIA_THREAD_STACK_SIZE); MEDIA_THREAD_STACK_SIZE);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
mStateMachine->OnAudioSinkError();
return rv; return rv;
} }
nsCOMPtr<nsIRunnable> event = NS_NewRunnableMethod(this, &AudioSink::AudioLoop); nsCOMPtr<nsIRunnable> event = NS_NewRunnableMethod(this, &AudioSink::AudioLoop);
rv = mThread->Dispatch(event, NS_DISPATCH_NORMAL); return mThread->Dispatch(event, NS_DISPATCH_NORMAL);
if (NS_FAILED(rv)) {
mStateMachine->OnAudioSinkError();
return rv;
}
return NS_OK;
} }
int64_t int64_t
@ -146,8 +138,6 @@ AudioSink::AudioLoop()
if (NS_FAILED(InitializeAudioStream())) { if (NS_FAILED(InitializeAudioStream())) {
NS_WARNING("Initializing AudioStream failed."); NS_WARNING("Initializing AudioStream failed.");
ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
mStateMachine->OnAudioSinkError();
return; return;
} }
@ -207,13 +197,10 @@ AudioSink::InitializeAudioStream()
// circumstances, so we take care to drop the decoder monitor while // circumstances, so we take care to drop the decoder monitor while
// initializing. // initializing.
RefPtr<AudioStream> audioStream(new AudioStream()); RefPtr<AudioStream> audioStream(new AudioStream());
nsresult rv = audioStream->Init(mInfo.mChannels, mInfo.mRate, audioStream->Init(mInfo.mChannels, mInfo.mRate,
mChannel, AudioStream::HighLatency); mChannel, AudioStream::HighLatency);
if (NS_FAILED(rv)) { // TODO: Check Init's return value and bail on error. Unfortunately this
audioStream->Shutdown(); // causes some tests to fail due to playback failing.
return rv;
}
ReentrantMonitorAutoEnter mon(GetReentrantMonitor()); ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
mAudioStream = audioStream; mAudioStream = audioStream;
UpdateStreamSettings(); UpdateStreamSettings();