mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-26 20:42:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove comments and corrected code, which exists for correctness but will likely never be used. Fixes #20362

Browse source
This commit is contained in:
Juan Linietsky 2018-11-21 22:57:31 -03:00
parent f150c5b4a0
commit 10c3ba2c1b
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
servers/audio/audio_rb_resampler.cpp
View file

@ -79,53 +79,27 @@ uint32_t AudioRBResampler::_resample(AudioFrame *p_dest, int p_todo, int32_t p_i
p_dest[i] = AudioFrame(v0, v1); p_dest[i] = AudioFrame(v0, v1);
} }
// For now, channels higher than stereo are almost ignored // This will probably never be used, but added anyway
if (C == 4) { if (C == 4) {
// FIXME: v2 and v3 are not being used (thus were commented out to prevent
// compilation warnings, but they should likely be uncommented *and* used).
// See also C == 6 with similar issues.
float v0 = rb[(pos << 2) + 0]; float v0 = rb[(pos << 2) + 0];
float v1 = rb[(pos << 2) + 1]; float v1 = rb[(pos << 2) + 1];
/*
float v2 = rb[(pos << 2) + 2];
float v3 = rb[(pos << 2) + 3];
*/
float v0n = rb[(pos_next << 2) + 0]; float v0n = rb[(pos_next << 2) + 0];
float v1n = rb[(pos_next << 2) + 1]; float v1n = rb[(pos_next << 2) + 1];
/*
float v2n = rb[(pos_next << 2) + 2];
float v3n = rb[(pos_next << 2) + 3];
*/
v0 += (v0n - v0) * frac; v0 += (v0n - v0) * frac;
v1 += (v1n - v1) * frac; v1 += (v1n - v1) * frac;
/*
v2 += (v2n - v2) * frac;
v3 += (v3n - v3) * frac;
*/
p_dest[i] = AudioFrame(v0, v1); p_dest[i] = AudioFrame(v0, v1);
} }
if (C == 6) { if (C == 6) {
// FIXME: Lot of unused assignments here, but it seems like intermediate calculations
// should be done as for C == 2 (C == 4 also has some unused assignments).
float v0 = rb[(pos * 6) + 0]; float v0 = rb[(pos * 6) + 0];
float v1 = rb[(pos * 6) + 1]; float v1 = rb[(pos * 6) + 1];
/*
float v2 = rb[(pos * 6) + 2];
float v3 = rb[(pos * 6) + 3];
float v4 = rb[(pos * 6) + 4];
float v5 = rb[(pos * 6) + 5];
float v0n = rb[(pos_next * 6) + 0]; float v0n = rb[(pos_next * 6) + 0];
float v1n = rb[(pos_next * 6) + 1]; float v1n = rb[(pos_next * 6) + 1];
float v2n = rb[(pos_next * 6) + 2];
float v3n = rb[(pos_next * 6) + 3];
float v4n = rb[(pos_next * 6) + 4];
float v5n = rb[(pos_next * 6) + 5];
*/
v0 += (v0n - v0) * frac;
v1 += (v1n - v1) * frac;
p_dest[i] = AudioFrame(v0, v1); p_dest[i] = AudioFrame(v0, v1);
} }
} }