Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Warning fix, rename some variables to avoid clashes with actual ffmpeg

Browse Source
This commit is contained in:
Henrik Rydgård 2024-04-11 14:48:27 +02:00
parent b35b351802
commit 6ee008af72
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/at3_standalone/atrac3plus.cpp
View File

@ -854,8 +854,8 @@ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
memset(chan->power_levs, ATRAC3P_POWER_COMP_OFF, sizeof(chan->power_levs));
for (qu = 0; qu < ctx->used_quant_units; qu++) {
num_specs = ff_atrac3p_qu_to_spec_pos[qu + 1] -
ff_atrac3p_qu_to_spec_pos[qu];
num_specs = av_atrac3p_qu_to_spec_pos[qu + 1] -
av_atrac3p_qu_to_spec_pos[qu];
wordlen = chan->qu_wordlen[qu];
codetab = chan->qu_tab_idx[qu];
@ -871,14 +871,14 @@ static void decode_spectrum(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
tab_index = tab->redirect;
decode_qu_spectra(gb, tab, &spec_vlc_tabs[tab_index],
&chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
&chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]],
num_specs);
} else if (ch_num && ctx->channels[0].qu_wordlen[qu] && !codetab) {
/* copy coefficients from master */
memcpy(&chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
&ctx->channels[0].spectrum[ff_atrac3p_qu_to_spec_pos[qu]],
memcpy(&chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]],
&ctx->channels[0].spectrum[av_atrac3p_qu_to_spec_pos[qu]],
num_specs *
sizeof(chan->spectrum[ff_atrac3p_qu_to_spec_pos[qu]]));
sizeof(chan->spectrum[av_atrac3p_qu_to_spec_pos[qu]]));
chan->qu_wordlen[qu] = ctx->channels[0].qu_wordlen[qu];
}
}

6
ext/at3_standalone/atrac3plus.h
View File

@ -229,8 +229,8 @@ void ff_atrac3p_imdct(FFTContext *mdct_ctx, float *pIn,
void ff_atrac3p_ipqf(FFTContext *dct_ctx, Atrac3pIPQFChannelCtx *hist,
const float *in, float *out);
extern const uint16_t ff_atrac3p_qu_to_spec_pos[33];
extern const float ff_atrac3p_sf_tab[64];
extern const float ff_atrac3p_mant_tab[8];
extern const uint16_t av_atrac3p_qu_to_spec_pos[33];
extern const float av_atrac3p_sf_tab[64];
extern const float av_atrac3p_mant_tab[8];
#endif /* AVCODEC_ATRAC3PLUS_H */

12
ext/at3_standalone/atrac3plusdec.cpp
View File

@ -205,14 +205,14 @@ static void decode_residual_spectrum(Atrac3pChanUnitCtx *ctx,
memset(out[ch], 0, ATRAC3P_FRAME_SAMPLES * sizeof(*out[ch]));
for (qu = 0; qu < ctx->used_quant_units; qu++) {
src = &ctx->channels[ch].spectrum[ff_atrac3p_qu_to_spec_pos[qu]];
dst = &out[ch][ff_atrac3p_qu_to_spec_pos[qu]];
nspeclines = ff_atrac3p_qu_to_spec_pos[qu + 1] -
ff_atrac3p_qu_to_spec_pos[qu];
src = &ctx->channels[ch].spectrum[av_atrac3p_qu_to_spec_pos[qu]];
dst = &out[ch][av_atrac3p_qu_to_spec_pos[qu]];
nspeclines = av_atrac3p_qu_to_spec_pos[qu + 1] -
av_atrac3p_qu_to_spec_pos[qu];
if (ctx->channels[ch].qu_wordlen[qu] > 0) {
q = ff_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] *
ff_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]];
q = av_atrac3p_sf_tab[ctx->channels[ch].qu_sf_idx[qu]] *
av_atrac3p_mant_tab[ctx->channels[ch].qu_wordlen[qu]];
for (i = 0; i < nspeclines; i++)
dst[i] = src[i] * q;
}

16
ext/at3_standalone/atrac3plusdsp.cpp
View File

@ -38,7 +38,7 @@
* To get the number of spectral lines in each quant unit do the following:
* num_specs = qu_to_spec_pos[i+1] - qu_to_spec_pos[i]
*/
const uint16_t ff_atrac3p_qu_to_spec_pos[33] = {
const uint16_t av_atrac3p_qu_to_spec_pos[33] = {
0, 16, 32, 48, 64, 80, 96, 112,
128, 160, 192, 224, 256, 288, 320, 352,
384, 448, 512, 576, 640, 704, 768, 896,
@ -48,7 +48,7 @@ const uint16_t ff_atrac3p_qu_to_spec_pos[33] = {
/* Scalefactors table. */
/* Approx. Equ: pow(2.0, (i - 16.0 + 0.501783948) / 3.0) */
const float ff_atrac3p_sf_tab[64] = {
const float av_atrac3p_sf_tab[64] = {
0.027852058, 0.0350914, 0.044212341, 0.055704117, 0.0701828,
0.088424683, 0.11140823, 0.1403656, 0.17684937, 0.22281647, 0.2807312, 0.35369873,
0.44563293, 0.5614624, 0.70739746, 0.89126587, 1.1229248, 1.4147949, 1.7825317,
@ -63,7 +63,7 @@ const float ff_atrac3p_sf_tab[64] = {
/* Mantissa table. */
/* pow(10, x * log10(2) + 0.05) / 2 / ([1,2,3,5,7,15,31] + 0.5) */
const float ff_atrac3p_mant_tab[8] = {
const float av_atrac3p_mant_tab[8] = {
0.0,
0.74801636,
0.44882202,
@ -167,7 +167,7 @@ static void waves_synth(Atrac3pWaveSynthParams *synth_param,
/* fade out with steep Hann window if requested */
if (envelope->has_stop_point) {
pos = (envelope->stop_pos + 1 << 2) - reg_offset;
pos = ((envelope->stop_pos + 1) << 2) - reg_offset;
if (pos > 0 && pos <= 128) {
out[pos - 4] *= hann_window[96];
out[pos - 3] *= hann_window[64];
@ -445,12 +445,12 @@ void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index,
if (ctx->channels[ch_index].qu_wordlen[qu] <= 0)
continue;
qu_lev = ff_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] *
ff_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] /
qu_lev = av_atrac3p_sf_tab[ctx->channels[ch_index].qu_sf_idx[qu]] *
av_atrac3p_mant_tab[ctx->channels[ch_index].qu_wordlen[qu]] /
(1 << ctx->channels[ch_index].qu_wordlen[qu]) * grp_lev;
dst = &sp[ff_atrac3p_qu_to_spec_pos[qu]];
nsp = ff_atrac3p_qu_to_spec_pos[qu + 1] - ff_atrac3p_qu_to_spec_pos[qu];
dst = &sp[av_atrac3p_qu_to_spec_pos[qu]];
nsp = av_atrac3p_qu_to_spec_pos[qu + 1] - av_atrac3p_qu_to_spec_pos[qu];
for (i = 0; i < nsp; i++)
dst[i] += pwcsp[i] * qu_lev;