wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-07 08:18:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2311 - Part 4 - Use FFTBlock from ffvpx instead of libav

Browse source
This commit is contained in:
trav90 2023-09-20 14:03:40 -05:00 • committed by roytam1
commit 1ae2b21c0d
3 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dom/media/webaudio/AudioContext.cpp
View file

@ -135,6 +135,8 @@ AudioContext::AudioContext(nsPIDOMWindowInner* aWindow,
if (mute) {
Mute();
}
FFTBlock::MainThreadInit();
}
nsresult

4
dom/media/webaudio/FFTBlock.cpp
View file

@ -35,6 +35,10 @@ namespace mozilla {
typedef std::complex<double> Complex;
#ifdef MOZ_LIBAV_FFT
FFmpegRDFTFuncs FFTBlock::sRDFTFuncs;
#endif
FFTBlock* FFTBlock::CreateInterpolatedBlock(const FFTBlock& block0, const FFTBlock& block1, double interp)
{
FFTBlock* newBlock = new FFTBlock(block0.FFTSize());

60
dom/media/webaudio/FFTBlock.h
View file

@ -15,13 +15,8 @@
#include "AlignedTArray.h"
#include "AudioNodeEngine.h"
#if defined(MOZ_LIBAV_FFT)
#ifdef __cplusplus
extern "C" {
#endif
#include "libavcodec/avfft.h"
#ifdef __cplusplus
}
#endif
#include "FFmpegRDFTTypes.h"
#include "FFVPXRuntimeLinker.h"
#else
#include "kiss_fft/kiss_fftr.h"
#endif
@ -45,6 +40,14 @@ class FFTBlock final
};
public:
static void MainThreadInit()
{
#ifdef MOZ_LIBAV_FFT
FFVPXRuntimeLinker::Init();
FFVPXRuntimeLinker::GetRDFTFuncs(&sRDFTFuncs);
#endif
}
explicit FFTBlock(uint32_t aFFTSize)
#if defined(MOZ_LIBAV_FFT)
: mAvRDFT(nullptr)
@ -76,10 +79,12 @@ public:
// Transform FFTSize() points of aData and store the result internally.
void PerformFFT(const float* aData)
{
EnsureFFT();
if (!EnsureFFT()) {
return;
}
#if defined(MOZ_LIBAV_FFT)
PodCopy(mOutputBuffer.Elements()->f, aData, mFFTSize);
av_rdft_calc(mAvRDFT, mOutputBuffer.Elements()->f);
sRDFTFuncs.calc(mAvRDFT, mOutputBuffer.Elements()->f);
// Recover packed Nyquist.
mOutputBuffer[mFFTSize / 2].r = mOutputBuffer[0].i;
mOutputBuffer[0].i = 0.0f;
@ -106,7 +111,11 @@ public:
// scaled, then the output will need scaling by 1/FFTSize().
void GetInverseWithoutScaling(float* aDataOut)
{
EnsureIFFT();
if (!EnsureIFFT()) {
std::fill_n(aDataOut, mFFTSize, 0.0f);
return;
};
#if defined(MOZ_LIBAV_FFT)
{
// Even though this function doesn't scale, the libav forward transform
@ -115,7 +124,7 @@ public:
AudioBufferCopyWithScale(mOutputBuffer.Elements()->f, 2.0f,
aDataOut, mFFTSize);
aDataOut[1] = 2.0f * mOutputBuffer[mFFTSize/2].r; // Packed Nyquist
av_rdft_calc(mAvIRDFT, aDataOut);
sRDFTFuncs.calc(mAvIRDFT, aDataOut);
}
#else
#ifdef BUILD_ARM_NEON
@ -215,11 +224,14 @@ private:
FFTBlock(const FFTBlock& other) = delete;
void operator=(const FFTBlock& other) = delete;
void EnsureFFT()
bool EnsureFFT()
{
#if defined(MOZ_LIBAV_FFT)
if (!mAvRDFT) {
mAvRDFT = av_rdft_init(log((double)mFFTSize)/M_LN2, DFT_R2C);
if (!sRDFTFuncs.init) {
return false;
}
mAvRDFT = sRDFTFuncs.init(log((double)mFFTSize)/M_LN2, DFT_R2C);
}
#else
#ifdef BUILD_ARM_NEON
@ -235,12 +247,17 @@ private:
}
}
#endif
return true;
}
void EnsureIFFT()
bool EnsureIFFT()
{
#if defined(MOZ_LIBAV_FFT)
if (!mAvIRDFT) {
mAvIRDFT = av_rdft_init(log((double)mFFTSize)/M_LN2, IDFT_C2R);
if (!sRDFTFuncs.init) {
return false;
}
mAvIRDFT = sRDFTFuncs.init(log((double)mFFTSize)/M_LN2, IDFT_C2R);
}
#else
#ifdef BUILD_ARM_NEON
@ -256,6 +273,7 @@ private:
}
}
#endif
return true;
}
#ifdef BUILD_ARM_NEON
@ -280,9 +298,14 @@ private:
void Clear()
{
#if defined(MOZ_LIBAV_FFT)
av_rdft_end(mAvRDFT);
av_rdft_end(mAvIRDFT);
mAvRDFT = mAvIRDFT = nullptr;
if (mAvRDFT) {
sRDFTFuncs.end(mAvRDFT);
mAvRDFT = nullptr;
}
if (mAvIRDFT) {
sRDFTFuncs.end(mAvIRDFT);
mAvIRDFT = nullptr;
}
#else
#ifdef BUILD_ARM_NEON
free(mOmxFFT);
@ -300,6 +323,7 @@ private:
#if defined(MOZ_LIBAV_FFT)
RDFTContext *mAvRDFT;
RDFTContext *mAvIRDFT;
static FFmpegRDFTFuncs sRDFTFuncs;
#else
kiss_fftr_cfg mKissFFT;
kiss_fftr_cfg mKissIFFT;