mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Bug 882171 - Part 1: Add NEON implementation of AudioNodeEngine.cpp. r=roc, r=padenot, r=derf, r=glandium
This commit is contained in:
JW Wang
parent
35f41d78c8
commit
3188d4643b
@ -222,7 +222,7 @@ if test "$CPU_ARCH" = "arm"; then
|
||||
dnl This matches media/webrtc/trunk/webrtc/build/common.gypi.
|
||||
if test -n "$ARM_ARCH"; then
|
||||
if test "$ARM_ARCH" -lt 7; then
|
||||
BUILD_ARM_NEON=0
|
||||
BUILD_ARM_NEON=
|
||||
else
|
||||
BUILD_ARM_NEON=1
|
||||
fi
|
||||
|
||||
250
content/media/AudioNodeEngineNEON.cpp
Normal file
250
content/media/AudioNodeEngineNEON.cpp
Normal file
@ -0,0 +1,250 @@
|
||||
/* -*- 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 "AudioNodeEngineNEON.h"
|
||||
#include <arm_neon.h>
|
||||
|
||||
#ifdef DEBUG
|
||||
#define ASSERT_ALIGNED(ptr) \
|
||||
MOZ_ASSERT((((uintptr_t)ptr + 15) & ~0x0F) == (uintptr_t)ptr, \
|
||||
#ptr " has to be aligned 16-bytes aligned.");
|
||||
#else
|
||||
#define ASSERT_ALIGNED(ptr)
|
||||
#endif
|
||||
|
||||
#define ADDRESS_OF(array, index) ((float32_t*)&array[index])
|
||||
|
||||
namespace mozilla {
|
||||
void AudioBufferAddWithScale_NEON(const float* aInput,
|
||||
float aScale,
|
||||
float* aOutput,
|
||||
uint32_t aSize)
|
||||
{
|
||||
ASSERT_ALIGNED(aInput);
|
||||
ASSERT_ALIGNED(aOutput);
|
||||
|
||||
float32x4_t vin0, vin1, vin2, vin3;
|
||||
float32x4_t vout0, vout1, vout2, vout3;
|
||||
float32x4_t vscale = vmovq_n_f32(aScale);
|
||||
|
||||
uint32_t dif = aSize % 16;
|
||||
aSize -= dif;
|
||||
unsigned i = 0;
|
||||
for (; i < aSize; i+=16) {
|
||||
vin0 = vld1q_f32(ADDRESS_OF(aInput, i));
|
||||
vin1 = vld1q_f32(ADDRESS_OF(aInput, i+4));
|
||||
vin2 = vld1q_f32(ADDRESS_OF(aInput, i+8));
|
||||
vin3 = vld1q_f32(ADDRESS_OF(aInput, i+12));
|
||||
|
||||
vout0 = vld1q_f32(ADDRESS_OF(aOutput, i));
|
||||
vout1 = vld1q_f32(ADDRESS_OF(aOutput, i+4));
|
||||
vout2 = vld1q_f32(ADDRESS_OF(aOutput, i+8));
|
||||
vout3 = vld1q_f32(ADDRESS_OF(aOutput, i+12));
|
||||
|
||||
vout0 = vmlaq_f32(vout0, vin0, vscale);
|
||||
vout1 = vmlaq_f32(vout1, vin1, vscale);
|
||||
vout2 = vmlaq_f32(vout2, vin2, vscale);
|
||||
vout3 = vmlaq_f32(vout3, vin3, vscale);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i), vout0);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+4), vout1);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+8), vout2);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+12), vout3);
|
||||
}
|
||||
|
||||
for (unsigned j = 0; j < dif; ++i, ++j) {
|
||||
aOutput[i] += aInput[i]*aScale;
|
||||
}
|
||||
}
|
||||
void
|
||||
AudioBlockCopyChannelWithScale_NEON(const float* aInput,
|
||||
float aScale,
|
||||
float* aOutput)
|
||||
{
|
||||
ASSERT_ALIGNED(aInput);
|
||||
ASSERT_ALIGNED(aOutput);
|
||||
|
||||
float32x4_t vin0, vin1, vin2, vin3;
|
||||
float32x4_t vout0, vout1, vout2, vout3;
|
||||
float32x4_t vscale = vmovq_n_f32(aScale);
|
||||
|
||||
for (uint32_t i = 0; i < WEBAUDIO_BLOCK_SIZE; i+=16) {
|
||||
vin0 = vld1q_f32(ADDRESS_OF(aInput, i));
|
||||
vin1 = vld1q_f32(ADDRESS_OF(aInput, i+4));
|
||||
vin2 = vld1q_f32(ADDRESS_OF(aInput, i+8));
|
||||
vin3 = vld1q_f32(ADDRESS_OF(aInput, i+12));
|
||||
|
||||
vout0 = vmulq_f32(vin0, vscale);
|
||||
vout1 = vmulq_f32(vin1, vscale);
|
||||
vout2 = vmulq_f32(vin2, vscale);
|
||||
vout3 = vmulq_f32(vin3, vscale);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i), vout0);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+4), vout1);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+8), vout2);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+12), vout3);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioBlockCopyChannelWithScale_NEON(const float aInput[WEBAUDIO_BLOCK_SIZE],
|
||||
const float aScale[WEBAUDIO_BLOCK_SIZE],
|
||||
float aOutput[WEBAUDIO_BLOCK_SIZE])
|
||||
{
|
||||
ASSERT_ALIGNED(aInput);
|
||||
ASSERT_ALIGNED(aScale);
|
||||
ASSERT_ALIGNED(aOutput);
|
||||
|
||||
float32x4_t vin0, vin1, vin2, vin3;
|
||||
float32x4_t vout0, vout1, vout2, vout3;
|
||||
float32x4_t vscale0, vscale1, vscale2, vscale3;
|
||||
|
||||
for (uint32_t i = 0; i < WEBAUDIO_BLOCK_SIZE; i+=16) {
|
||||
vin0 = vld1q_f32(ADDRESS_OF(aInput, i));
|
||||
vin1 = vld1q_f32(ADDRESS_OF(aInput, i+4));
|
||||
vin2 = vld1q_f32(ADDRESS_OF(aInput, i+8));
|
||||
vin3 = vld1q_f32(ADDRESS_OF(aInput, i+12));
|
||||
|
||||
vscale0 = vld1q_f32(ADDRESS_OF(aScale, i));
|
||||
vscale1 = vld1q_f32(ADDRESS_OF(aScale, i+4));
|
||||
vscale2 = vld1q_f32(ADDRESS_OF(aScale, i+8));
|
||||
vscale3 = vld1q_f32(ADDRESS_OF(aScale, i+12));
|
||||
|
||||
vout0 = vmulq_f32(vin0, vscale0);
|
||||
vout1 = vmulq_f32(vin1, vscale1);
|
||||
vout2 = vmulq_f32(vin2, vscale2);
|
||||
vout3 = vmulq_f32(vin3, vscale3);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i), vout0);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+4), vout1);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+8), vout2);
|
||||
vst1q_f32(ADDRESS_OF(aOutput, i+12), vout3);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioBufferInPlaceScale_NEON(float* aBlock,
|
||||
uint32_t aChannelCount,
|
||||
float aScale,
|
||||
uint32_t aSize)
|
||||
{
|
||||
ASSERT_ALIGNED(aBlock);
|
||||
|
||||
float32x4_t vin0, vin1, vin2, vin3;
|
||||
float32x4_t vout0, vout1, vout2, vout3;
|
||||
float32x4_t vscale = vmovq_n_f32(aScale);
|
||||
|
||||
uint32_t totalSize = aSize * aChannelCount;
|
||||
uint32_t dif = totalSize % 16;
|
||||
totalSize -= dif;
|
||||
uint32_t i = 0;
|
||||
for (; i < totalSize; i+=16) {
|
||||
vin0 = vld1q_f32(ADDRESS_OF(aBlock, i));
|
||||
vin1 = vld1q_f32(ADDRESS_OF(aBlock, i+4));
|
||||
vin2 = vld1q_f32(ADDRESS_OF(aBlock, i+8));
|
||||
vin3 = vld1q_f32(ADDRESS_OF(aBlock, i+12));
|
||||
|
||||
vout0 = vmulq_f32(vin0, vscale);
|
||||
vout1 = vmulq_f32(vin1, vscale);
|
||||
vout2 = vmulq_f32(vin2, vscale);
|
||||
vout3 = vmulq_f32(vin3, vscale);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aBlock, i), vout0);
|
||||
vst1q_f32(ADDRESS_OF(aBlock, i+4), vout1);
|
||||
vst1q_f32(ADDRESS_OF(aBlock, i+8), vout2);
|
||||
vst1q_f32(ADDRESS_OF(aBlock, i+12), vout3);
|
||||
}
|
||||
|
||||
for (unsigned j = 0; j < dif; ++i, ++j) {
|
||||
aBlock[i] *= aScale;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AudioBlockPanStereoToStereo_NEON(const float aInputL[WEBAUDIO_BLOCK_SIZE],
|
||||
const float aInputR[WEBAUDIO_BLOCK_SIZE],
|
||||
float aGainL, float aGainR, bool aIsOnTheLeft,
|
||||
float aOutputL[WEBAUDIO_BLOCK_SIZE],
|
||||
float aOutputR[WEBAUDIO_BLOCK_SIZE])
|
||||
{
|
||||
ASSERT_ALIGNED(aInputL);
|
||||
ASSERT_ALIGNED(aInputR);
|
||||
ASSERT_ALIGNED(aOutputL);
|
||||
ASSERT_ALIGNED(aOutputR);
|
||||
|
||||
float32x4_t vinL0, vinL1, vinL2, vinL3;
|
||||
float32x4_t vinR0, vinR1, vinR2, vinR3;
|
||||
float32x4_t voutL0, voutL1, voutL2, voutL3;
|
||||
float32x4_t voutR0, voutR1, voutR2, voutR3;
|
||||
float32x4_t vscaleL = vmovq_n_f32(aGainL);
|
||||
float32x4_t vscaleR = vmovq_n_f32(aGainR);
|
||||
|
||||
if (aIsOnTheLeft) {
|
||||
for (uint32_t i = 0; i < WEBAUDIO_BLOCK_SIZE; i+=16) {
|
||||
vinL0 = vld1q_f32(ADDRESS_OF(aInputL, i));
|
||||
vinL1 = vld1q_f32(ADDRESS_OF(aInputL, i+4));
|
||||
vinL2 = vld1q_f32(ADDRESS_OF(aInputL, i+8));
|
||||
vinL3 = vld1q_f32(ADDRESS_OF(aInputL, i+12));
|
||||
|
||||
vinR0 = vld1q_f32(ADDRESS_OF(aInputR, i));
|
||||
vinR1 = vld1q_f32(ADDRESS_OF(aInputR, i+4));
|
||||
vinR2 = vld1q_f32(ADDRESS_OF(aInputR, i+8));
|
||||
vinR3 = vld1q_f32(ADDRESS_OF(aInputR, i+12));
|
||||
|
||||
voutL0 = vmlaq_f32(vinL0, vinR0, vscaleL);
|
||||
voutL1 = vmlaq_f32(vinL1, vinR1, vscaleL);
|
||||
voutL2 = vmlaq_f32(vinL2, vinR2, vscaleL);
|
||||
voutL3 = vmlaq_f32(vinL3, vinR3, vscaleL);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i), voutL0);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+4), voutL1);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+8), voutL2);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+12), voutL3);
|
||||
|
||||
voutR0 = vmulq_f32(vinR0, vscaleR);
|
||||
voutR1 = vmulq_f32(vinR1, vscaleR);
|
||||
voutR2 = vmulq_f32(vinR2, vscaleR);
|
||||
voutR3 = vmulq_f32(vinR3, vscaleR);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i), voutR0);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+4), voutR1);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+8), voutR2);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+12), voutR3);
|
||||
}
|
||||
} else {
|
||||
for (uint32_t i = 0; i < WEBAUDIO_BLOCK_SIZE; i+=16) {
|
||||
vinL0 = vld1q_f32(ADDRESS_OF(aInputL, i));
|
||||
vinL1 = vld1q_f32(ADDRESS_OF(aInputL, i+4));
|
||||
vinL2 = vld1q_f32(ADDRESS_OF(aInputL, i+8));
|
||||
vinL3 = vld1q_f32(ADDRESS_OF(aInputL, i+12));
|
||||
|
||||
vinR0 = vld1q_f32(ADDRESS_OF(aInputR, i));
|
||||
vinR1 = vld1q_f32(ADDRESS_OF(aInputR, i+4));
|
||||
vinR2 = vld1q_f32(ADDRESS_OF(aInputR, i+8));
|
||||
vinR3 = vld1q_f32(ADDRESS_OF(aInputR, i+12));
|
||||
|
||||
voutL0 = vmulq_f32(vinL0, vscaleL);
|
||||
voutL1 = vmulq_f32(vinL1, vscaleL);
|
||||
voutL2 = vmulq_f32(vinL2, vscaleL);
|
||||
voutL3 = vmulq_f32(vinL3, vscaleL);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i), voutL0);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+4), voutL1);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+8), voutL2);
|
||||
vst1q_f32(ADDRESS_OF(aOutputL, i+12), voutL3);
|
||||
|
||||
voutR0 = vmlaq_f32(vinR0, vinL0, vscaleR);
|
||||
voutR1 = vmlaq_f32(vinR1, vinL1, vscaleR);
|
||||
voutR2 = vmlaq_f32(vinR2, vinL2, vscaleR);
|
||||
voutR3 = vmlaq_f32(vinR3, vinL3, vscaleR);
|
||||
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i), voutR0);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+4), voutR1);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+8), voutR2);
|
||||
vst1q_f32(ADDRESS_OF(aOutputR, i+12), voutR3);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
41
content/media/AudioNodeEngineNEON.h
Normal file
41
content/media/AudioNodeEngineNEON.h
Normal file
@ -0,0 +1,41 @@
|
||||
/* -*- 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/. */
|
||||
|
||||
#ifndef MOZILLA_AUDIONODEENGINENEON_H_
|
||||
#define MOZILLA_AUDIONODEENGINENEON_H_
|
||||
|
||||
#include "AudioNodeEngine.h"
|
||||
|
||||
namespace mozilla {
|
||||
void AudioBufferAddWithScale_NEON(const float* aInput,
|
||||
float aScale,
|
||||
float* aOutput,
|
||||
uint32_t aSize);
|
||||
|
||||
void
|
||||
AudioBlockCopyChannelWithScale_NEON(const float* aInput,
|
||||
float aScale,
|
||||
float* aOutput);
|
||||
|
||||
void
|
||||
AudioBlockCopyChannelWithScale_NEON(const float aInput[WEBAUDIO_BLOCK_SIZE],
|
||||
const float aScale[WEBAUDIO_BLOCK_SIZE],
|
||||
float aOutput[WEBAUDIO_BLOCK_SIZE]);
|
||||
|
||||
void
|
||||
AudioBufferInPlaceScale_NEON(float* aBlock,
|
||||
uint32_t aChannelCount,
|
||||
float aScale,
|
||||
uint32_t aSize);
|
||||
|
||||
void
|
||||
AudioBlockPanStereoToStereo_NEON(const float aInputL[WEBAUDIO_BLOCK_SIZE],
|
||||
const float aInputR[WEBAUDIO_BLOCK_SIZE],
|
||||
float aGainL, float aGainR, bool aIsOnTheLeft,
|
||||
float aOutputL[WEBAUDIO_BLOCK_SIZE],
|
||||
float aOutputR[WEBAUDIO_BLOCK_SIZE]);
|
||||
}
|
||||
|
||||
#endif /* MOZILLA_AUDIONODEENGINENEON_H_ */
|
||||
@ -30,3 +30,5 @@ endif
|
||||
|
||||
CFLAGS += $(GSTREAMER_CFLAGS)
|
||||
CXXFLAGS += $(GSTREAMER_CFLAGS)
|
||||
|
||||
AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
|
||||
|
||||
@ -130,3 +130,8 @@ CPP_SOURCES += [
|
||||
'VideoUtils.cpp',
|
||||
'WebVTTLoadListener.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
|
||||
CPP_SOURCES += [
|
||||
'AudioNodeEngineNEON.cpp',
|
||||
]
|
||||
|
||||
@ -222,7 +222,7 @@ if test "$CPU_ARCH" = "arm"; then
|
||||
dnl This matches media/webrtc/trunk/webrtc/build/common.gypi.
|
||||
if test -n "$ARM_ARCH"; then
|
||||
if test "$ARM_ARCH" -lt 7; then
|
||||
BUILD_ARM_NEON=0
|
||||
BUILD_ARM_NEON=
|
||||
else
|
||||
BUILD_ARM_NEON=1
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user