corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset ac06eacc2206 (bug 987064) for B2G ICS Emulator Debug Bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-04-10 13:18:18 +02:00
parent 5adb9c9e75
commit f6bb1140ed
27 changed files with 399 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/media/MediaDecoderStateMachine.cpp
View File

@@ -763,7 +763,7 @@ void MediaDecoderStateMachine::AudioLoop()
bool setPlaybackRate;
bool preservesPitch;
bool setPreservesPitch;
AudioChannel audioChannel;
AudioChannelType audioChannelType;
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
@@ -773,7 +773,7 @@ void MediaDecoderStateMachine::AudioLoop()
channels = mInfo.mAudio.mChannels;
rate = mInfo.mAudio.mRate;
audioChannel = mDecoder->GetAudioChannel();
audioChannelType = mDecoder->GetAudioChannelType();
volume = mVolume;
preservesPitch = mPreservesPitch;
playbackRate = mPlaybackRate;
@@ -784,7 +784,7 @@ void MediaDecoderStateMachine::AudioLoop()
// circumstances, so we take care to drop the decoder monitor while
// initializing.
nsAutoPtr<AudioStream> audioStream(new AudioStream());
audioStream->Init(channels, rate, audioChannel, AudioStream::HighLatency);
audioStream->Init(channels, rate, audioChannelType, AudioStream::HighLatency);
audioStream->SetVolume(volume);
if (audioStream->SetPreservesPitch(preservesPitch) != NS_OK) {
NS_WARNING("Setting the pitch preservation failed at AudioLoop start.");