wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

[WebAudio] Gracefully handle mid-stream audio changes.

Browse source
This commit is contained in:
Moonchild 2026-02-26 00:03:19 +01:00 • committed by OwnedByWuigi
commit a3fcc2932f
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dom/media/webaudio/MediaBufferDecoder.cpp
View file

@ -254,6 +254,9 @@ public:
} }
void operator=(SpeexResamplerState* aResampler) void operator=(SpeexResamplerState* aResampler)
{ {
if (mResampler) {
speex_resampler_destroy(mResampler);
}
mResampler = aResampler; mResampler = aResampler;
} }
@ -392,6 +395,28 @@ MediaDecodeTask::FinishDecode()
while ((mediaData = mAudioQueue.PopFront())) { while ((mediaData = mAudioQueue.PopFront())) {
RefPtr<AudioData> audioData = mediaData->As<AudioData>(); RefPtr<AudioData> audioData = mediaData->As<AudioData>();
audioData->EnsureAudioBuffer(); // could lead to a copy :( audioData->EnsureAudioBuffer(); // could lead to a copy :(
if (audioData->mChannels != channelCount) {
if (audioData->mChannels > channelCount) {
MOZ_LOG(gMediaDecoderLog,
LogLevel::Error,
("MediaDecodeTask: Channel count increased from %u to %u mid-stream; "
"this is fatal, stopping decode", channelCount, audioData->mChannels));
ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
return;
}
MOZ_LOG(gMediaDecoderLog,
LogLevel::Verbose,
("MediaDecodeTask: Channel count changed from %u to %u mid-stream, reinitializing resampler",
channelCount, audioData->mChannels));
channelCount = audioData->mChannels;
if (sampleRate != destSampleRate) {
resampler = speex_resampler_init(channelCount, sampleRate, destSampleRate,
SPEEX_RESAMPLER_QUALITY_DEFAULT, nullptr);
speex_resampler_skip_zeros(resampler);
}
}
AudioDataValue* bufferData = static_cast<AudioDataValue*> AudioDataValue* bufferData = static_cast<AudioDataValue*>
(audioData->mAudioBuffer->Data()); (audioData->mAudioBuffer->Data());