mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1156472 - Part 13 - Make necessary adjustments for integer audio. r=jesup
This commit is contained in:
Paul Adenot
parent
c847e0f8f4
commit
3d99902194
@ -4,26 +4,11 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "AudioChannelFormat.h"
|
||||
#include "nsTArray.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
enum {
|
||||
SURROUND_L,
|
||||
SURROUND_R,
|
||||
SURROUND_C,
|
||||
SURROUND_LFE,
|
||||
SURROUND_SL,
|
||||
SURROUND_SR
|
||||
};
|
||||
|
||||
static const uint32_t CUSTOM_CHANNEL_LAYOUTS = 6;
|
||||
|
||||
static const int IGNORE = CUSTOM_CHANNEL_LAYOUTS;
|
||||
static const float IGNORE_F = 0.0f;
|
||||
|
||||
uint32_t
|
||||
GetAudioChannelsSuperset(uint32_t aChannels1, uint32_t aChannels2)
|
||||
{
|
||||
@ -63,9 +48,6 @@ gUpMixMatrices[CUSTOM_CHANNEL_LAYOUTS*(CUSTOM_CHANNEL_LAYOUTS - 1)/2] =
|
||||
{ { 0, 1, 2, 3, 4, IGNORE } }
|
||||
};
|
||||
|
||||
static const int gMixingMatrixIndexByChannels[CUSTOM_CHANNEL_LAYOUTS - 1] =
|
||||
{ 0, 5, 9, 12, 14 };
|
||||
|
||||
void
|
||||
AudioChannelsUpMix(nsTArray<const void*>* aChannelArray,
|
||||
uint32_t aOutputChannelCount,
|
||||
@ -108,94 +90,4 @@ AudioChannelsUpMix(nsTArray<const void*>* aChannelArray,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DownMixMatrix represents a conversion matrix efficiently by exploiting the
|
||||
* fact that each input channel contributes to at most one output channel,
|
||||
* except possibly for the C input channel in layouts that have one. Also,
|
||||
* every input channel is multiplied by the same coefficient for every output
|
||||
* channel it contributes to.
|
||||
*/
|
||||
struct DownMixMatrix {
|
||||
// Every input channel c is copied to output channel mInputDestination[c]
|
||||
// after multiplying by mInputCoefficient[c].
|
||||
uint8_t mInputDestination[CUSTOM_CHANNEL_LAYOUTS];
|
||||
// If not IGNORE, then the C channel is copied to this output channel after
|
||||
// multiplying by its coefficient.
|
||||
uint8_t mCExtraDestination;
|
||||
float mInputCoefficient[CUSTOM_CHANNEL_LAYOUTS];
|
||||
};
|
||||
|
||||
static const DownMixMatrix
|
||||
gDownMixMatrices[CUSTOM_CHANNEL_LAYOUTS*(CUSTOM_CHANNEL_LAYOUTS - 1)/2] =
|
||||
{
|
||||
// Downmixes to mono
|
||||
{ { 0, 0 }, IGNORE, { 0.5f, 0.5f } },
|
||||
{ { 0, IGNORE, IGNORE }, IGNORE, { 1.0f, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 0, 0, 0 }, IGNORE, { 0.25f, 0.25f, 0.25f, 0.25f } },
|
||||
{ { 0, IGNORE, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, IGNORE_F, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 0, 0, IGNORE, 0, 0 }, IGNORE, { 0.7071f, 0.7071f, 1.0f, IGNORE_F, 0.5f, 0.5f } },
|
||||
// Downmixes to stereo
|
||||
{ { 0, 1, IGNORE }, IGNORE, { 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 0, 1 }, IGNORE, { 0.5f, 0.5f, 0.5f, 0.5f } },
|
||||
{ { 0, 1, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 1, 0, IGNORE, 0, 1 }, 1, { 1.0f, 1.0f, 0.7071f, IGNORE_F, 0.7071f, 0.7071f } },
|
||||
// Downmixes to 3-channel
|
||||
{ { 0, 1, 2, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 2, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 1, 2, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
// Downmixes to quad
|
||||
{ { 0, 1, 2, 3, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 0, IGNORE, 2, 3 }, 1, { 1.0f, 1.0f, 0.7071f, IGNORE_F, 1.0f, 1.0f } },
|
||||
// Downmixes to 5-channel
|
||||
{ { 0, 1, 2, 3, 4, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, IGNORE_F } }
|
||||
};
|
||||
|
||||
void
|
||||
AudioChannelsDownMix(const nsTArray<const void*>& aChannelArray,
|
||||
float** aOutputChannels,
|
||||
uint32_t aOutputChannelCount,
|
||||
uint32_t aDuration)
|
||||
{
|
||||
uint32_t inputChannelCount = aChannelArray.Length();
|
||||
const void* const* inputChannels = aChannelArray.Elements();
|
||||
NS_ASSERTION(inputChannelCount > aOutputChannelCount, "Nothing to do");
|
||||
|
||||
if (inputChannelCount > 6) {
|
||||
// Just drop the unknown channels.
|
||||
for (uint32_t o = 0; o < aOutputChannelCount; ++o) {
|
||||
memcpy(aOutputChannels[o], inputChannels[o], aDuration*sizeof(float));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Ignore unknown channels, they're just dropped.
|
||||
inputChannelCount = std::min<uint32_t>(6, inputChannelCount);
|
||||
|
||||
const DownMixMatrix& m = gDownMixMatrices[
|
||||
gMixingMatrixIndexByChannels[aOutputChannelCount - 1] +
|
||||
inputChannelCount - aOutputChannelCount - 1];
|
||||
|
||||
// This is slow, but general. We can define custom code for special
|
||||
// cases later.
|
||||
for (uint32_t s = 0; s < aDuration; ++s) {
|
||||
// Reserve an extra junk channel at the end for the cases where we
|
||||
// want an input channel to contribute to nothing
|
||||
float outputChannels[CUSTOM_CHANNEL_LAYOUTS + 1];
|
||||
memset(outputChannels, 0, sizeof(float)*(CUSTOM_CHANNEL_LAYOUTS));
|
||||
for (uint32_t c = 0; c < inputChannelCount; ++c) {
|
||||
outputChannels[m.mInputDestination[c]] +=
|
||||
m.mInputCoefficient[c]*(static_cast<const float*>(inputChannels[c]))[s];
|
||||
}
|
||||
// Utilize the fact that in every layout, C is the third channel.
|
||||
if (m.mCExtraDestination != IGNORE) {
|
||||
outputChannels[m.mCExtraDestination] +=
|
||||
m.mInputCoefficient[SURROUND_C]*(static_cast<const float*>(inputChannels[SURROUND_C]))[s];
|
||||
}
|
||||
|
||||
for (uint32_t c = 0; c < aOutputChannelCount; ++c) {
|
||||
aOutputChannels[c][s] = outputChannels[c];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "nsTArrayForwardDeclare.h"
|
||||
#include "AudioSampleFormat.h"
|
||||
#include "nsTArray.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
@ -29,6 +31,26 @@ namespace mozilla {
|
||||
* Only 1, 2, 4 and 6 are currently defined in Web Audio.
|
||||
*/
|
||||
|
||||
enum {
|
||||
SURROUND_L,
|
||||
SURROUND_R,
|
||||
SURROUND_C,
|
||||
SURROUND_LFE,
|
||||
SURROUND_SL,
|
||||
SURROUND_SR
|
||||
};
|
||||
|
||||
const uint32_t CUSTOM_CHANNEL_LAYOUTS = 6;
|
||||
|
||||
// This is defined by some Windows SDK header.
|
||||
#undef IGNORE
|
||||
|
||||
const int IGNORE = CUSTOM_CHANNEL_LAYOUTS;
|
||||
const float IGNORE_F = 0.0f;
|
||||
|
||||
const int gMixingMatrixIndexByChannels[CUSTOM_CHANNEL_LAYOUTS - 1] =
|
||||
{ 0, 5, 9, 12, 14 };
|
||||
|
||||
/**
|
||||
* Return a channel count whose channel layout includes all the channels from
|
||||
* aChannels1 and aChannels2.
|
||||
@ -53,19 +75,102 @@ AudioChannelsUpMix(nsTArray<const void*>* aChannelArray,
|
||||
uint32_t aOutputChannelCount,
|
||||
const void* aZeroChannel);
|
||||
|
||||
/**
|
||||
* Given an array of input channels (which must be float format!),
|
||||
* downmix to aOutputChannelCount, and copy the results to the
|
||||
* channel buffers in aOutputChannels.
|
||||
* Don't call this with input count <= output count.
|
||||
*/
|
||||
void
|
||||
AudioChannelsDownMix(const nsTArray<const void*>& aChannelArray,
|
||||
float** aOutputChannels,
|
||||
uint32_t aOutputChannelCount,
|
||||
uint32_t aDuration);
|
||||
|
||||
// A version of AudioChannelsDownMix that downmixes int16_ts may be required.
|
||||
/**
|
||||
* DownMixMatrix represents a conversion matrix efficiently by exploiting the
|
||||
* fact that each input channel contributes to at most one output channel,
|
||||
* except possibly for the C input channel in layouts that have one. Also,
|
||||
* every input channel is multiplied by the same coefficient for every output
|
||||
* channel it contributes to.
|
||||
*/
|
||||
struct DownMixMatrix {
|
||||
// Every input channel c is copied to output channel mInputDestination[c]
|
||||
// after multiplying by mInputCoefficient[c].
|
||||
uint8_t mInputDestination[CUSTOM_CHANNEL_LAYOUTS];
|
||||
// If not IGNORE, then the C channel is copied to this output channel after
|
||||
// multiplying by its coefficient.
|
||||
uint8_t mCExtraDestination;
|
||||
float mInputCoefficient[CUSTOM_CHANNEL_LAYOUTS];
|
||||
};
|
||||
|
||||
static const DownMixMatrix
|
||||
gDownMixMatrices[CUSTOM_CHANNEL_LAYOUTS*(CUSTOM_CHANNEL_LAYOUTS - 1)/2] =
|
||||
{
|
||||
// Downmixes to mono
|
||||
{ { 0, 0 }, IGNORE, { 0.5f, 0.5f } },
|
||||
{ { 0, IGNORE, IGNORE }, IGNORE, { 1.0f, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 0, 0, 0 }, IGNORE, { 0.25f, 0.25f, 0.25f, 0.25f } },
|
||||
{ { 0, IGNORE, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, IGNORE_F, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 0, 0, IGNORE, 0, 0 }, IGNORE, { 0.7071f, 0.7071f, 1.0f, IGNORE_F, 0.5f, 0.5f } },
|
||||
// Downmixes to stereo
|
||||
{ { 0, 1, IGNORE }, IGNORE, { 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 0, 1 }, IGNORE, { 0.5f, 0.5f, 0.5f, 0.5f } },
|
||||
{ { 0, 1, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 1, 0, IGNORE, 0, 1 }, 1, { 1.0f, 1.0f, 0.7071f, IGNORE_F, 0.7071f, 0.7071f } },
|
||||
// Downmixes to 3-channel
|
||||
{ { 0, 1, 2, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 2, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F, IGNORE_F } },
|
||||
{ { 0, 1, 2, IGNORE, IGNORE, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, IGNORE_F, IGNORE_F, IGNORE_F } },
|
||||
// Downmixes to quad
|
||||
{ { 0, 1, 2, 3, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, 1.0f, IGNORE_F } },
|
||||
{ { 0, 1, 0, IGNORE, 2, 3 }, 1, { 1.0f, 1.0f, 0.7071f, IGNORE_F, 1.0f, 1.0f } },
|
||||
// Downmixes to 5-channel
|
||||
{ { 0, 1, 2, 3, 4, IGNORE }, IGNORE, { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, IGNORE_F } }
|
||||
};
|
||||
|
||||
/**
|
||||
* Given an array of input channels, downmix to aOutputChannelCount, and copy
|
||||
* the results to the channel buffers in aOutputChannels. Don't call this with
|
||||
* input count <= output count.
|
||||
*/
|
||||
template<typename T>
|
||||
void AudioChannelsDownMix(const nsTArray<const void*>& aChannelArray,
|
||||
T** aOutputChannels,
|
||||
uint32_t aOutputChannelCount,
|
||||
uint32_t aDuration)
|
||||
{
|
||||
uint32_t inputChannelCount = aChannelArray.Length();
|
||||
const void* const* inputChannels = aChannelArray.Elements();
|
||||
NS_ASSERTION(inputChannelCount > aOutputChannelCount, "Nothing to do");
|
||||
|
||||
if (inputChannelCount > 6) {
|
||||
// Just drop the unknown channels.
|
||||
for (uint32_t o = 0; o < aOutputChannelCount; ++o) {
|
||||
memcpy(aOutputChannels[o], inputChannels[o], aDuration*sizeof(T));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Ignore unknown channels, they're just dropped.
|
||||
inputChannelCount = std::min<uint32_t>(6, inputChannelCount);
|
||||
|
||||
const DownMixMatrix& m = gDownMixMatrices[
|
||||
gMixingMatrixIndexByChannels[aOutputChannelCount - 1] +
|
||||
inputChannelCount - aOutputChannelCount - 1];
|
||||
|
||||
// This is slow, but general. We can define custom code for special
|
||||
// cases later.
|
||||
for (uint32_t s = 0; s < aDuration; ++s) {
|
||||
// Reserve an extra junk channel at the end for the cases where we
|
||||
// want an input channel to contribute to nothing
|
||||
T outputChannels[CUSTOM_CHANNEL_LAYOUTS + 1];
|
||||
memset(outputChannels, 0, sizeof(T)*(CUSTOM_CHANNEL_LAYOUTS));
|
||||
for (uint32_t c = 0; c < inputChannelCount; ++c) {
|
||||
outputChannels[m.mInputDestination[c]] +=
|
||||
m.mInputCoefficient[c]*(static_cast<const T*>(inputChannels[c]))[s];
|
||||
}
|
||||
// Utilize the fact that in every layout, C is the third channel.
|
||||
if (m.mCExtraDestination != IGNORE) {
|
||||
outputChannels[m.mCExtraDestination] +=
|
||||
m.mInputCoefficient[SURROUND_C]*(static_cast<const T*>(inputChannels[SURROUND_C]))[s];
|
||||
}
|
||||
|
||||
for (uint32_t c = 0; c < aOutputChannelCount; ++c) {
|
||||
aOutputChannels[c][s] = outputChannels[c];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
|
||||
@ -206,13 +206,13 @@ AudioSegment::Mix(AudioMixer& aMixer, uint32_t aOutputChannels,
|
||||
AudioDataValue* ptr =
|
||||
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
||||
aOutputChannels, channel, offsetSamples);
|
||||
PodCopy(ptr, reinterpret_cast<const float*>(channelData[channel]),
|
||||
PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
|
||||
frames);
|
||||
}
|
||||
MOZ_ASSERT(channelData.Length() == aOutputChannels);
|
||||
} else if (channelData.Length() > aOutputChannels) {
|
||||
// Down mix.
|
||||
nsAutoTArray<float*, GUESS_AUDIO_CHANNELS> outChannelPtrs;
|
||||
nsAutoTArray<AudioDataValue*, GUESS_AUDIO_CHANNELS> outChannelPtrs;
|
||||
outChannelPtrs.SetLength(aOutputChannels);
|
||||
uint32_t offsetSamples = 0;
|
||||
for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
|
||||
@ -228,7 +228,7 @@ AudioSegment::Mix(AudioMixer& aMixer, uint32_t aOutputChannels,
|
||||
AudioDataValue* ptr =
|
||||
PointerForOffsetInChannel(buf.Elements(), outBufferLength,
|
||||
aOutputChannels, channel, offsetSamples);
|
||||
PodCopy(ptr, reinterpret_cast<const float*>(channelData[channel]),
|
||||
PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
|
||||
frames);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user