Cleanup AudioAnalyzer
This commit is contained in:
@@ -27,7 +27,7 @@ import lime.media.openal.AL;
|
||||
@:fileXml('tags="haxe,release"')
|
||||
@:noDebug
|
||||
#end
|
||||
#if (lime && lime_cffi)
|
||||
#if lime_cffi
|
||||
@:access(lime._internal.backend.native.NativeAudioSource)
|
||||
@:access(lime.media.AudioSource)
|
||||
#end
|
||||
@@ -158,9 +158,9 @@ import lime.media.openal.AL;
|
||||
if (!__isValid) return false;
|
||||
|
||||
var buffer = __source.buffer;
|
||||
var wordSize = buffer.bitsPerSample >> 3, bitUnsignedSize = 1 << buffer.bitsPerSample, bitSize = 1 << (buffer.bitsPerSample - 1);
|
||||
var pos = Math.floor(time * buffer.sampleRate / 1000 * buffer.channels * wordSize), size = 0, buf;
|
||||
var leftMin = 0, leftMax = 0, rightMin = 0, rightMax = 0;
|
||||
var wordSize = buffer.bitsPerSample >> 3, byteSize = 1 << (buffer.bitsPerSample - 1);
|
||||
var pos = Math.floor(time * buffer.sampleRate / 1000 * buffer.channels * wordSize);
|
||||
var leftMin = 0, leftMax = 0, rightMin = 0, rightMax = 0, size = 0, buf;
|
||||
|
||||
#if lime_cffi
|
||||
var backend = __source.__backend, i = 0;
|
||||
@@ -175,25 +175,14 @@ import lime.media.openal.AL;
|
||||
size = #if js buf.byteLength #else buf.length #end;
|
||||
}
|
||||
|
||||
var s = Math.floor(Math.min(buffer.sampleRate / 80, 512)), c = Math.floor((pos % (wordSize * buffer.channels)) / wordSize), b = 0, w = 0;
|
||||
pos -= pos % wordSize;
|
||||
var s = Math.floor(Math.min(buffer.sampleRate / 80, 512)), c = 0, b;
|
||||
pos -= pos % (buffer.channels * wordSize);
|
||||
|
||||
while (s > 0) {
|
||||
if (wordSize == 1) b = #if js buf[pos++] #else buf.get(pos++) #end - bitSize;
|
||||
else {
|
||||
while (w < buffer.bitsPerSample) {
|
||||
b |= #if js buf[pos] #else buf.get(pos) #end << w;
|
||||
w += 8;
|
||||
pos++;
|
||||
}
|
||||
if (b > bitSize) b -= bitUnsignedSize;
|
||||
}
|
||||
if (c % 2 == 0) {
|
||||
if (leftMax < b) leftMax = b; else if (leftMin < (b = -b)) leftMin = b;
|
||||
}
|
||||
else if (rightMax < b) rightMax = b; else if (rightMin < (b = -b)) rightMin = b;
|
||||
|
||||
if (pos >= size) #if lime_cffi {
|
||||
b = funkin.backend.utils.AudioAnalyzer.getByte(buf, pos, wordSize);
|
||||
if (c % 2 == 0) ((b > leftMax) ? (leftMax = b) : (if ((b = -b) > leftMin) (leftMin = b)));
|
||||
else ((b > rightMax) ? (rightMax = b) : (if ((b = -b) > rightMin) (rightMin = b)));
|
||||
if ((pos += wordSize) >= size) #if lime_cffi {
|
||||
if (!backend.streamed || ++i >= backend.bufferDatas.length) break;
|
||||
size = backend.bufferSizes[i];
|
||||
buf = backend.bufferDatas[i].buffer;
|
||||
@@ -205,13 +194,12 @@ import lime.media.openal.AL;
|
||||
c = 0;
|
||||
s--;
|
||||
}
|
||||
w = b = 0;
|
||||
}
|
||||
|
||||
if (buffer.channels == 1) __rightPeak = (__leftPeak = (leftMax + leftMin) / bitSize);
|
||||
if (buffer.channels == 1) __rightPeak = (__leftPeak = (leftMax + leftMin) / byteSize);
|
||||
else {
|
||||
__leftPeak = (leftMax + leftMin) / bitSize;
|
||||
__rightPeak = (rightMax + rightMin) / bitSize;
|
||||
__leftPeak = (leftMax + leftMin) / byteSize;
|
||||
__rightPeak = (rightMax + rightMin) / byteSize;
|
||||
}
|
||||
#end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user