Remove float_dsp.cpp, inline the functions

This commit is contained in:
Henrik Rydgård 2024-05-01 11:58:53 +02:00
parent c6502155ab
commit b6b869ddee
9 changed files with 32 additions and 77 deletions

View File

@ -604,7 +604,6 @@
<ClCompile Include="..\ext\at3_standalone\get_bits.cpp" />
<ClCompile Include="..\ext\at3_standalone\compat.cpp" />
<ClCompile Include="..\ext\at3_standalone\fft.cpp" />
<ClCompile Include="..\ext\at3_standalone\float_dsp.cpp" />
<ClCompile Include="..\ext\at3_standalone\mem.cpp" />
<ClCompile Include="..\ext\at3_standalone\sinewin.cpp" />
<ClCompile Include="..\ext\basis_universal\basisu_transcoder.cpp" />

View File

@ -1029,9 +1029,6 @@
<ClCompile Include="..\ext\at3_standalone\atrac3plusdsp.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>
<ClCompile Include="..\ext\at3_standalone\float_dsp.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>
<ClCompile Include="..\ext\at3_standalone\mem.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>

View File

@ -248,7 +248,6 @@
<ClInclude Include="..\..\ext\at3_standalone\atrac3plus_data.h" />
<ClInclude Include="..\..\ext\at3_standalone\compat.h" />
<ClInclude Include="..\..\ext\at3_standalone\fft.h" />
<ClInclude Include="..\..\ext\at3_standalone\float_dsp.h" />
<ClInclude Include="..\..\ext\at3_standalone\get_bits.h" />
<ClInclude Include="..\..\ext\at3_standalone\intreadwrite.h" />
<ClInclude Include="..\..\ext\at3_standalone\mem.h" />
@ -401,7 +400,6 @@
<ClCompile Include="..\..\ext\at3_standalone\atrac3plusdsp.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\compat.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\fft.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\float_dsp.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\get_bits.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\mem.cpp" />
<ClCompile Include="..\..\ext\at3_standalone\sinewin.cpp" />

View File

@ -486,9 +486,6 @@
<ClCompile Include="..\..\ext\at3_standalone\fft.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\at3_standalone\float_dsp.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\at3_standalone\get_bits.cpp">
<Filter>ext\at3_standalone</Filter>
</ClCompile>
@ -937,9 +934,6 @@
<ClInclude Include="..\..\ext\at3_standalone\fft.h">
<Filter>ext\at3_standalone</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\at3_standalone\float_dsp.h">
<Filter>ext\at3_standalone</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\at3_standalone\get_bits.h">
<Filter>ext\at3_standalone</Filter>
</ClInclude>

View File

@ -121,7 +121,6 @@ AT3_STANDALONE_FILES := \
${SRC}/ext/at3_standalone/get_bits.cpp \
${SRC}/ext/at3_standalone/compat.cpp \
${SRC}/ext/at3_standalone/fft.cpp \
${SRC}/ext/at3_standalone/float_dsp.cpp \
${SRC}/ext/at3_standalone/mem.cpp \
${SRC}/ext/at3_standalone/sinewin.cpp

View File

@ -14,7 +14,6 @@ set(ALL_SOURCE_FILES
${SRC_DIR}/get_bits.cpp
${SRC_DIR}/compat.cpp
${SRC_DIR}/fft.cpp
${SRC_DIR}/float_dsp.cpp
${SRC_DIR}/mem.cpp
${SRC_DIR}/sinewin.cpp
)

View File

@ -1,43 +0,0 @@
/*
* Copyright 2005 Balatoni Denes
* Copyright 2006 Loren Merritt
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "compat.h"
#include "float_dsp.h"
#include "mem.h"
void vector_fmul(float *dst, const float *src0, const float *src1, int len) {
int i;
for (i = 0; i < len; i++)
dst[i] = src0[i] * src1[i];
}
void vector_fmul_scalar(float *dst, const float *src, float mul, int len) {
int i;
for (i = 0; i < len; i++)
dst[i] = src[i] * mul;
}
void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) {
int i;
src1 += len - 1;
for (i = 0; i < len; i++)
dst[i] = src0[i] * src1[-i];
}

View File

@ -18,26 +18,39 @@
#pragma once
void vector_fmul(float *dst, const float *src0, const float *src1, int len);
inline void vector_fmul(float *dst, const float *src0, const float *src1, int len) {
int i;
for (i = 0; i < len; i++)
dst[i] = src0[i] * src1[i];
}
/**
* Multiply a vector of floats by a scalar float. Source and
* destination vectors must overlap exactly or not at all.
*/
void vector_fmul_scalar(float *dst, const float *src, float mul, int len);
* Multiply a vector of floats by a scalar float. Source and
* destination vectors must overlap exactly or not at all.
*/
inline void vector_fmul_scalar(float *dst, const float *src, float mul, int len) {
int i;
for (i = 0; i < len; i++)
dst[i] = src[i] * mul;
}
/**
* Calculate the entry wise product of two vectors of floats, and store the result
* in a vector of floats. The second vector of floats is iterated over
* in reverse order.
*
* @param dst output vector
* constraints: 32-byte aligned
* @param src0 first input vector
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
*/
void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len);
* Calculate the entry wise product of two vectors of floats, and store the result
* in a vector of floats. The second vector of floats is iterated over
* in reverse order.
*
* @param dst output vector
* constraints: 32-byte aligned
* @param src0 first input vector
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
*/
inline void vector_fmul_reverse(float *dst, const float *src0, const float *src1, int len) {
int i;
src1 += len - 1;
for (i = 0; i < len; i++)
dst[i] = src0[i] * src1[-i];
}

View File

@ -271,7 +271,6 @@ SOURCES_CXX += \
${EXTDIR}/at3_standalone/get_bits.cpp \
${EXTDIR}/at3_standalone/compat.cpp \
${EXTDIR}/at3_standalone/fft.cpp \
${EXTDIR}/at3_standalone/float_dsp.cpp \
${EXTDIR}/at3_standalone/mem.cpp \
${EXTDIR}/at3_standalone/sinewin.cpp