Skip to content

Commit eaeb3d4

Browse files
GiantLuigi4GiantLuigi4
authored
Audio handler improvements (CinemaMod#19)
1 parent c877637 commit eaeb3d4

5 files changed

Lines changed: 105 additions & 19 deletions

File tree

‎java/org/cef/CefClient.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
import org.cef.callback.CefPrintDialogCallback;
2323
import org.cef.callback.CefPrintJobCallback;
2424
import org.cef.handler.*;
25-
import org.cef.misc.BoolRef;
26-
import org.cef.misc.CefAudioParameters;
27-
import org.cef.misc.CefPrintSettings;
28-
import org.cef.misc.StringRef;
25+
import org.cef.misc.*;
2926
import org.cef.network.CefRequest;
3027
import org.cef.network.CefRequest.TransitionType;
3128
import org.cef.network.CefResponse;
@@ -815,7 +812,7 @@ public void onAudioStreamStarted(CefBrowser browser, CefAudioParameters params,
815812
}
816813

817814
@Override
818-
public void onAudioStreamPacket(CefBrowser browser, float[] data, int frames, long pts) {
815+
public void onAudioStreamPacket(CefBrowser browser, DataPointer data, int frames, long pts) {
819816
if (audioHandler_ != null) audioHandler_.onAudioStreamPacket(browser, data, frames, pts);
820817
}
821818

‎java/org/cef/handler/CefAudioHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.cef.browser.CefBrowser;
88
import org.cef.misc.CefAudioParameters;
9+
import org.cef.misc.DataPointer;
910

1011
/**
1112
* Implement this interface to handle events related to audio playing.
@@ -16,7 +17,7 @@ public interface CefAudioHandler {
1617

1718
void onAudioStreamStarted(CefBrowser browser, CefAudioParameters params, int channels);
1819

19-
void onAudioStreamPacket(CefBrowser browser, float[] data, int frames, long pts);
20+
void onAudioStreamPacket(CefBrowser browser, DataPointer data, int frames, long pts);
2021

2122
void onAudioStreamStopped(CefBrowser browser);
2223

‎java/org/cef/handler/CefAudioHandlerAdapter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.cef.browser.CefBrowser;
88
import org.cef.misc.CefAudioParameters;
9+
import org.cef.misc.DataPointer;
910

1011
/**
1112
* Implement this interface to handle events related to audio playing.
@@ -19,7 +20,7 @@ public boolean getAudioParameters(CefBrowser browser, CefAudioParameters params)
1920
public void onAudioStreamStarted(CefBrowser browser, CefAudioParameters params, int channels) {
2021
}
2122

22-
public void onAudioStreamPacket(CefBrowser browser, float[] data, int frames, long pts) {
23+
public void onAudioStreamPacket(CefBrowser browser, DataPointer data, int frames, long pts) {
2324
}
2425

2526
public void onAudioStreamStopped(CefBrowser browser) {

‎java/org/cef/misc/DataPointer.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
package org.cef.misc;
2+
3+
import java.lang.invoke.MethodHandle;
4+
import java.lang.invoke.MethodHandles;
5+
import java.lang.invoke.MethodType;
6+
import java.nio.ByteBuffer;
7+
8+
public class DataPointer {
9+
private final long address;
10+
private ByteBuffer dataBuffer;
11+
boolean initialized = false;
12+
int alignment = 3;
13+
14+
public DataPointer(long address) {
15+
this.address = address;
16+
}
17+
18+
public DataPointer forCapacity(int capacity) {
19+
try {
20+
dataBuffer = (ByteBuffer) memByteBuffer.invoke(address, capacity);
21+
initialized = true;
22+
return this;
23+
} catch (Throwable err) {
24+
throw new RuntimeException("Failed to invoke memByteBuffer?", err);
25+
}
26+
}
27+
28+
public DataPointer withAlignment(int alignment) {
29+
this.alignment = alignment;
30+
return this;
31+
}
32+
33+
public long getAddress() {
34+
return address;
35+
}
36+
37+
public DataPointer getData(int offset) {
38+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
39+
return new DataPointer(dataBuffer.getLong(offset << alignment));
40+
}
41+
42+
public long getLong(int offset) {
43+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
44+
return dataBuffer.getLong(offset << alignment);
45+
}
46+
47+
public int getInt(int offset) {
48+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
49+
return dataBuffer.getInt(offset << alignment);
50+
}
51+
52+
public short getShort(int offset) {
53+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
54+
return dataBuffer.getShort(offset << alignment);
55+
}
56+
57+
public byte getByte(int offset) {
58+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
59+
return dataBuffer.get(offset << alignment);
60+
}
61+
62+
public double getDouble(int offset) {
63+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
64+
return dataBuffer.getDouble(offset << alignment);
65+
}
66+
67+
public float getFloat(int offset) {
68+
if (!initialized) throw new RuntimeException("DataPoint#forCapacity must be called before the data can be accessed.");
69+
return dataBuffer.getFloat(offset << alignment);
70+
}
71+
72+
// TODO: ideally we'd just directly depend on lwjgl, since we require it for GLFW anyway
73+
private static final MethodHandle memByteBuffer;
74+
75+
static {
76+
MethodHandles.Lookup lookup = MethodHandles.lookup();
77+
try {
78+
Class<?> clz = Class.forName("org.lwjgl.system.MemoryUtil", false, lookup.lookupClass().getClassLoader());
79+
memByteBuffer = lookup.findStatic(clz, "memByteBuffer", MethodType.methodType(ByteBuffer.class, new Class[]{Long.TYPE, Integer.TYPE}));
80+
} catch (Throwable err) {
81+
System.err.println("Could not find LWJGL MemoryUtil's memByteBuffer method.\nAre you using LWJGL 3.x?");
82+
throw new RuntimeException(err);
83+
}
84+
}
85+
}

‎native/audio_handler.cpp‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
AudioHandler::AudioHandler(JNIEnv* env, jobject handler)
1212
: handle_(env, handler) {}
1313

14-
jobject jniParams(ScopedJNIEnv env, const CefAudioParameters& params) {
14+
jobject jniParams(ScopedJNIEnv env, jclass clsProps, const CefAudioParameters& params) {
1515
jclass cls = env->FindClass("org/cef/misc/CefChannelLayout");
1616
if (cls == nullptr) {
1717
// std::cout << "Could not find class 0";
@@ -24,7 +24,7 @@ jobject jniParams(ScopedJNIEnv env, const CefAudioParameters& params) {
2424
}
2525
jobject layout = env->CallStaticObjectMethod(cls, getLayout, (int) params.channel_layout);
2626

27-
cls = env->FindClass("org/cef/misc/CefAudioParameters");
27+
cls = clsProps;
2828
if (cls == nullptr) {
2929
// std::cout << "Could not find class 1";
3030
return nullptr;
@@ -39,6 +39,11 @@ jobject jniParams(ScopedJNIEnv env, const CefAudioParameters& params) {
3939
return parameters;
4040
}
4141

42+
jobject jniParams(ScopedJNIEnv env, const CefAudioParameters& params) {
43+
jclass cls = env->FindClass("org/cef/misc/CefAudioParameters");
44+
return jniParams(env, cls, params);
45+
}
46+
4247
bool AudioHandler::GetAudioParameters(CefRefPtr<CefBrowser> browser,
4348
CefAudioParameters& params) {
4449
ScopedJNIEnv env;
@@ -48,10 +53,12 @@ bool AudioHandler::GetAudioParameters(CefRefPtr<CefBrowser> browser,
4853
ScopedJNIBrowser jbrowser(env, browser);
4954

5055
jboolean jreturn = JNI_FALSE;
56+
jclass cls = env->FindClass("org/cef/misc/CefAudioParameters");
57+
jobject paramsJni = jniParams(env, cls, params);
5158

5259
JNI_CALL_METHOD(env, handle_, "getAudioParameters",
5360
"(Lorg/cef/browser/CefBrowser;Lorg/cef/misc/CefAudioParameters;)Z", Boolean,
54-
jreturn, jbrowser.get(), jniParams(env, params));
61+
jreturn, jbrowser.get(), paramsJni);
5562

5663
return (jreturn != JNI_FALSE);
5764
}
@@ -76,17 +83,12 @@ void AudioHandler::OnAudioStreamPacket(CefRefPtr<CefBrowser> browser, const floa
7683

7784
ScopedJNIBrowser jbrowser(env, browser);
7885

79-
// TODO: this should truthfully be using a float buffer, but I'm not yet sure how to do that from JNI
80-
jfloatArray jArray = env->NewFloatArray(frames);
81-
int size = frames;
82-
jfloat* fill = (jfloat*) malloc(size * sizeof(jfloat));
83-
for (int i = 0; i < size; i++)
84-
fill[i] = data[0][i];
85-
env->SetFloatArrayRegion(jArray, 0, size, fill);
86+
ScopedJNIObjectLocal dataPtr(
87+
env, NewJNIObject(env, "org/cef/misc/DataPointer", "(J)V", (jlong) data));
8688

8789
JNI_CALL_VOID_METHOD(env, handle_, "onAudioStreamPacket",
88-
"(Lorg/cef/browser/CefBrowser;[FIJ)V",
89-
jbrowser.get(), jArray, frames, (long long) pts);
90+
"(Lorg/cef/browser/CefBrowser;Lorg/cef/misc/DataPointer;IJ)V",
91+
jbrowser.get(), dataPtr.get(), frames, (long long) pts);
9092
}
9193

9294
void AudioHandler::OnAudioStreamStopped(CefRefPtr<CefBrowser> browser) {

0 commit comments

Comments
 (0)