/hg/icedtea6: 2 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Mon Jun 20 10:27:10 PDT 2011
changeset 628bfb4cd6c1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=628bfb4cd6c1
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 11:23:24 2011 -0400
PR734. Fix pulse-java latency problem.
changeset 50b12236cc6d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50b12236cc6d
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 11:38:07 2011 -0400
Fix hanging jtreg test.
diffstat:
ChangeLog | 29 +++++++
Makefile.am | 3 +-
patches/jtreg-bug7036148-test.patch | 23 +++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 4 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 11 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 39 ++++++++-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 29 ++++++-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 17 +++-
8 files changed, 139 insertions(+), 16 deletions(-)
diffs (284 lines):
diff -r 2962ab27cd01 -r 50b12236cc6d ChangeLog
--- a/ChangeLog Fri Jun 17 16:16:47 2011 -0400
+++ b/ChangeLog Mon Jun 20 11:38:07 2011 -0400
@@ -1,3 +1,32 @@
+2011-06-20 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add patch.
+ * patches/jtreg-bug7036148-test.patch:
+ Fix regression test. It used to never end, regardless of
+ success/failure.
+
+2011-06-20 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ (bufferSize): Remove.
+ (getBufferSize): Return stream.getBufferSize().
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (connectLine): Improve formatting.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+ (connectLine): Set up flags to adjust the latency, if needed.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+ (bufAttr, bufAttrMutex): New members.
+ (setBufAttr, bufferAttrCallback): New methods. They both set bufAttr.
+ (getBufferSize): Return the current buffer size.
+ (connectForRecording): Add a flags argument to allow callers to chose the
+ flags.
+ (stateCallback): When the stream is ready, set the buffer attributes to
+ the actual ones used by the server.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (buf_attr_changed_callback): New function.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
+ Set the buffer attribute callback.
+
2011-06-17 Denis Lila <dlila at redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
diff -r 2962ab27cd01 -r 50b12236cc6d Makefile.am
--- a/Makefile.am Fri Jun 17 16:16:47 2011 -0400
+++ b/Makefile.am Mon Jun 20 11:38:07 2011 -0400
@@ -358,7 +358,8 @@
patches/jtreg-EncodedMultiByteChar.patch \
patches/jtreg-FileLoaderTest.patch \
patches/jtreg-FileMap.patch \
- patches/jtreg-ChannelsWrite.patch
+ patches/jtreg-ChannelsWrite.patch \
+ patches/jtreg-bug7036148-test.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 2962ab27cd01 -r 50b12236cc6d patches/jtreg-bug7036148-test.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-bug7036148-test.patch Mon Jun 20 11:38:07 2011 -0400
@@ -0,0 +1,24 @@
+diff -r e7493c32e598 test/javax/swing/JMenuItem/7036148/bug7036148.java
+--- openjdk.orig/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java Wed Jun 08 10:24:10 2011 -0700
++++ openjdk/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java Wed Jun 15 14:25:59 2011 -0400
+@@ -44,10 +44,16 @@
+ menu.add(new JMenuItem("test"));
+ bar.add(menu);
+ setJMenuBar(bar);
+- pack();
+ }
+
+- public static void main(String[] args) {
+- new bug7036148();
+- }
++ public static void main(String[] args) {
++ // if the bug is present, an NPE will be thrown on pack() above.
++ JFrame f = new bug7036148();
++
++ try {
++ f.pack();
++ } finally {
++ f.dispose();
++ }
++ }
+ }
diff -r 2962ab27cd01 -r 50b12236cc6d pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Fri Jun 17 16:16:47 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Mon Jun 20 11:38:07 2011 -0400
@@ -74,7 +74,6 @@
protected AudioFormat defaultFormat = null;
protected boolean sendEvents = true;
- protected int bufferSize = 0;
// the total number of frames played since this line was opened
protected long framesSinceOpen = 0;
@@ -265,7 +264,6 @@
throw e;
}
- this.bufferSize = bufferSize;
try {
semaphore.acquire();
synchronized (eventLoop.threadLock) {
@@ -442,7 +440,7 @@
if (!isOpen()) {
return DEFAULT_BUFFER_SIZE;
}
- return bufferSize;
+ return stream.getBufferSize();
}
@Override
diff -r 2962ab27cd01 -r 50b12236cc6d pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Fri Jun 17 16:16:47 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Mon Jun 20 11:38:07 2011 -0400
@@ -116,10 +116,13 @@
@Override
protected void connectLine(int bufferSize, Stream masterStream)
throws LineUnavailableException {
- StreamBufferAttributes bufferAttributes = new StreamBufferAttributes(
-
- bufferSize, bufferSize / 4, bufferSize / 8,
- ((bufferSize / 10) > 100 ? bufferSize / 10 : 100), 0);
+ StreamBufferAttributes bufferAttributes =
+ new StreamBufferAttributes(
+ bufferSize,
+ bufferSize / 4,
+ bufferSize / 8,
+ Math.max(bufferSize / 10, 100),
+ 0);
if (masterStream != null) {
synchronized (eventLoop.threadLock) {
diff -r 2962ab27cd01 -r 50b12236cc6d pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Fri Jun 17 16:16:47 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Mon Jun 20 11:38:07 2011 -0400
@@ -133,11 +133,42 @@
@Override
protected void connectLine(int bufferSize, Stream masterStream)
throws LineUnavailableException {
- int fragmentSize = bufferSize / 10 > 500 ? bufferSize / 10 : 500;
- StreamBufferAttributes bufferAttributes = new StreamBufferAttributes(
- bufferSize, 0, 0, 0, fragmentSize);
+ int fs = currentFormat.getFrameSize();
+ float fr = currentFormat.getFrameRate();
+ int bps = (int)(fs*fr); // bytes per second.
+
+ // if 2 seconds' worth of data can fit in the buffer of the specified
+ // size, we don't have to adjust the latency. Otherwise we do, so as
+ // to avoid overruns.
+ long flags = Stream.FLAG_START_CORKED;
+ StreamBufferAttributes bufferAttributes;
+ if (bps*2 < bufferSize) {
+ // pulse audio completely ignores our fragmentSize attribute unless
+ // ADJUST_LATENCY is set, so we just leave it at -1.
+ bufferAttributes = new StreamBufferAttributes(bufferSize, -1, -1, -1, -1);
+ } else {
+ flags |= Stream.FLAG_ADJUST_LATENCY;
+ // in this case, the pulse audio docs:
+ // http://www.pulseaudio.org/wiki/LatencyControl
+ // say every field (including bufferSize) must be initialized
+ // to -1 except fragmentSize.
+ // XXX: but in my tests, it just sets it to about 4MB, which
+ // effectively makes it impossible to allocate a small buffer
+ // and nothing bad happens (yet) when you don't set it to -1
+ // so we just leave it at bufferSize.
+ // XXX: the java api has no way to specify latency, which probably
+ // means it should be as low as possible. Right now this method's
+ // primary concern is avoiding dropouts, and if the user-provided
+ // buffer size is large enough, we leave the latency up to pulse
+ // audio (which sets it to something extremely high - about 2
+ // seconds). We might want to always set a low latency.
+ int fragmentSize = bufferSize/2;
+ fragmentSize = Math.max((fragmentSize/fs)*fs, fs);
+ bufferAttributes = new StreamBufferAttributes(bufferSize, -1, -1, -1, fragmentSize);
+ }
+
synchronized (eventLoop.threadLock) {
- stream.connectForRecording(Stream.DEFAULT_DEVICE, bufferAttributes);
+ stream.connectForRecording(Stream.DEFAULT_DEVICE, flags, bufferAttributes);
}
}
diff -r 2962ab27cd01 -r 50b12236cc6d pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java Fri Jun 17 16:16:47 2011 -0400
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java Mon Jun 20 11:38:07 2011 -0400
@@ -170,6 +170,9 @@
private Format format;
private float cachedVolume;
+ private StreamBufferAttributes bufAttr = new StreamBufferAttributes(0,0,0,0,0);
+ private static final Object bufAttrMutex = new Object();
+
private List<StateListener> stateListeners;
private List<WriteListener> writeListeners;
private List<ReadListener> readListeners;
@@ -459,6 +462,23 @@
return native_pa_stream_get_device_index();
}
+ private void setBufAttr() {
+ synchronized(bufAttrMutex) {
+ bufAttr = native_pa_stream_get_buffer_attr();
+ }
+ }
+
+ @SuppressWarnings("unused")
+ private void bufferAttrCallback() {
+ setBufAttr();
+ }
+
+ int getBufferSize() {
+ synchronized (bufAttrMutex) {
+ return bufAttr.getMaxLength();
+ }
+ }
+
/**
*
* @return the name of the sink or source this stream is connected to in the
@@ -510,7 +530,7 @@
* @throws LineUnavailableException
*
*/
- void connectForRecording(String deviceName,
+ void connectForRecording(String deviceName, long flags,
StreamBufferAttributes bufferAttributes)
throws LineUnavailableException {
@@ -521,7 +541,7 @@
bufferAttributes.getPreBuffering(),
bufferAttributes.getMinimumRequest(),
bufferAttributes.getFragmentSize(),
- FLAG_START_CORKED, null, null
+ flags, null, null
);
if (returnValue < 0) {
throw new LineUnavailableException(
@@ -605,6 +625,11 @@
*/
@SuppressWarnings("unused")
private void stateCallback() {
+ synchronized(EventLoop.getEventLoop().threadLock) {
+ if (getState() == Stream.STATE_READY) {
+ setBufAttr();
+ }
+ }
synchronized (stateListeners) {
for (StateListener listener : stateListeners) {
listener.update();
diff -r 2962ab27cd01 -r 50b12236cc6d pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
--- a/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c Fri Jun 17 16:16:47 2011 -0400
+++ b/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c Mon Jun 20 11:38:07 2011 -0400
@@ -169,7 +169,6 @@
}
-
// requires pulseaudio 0.9.11 :(
static void stream_started_callback(pa_stream *stream, void *userdata) {
// printf("stream_started_callback called\n");
@@ -240,6 +239,20 @@
}
+static void buf_attr_changed_callback(pa_stream *stream, void *userdata) {
+ java_context* context = userdata;
+ assert(stream);
+ assert(context);
+ assert(context->env);
+ assert(context->obj);
+
+ if (pa_stream_get_state(stream) == PA_STREAM_CREATING) {
+ callJavaVoidMethod(context->env, context->obj, "bufferAttrCallback");
+ } else {
+ callJavaVoidMethod(pulse_thread_env, context->obj, "bufferAttrCallback");
+ }
+}
+
// used to set stream flags and states.
#define SET_STREAM_ENUM(env, clz, java_prefix, state_name) \
SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM(env, clz, java_prefix, STREAM, state_name)
@@ -353,7 +366,7 @@
pa_stream_set_latency_update_callback (stream, stream_latency_update_callback, j_context);
pa_stream_set_moved_callback (stream, stream_moved_callback, j_context);
pa_stream_set_suspended_callback (stream, stream_suspended_callback, j_context);
-
+ pa_stream_set_buffer_attr_callback(stream, buf_attr_changed_callback, j_context);
}
/*
More information about the distro-pkg-dev
mailing list