Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1419378 - Fail before stream init when output number of channels is zero. r=padenot

Browse Source 
MozReview-Commit-ID: G2bjXhAXiqz

--HG--
extra : rebase_source : 21cf22e4afd4065835a5323ed0ab44a55035f0db
This commit is contained in:
Alex Chronopoulos 2017-11-28 12:57:02 +02:00
parent 6a1c57c446
commit 758db182f3
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dom/media/GraphDriver.cpp
View File

@ -613,7 +613,14 @@ AudioCallbackDriver::Init()
}
// Query and set the number of channels this AudioCallbackDriver will use.
mOutputChannels = std::max<uint32_t>(1, mGraphImpl->AudioChannelCount());
mOutputChannels = mGraphImpl->AudioChannelCount();
if (!mOutputChannels) {
LOG(LogLevel::Warning, ("Output number of channels is 0."));
MonitorAutoLock lock(GraphImpl()->GetMonitor());
FallbackToSystemClockDriver();
return true;
}
mBuffer = AudioCallbackBufferWrapper<AudioDataValue>(mOutputChannels);
mScratchBuffer = SpillBuffer<AudioDataValue, WEBAUDIO_BLOCK_SIZE * 2>(mOutputChannels);
@ -695,18 +702,8 @@ AudioCallbackDriver::Init()
if (!mFromFallback) {
CubebUtils::ReportCubebStreamInitFailure(firstStream);
}
// Fall back to a driver using a normal thread. If needed,
// the graph will try to re-open an audio stream later.
MonitorAutoLock lock(GraphImpl()->GetMonitor());
SystemClockDriver* nextDriver = new SystemClockDriver(GraphImpl());
SetNextDriver(nextDriver);
nextDriver->MarkAsFallback();
nextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
// We're not using SwitchAtNextIteration here, because there
// won't be a next iteration if we don't restart things manually:
// the audio stream just signaled that it's in error state.
mGraphImpl->SetCurrentDriver(nextDriver);
nextDriver->Start();
FallbackToSystemClockDriver();
return true;
}
}
@ -1042,18 +1039,8 @@ AudioCallbackDriver::StateCallback(cubeb_state aState)
if (aState == CUBEB_STATE_ERROR && mShouldFallbackIfError) {
MonitorAutoLock lock(GraphImpl()->GetMonitor());
// Fall back to a driver using a normal thread. If needed,
// the graph will try to re-open an audio stream later.
SystemClockDriver* nextDriver = new SystemClockDriver(GraphImpl());
SetNextDriver(nextDriver);
RemoveCallback();
nextDriver->MarkAsFallback();
nextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
// We're not using SwitchAtNextIteration here, because there
// won't be a next iteration if we don't restart things manually:
// the audio stream just signaled that it's in error state.
mGraphImpl->SetCurrentDriver(nextDriver);
nextDriver->Start();
FallbackToSystemClockDriver();
}
}
@ -1197,6 +1184,19 @@ void AudioCallbackDriver::CompleteAudioContextOperations(AsyncCubebOperation aOp
}
}
void AudioCallbackDriver::FallbackToSystemClockDriver()
{
GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
SystemClockDriver* nextDriver = new SystemClockDriver(GraphImpl());
SetNextDriver(nextDriver);
nextDriver->MarkAsFallback();
nextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
// We're not using SwitchAtNextIteration here, because there
// won't be a next iteration if we don't restart things manually:
// the audio stream just signaled that it's in error state.
mGraphImpl->SetCurrentDriver(nextDriver);
nextDriver->Start();
}
} // namespace mozilla

4
dom/media/GraphDriver.h
View File

@ -485,6 +485,10 @@ private:
friend class AsyncCubebTask;
bool Init();
void Stop();
/**
* Fall back to a SystemClockDriver using a normal thread. If needed,
* the graph will try to re-open an audio stream later. */
void FallbackToSystemClockDriver();
/* MediaStreamGraphs are always down/up mixed to output channels. */
uint32_t mOutputChannels;