mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-07 00:39:13 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved a concurrency issue regarding shared state within static decompress method

Browse Source
This commit is contained in:
Collin Smith
2020-09-18 22:36:18 -07:00
parent 303e063586
commit 9009cdcfd9
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/com/riiablo/mpq/util/ADPCM.java
View File

@ -3,6 +3,8 @@ package com.riiablo.mpq.util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import com.badlogic.gdx.utils.Pool;
public class ADPCM { public class ADPCM {
private ADPCM() {} private ADPCM() {}
@ -37,14 +39,25 @@ public class ADPCM {
byte stepIndex; byte stepIndex;
} }
private static final Channel[] state = new Channel[2]; private static final Pool<Channel[]> POOL = new Pool<Channel[]>(8, 64, true) {
static { @Override
for (int i = 0; i < CHANNELS; i++) { protected Channel[] newObject() {
state[i] = new Channel(); final Channel[] channels = new Channel[CHANNELS];
for (int i = 0; i < CHANNELS; i++) channels[i] = new Channel();
return channels;
}
};
public static void decompress(ByteBuffer in, ByteBuffer out, int numChannels) {
Channel[] channels = POOL.obtain();
try {
decompress(in, out, numChannels, channels);
} finally {
POOL.free(channels);
} }
} }
public static void decompress(ByteBuffer in, ByteBuffer out, int numChannels) { public static void decompress(ByteBuffer in, ByteBuffer out, int numChannels, Channel[] state) {
assert in.order() == ByteOrder.LITTLE_ENDIAN && out.order() == ByteOrder.LITTLE_ENDIAN : "in.order() = " + in.order() + "; out.order() = " + out.order(); assert in.order() == ByteOrder.LITTLE_ENDIAN && out.order() == ByteOrder.LITTLE_ENDIAN : "in.order() = " + in.order() + "; out.order() = " + out.order();
byte stepshift = (byte) (in.getShort() >>> Byte.SIZE); byte stepshift = (byte) (in.getShort() >>> Byte.SIZE);