preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some symbol clashes apparently affecting the docker build

Browse Source
This commit is contained in:
Henrik Rydgård
2024-04-13 01:05:55 +02:00
parent c2bcdd3076
commit 68c192b892
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/GameInfoCache.cpp
+1 -1
View File
@@ -357,7 +357,7 @@ void GameInfo::SetupTexture(Draw::DrawContext *thin3d, GameInfoTex &tex) {
tex.texture = CreateTextureFromFileData(thin3d, (const uint8_t *)tex.data.data(), tex.data.size(), ImageFileType::DETECT, false, GetTitle().c_str());
tex.timeLoaded = time_now_d();
if (!tex.texture) {
ERROR_LOG(G3D, "Failed creating texture (%s) from %d-byte file", GetTitle().c_str(), tex.data.size());
ERROR_LOG(G3D, "Failed creating texture (%s) from %d-byte file", GetTitle().c_str(), (int)tex.data.size());
}
}
ext/at3_standalone/atrac.cpp
+3 -3
View File
@@ -32,7 +32,7 @@
#include "atrac.h"
float ff_atrac_sf_table[64];
float av_atrac_sf_table[64];
static float qmf_window[48];
static const float qmf_48tap_half[24] = {
@@ -50,9 +50,9 @@ void ff_atrac_generate_tables(void)
float s;
/* Generate scale factors */
if (!ff_atrac_sf_table[63])
if (!av_atrac_sf_table[63])
for (i=0 ; i<64 ; i++)
ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0);
av_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0);
/* Generate the QMF window. */
if (!qmf_window[47])
ext/at3_standalone/atrac.h
+1 -1
View File
@@ -51,7 +51,7 @@ typedef struct AtracGCContext {
int loc_size; ///< size of location code in samples
} AtracGCContext;
extern float ff_atrac_sf_table[64];
extern float av_atrac_sf_table[64];
/**
* Generate common tables.
ext/at3_standalone/atrac3.cpp
+2 -2
View File
@@ -297,7 +297,7 @@ static int decode_spectrum(GetBitContext *gb, float *output)
mantissas, subband_size);
/* decode the scale factor for this subband */
scale_factor = ff_atrac_sf_table[sf_index[i]] *
scale_factor = av_atrac_sf_table[sf_index[i]] *
inv_max_quant[subband_vlc_index[i]];
/* inverse quantize the coefficients */
@@ -379,7 +379,7 @@ static int decode_tonal_components(GetBitContext *gb,
coded_values = coded_values_per_component + 1;
coded_values = FFMIN(max_coded_values, coded_values);
scale_factor = ff_atrac_sf_table[sf_index] *
scale_factor = av_atrac_sf_table[sf_index] *
inv_max_quant[quant_step_index];
read_quant_spectral_coeffs(gb, quant_step_index, coding_mode,
ext/at3_standalone/atrac3plusdsp.cpp
+4 -4
View File
@@ -476,15 +476,15 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn,
* Both regions are 32 samples long. */
if (wind_id & 2) { /* 1st half: steep window */
memset(pOut, 0, sizeof(float) * 32);
vector_fmul(&pOut[32], &pOut[32], ff_sine_64, 64);
vector_fmul(&pOut[32], &pOut[32], av_sine_64, 64);
} else /* 1st half: simple sine window */
vector_fmul(pOut, pOut, ff_sine_128, ATRAC3P_MDCT_SIZE / 2);
vector_fmul(pOut, pOut, av_sine_128, ATRAC3P_MDCT_SIZE / 2);
if (wind_id & 1) { /* 2nd half: steep window */
vector_fmul_reverse(&pOut[160], &pOut[160], ff_sine_64, 64);
vector_fmul_reverse(&pOut[160], &pOut[160], av_sine_64, 64);
memset(&pOut[224], 0, sizeof(float) * 32);
} else /* 2nd half: simple sine window */
vector_fmul_reverse(&pOut[128], &pOut[128], ff_sine_128, ATRAC3P_MDCT_SIZE / 2);
vector_fmul_reverse(&pOut[128], &pOut[128], av_sine_128, ATRAC3P_MDCT_SIZE / 2);
}
/* lookup table for fast modulo 23 op required for cyclic buffers of the IPQF */
ext/at3_standalone/fft.cpp
+18 -18
View File
@@ -54,21 +54,21 @@ COSTABLE(16384);
COSTABLE(32768);
COSTABLE(65536);
static FFTSample * const ff_cos_tabs[] = {
static FFTSample * const av_cos_tabs[] = {
NULL, NULL, NULL, NULL,
ff_cos_16,
ff_cos_32,
ff_cos_64,
ff_cos_128,
ff_cos_256,
ff_cos_512,
ff_cos_1024,
ff_cos_2048,
ff_cos_4096,
ff_cos_8192,
ff_cos_16384,
ff_cos_32768,
ff_cos_65536,
av_cos_16,
av_cos_32,
av_cos_64,
av_cos_128,
av_cos_256,
av_cos_512,
av_cos_1024,
av_cos_2048,
av_cos_4096,
av_cos_8192,
av_cos_16384,
av_cos_32768,
av_cos_65536,
};
static void fft_permute_c(FFTContext *s, FFTComplex *z);
@@ -90,7 +90,7 @@ void ff_init_ff_cos_tabs(int index)
int i;
int m = 1<<index;
double freq = 2*M_PI/m;
FFTSample *tab = ff_cos_tabs[index];
FFTSample *tab = av_cos_tabs[index];
for(i=0; i<=m/4; i++)
tab[i] = cos(i*freq);
for(i=1; i<m/4; i++)
@@ -243,7 +243,7 @@ static void fft##n(FFTComplex *z)\
fft##n2(z);\
fft##n4(z+n4*2);\
fft##n4(z+n4*3);\
pass(z,ff_cos_##n,n4/2);\
pass(z,av_cos_##n,n4/2);\
}
static void fft4(FFTComplex *z)
@@ -279,8 +279,8 @@ static void fft8(FFTComplex *z)
static void fft16(FFTComplex *z)
{
FFTDouble t1, t2, t3, t4, t5, t6;
FFTSample cos_16_1 = ff_cos_16[1];
FFTSample cos_16_3 = ff_cos_16[3];
FFTSample cos_16_1 = av_cos_16[1];
FFTSample cos_16_3 = av_cos_16[3];
fft8(z);
fft4(z+8);
ext/at3_standalone/fft.h
+1 -1
View File
@@ -73,7 +73,7 @@ struct FFTContext {
};
#define COSTABLE(size) \
DECLARE_ALIGNED(32, FFTSample, ff_cos_##size)[size/2]
DECLARE_ALIGNED(32, FFTSample, av_cos_##size)[size/2]
extern COSTABLE(16);
extern COSTABLE(32);
ext/at3_standalone/sinewin.cpp
+6 -6
View File
@@ -40,11 +40,11 @@ SINETABLE(8192);
// Thie array is only accessed in init. However, not so for the
// sine tables it points to.
static float *ff_sine_windows[] = {
static float *av_sine_windows[] = {
NULL, NULL, NULL, NULL, NULL, // unused
ff_sine_32 , ff_sine_64, ff_sine_128,
ff_sine_256, ff_sine_512, ff_sine_1024,
ff_sine_2048,ff_sine_4096, ff_sine_8192
av_sine_32, av_sine_64, av_sine_128,
av_sine_256, av_sine_512, av_sine_1024,
av_sine_2048, av_sine_4096, av_sine_8192
};
// Generate a sine window.
@@ -55,6 +55,6 @@ void ff_sine_window_init(float *window, int n) {
}
void ff_init_ff_sine_windows(int index) {
assert(index >= 0 && index < FF_ARRAY_ELEMS(ff_sine_windows));
ff_sine_window_init(ff_sine_windows[index], 1 << index);
assert(index >= 0 && index < FF_ARRAY_ELEMS(av_sine_windows));
ff_sine_window_init(av_sine_windows[index], 1 << index);
}
ext/at3_standalone/sinewin.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "compat.h"
#define SINETABLE(size) \
DECLARE_ALIGNED(32, float, ff_sine_##size)[size]
DECLARE_ALIGNED(32, float, av_sine_##size)[size]
/**
* Generate a sine window.