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 1201855 send ended event even when the buffer has no channel data r=padenot

Browse Source 
The ThreadSharedFloatArrayBufferList may be null even when there is a buffer
if one of its arrays has been neutered.

SAMPLE_RATE is used instead of BUFFEREND to detect whether start() and buffer
have been received because buffers can have zero length when acquiring the
contents returns "zero-length channel data buffers", although this zero-length
is not yet implemented.

LOOP and BUFFEREND are reset when the buffer is set to null to end playback.
This commit is contained in:
Karl Tomlinson 2015-09-05 00:15:52 +12:00
parent eacc146607
commit 5059538e20
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/media/webaudio/AudioBufferSourceNode.cpp
View File

@ -460,12 +460,13 @@ public:
AudioBlock* aOutput,
bool* aFinished) override
{
if (!mBuffer || !mBufferEnd) {
if (mBufferSampleRate == 0) {
// start() has not yet been called or no buffer has yet been set
aOutput->SetNull(WEBAUDIO_BLOCK_SIZE);
return;
}
uint32_t channels = mBuffer->GetChannels();
uint32_t channels = mBuffer ? mBuffer->GetChannels() : 0;
UpdateSampleRateIfNeeded(channels);
@ -669,16 +670,15 @@ AudioBufferSourceNode::SendBufferParameterToStream(JSContext* aCx)
}
if (mBuffer) {
float rate = mBuffer->SampleRate();
nsRefPtr<ThreadSharedFloatArrayBufferList> data =
mBuffer->GetThreadSharedChannelsForRate(aCx);
ns->SetBuffer(data.forget());
ns->SetInt32Parameter(SAMPLE_RATE, rate);
if (mStartCalled) {
SendOffsetAndDurationParametersToStream(ns);
}
} else {
ns->SetInt32Parameter(BUFFEREND, 0);
ns->SetBuffer(nullptr);
MarkInactive();
@ -692,6 +692,8 @@ AudioBufferSourceNode::SendOffsetAndDurationParametersToStream(AudioNodeStream*
"Only call this when we have a buffer and start() has been called");
float rate = mBuffer->SampleRate();
aStream->SetInt32Parameter(SAMPLE_RATE, rate);
int32_t bufferEnd = mBuffer->Length();
int32_t offsetSamples = std::max(0, NS_lround(mOffset * rate));
@ -823,7 +825,7 @@ AudioBufferSourceNode::SendLoopParametersToStream()
// looping impossible.
SendInt32ParameterToStream(LOOP, 0);
}
} else if (!mLoop) {
} else {
SendInt32ParameterToStream(LOOP, 0);
}
}