mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
04083ef9b4
- Bug 1235261 - Part 1: Rename nsAutoTArray to AutoTArray. r=froydnj (0662c2ac56)
- Bug 1235261 - Part 2: Switch some uses of AutoFallibleTArray to AutoTArray. r=froydnj (ab52085f2a)
- Bug 1235261 - Part 3: Switch remaining uses of AutoFallibleTArray to AutoTArray. r=froydnj (3763b16ddd)
- Bug 1235261 - Part 4: Remove AutoFallibleTArray. r=froydnj (5480b0d786)
- Bug 1235261 - Part 5: Merge nsAutoArrayBase into AutoTArray. r=froydnj (6c64e73e3b)
- Bug 1235261 - Part 7: Remove AutoInfallibleTArray. r=froydnj (acf266464e)
- Bug 1222624: Make xpath document() function use nsIPrincipals and nsIURIs rather than strings. r=peterv (5ee694d132)
- Bug 1235261 - Part 6: Rename AutoInfallibleTArray to AutoTArray. r=froydnj (d282f7df6c)
- Bug 1241394 - Hit testing with 3d transforms should use fuzzy when comparing depths. r=thinker (6c3f50670f)
- Bug 1241394 - Follow up to fix windows build bustage. (02ab2600af)
- Bug 1241394 - Check clip for the children of the establisher. r=mattwoodrow (46f151ea55)
- bug 1241453 - allow caching proxies in xpcAccessibleDocuments r=davidb (f5d41ad2ee)
- Bug 1247364 - use AllChildrenIterator::Seek by a11y tree walker, r=davidb (0ec230908e)
- Bug 1248840 - rename TreeWalker::NextChild, r=yzen (c89ecc5a29)
- Bug 1249927 - devirtualize CanHavaAnonymousChildren, r=davdib (89e8088e63)
- Bug 1206598 - Use universal reference to reduce the redundant copy. r=nfroyd (bae4ad6dd1)
- Bug 1247364 - add AllChildrenIterator::Seek, r=bz (215abebf12)
- bug 1241453 - allow storing proxies in xpcAccessibleGeneric::mIntl r=davidb (dd5e6c896b)
- bug 1241453 - allow constructing xpcAccessibles with proxies r=davidb (d0258122be)
- bug 1241453 - fixup xpcAccessible Intl() methods to not assume mIntl is always an Accessible r=davidb (168f71fdf5)
- bug 1241453 - allow xpcAccessibleDocument::mCache to use proxies as keys r=davidb (85b7eec81c)
- bug 1241453 - assert accessibles are only added to non remote xpcAccessibleDocuments r=davidb (7731b21d17)
- bug 1243077 - add ToXPC{,Document} overloads for proxied accessibles r=davidb (7bc085f1b5)
- bug 1243077 - add AccessibleOrProxy xpcAccessible::IntlGeneric() r=davidb (006a635992)
- Bug 1245464 - initialize with 0 mSupportedIfaces in xpcAccessibleGeneric in order to avoid corrupted result after bit-wise operation. r=surkov (ae41bafcef)
- bug 1241453 - allow caching xpc documents for remote documents r=davidb (a357630690)
- bug 1241453 - factor dispatching nsIAccessibleEvents out of HandleAccEvent() r=davidb (091073d981)
- Bug 1249183 - Suppress GC harder, r=terrence (2185ccb4dd)
- Bug 1248420 - Handle JSObject::getGroup OOM in js::ArraySetLength. r=jandem (04b67c8d31)
- Bug 1242270 - Add SPS pseudo frames for the Array.prototype methods; r=shu (f5e5871439)
- Bug 1247701 - Bail from ArrayShiftDenseKernel if the array is used by for-in iteration. r=jandem (41eff38954)
- Bug 1247701 followup - Change ArrayShiftDenseKernel to receive handle. r=bz (b29ce0c555)
218 lines
7.5 KiB
C++
218 lines
7.5 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "AudioSegment.h"
|
|
|
|
#include "AudioMixer.h"
|
|
#include "AudioChannelFormat.h"
|
|
#include "Latency.h"
|
|
#include <speex/speex_resampler.h>
|
|
|
|
namespace mozilla {
|
|
|
|
const uint8_t SilentChannel::gZeroChannel[MAX_AUDIO_SAMPLE_SIZE*SilentChannel::AUDIO_PROCESSING_FRAMES] = {0};
|
|
|
|
template<>
|
|
const float* SilentChannel::ZeroChannel<float>()
|
|
{
|
|
return reinterpret_cast<const float*>(SilentChannel::gZeroChannel);
|
|
}
|
|
|
|
template<>
|
|
const int16_t* SilentChannel::ZeroChannel<int16_t>()
|
|
{
|
|
return reinterpret_cast<const int16_t*>(SilentChannel::gZeroChannel);
|
|
}
|
|
|
|
void
|
|
AudioSegment::ApplyVolume(float aVolume)
|
|
{
|
|
for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
|
|
ci->mVolume *= aVolume;
|
|
}
|
|
}
|
|
|
|
void AudioSegment::ResampleChunks(SpeexResamplerState* aResampler, uint32_t aInRate, uint32_t aOutRate)
|
|
{
|
|
if (mChunks.IsEmpty()) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(aResampler || IsNull(), "We can only be here without a resampler if this segment is null.");
|
|
|
|
AudioSampleFormat format = AUDIO_FORMAT_SILENCE;
|
|
for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
|
|
if (ci->mBufferFormat != AUDIO_FORMAT_SILENCE) {
|
|
format = ci->mBufferFormat;
|
|
}
|
|
}
|
|
|
|
switch (format) {
|
|
// If the format is silence at this point, all the chunks are silent. The
|
|
// actual function we use does not matter, it's just a matter of changing
|
|
// the chunks duration.
|
|
case AUDIO_FORMAT_SILENCE:
|
|
case AUDIO_FORMAT_FLOAT32:
|
|
Resample<float>(aResampler, aInRate, aOutRate);
|
|
break;
|
|
case AUDIO_FORMAT_S16:
|
|
Resample<int16_t>(aResampler, aInRate, aOutRate);
|
|
break;
|
|
default:
|
|
MOZ_ASSERT(false);
|
|
break;
|
|
}
|
|
}
|
|
|
|
// This helps to to safely get a pointer to the position we want to start
|
|
// writing a planar audio buffer, depending on the channel and the offset in the
|
|
// buffer.
|
|
static AudioDataValue*
|
|
PointerForOffsetInChannel(AudioDataValue* aData, size_t aLengthSamples,
|
|
uint32_t aChannelCount, uint32_t aChannel,
|
|
uint32_t aOffsetSamples)
|
|
{
|
|
size_t samplesPerChannel = aLengthSamples / aChannelCount;
|
|
size_t beginningOfChannel = samplesPerChannel * aChannel;
|
|
MOZ_ASSERT(aChannel * samplesPerChannel + aOffsetSamples < aLengthSamples,
|
|
"Offset request out of bounds.");
|
|
return aData + beginningOfChannel + aOffsetSamples;
|
|
}
|
|
|
|
void
|
|
AudioSegment::Mix(AudioMixer& aMixer, uint32_t aOutputChannels,
|
|
uint32_t aSampleRate)
|
|
{
|
|
AutoTArray<AudioDataValue, SilentChannel::AUDIO_PROCESSING_FRAMES* GUESS_AUDIO_CHANNELS>
|
|
buf;
|
|
AutoTArray<const AudioDataValue*, GUESS_AUDIO_CHANNELS> channelData;
|
|
uint32_t offsetSamples = 0;
|
|
uint32_t duration = GetDuration();
|
|
|
|
if (duration <= 0) {
|
|
MOZ_ASSERT(duration == 0);
|
|
return;
|
|
}
|
|
|
|
uint32_t outBufferLength = duration * aOutputChannels;
|
|
buf.SetLength(outBufferLength);
|
|
|
|
for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
|
|
AudioChunk& c = *ci;
|
|
uint32_t frames = c.mDuration;
|
|
|
|
// If the chunk is silent, simply write the right number of silence in the
|
|
// buffers.
|
|
if (c.mBufferFormat == AUDIO_FORMAT_SILENCE) {
|
|
for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
|
|
AudioDataValue* ptr =
|
|
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
|
aOutputChannels, channel, offsetSamples);
|
|
PodZero(ptr, frames);
|
|
}
|
|
} else {
|
|
// Othewise, we need to upmix or downmix appropriately, depending on the
|
|
// desired input and output channels.
|
|
channelData.SetLength(c.mChannelData.Length());
|
|
for (uint32_t i = 0; i < channelData.Length(); ++i) {
|
|
channelData[i] = static_cast<const AudioDataValue*>(c.mChannelData[i]);
|
|
}
|
|
if (channelData.Length() < aOutputChannels) {
|
|
// Up-mix.
|
|
AudioChannelsUpMix(&channelData, aOutputChannels, SilentChannel::ZeroChannel<AudioDataValue>());
|
|
for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
|
|
AudioDataValue* ptr =
|
|
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
|
aOutputChannels, channel, offsetSamples);
|
|
PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
|
|
frames);
|
|
}
|
|
MOZ_ASSERT(channelData.Length() == aOutputChannels);
|
|
} else if (channelData.Length() > aOutputChannels) {
|
|
// Down mix.
|
|
AutoTArray<AudioDataValue*, GUESS_AUDIO_CHANNELS> outChannelPtrs;
|
|
outChannelPtrs.SetLength(aOutputChannels);
|
|
uint32_t offsetSamples = 0;
|
|
for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
|
|
outChannelPtrs[channel] =
|
|
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
|
aOutputChannels, channel, offsetSamples);
|
|
}
|
|
AudioChannelsDownMix(channelData, outChannelPtrs.Elements(),
|
|
aOutputChannels, frames);
|
|
} else {
|
|
// The channel count is already what we want, just copy it over.
|
|
for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
|
|
AudioDataValue* ptr =
|
|
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
|
aOutputChannels, channel, offsetSamples);
|
|
PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
|
|
frames);
|
|
}
|
|
}
|
|
}
|
|
offsetSamples += frames;
|
|
}
|
|
|
|
if (offsetSamples) {
|
|
MOZ_ASSERT(offsetSamples == outBufferLength / aOutputChannels,
|
|
"We forgot to write some samples?");
|
|
aMixer.Mix(buf.Elements(), aOutputChannels, offsetSamples, aSampleRate);
|
|
}
|
|
}
|
|
|
|
void
|
|
AudioSegment::WriteTo(uint64_t aID, AudioMixer& aMixer, uint32_t aOutputChannels, uint32_t aSampleRate)
|
|
{
|
|
AutoTArray<AudioDataValue,SilentChannel::AUDIO_PROCESSING_FRAMES*GUESS_AUDIO_CHANNELS> buf;
|
|
// Offset in the buffer that will be written to the mixer, in samples.
|
|
uint32_t offset = 0;
|
|
|
|
if (GetDuration() <= 0) {
|
|
MOZ_ASSERT(GetDuration() == 0);
|
|
return;
|
|
}
|
|
|
|
uint32_t outBufferLength = GetDuration() * aOutputChannels;
|
|
buf.SetLength(outBufferLength);
|
|
|
|
|
|
for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
|
|
AudioChunk& c = *ci;
|
|
|
|
switch (c.mBufferFormat) {
|
|
case AUDIO_FORMAT_S16:
|
|
WriteChunk<int16_t>(c, aOutputChannels, buf.Elements() + offset);
|
|
break;
|
|
case AUDIO_FORMAT_FLOAT32:
|
|
WriteChunk<float>(c, aOutputChannels, buf.Elements() + offset);
|
|
break;
|
|
case AUDIO_FORMAT_SILENCE:
|
|
// The mixer is expecting interleaved data, so this is ok.
|
|
PodZero(buf.Elements() + offset, c.mDuration * aOutputChannels);
|
|
break;
|
|
default:
|
|
MOZ_ASSERT(false, "Not handled");
|
|
}
|
|
|
|
offset += c.mDuration * aOutputChannels;
|
|
|
|
#if !defined(MOZILLA_XPCOMRT_API)
|
|
if (!c.mTimeStamp.IsNull()) {
|
|
TimeStamp now = TimeStamp::Now();
|
|
// would be more efficient to c.mTimeStamp to ms on create time then pass here
|
|
LogTime(AsyncLatencyLogger::AudioMediaStreamTrack, aID,
|
|
(now - c.mTimeStamp).ToMilliseconds(), c.mTimeStamp);
|
|
}
|
|
#endif // !defined(MOZILLA_XPCOMRT_API)
|
|
}
|
|
|
|
if (offset) {
|
|
aMixer.Mix(buf.Elements(), aOutputChannels, offset / aOutputChannels, aSampleRate);
|
|
}
|
|
}
|
|
|
|
} // namespace mozilla
|