wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1023947 - Part 1 - Drop frame instead of buffering them when we are swiching device. r=jesup

Browse Source
This commit is contained in:
Paul Adenot 2014-07-18 19:20:00 +02:00
parent ae5c8c7f2b
commit e25b14a438
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/media/AudioStream.cpp
View File

@ -253,6 +253,7 @@ AudioStream::AudioStream()
, mBytesPerFrame(0)
, mState(INITIALIZED)
, mNeedsStart(false)
, mShouldDropFrames(false)
{
// keep a ref in case we shut down later than nsLayoutStatics
mLatencyLog = AsyncLatencyLogger::Get(true);
@ -591,6 +592,7 @@ void AudioStream::PanOutputIfNeeded(bool aMicrophoneActive)
void AudioStream::DeviceChangedCallback() {
MonitorAutoLock mon(mMonitor);
PanOutputIfNeeded(mMicrophoneActive);
mShouldDropFrames = true;
}
// This code used to live inside AudioStream::Init(), but on Mac (others?)
@ -712,6 +714,10 @@ nsresult
AudioStream::Write(const AudioDataValue* aBuf, uint32_t aFrames, TimeStamp *aTime)
{
MonitorAutoLock mon(mMonitor);
if (mShouldDropFrames) {
mBuffer.ContractTo(0);
return NS_OK;
}
if (mState == ERRORED) {
return NS_ERROR_FAILURE;
}
@ -1113,6 +1119,8 @@ AudioStream::DataCallback(void* aBuffer, long aFrames)
uint32_t servicedFrames = 0;
int64_t insertTime;
mShouldDropFrames = false;
// NOTE: wasapi (others?) can call us back *after* stop()/Shutdown() (mState == SHUTDOWN)
// Bug 996162

4
content/media/AudioStream.h
View File

@ -407,6 +407,10 @@ private:
bool mIsFirst;
// True if a microphone is active.
bool mMicrophoneActive;
// When we are in the process of changing the output device, and the callback
// is not going to be called for a little while, simply drop incoming frames.
// This is only on OSX for now, because other systems handle this gracefully.
bool mShouldDropFrames;
// This mutex protects the static members below.
static StaticMutex sMutex;