changeset in /hg/pulseaudio: 2008-08-25 Omair Majid <omajid at redh...
Omair Majid
omajid at redhat.com
Wed Aug 27 09:05:26 PDT 2008
changeset 2e4a2a022ffb in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=2e4a2a022ffb
description:
2008-08-25 Omair Majid <omajid at redhat.com>
* src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
(static): Output the name of the class and the native library being
loaded.
* src/java/org/classpath/icedtea/pulseaudio/Operation.java
(static): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
Removed unneeded imports to remove compiler warnings. Moved bufferSize
into PulseAudioDataLine so it can be shared. Removed DEFAULT_FORMAT and
DEFAULT_BUFFER_SIZE.
(static): Removed static initializer (there are no native methods)
(flush): Added Operation object to release refernce and wait for operation
to complete.
(getControl): Throw an exception to comply with the api reference.
(getControls): Return an array of size 0 instead of null.
(getFormat): Return defaultFormat which is set when obtaining a line
instead of DEFAULT_FORMAT.
(getLineInfo): Return a DataLine.Info object which includes extra
information.
(isControlSupported): Removed (wrong) comment.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
Added bufferSize as a protected variable
(open): Set the value of bufferSize.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
(PulseAudioMixer): Set the values of min and max buffer sizes.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java
(getMixer): Commented out extra debug output.
(getMixerInfo): Likewise.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
(getBufferSize): Return the actual buffer size.
(getFormat): Return the default format of the line if the line is not
open.
(getLineInfo): Return the proper buffer metrics.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java
(static). Output name of class and the library being loaded.
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
(getBufferSize): Return the actual buffer size.
(getFormat): Return the default format of the line if the line is closed.
(getLineInfo): Set the correct value of buffer metrics.
* src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java
Removed uneeded imports to remove compiler warnings.
* src/java/org/classpath/icedtea/pulseaudio/Stream.java
(static): Added static initializer.
(Stream): Commented out debug output.
* src/native/org_classpath_icedtea_pulseaudio_Stream.c
(stream_underflow_callback): Commented out debug output.
* unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
Removed unneeded imports to remove compiler warnings.
* unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java
Likewise.
diffstat:
14 files changed, 79 insertions(+), 76 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 7 -
src/java/org/classpath/icedtea/pulseaudio/Operation.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 55 +++-------
src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 4
src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 17 +--
src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 4
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 10 +
src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java | 12 --
src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 10 +
src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java | 13 +-
src/java/org/classpath/icedtea/pulseaudio/Stream.java | 16 ++
src/native/org_classpath_icedtea_pulseaudio_Stream.c | 2
unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 1
unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java | 2
diffs (457 lines):
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Mon Aug 25 14:51:13 2008 -0400
@@ -105,9 +105,10 @@ public class EventLoop implements Runnab
static {
try {
String library = new java.io.File(".").getCanonicalPath()
-
- + java.io.File.separatorChar + System.mapLibraryName("pulse-java");
- System.out.println(library);
+ + java.io.File.separatorChar
+ + System.mapLibraryName("pulse-java");
+ System.out.println(EventLoop.class.getCanonicalName() + ": "
+ + library);
System.load(library);
} catch (IOException e) {
assert ("Loading failed".endsWith("library"));
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/Operation.java
--- a/src/java/org/classpath/icedtea/pulseaudio/Operation.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/Operation.java Mon Aug 25 14:51:13 2008 -0400
@@ -63,7 +63,7 @@ public class Operation {
String library = new java.io.File(".").getCanonicalPath()
+ java.io.File.separatorChar
+ System.mapLibraryName("pulse-java");
- System.out.println(library);
+ System.out.println(Operation.class.getCanonicalName() + ": " + library);
System.load(library);
} catch (IOException e) {
assert ("Loading failed".endsWith("library"));
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Mon Aug 25 14:51:13 2008 -0400
@@ -39,8 +39,6 @@ package org.classpath.icedtea.pulseaudio
import java.io.IOException;
import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
import java.util.concurrent.Semaphore;
import javax.sound.sampled.AudioFormat;
@@ -48,7 +46,7 @@ import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
import javax.sound.sampled.Control;
-import javax.sound.sampled.Line;
+import javax.sound.sampled.DataLine;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Control.Type;
@@ -56,9 +54,6 @@ public class PulseAudioClip extends Puls
public class PulseAudioClip extends PulseAudioDataLine implements Clip {
private byte[] data = null;
-
- // FIXME
- private int bufferSize = 0;
// these are frame indices. so counted from 0
private int currentFrame = 0;
@@ -68,10 +63,7 @@ public class PulseAudioClip extends Puls
private int framesSinceOpen = 0;
private AudioFormat currentFormat = null;
- private static final AudioFormat DEFAULT_FORMAT = new AudioFormat(
- AudioFormat.Encoding.PCM_UNSIGNED, 22050, 8, 2, 2, 22050 / 2, false);
-
- private static final int DEFAULT_BUFFER_SIZE = 0;
+
public static final String DEFAULT_CLIP_NAME = "Clip";
private Object clipLock = new Object();
@@ -86,14 +78,14 @@ public class PulseAudioClip extends Puls
while (loopsLeft >= 0) {
writeFrames(currentFrame, endFrame + 1);
if (Thread.interrupted()) {
- //Thread.currentThread().interrupt();
+ // Thread.currentThread().interrupt();
clipThreadStarted = false;
return;
}
try {
- //if loop(0) has been called from the mainThread,
- //wait until loopsLeft has been set
+ // if loop(0) has been called from the mainThread,
+ // wait until loopsLeft has been set
clipSemaphore.acquire();
if (loopsLeft == 0) {
System.out.println("Reading to the end of the file");
@@ -137,18 +129,6 @@ public class PulseAudioClip extends Puls
}
}
- static {
- try {
- String library = new java.io.File(".").getCanonicalPath()
- + java.io.File.separatorChar
- + System.mapLibraryName("pulse-java");
- System.out.println(library);
- System.load(library);
- } catch (IOException e) {
- assert ("Loading failed".endsWith("library"));
- }
- }
-
public PulseAudioClip(EventLoop eventLoop, AudioFormat[] formats,
AudioFormat defaultFormat) {
supportedFormats = formats;
@@ -202,9 +182,13 @@ public class PulseAudioClip extends Puls
@Override
public void flush() {
+ Operation operation;
synchronized (eventLoop.threadLock) {
- stream.flush();
- }
+ operation = stream.flush();
+ operation.waitForCompletion();
+ }
+ operation.releaseReference();
+
}
@Override
@@ -214,20 +198,19 @@ public class PulseAudioClip extends Puls
@Override
public Control getControl(Type control) {
- // TODO Auto-generated method stub
- return null;
+ throw new IllegalArgumentException(control.toString()
+ + " not supported");
}
@Override
public Control[] getControls() {
- // TODO Auto-generated method stub
- return null;
+ return new Control[] {};
}
@Override
public AudioFormat getFormat() {
if (!isOpen) {
- return DEFAULT_FORMAT;
+ return defaultFormat;
}
return currentFormat;
}
@@ -244,13 +227,14 @@ public class PulseAudioClip extends Puls
@Override
public float getLevel() {
- // TODO Auto-generated method stub
return AudioSystem.NOT_SPECIFIED;
}
@Override
public javax.sound.sampled.Line.Info getLineInfo() {
- return new Line.Info(this.getClass());
+ return new DataLine.Info(this.getClass(), supportedFormats,
+ StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE);
}
@Override
@@ -285,7 +269,6 @@ public class PulseAudioClip extends Puls
@Override
public boolean isControlSupported(Type control) {
- // TODO Auto-generated method stub
return false;
}
@@ -304,7 +287,7 @@ public class PulseAudioClip extends Puls
public void loop(int count) {
System.out.println("Loop " + count + " called");
if (clipThreadStarted && count != 0) {
- //Do nothing; behavior not specified by the Java API
+ // Do nothing; behavior not specified by the Java API
return;
}
synchronized (clipLock) {
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Mon Aug 25 14:51:13 2008 -0400
@@ -25,6 +25,8 @@ public abstract class PulseAudioDataLine
protected AudioFormat currentFormat = null;
protected AudioFormat defaultFormat = null;
+ protected int bufferSize = 0;
+
protected List<LineListener> lineListeners = new ArrayList<LineListener>();;
protected EventLoop eventLoop = null;
@@ -79,7 +81,7 @@ public abstract class PulseAudioDataLine
synchronized (eventLoop.threadLock) {
connectLine(bufferSize);
}
-
+ this.bufferSize = bufferSize;
try {
semaphore.acquire();
synchronized (eventLoop.threadLock) {
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Mon Aug 25 14:51:13 2008 -0400
@@ -88,13 +88,16 @@ public class PulseAudioMixer implements
private PulseAudioMixer() {
AudioFormat[] formats = getSupportedFormats();
sourceLineInfos = new Line.Info[] { new DataLine.Info(
- SourceDataLine.class, formats, AudioSystem.NOT_SPECIFIED,
- AudioSystem.NOT_SPECIFIED) };
+ SourceDataLine.class, formats,
+ StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE) };
targetLineInfos = new Line.Info[] { new DataLine.Info(
- TargetDataLine.class, formats, AudioSystem.NOT_SPECIFIED,
- AudioSystem.NOT_SPECIFIED) };
- clipInfos = new Line.Info[] { new DataLine.Info(PulseAudioClip.class,
- formats, AudioSystem.NOT_SPECIFIED, AudioSystem.NOT_SPECIFIED) };
+ TargetDataLine.class, formats,
+ StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE) };
+ clipInfos = new Line.Info[] { new DataLine.Info(Clip.class, formats,
+ StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE) };
}
@@ -320,7 +323,7 @@ public class PulseAudioMixer implements
}
if ((info.getLineClass() == Clip.class)) {
- Clip clip = new PulseAudioClip(eventLoop, formats, defaultFormat);
+ Clip clip = new PulseAudioClip(eventLoop, formats, defaultFormat);
clips.add((PulseAudioClip) clip);
return clip;
}
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java Mon Aug 25 14:51:13 2008 -0400
@@ -45,7 +45,7 @@ public class PulseAudioMixerProvider ext
@Override
public Mixer getMixer(Info info) {
- System.out.println("DEBUG: getMixer called");
+ // System.out.println("DEBUG: getMixer called");
if (info.equals(PulseAudioMixerInfo.getInfo())) {
return PulseAudioMixer.getInstance();
} else {
@@ -55,7 +55,7 @@ public class PulseAudioMixerProvider ext
@Override
public Info[] getMixerInfo() {
- System.out.println("DEBUG: get mixer info called");
+ // System.out.println("DEBUG: get mixer info called");
Mixer.Info[] m = { PulseAudioMixerInfo.getInfo() };
return m;
}
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Mon Aug 25 14:51:13 2008 -0400
@@ -168,11 +168,13 @@ public class PulseAudioSourceDataLine ex
};
public int getBufferSize() {
- // FIXME!
- return 10000;
+ return bufferSize;
}
public AudioFormat getFormat() {
+ if (!isOpen) {
+ return defaultFormat;
+ }
return currentFormat;
}
@@ -238,8 +240,8 @@ public class PulseAudioSourceDataLine ex
}
public javax.sound.sampled.Line.Info getLineInfo() {
- return new DataLine.Info(SourceDataLine.class, supportedFormats, 0,
- 100000);
+ return new DataLine.Info(this.getClass(), supportedFormats, StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE);
}
public boolean isControlSupported(Type control) {
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java Mon Aug 25 14:51:13 2008 -0400
@@ -16,10 +16,11 @@ public class PulseAudioStreamVolumeContr
static {
try {
String library = new java.io.File(".").getCanonicalPath()
-
- + java.io.File.separatorChar + System.mapLibraryName("pulse-java");
-
- System.out.println(library);
+ + java.io.File.separatorChar
+ + System.mapLibraryName("pulse-java");
+ System.out.println(PulseAudioStreamVolumeControl.class
+ .getCanonicalName()
+ + ": " + library);
System.load(library);
} catch (IOException e) {
assert ("Loading failed".endsWith("library"));
@@ -53,9 +54,6 @@ public class PulseAudioStreamVolumeContr
}
op.waitForCompletion();
-
- assert (op.getState() == Operation.State.Done);
-
op.releaseReference();
}
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Mon Aug 25 14:51:13 2008 -0400
@@ -143,10 +143,13 @@ public class PulseAudioTargetDataLine ex
}
public int getBufferSize() {
- return DEFAULT_BUFFER_SIZE;
+ return bufferSize;
}
public AudioFormat getFormat() {
+ if (!isOpen) {
+ return defaultFormat;
+ }
return currentFormat;
}
@@ -186,8 +189,9 @@ public class PulseAudioTargetDataLine ex
}
public javax.sound.sampled.Line.Info getLineInfo() {
- return new DataLine.Info(TargetDataLine.class, supportedFormats, 0,
- DEFAULT_BUFFER_SIZE);
+ return new DataLine.Info(this.getClass(), supportedFormats,
+ StreamBufferAttributes.MIN_VALUE,
+ StreamBufferAttributes.MAX_VALUE);
}
public boolean isControlSupported(Type control) {
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java
--- a/src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java Mon Aug 25 14:51:13 2008 -0400
@@ -39,17 +39,16 @@ package org.classpath.icedtea.pulseaudio
|<--- this code is formatted to fit into 80 columns --->|
*/
+import java.io.File;
import java.io.IOException;
-import java.io.File;
-
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.TargetDataLine;
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.AudioFileFormat;
public class SimpleAudioRecorder extends Thread {
private TargetDataLine m_line;
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/java/org/classpath/icedtea/pulseaudio/Stream.java
--- a/src/java/org/classpath/icedtea/pulseaudio/Stream.java Mon Aug 25 12:07:04 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/Stream.java Mon Aug 25 14:51:13 2008 -0400
@@ -1,5 +1,6 @@ package org.classpath.icedtea.pulseaudio
package org.classpath.icedtea.pulseaudio;
+import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
@@ -59,6 +60,19 @@ public class Stream {
@SuppressWarnings("unused")
private long streamPointer;
+
+ static {
+ try {
+ String library = new java.io.File(".").getCanonicalPath()
+ + java.io.File.separatorChar
+ + System.mapLibraryName("pulse-java");
+ System.out
+ .println(Stream.class.getCanonicalName() + ": " + library);
+ System.load(library);
+ } catch (IOException e) {
+ assert ("Loading failed".endsWith("library"));
+ }
+ }
private Format format;
@@ -178,7 +192,7 @@ public class Stream {
public Stream(long contextPointer, String name, Format format,
int sampleRate, int channels) {
- System.out.println("format: " + format.toString());
+ // System.out.println("format: " + format.toString());
stateListeners = new LinkedList<StateListener>();
writeListeners = new LinkedList<WriteListener>();
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb src/native/org_classpath_icedtea_pulseaudio_Stream.c
--- a/src/native/org_classpath_icedtea_pulseaudio_Stream.c Mon Aug 25 12:07:04 2008 -0400
+++ b/src/native/org_classpath_icedtea_pulseaudio_Stream.c Mon Aug 25 14:51:13 2008 -0400
@@ -130,7 +130,7 @@ static void stream_overflow_callback(pa_
}
static void stream_underflow_callback(pa_stream *stream, void *userdata) {
- printf("stream_underflow_callback called\n");
+ // printf("stream_underflow_callback called\n");
java_context* context = userdata;
assert(stream);
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
--- a/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java Mon Aug 25 12:07:04 2008 -0400
+++ b/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java Mon Aug 25 14:51:13 2008 -0400
@@ -47,7 +47,6 @@ import javax.sound.sampled.LineUnavailab
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.sound.sampled.DataLine.Info;
import junit.framework.JUnit4TestAdapter;
diff -r 9a4c1d255bc6 -r 2e4a2a022ffb unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java
--- a/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java Mon Aug 25 12:07:04 2008 -0400
+++ b/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java Mon Aug 25 14:51:13 2008 -0400
@@ -51,14 +51,12 @@ import javax.sound.sampled.Port;
import javax.sound.sampled.Port;
import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.TargetDataLine;
-import javax.sound.sampled.Line.Info;
import junit.framework.JUnit4TestAdapter;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class PulseAudioMixerTest {
More information about the distro-pkg-dev
mailing list