Nabble - OpenJDK Sound API Development

Re: Great work on the Java Sound API for Linux!

2009-11-07T22:04:00Z

On Sun, Nov 8, 2009 at 12:37 AM, Nerius Landys <nlandys@...> wrote:

>> Do you mean that you can play sound with another non-Java applications in
>> the same time? With Sun's JDK 1.6.0u16 i can't do it:
>> What is a difference? Is Java Sound has been rewritten for Linux?
>
> Yes, when using the OpenJDK 1.6, I can play sound from my Java app at
> the same time that other audio apps are running, such as video games,
> speech-dispatcher, Mumble, etc. Furthermore, in OpenJDK, I can play 2
> Clip objects simultaneously and it will mix them for me (presumably
> using ALSA mix program).
>
> On the other hand Sun's JDK does not do all of the above for me.
>
> Thank you, OpenJDK.
>

How did you install your OpenJDK? If you're using the Debian package,
I think it comes with Pulseaudio support.

Please check the jre/lib/ext directory and your /usr/share/java
directory for pulse-java.jar.

Regards
Damjan

Re: Great work on the Java Sound API for Linux!

2009-11-07T14:37:59Z

> Do you mean that you can play sound with another non-Java applications in
> the same time? With Sun's JDK 1.6.0u16 i can't do it:
> What is a difference? Is Java Sound has been rewritten for Linux?

Yes, when using the OpenJDK 1.6, I can play sound from my Java app at
the same time that other audio apps are running, such as video games,
speech-dispatcher, Mumble, etc. Furthermore, in OpenJDK, I can play 2
Clip objects simultaneously and it will mix them for me (presumably
using ALSA mix program).

On the other hand Sun's JDK does not do all of the above for me.

Thank you, OpenJDK.

Re: Great work on the Java Sound API for Linux!

2009-11-07T14:01:13Z

Do you mean that you can play sound with another non-Java applications in the same time? With Sun's JDK 1.6.0u16 i can't do it:
Exception in thread "main" javax.sound.sampled.LineUnavailableException: Audio Device Unavailable
        at com.sun.media.sound.HeadspaceMixer.nResume(Native Method)
        at com.sun.media.sound.HeadspaceMixer.implOpen(HeadspaceMixer.java:346)
        at com.sun.media.sound.AbstractMixer.open(AbstractMixer.java:286)
        at com.sun.media.sound.AbstractMixer.open(AbstractMixer.java:323)
        at com.sun.media.sound.MixerClip.open(MixerClip.java:162)
        at com.sun.media.sound.MixerClip.open(MixerClip.java:256)
        at soundtests.Main.main(Main.java:33)

What is a difference? Is Java Sound has been rewritten for Linux?

2009/11/7 Nerius Landys <nlandys@...>

Well, the OpenJDK really improves the audio situation for me on Debian
Linux. I can now finally mix multiple audios together in the Java
program using Clip, and I can run the Java program while other audio
apps are running.

However, just wanted to point out that on my system the call
"AudioSystem.getClip()" does not work. It's not stopping me from my
programming, but I thought perhaps it should work.

OpenJDK Runtime Environment (build 1.6.0_0-b11)
OpenJDK 64-Bit Server VM (build 1.6.0_0-b11, mixed mode)

=============================
import java.io.*;
import javax.sound.sampled.*;

public class PlayAudios {

public static void main(String[] args)
throws Exception {
// This call fails on my 64 bit Debian
// Lenny 5.0 system, HP Z400 workstation:
//AudioSystem.getClip();
// It throws an IllegalArgumentException.

for (String filename : args) {
AudioInputStream auIn =
AudioSystem.getAudioInputStream
(new File(filename));
AudioFormat format = auIn.getFormat();
DataLine.Info info = new DataLine.Info
(Clip.class, format);
Clip clip = (Clip) AudioSystem.getLine(info);
clip.open(auIn);
clip.start();
}
Thread.sleep(3000);
}

}

--
-----------------------------------------------------------------
Всего наилучшего

<y6erGn0m.

Great work on the Java Sound API for Linux!

2009-11-07T02:05:37Z

Well, the OpenJDK really improves the audio situation for me on Debian
Linux. I can now finally mix multiple audios together in the Java
program using Clip, and I can run the Java program while other audio
apps are running.

However, just wanted to point out that on my system the call
"AudioSystem.getClip()" does not work. It's not stopping me from my
programming, but I thought perhaps it should work.

OpenJDK Runtime Environment (build 1.6.0_0-b11)
OpenJDK 64-Bit Server VM (build 1.6.0_0-b11, mixed mode)

=============================
import java.io.*;
import javax.sound.sampled.*;

public class PlayAudios {

public static void main(String[] args)
throws Exception {
// This call fails on my 64 bit Debian
// Lenny 5.0 system, HP Z400 workstation:
//AudioSystem.getClip();
// It throws an IllegalArgumentException.

for (String filename : args) {
AudioInputStream auIn =
AudioSystem.getAudioInputStream
(new File(filename));
AudioFormat format = auIn.getFormat();
DataLine.Info info = new DataLine.Info
(Clip.class, format);
Clip clip = (Clip) AudioSystem.getLine(info);
clip.open(auIn);
clip.start();
}
Thread.sleep(3000);
}

}

Java and pulseaudio

2009-11-01T05:23:34Z

Is somebody tried to implement pulseaudio sound line for java? Is it possible to implement this feature as extension for Java Sound?
I saw thread about gstreamer.. is the same problem actual for pulse as for gstreamer?

Re: gstreame - Sound output?

2009-10-18T03:26:45Z

Il 18/10/2009 05:16, David Welch ha scritto:
> I've loaded gstreamer to expand the number of sound formats my software will handle. Does it also assist sound output? It supports 24-bit stereo FLAC, and I can hear the difference! Is anybody working to bring this functionality to the JDK?
>
> Warm regards,
> Dave (An old retired Computer Geek.)
>
> P.S.
> I am running OpenSolaris 2009.06 with two "entire" updates.

Hi!

I once wrote a GStreamer java sound backend. It's not in perfect shape
and lots of things are needed, but the code is public, you can find it
in the GNU Classpath repository, you could use it as a basis, or as is
depending on your needs. Porting it to OpenJDK should be a matter of
adding some build machinery, because the code doesn't really depend on
any internal Classpath code, if you find any of such dependencies, is
probably one or two lines of code that can be easily replaced (in fact,
as we use a Pointer abstraction in Classpath to store native pointers
you may need to replace this code, but it's not much work).

In general, it's not very easy to do a Java Sound backend with
GStreamer, because GStreamer is quite high level API and doesn't really
support well the way Java Sound work internally, but was enough to
stream from the network all the funny format supported by GStreamer (it
auto detects those, so no need to do anything). I didn't implement
support for MIDI and if you plan to use it for real time audio editing
you will be out of luck.

It was a fun project, I would really liked to revive it if I had some time.

Cheers,
Mario
--
pgp key: http://subkeys.pgp.net/

Proud GNU Classpath developer: http://www.classpath.org/
Read About us at: http://planet.classpath.org
OpenJDK: http://openjdk.java.net/projects/caciocavallo/

Please, support open standards:
http://endsoftpatents.org/

gstreame - Sound output?

2009-10-17T20:16:49Z

I've loaded gstreamer to expand the number of sound formats my software will handle. Does it also assist sound output? It supports 24-bit stereo FLAC, and I can hear the difference! Is anybody working to bring this functionality to the JDK?

Warm regards,
Dave (An old retired Computer Geek.)

P.S.
I am running OpenSolaris 2009.06 with two "entire" updates.

------------------------------------------------------------
Freemasonry is a system of morality,
veiled in allegory,
and illustrated by symbols.
------------------------------------------------------------

Re: sound on Linux

2009-10-17T04:45:01Z

2009/10/14 Alex Menkov <alex.menkov@...>

rom1dep wrote:

2009/10/13 cyberGn0m <cy6ergn0m@... <mailto:cy6ergn0m@...>>

Anybody tested java sound on linux? As I know, java uses ALSA on
Linux to play audio.. so, i have a problem with it: when java
plays sound, other applications can't play anything. When other
applications plays sound, java can't. As i know, mplayer can
play sound via ALSA and i can open many players and all of them
will plays as expected...
Yepp, I have this problem too and this is very annoying. I found this bug : http://bugs.sun.com/view_bug.do?bug_id=6832063
but I was asking me recently whether or not the fix is really in progress. This issue has made us (people working on the XtremeMP media player) think on a fallback audio backend based on gstreamer-java for people running under linux

The bug is fixed in 6-open, but the fix is still not integrated into jdk7.

Regards
Alex

Ok, that fits with the behavior I encounter... Do you know when the fix will be applied into jdk7 ? That shouldn't be that hard if the work has already been done for openjdk6 :)

Then, have a nice WE !

Romain.

Re: sound on Linux

2009-10-16T15:29:16Z

So this is only fixed on openjdk? No code level work around for lower versions?

On Thu, Oct 15, 2009 at 8:24 AM, cyberGn0m <cy6ergn0m@...> wrote:

> I run mplayer in "alsa" mode and many mplayer's can play sound at the same
> time in this mode. Java uses ALSA too, but it gets exclusive access to audio
> device...
>
> 2009/10/14 PJ leonard <pauljohnleonard@...>
>>
>> My understanding is:
>>
>> mplayer might use pulseaudio which allows the sharing of the soundoutput
>> (on my ubuntu this is the default)
>> JAVA uses the alsa device directly so it can not be used by other
>> applications.
>> iced tea JAVA does have a pulseaudio device but I can only produce broken
>> up sound using this.
>>
>> Paul.
>>
>> 2009/10/13 cyberGn0m <cy6ergn0m@...>
>>>
>>> Anybody tested java sound on linux? As I know, java uses ALSA on Linux to
>>> play audio.. so, i have a problem with it: when java plays sound, other
>>> applications can't play anything. When other applications plays sound, java
>>> can't. As i know, mplayer can play sound via ALSA and i can open many
>>> players and all of them will plays as expected...
>>>
>>>
>>
>
>
>
> --
> -----------------------------------------------------------------
> Всего наилучшего
>
> <y6erGn0m.
>

Re: SourceDataLine behavior on Linux and Windows

2009-10-15T17:19:09Z

Are you trying to make a pause() method in a streaming audioplayer
implementation? If you are can you tell any pointers to do it. In fact
can AudioInputStream do it? The documentation implies that mark can
work.

On Thu, Oct 15, 2009 at 11:18 PM, cyberGn0m <cy6ergn0m@...> wrote:

> DataLine has a different behavior on Linux and Windows. I do not know, it it
> a bug or feature... may be documentation is not a full?
>
> So, steps to reproduce:
> 1. Create and open data line and start() on it.
> 2. Write data to line in a separate thread.
> 3. Stop line with a stop() method but do not stop thread from (2).
>
> On Windows:
> Thread that writes data to data line will fill line's buffer and then blocks
> (sleeps) when buffer reaches full.
>
> On Linux:
> Thread that writes data to line will spin around method write and eat CPU,
> because stopped line can't be written and write method returns 0 (no bytes
> written). This happens before line's buffer reaches full (available() > 0).
>
> Of course workaround present, but this behavior looks strange...
>

SourceDataLine behavior on Linux and Windows

2009-10-15T15:18:20Z

DataLine has a different behavior on Linux and Windows. I do not know, it it a bug or feature... may be documentation is not a full?

So, steps to reproduce:
1. Create and open data line and start() on it.
2. Write data to line in a separate thread.
3. Stop line with a stop() method but do not stop thread from (2).

On Windows:
Thread that writes data to data line will fill line's buffer and then blocks (sleeps) when buffer reaches full.

On Linux:
Thread that writes data to line will spin around method write and eat CPU, because stopped line can't be written and write method returns 0 (no bytes written). This happens before line's buffer reaches full (available() > 0).

Of course workaround present, but this behavior looks strange...

Re: sound on Linux

2009-10-15T00:24:28Z

I run mplayer in "alsa" mode and many mplayer's can play sound at the same time in this mode. Java uses ALSA too, but it gets exclusive access to audio device...

2009/10/14 PJ leonard <pauljohnleonard@...>

My understanding is:

mplayer might use pulseaudio which allows the sharing of the soundoutput (on my ubuntu this is the default)
JAVA uses the alsa device directly so it can not be used by other applications.
iced tea JAVA does have a pulseaudio device but I can only produce broken up sound using this.

Paul.

2009/10/13 cyberGn0m <cy6ergn0m@...>

Anybody tested java sound on linux? As I know, java uses ALSA on Linux to play audio.. so, i have a problem with it: when java plays sound, other applications can't play anything. When other applications plays sound, java can't. As i know, mplayer can play sound via ALSA and i can open many players and all of them will plays as expected...

--
-----------------------------------------------------------------
Всего наилучшего

<y6erGn0m.

Re: sound on Linux

2009-10-14T05:32:16Z

rom1dep wrote:

> 2009/10/13 cyberGn0m <cy6ergn0m@... <mailto:cy6ergn0m@...>>
> Anybody tested java sound on linux? As I know, java uses ALSA on
> Linux to play audio.. so, i have a problem with it: when java
> plays sound, other applications can't play anything. When other
> applications plays sound, java can't. As i know, mplayer can
> play sound via ALSA and i can open many players and all of them
> will plays as expected...
> Yepp, I have this problem too and this is very annoying. I found this
> bug : http://bugs.sun.com/view_bug.do?bug_id=6832063
> but I was asking me recently whether or not the fix is really in
> progress. This issue has made us (people working on the XtremeMP media
> player) think on a fallback audio backend based on gstreamer-java for
> people running under linux

The bug is fixed in 6-open, but the fix is still not integrated into jdk7.

Regards
Alex

> If you rather use OpenJDK instead of Sun's, then you can use
> pulseaudio for playback. Actually pulseaudio is default audio output
> for OpenJDK on ubuntu linux. Then it's no problem with audio output
> from multiple applications simultaneously..
> Are you sure ? I use OpenJDK 1.7.0b70 and can't have amarok
> (gstreamer->PulseAudio) and XtremeMP playing simultaneously on my
> netbook. Maybe your hardware has some mixing abilities that lets your
> 'normal' programs play through pulseaudio over a stream while another
> one is available for java ? You can try this : play something with
> mplayer or whatever grinding PA, + trying to play a wave file with
> "aplay <file.wav>". If you have your two streams being played, then your
> audio card is likely mixing-capable...

Re: sound on Linux

2009-10-14T04:10:29Z

Hi,

Yes, I'm sure:

This is run on an out-of-the-box ubuntu installation:

public static void main(String[] args) throws Exception {
        Clip clip = AudioSystem.getClip();
        clip.open(AudioSystem.getAudioInputStream(new File("test.wav")));
        clip.start();
        while(true)
            Thread.sleep(1);
    }

Plays without problems, and I can also call with skype simultaneously (and other pulseaudio supporting apps).

As for Frinika - the sound produced from this app is choppy as Paul said - but this is a problem with Frinika and not the pulseaudio support in openjdk..

regards,

Peter

2009/10/14 rom1dep <rom1dep@...>

2009/10/13 cyberGn0m <cy6ergn0m@...>

Anybody tested java sound on linux? As I know, java uses ALSA on Linux to play audio.. so, i have a problem with it: when java plays sound, other applications can't play anything. When other applications plays sound, java can't. As i know, mplayer can play sound via ALSA and i can open many players and all of them will plays as expected...

Yepp, I have this problem too and this is very annoying. I found this bug : http://bugs.sun.com/view_bug.do?bug_id=6832063
but I was asking me recently whether or not the fix is really in progress. This issue has made us (people working on the XtremeMP media player) think on a fallback audio backend based on gstreamer-java for people running under linux

If you rather use OpenJDK instead of Sun's, then you can use pulseaudio for playback. Actually pulseaudio is default audio output for OpenJDK on ubuntu linux. Then it's no problem with audio output from multiple applications simultaneously..

Are you sure ? I use OpenJDK 1.7.0b70 and can't have amarok (gstreamer->PulseAudio) and XtremeMP playing simultaneously on my netbook. Maybe your hardware has some mixing abilities that lets your 'normal' programs play through pulseaudio over a stream while another one is available for java ? You can try this : play something with mplayer or whatever grinding PA, + trying to play a wave file with "aplay <file.wav>". If you have your two streams being played, then your audio card is likely mixing-capable...

Re: sound on Linux

2009-10-14T03:51:45Z

2009/10/13 cyberGn0m <cy6ergn0m@...>

Anybody tested java sound on linux? As I know, java uses ALSA on Linux to play audio.. so, i have a problem with it: when java plays sound, other applications can't play anything. When other applications plays sound, java can't. As i know, mplayer can play sound via ALSA and i can open many players and all of them will plays as expected...

Yepp, I have this problem too and this is very annoying. I found this bug : http://bugs.sun.com/view_bug.do?bug_id=6832063
but I was asking me recently whether or not the fix is really in progress. This issue has made us (people working on the XtremeMP media player) think on a fallback audio backend based on gstreamer-java for people running under linux

If you rather use OpenJDK instead of Sun's, then you can use pulseaudio for playback. Actually pulseaudio is default audio output for OpenJDK on ubuntu linux. Then it's no problem with audio output from multiple applications simultaneously..

Are you sure ? I use OpenJDK 1.7.0b70 and can't have amarok (gstreamer->PulseAudio) and XtremeMP playing simultaneously on my netbook. Maybe your hardware has some mixing abilities that lets your 'normal' programs play through pulseaudio over a stream while another one is available for java ? You can try this : play something with mplayer or whatever grinding PA, + trying to play a wave file with "aplay <file.wav>". If you have your two streams being played, then your audio card is likely mixing-capable...

Re: sound on Linux

2009-10-14T03:00:19Z

My understanding is:

mplayer might use pulseaudio which allows the sharing of the soundoutput (on my ubuntu this is the default)
JAVA uses the alsa device directly so it can not be used by other applications.
iced tea JAVA does have a pulseaudio device but I can only produce broken up sound using this.

Paul.

2009/10/13 cyberGn0m <cy6ergn0m@...>

Anybody tested java sound on linux? As I know, java uses ALSA on Linux to play audio.. so, i have a problem with it: when java plays sound, other applications can't play anything. When other applications plays sound, java can't. As i know, mplayer can play sound via ALSA and i can open many players and all of them will plays as expected...

Re: sound on Linux

2009-10-14T00:29:53Z

Hi,

If you rather use OpenJDK instead of Sun's, then you can use pulseaudio for playback. Actually pulseaudio is default audio output for OpenJDK on ubuntu linux. Then it's no problem with audio output from multiple applications simultaneously..

regards,

Peter

2009/10/14 cyberGn0m <cy6ergn0m@...>

This way still conflicts with ALSA-based players... and probably with any other sound players.. In comments i saw that Java uses OSS for sound output? I think this is a root cause.. This looks it is the same that no sound at Linux...

2009/10/14 Paulo Levi <i30817@...>
Try to make the default engine the java audio engine... I think i had

a test case to see if it worked around here... replace the string for
the wav file, and also, probably the "Java Sound Audio Engine" is not
the correct name string in the comparator ... you'll have to see. I
can't test this now since i don't have a linux here this fails handy.

Re: sound on Linux

2009-10-13T23:08:35Z

This way still conflicts with ALSA-based players... and probably with any other sound players.. In comments i saw that Java uses OSS for sound output? I think this is a root cause.. This looks it is the same that no sound at Linux...

2009/10/14 Paulo Levi <i30817@...>

Try to make the default engine the java audio engine... I think i had
a test case to see if it worked around here... replace the string for
the wav file, and also, probably the "Java Sound Audio Engine" is not
the correct name string in the comparator ... you'll have to see. I
can't test this now since i don't have a linux here this fails handy.

Re: sound on Linux

2009-10-13T22:49:21Z

Try to make the default engine the java audio engine... I think i had
a test case to see if it worked around here... replace the string for
the wav file, and also, probably the "Java Sound Audio Engine" is not
the correct name string in the comparator ... you'll have to see. I
can't test this now since i don't have a linux here this fails handy.

[SoundPlayer.java]

import java.io.Closeable; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.Comparator; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.LineListener; import javax.sound.sampled.Mixer; import javax.sound.sampled.Mixer.Info; import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.UnsupportedAudioFileException; import marytts.util.data.audio.MonoAudioInputStream; import marytts.util.data.audio.StereoAudioInputStream; public class SoundPlayer implements Runnable, Closeable { public static final int MONO = 0; public static final int STEREO = 3; public static final int LEFT_ONLY = 1; public static final int RIGHT_ONLY = 2; public enum Status { WAITING, PLAYING }; private final LineListener lineListener; private final int outputMode; private volatile Status status = Status.WAITING; private volatile AudioInputStream ais; private volatile SourceDataLine line; private volatile boolean exitRequested; private volatile boolean isPaused; private volatile boolean isCancelled; public static void main(String ... args) throws Exception{ SoundPlayer p = new SoundPlayer(new File("shoeshineshop.wav")); p.run(); } /** * AudioPlayer which can be used if audio stream is to be set separately, using setAudio(). * */ public SoundPlayer() { this.outputMode = MONO; this.lineListener = null; } public SoundPlayer(File audioFile) throws IOException, UnsupportedAudioFileException { this.ais = AudioSystem.getAudioInputStream(audioFile); this.outputMode = MONO; this.lineListener = null; initAudioInputStream(ais.getFormat()); } public SoundPlayer(AudioInputStream ais) { this.ais = ais; this.outputMode = MONO; this.lineListener = null; initAudioInputStream(ais.getFormat()); } public SoundPlayer(File audioFile, LineListener lineListener) throws IOException, UnsupportedAudioFileException { this.ais = AudioSystem.getAudioInputStream(audioFile); this.lineListener = lineListener; this.outputMode = MONO; initAudioInputStream(ais.getFormat()); } public SoundPlayer(AudioInputStream ais, LineListener lineListener) { this.ais = ais; this.lineListener = lineListener; this.outputMode = MONO; initAudioInputStream(ais.getFormat()); } public SoundPlayer(File audioFile, SourceDataLine line, LineListener lineListener) throws IOException, UnsupportedAudioFileException { this.ais = AudioSystem.getAudioInputStream(audioFile); this.line = line; this.lineListener = lineListener; this.outputMode = MONO; initAudioInputStream(ais.getFormat()); } public SoundPlayer(AudioInputStream ais, SourceDataLine line, LineListener lineListener) { this.ais = ais; this.line = line; this.lineListener = lineListener; this.outputMode = MONO; initAudioInputStream(ais.getFormat()); } /** * * @param audioFile * @param line * @param lineListener * @param outputMode if MONO, force output to be mono; if STEREO, force output to be STEREO; * if LEFT_ONLY, play a mono signal over the left channel of a stereo output, or mute the * right channel of a stereo signal; if RIGHT_ONLY, do the same with the right output channel. * @throws IOException * @throws UnsupportedAudioFileException */ public SoundPlayer(File audioFile, SourceDataLine line, LineListener lineListener, int outputMode) throws IOException, UnsupportedAudioFileException { this.ais = AudioSystem.getAudioInputStream(audioFile); this.line = line; this.lineListener = lineListener; this.outputMode = outputMode; initAudioInputStream(ais.getFormat()); } /** * * @param ais * @param line * @param lineListener * @param outputMode if MONO, force output to be mono; if STEREO, force output to be STEREO; * if LEFT_ONLY, play a mono signal over the left channel of a stereo output, or mute the * right channel of a stereo signal; if RIGHT_ONLY, do the same with the right output channel. */ public SoundPlayer(AudioInputStream ais, SourceDataLine line, LineListener lineListener, int outputMode) { this.ais = ais; this.line = line; this.lineListener = lineListener; this.outputMode = outputMode; initAudioInputStream(ais.getFormat()); } private void initAudioInputStream(AudioFormat audioFormat) { if (audioFormat.getChannels() == 1) { if (outputMode != MONO) { ais = new StereoAudioInputStream(ais, outputMode); audioFormat = ais.getFormat(); } } else { assert audioFormat.getChannels() == 2 : "Unexpected number of channels: " + audioFormat.getChannels(); if (outputMode == MONO) { ais = new MonoAudioInputStream(ais); } else if (outputMode == LEFT_ONLY) { ais = new StereoAudioInputStream(ais, outputMode); } else if (outputMode == RIGHT_ONLY) { ais = new StereoAudioInputStream(ais, outputMode); } else { assert outputMode == STEREO : "Unexpected output mode: " + outputMode; } } } public void setAudio(AudioInputStream audio) { if (status == Status.PLAYING) { throw new IllegalStateException("Cannot set audio while playing"); } initAudioInputStream(audio.getFormat()); this.ais = audio; } /** * Queries cancelled state. */ public boolean isPaused() { return isPaused; } public void setPaused(boolean pause) { if (line != null) { if (pause) { isPaused = true; exitRequested = true; } else { isPaused = false; exitRequested = false; } } } public void cancel() { isPaused = false; exitRequested = true; isCancelled = true; } public boolean isCancelled() { return isCancelled; } public SourceDataLine getLine() { return line; } public void close() { if (line != null) { line.close(); } } @Override protected void finalize() throws Throwable { close(); } /** * Lines can fail to open because they are already in use. * Java sound uses OSS and some linuxes are using pulseaudio. * OSS needs exclusive access to the line, and pulse audio * highjacks it. Try to open another line. * @param format * @return a open line * @throws IllegalStateException if it can't open a dataline for the * audioformat. */ private SourceDataLine getSourceDataLine(AudioFormat format) { Exception audioException = null; try { DataLine.Info info = new DataLine.Info(SourceDataLine.class, format); Mixer.Info [] arr = AudioSystem.getMixerInfo(); Arrays.sort(arr, new Comparator() { public int compare(Object o1, Object o2) { Mixer.Info m1 = (Info) o1; Mixer.Info m2 = (Info) o2; if("Java Sound Audio Engine".equals(m1.getName())) return -1; if("Java Sound Audio Engine".equals(m2.getName())) return 1; return 0; } }); for (Mixer.Info mi : arr) { SourceDataLine dataline = null; try { Mixer mixer = AudioSystem.getMixer(mi); dataline = (SourceDataLine) mixer.getLine(info); dataline.open(format); dataline.start(); System.out.println(mi.getName()); return dataline; } catch (Exception e) { audioException = e; } if (dataline != null) { try { dataline.close(); } catch (Exception e) { } } } } catch (Exception e) { throw new IllegalStateException("Error trying to aquire dataline.", e); } if (audioException == null) { throw new IllegalStateException("Couldn't aquire a dataline, this computer doesn't seem to have audio output?"); } else { throw new IllegalStateException("Couldn't aquire a dataline, probably because all are in use. Last exception:", audioException); } } public void run() { status = Status.PLAYING; isCancelled = false; AudioFormat audioFormat = ais.getFormat(); DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); try { if (line == null) { boolean bIsSupportedDirectly = AudioSystem.isLineSupported(info); if (!bIsSupportedDirectly) { AudioFormat sourceFormat = audioFormat; AudioFormat targetFormat = new AudioFormat( AudioFormat.Encoding.PCM_SIGNED, sourceFormat.getSampleRate(), sourceFormat.getSampleSizeInBits(), sourceFormat.getChannels(), sourceFormat.getChannels() * (sourceFormat.getSampleSizeInBits() / 8), sourceFormat.getSampleRate(), sourceFormat.isBigEndian()); ais = AudioSystem.getAudioInputStream(targetFormat, ais); audioFormat = ais.getFormat(); } line = getSourceDataLine(audioFormat); if (lineListener != null) { line.addLineListener(lineListener); } } line.open(audioFormat); } catch (Exception e) { e.printStackTrace(); return; } int nRead = 0; byte[] abData = new byte[1056]; // needs to be a multiple of 4 and 6, to support both 16 and 24 bit stereo boolean startResume; do { startResume = false; line.start(); while (nRead != -1 && !exitRequested) { try { nRead = ais.read(abData, 0, abData.length); } catch (IOException e) { e.printStackTrace(); } if (nRead >= 0) { line.write(abData, 0, nRead); } } if (exitRequested && !isPaused) { //cancel line.stop(); line.flush(); } else if (isPaused) { line.stop(); line.drain(); try { while (isPaused) { Thread.sleep(20); } startResume = true; } catch (InterruptedException ex) { //if interrupted... cancel(); } } if (!exitRequested) { line.drain(); } //System.out.println("EXITREQ " + exitRequested + " RESUME " + startResume + " IS PAUSED " + isPaused); } while (startResume); exitRequested = false; status = Status.WAITING; } }

Re: sound on Linux

2009-10-13T22:22:12Z

I already wrote the same code but it still does not work. It conflicts with flash player and with mplayer (in any mode).

2009/10/14 Paulo Levi <i30817@...>

I was just looking at this problem a while ago... opening the java
sound audio engine instead of the default one might be a solution.
Actually right now i'm using the method bellow, however, there are
still some errors on a test machine that exhibited errors before (but
no exception anymore) - the errors come in a Fedora (Pulse-Audio)
linux. Obviously if it can't open the mixer it will try to open the
java sound audio engine one - that should take take of one of the
errors java not playing, but still might cause the second - native
applications not playing.
Actually the guy that is running the tests for me in that machine
reports that audio is inaudible still, but no exception is raised if i
use this.

/**
* Lines can fail to open because they are already in use.
* Java sound uses OSS and some linuxes are using pulseaudio.
* OSS needs exclusive access to the line, and pulse audio
* highjacks it. Try to open another line.
* @param format
* @return a open line
* @throws IllegalStateException if it can't open a dataline for the
* audioformat.
*/
private SourceDataLine getSourceDataLine(AudioFormat format) {
Exception audioException = null;
try {
DataLine.Info info = new
DataLine.Info(SourceDataLine.class, format);

for (Mixer.Info mi : AudioSystem.getMixerInfo()) {
SourceDataLine dataline = null;
try {
Mixer mixer = AudioSystem.getMixer(mi);
dataline = (SourceDataLine) mixer.getLine(info);
dataline.open(format);
dataline.start();
return dataline;
} catch (Exception e) {
audioException = e;
}
if (dataline != null) {
try {
dataline.close();
} catch (Exception e) {
}
}
}
} catch (Exception e) {
throw new IllegalStateException("Error trying to aquire
dataline.", e);
}
if (audioException == null) {
throw new IllegalStateException("Couldn't aquire a
dataline, this computer doesn't seem to have audio output?");
} else {
throw new IllegalStateException("Couldn't aquire a
dataline, probably because all are in use. Last exception:",
audioException);
}
}

--
-----------------------------------------------------------------
Всего наилучшего

<y6erGn0m.

Re: sound on Linux

2009-10-13T15:45:37Z

I was just looking at this problem a while ago... opening the java
sound audio engine instead of the default one might be a solution.
Actually right now i'm using the method bellow, however, there are
still some errors on a test machine that exhibited errors before (but
no exception anymore) - the errors come in a Fedora (Pulse-Audio)
linux. Obviously if it can't open the mixer it will try to open the
java sound audio engine one - that should take take of one of the
errors java not playing, but still might cause the second - native
applications not playing.
Actually the guy that is running the tests for me in that machine
reports that audio is inaudible still, but no exception is raised if i
use this.

/**
* Lines can fail to open because they are already in use.
* Java sound uses OSS and some linuxes are using pulseaudio.
* OSS needs exclusive access to the line, and pulse audio
* highjacks it. Try to open another line.
* @param format
* @return a open line
* @throws IllegalStateException if it can't open a dataline for the
* audioformat.
*/
private SourceDataLine getSourceDataLine(AudioFormat format) {
Exception audioException = null;
try {
DataLine.Info info = new
DataLine.Info(SourceDataLine.class, format);

for (Mixer.Info mi : AudioSystem.getMixerInfo()) {
SourceDataLine dataline = null;
try {
Mixer mixer = AudioSystem.getMixer(mi);
dataline = (SourceDataLine) mixer.getLine(info);
dataline.open(format);
dataline.start();
return dataline;
} catch (Exception e) {
audioException = e;
}
if (dataline != null) {
try {
dataline.close();
} catch (Exception e) {
}
}
}
} catch (Exception e) {
throw new IllegalStateException("Error trying to aquire
dataline.", e);
}
if (audioException == null) {
throw new IllegalStateException("Couldn't aquire a
dataline, this computer doesn't seem to have audio output?");
} else {
throw new IllegalStateException("Couldn't aquire a
dataline, probably because all are in use. Last exception:",
audioException);
}
}

sound on Linux

2009-10-13T15:31:56Z

Anybody tested java sound on linux? As I know, java uses ALSA on Linux to play audio.. so, i have a problem with it: when java plays sound, other applications can't play anything. When other applications plays sound, java can't. As i know, mplayer can play sound via ALSA and i can open many players and all of them will plays as expected...

Re: Ogg Vorbis in Java sound?

2009-06-01T08:14:52Z

Hi Damjan,

Sorry for the lag.
Currently nobody works on the task.
I think the best way for the feature is a separate openJDK project with
following (after completion) integration into jdk (the same way as Gervill had
gone).

Do you already have some code or for now you are just planning to start?

Regards
Alex

Damjan Jovanovic wrote:

> Hi
>
> I see there is a lot of interest in support of the Ogg Vorbis/Theora
> formats in Java Sound (http://bugs.sun.com/view_bug.do?bug_id=4671067)
> and/or JMF (http://bugs.sun.com/view_bug.do?bug_id=4499904).
>
> Is anyone working on this?
>
> Is a patch welcome?
>
> Regards
> Damjan Jovanovic

Ogg Vorbis in Java sound?

2009-05-13T23:02:10Z

Hi

I see there is a lot of interest in support of the Ogg Vorbis/Theora
formats in Java Sound (http://bugs.sun.com/view_bug.do?bug_id=4671067)
and/or JMF (http://bugs.sun.com/view_bug.do?bug_id=4499904).

Is anyone working on this?

Is a patch welcome?

Regards
Damjan Jovanovic

[Request for review] 6806019: 38 JCK api/javax_sound/midi/ tests fails starting from jdk7 b46

2009-03-31T03:29:43Z

Karl,

Could you please review a fix for 6806019: 38 JCK api/javax_sound/midi/ tests
fails starting from jdk7 b46
(http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6806019)

The issue was discovered testing jdk7, but openjdk6 has the same bug (it's
Gervill issue).

The fix: http://cr.openjdk.java.net/~amenkov/6806019/webrev.00/

The file changed (SoftSynthesizer.java) has no differences in openjdk 6 & 7, so
the fix is targeted to both jdks.

Regards
Alex

Bug in AudioSystem.getLine(DataLine.Info info)

2009-02-05T12:49:50Z

I think there is a problem in the linux implementation of
javax.sound.sampled.AudioSystem.getLine(DataLine.Info info);

It throws a line unavailable exception when trying to send data, not
on construction. Apparently its just each Line is saying that it
supports the AudioFormat when it does no such thing, leading to
innumerable exceptions when trying to use freetts in linux. I've
worked around it
with this http://forums.sun.com/thread.jspa?threadID=5189363, but i'd like the
root cause fixed.

BTW is FreeTTS dead or undead? Seeing projects like acapela tts with
their much higher quality voices in many languages is slightly
depressing from my the java is the platform and native is taboo
mindset.

Bug in javax.sound.sampled.AudioSystem

2009-02-04T11:56:52Z

Re: Updating Gervill for OpenJDK 6 build 13

2008-09-22T16:15:20Z

Joe Darcy wrote:

> Hello.
>
> Since OpenJDK 6 took a snapshot of Gervill for b12, Gervill was been
> updated. Also, Mark Wielaard has a patch which address some JCK
> failures:
>
> http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html
>
>
> For the next build of OpenJDK 6, build 13, I'd like to include both
> sets of changes; below is patch of those changes compared to build 12.
>
> Please review by September 19.
>
> Thanks,
>
> -Joe
>

I've applied the previously sent patch to the OpenJDK 6 b13 sources.

Cheers,

-Joe

Updating Gervill for OpenJDK 6 build 13

2008-09-15T20:24:47Z

Hello.

Since OpenJDK 6 took a snapshot of Gervill for b12, Gervill was been
updated. Also, Mark Wielaard has a patch which address some JCK failures:

http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html

For the next build of OpenJDK 6, build 13, I'd like to include both
sets of changes; below is patch of those changes compared to build 12.

Please review by September 19.

Thanks,

-Joe

--- old/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Sun Sep 14 23:15:37 2008
+++ new/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Sun Sep 14 23:15:37 2008
@@ -85,11 +85,12 @@
}

public long skip(long n) throws IOException {
+ if( n < 0)
+ return 0;
if (n > left)
n = left;
- n = super.skip(n);
- if (n == -1)
- return -1;
+ long p = raf.getFilePointer();
+ raf.seek(p + n);
left -= n;
return n;
}
--- old/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun Sep 14 23:15:38 2008
+++ new/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun Sep 14 23:15:38 2008
@@ -69,7 +69,7 @@
private int nrofchannels = 2;
private SoftVoice[] voicestatus = null;
private SoftAudioBuffer[] buffers;
- private SoftAudioProcessor reverb;
+ private SoftReverb reverb;
private SoftAudioProcessor chorus;
private SoftAudioProcessor agc;
private long msec_buffer_len = 0;
@@ -681,6 +681,8 @@
chorus.init(samplerate, controlrate);
agc.init(samplerate, controlrate);

+ reverb.setLightMode(synth.reverb_light);
+
reverb.setMixMode(true);
chorus.setMixMode(true);
agc.setMixMode(false);
--- old/src/share/classes/com/sun/media/sound/SoftReverb.java Sun Sep 14 23:15:39 2008
+++ new/src/share/classes/com/sun/media/sound/SoftReverb.java Sun Sep 14 23:15:39 2008
@@ -35,7 +35,7 @@
*/
public class SoftReverb implements SoftAudioProcessor {

- private static class Delay {
+ private final static class Delay {

private float[] delaybuffer;
private int rovepos = 0;
@@ -52,31 +52,28 @@
rovepos = 0;
}

- public void processReplace(float[] in, float[] out) {
- float[] delaybuffer = this.delaybuffer;
+ public void processReplace(float[] inout) {
if (delaybuffer == null)
return;
- int len = in.length;
+ int len = inout.length;
int rnlen = delaybuffer.length;
int rovepos = this.rovepos;

for (int i = 0; i < len; i++) {
- float x = in[i];
- out[i] = delaybuffer[rovepos];
+ float x = inout[i];
+ inout[i] = delaybuffer[rovepos];
delaybuffer[rovepos] = x;
- rovepos = rovepos + 1;
- if (rovepos == rnlen)
+ if (++rovepos == rnlen)
rovepos = 0;
- //rovepos = (rovepos + 1) % rnlen;
}
this.rovepos = rovepos;
}
}

- private static class AllPass {
+ private final static class AllPass {

- private float[] delaybuffer;
- private int delaybuffersize;
+ private final float[] delaybuffer;
+ private final int delaybuffersize;
private int rovepos = 0;
private float feedback;

@@ -88,47 +85,42 @@
public void setFeedBack(float feedback) {
this.feedback = feedback;
}
- int ucount = 0;

+ public void processReplace(float inout[]) {
+ int len = inout.length;
+ int delaybuffersize = this.delaybuffersize;
+ int rovepos = this.rovepos;
+ for (int i = 0; i < len; i++) {
+ float delayout = delaybuffer[rovepos];
+ float input = inout[i];
+ inout[i] = delayout - input;
+ delaybuffer[rovepos] = input + delayout * feedback;
+ if (++rovepos == delaybuffersize)
+ rovepos = 0;
+ }
+ this.rovepos = rovepos;
+ }
+
public void processReplace(float in[], float out[]) {
int len = in.length;
+ int delaybuffersize = this.delaybuffersize;
+ int rovepos = this.rovepos;
for (int i = 0; i < len; i++) {
-
float delayout = delaybuffer[rovepos];
-
- // undenormalise(delayout)
- /*
- if (((delayout > 0.0) && (delayout < 1.0E-10))
- || ((delayout < 0.0) && (delayout > -1.0E-10)))
- delayout = 0;
- */
-
float input = in[i];
- out[i] = -input + delayout;
+ out[i] = delayout - input;
delaybuffer[rovepos] = input + delayout * feedback;
if (++rovepos == delaybuffersize)
rovepos = 0;
}
-
- ucount++;
- if (ucount == 10) {
- ucount = 0;
- for (int i = 0; i < delaybuffer.length; i++) {
- double v = delaybuffer[i];
- if (((v > 0.0) && (v < 1.0E-10))
- || ((v < 0.0) && (v > -1.0E-10))) {
- delaybuffer[i] = 0;
- }
- }
- }
-
- }
+ this.rovepos = rovepos;
+ }
}

- private static class Comb {
+ private final static class Comb {

- private float[] delaybuffer;
- private int delaybuffersize;
+ private final float[] delaybuffer;
+ private final int delaybuffersize;
private int rovepos = 0;
private float feedback;
private float filtertemp = 0;
@@ -142,56 +134,54 @@

public void setFeedBack(float feedback) {
this.feedback = feedback;
+ filtercoeff2 = (1 - filtercoeff1)* feedback;
}
- int ucount = 0;

public void processMix(float in[], float out[]) {
- int len = in.length;
-
- float filtercoeff2 = this.filtercoeff2 * feedback;
-
+ int len = in.length;
+ int delaybuffersize = this.delaybuffersize;
+ int rovepos = this.rovepos;
+ float filtertemp = this.filtertemp;
+ float filtercoeff1 = this.filtercoeff1;
+ float filtercoeff2 = this.filtercoeff2;
for (int i = 0; i < len; i++) {
float delayout = delaybuffer[rovepos];
-
// One Pole Lowpass Filter
filtertemp = (delayout * filtercoeff2)
+ (filtertemp * filtercoeff1);
-
- // undenormalise(filtertemp)
- /*
- if (((filtertemp > 0.0) && (filtertemp < 1.0E-10))
- || ((filtertemp < 0.0) && (filtertemp > -1.0E-10)))
- filtertemp = 0;
- */
out[i] += delayout;
- delaybuffer[rovepos] = in[i] + (filtertemp);// * feedback);
-
+ delaybuffer[rovepos] = in[i] + filtertemp;
if (++rovepos == delaybuffersize)
rovepos = 0;
+ }
+ this.filtertemp = filtertemp;
+ this.rovepos = rovepos;
+ }

- }
- ucount++;
- if (ucount == 10) {
- ucount = 0;
- if (((filtertemp > 0.0) && (filtertemp < 1.0E-10))
- || ((filtertemp < 0.0) && (filtertemp > -1.0E-10))) {
- filtertemp = 0;
- }
- for (int i = 0; i < delaybuffer.length; i++) {
- double v = delaybuffer[i];
- if (((v > 0.0) && (v < 1.0E-10))
- || ((v < 0.0) && (v > -1.0E-10))) {
- delaybuffer[i] = 0;
- }
- }
- }
-
-
+ public void processReplace(float in[], float out[]) {
+ int len = in.length;
+ int delaybuffersize = this.delaybuffersize;
+ int rovepos = this.rovepos;
+ float filtertemp = this.filtertemp;
+ float filtercoeff1 = this.filtercoeff1;
+ float filtercoeff2 = this.filtercoeff2;
+ for (int i = 0; i < len; i++) {
+ float delayout = delaybuffer[rovepos];
+ // One Pole Lowpass Filter
+ filtertemp = (delayout * filtercoeff2)
+ + (filtertemp * filtercoeff1);
+ out[i] = delayout;
+ delaybuffer[rovepos] = in[i] + filtertemp;
+ if (++rovepos == delaybuffersize)
+ rovepos = 0;
+ }
+ this.filtertemp = filtertemp;
+ this.rovepos = rovepos;
}

public void setDamp(float val) {
filtercoeff1 = val;
- filtercoeff2 = 1 - filtercoeff1;
+ filtercoeff2 = (1 - filtercoeff1)* feedback;
}
}
private float roomsize;
@@ -203,8 +193,11 @@
private AllPass[] allpassL;
private AllPass[] allpassR;
private float[] input;
- private float[] outR;
- private float[] outL;
+ private float[] out;
+ private float[] pre1;
+ private float[] pre2;
+ private float[] pre3;
+ private boolean denormal_flip = false;
private boolean mix = true;
private SoftAudioBuffer inputA;
private SoftAudioBuffer left;
@@ -214,7 +207,8 @@
private float dirty_damp;
private float dirty_predelay;
private float dirty_gain;
- private float samplerate;
+ private float samplerate;
+ private boolean light = true;

public void init(float samplerate, float controlrate) {
this.samplerate = samplerate;
@@ -237,7 +231,7 @@
combL[3] = new Comb((int) (freqscale * (1356)));
combR[3] = new Comb((int) (freqscale * (1356 + stereospread)));
combL[4] = new Comb((int) (freqscale * (1422)));
- combR[4] = new Comb((int) (freqscale * (1422 + stereospread)));
+ combR[4] = new Comb((int) (freqscale * (1422 + stereospread)));
combL[5] = new Comb((int) (freqscale * (1491)));
combR[5] = new Comb((int) (freqscale * (1491 + stereospread)));
combL[6] = new Comb((int) (freqscale * (1557)));
@@ -306,58 +300,100 @@
input = new float[numsamples];

float again = gain * 0.018f / 2;
+
+ denormal_flip = !denormal_flip;
+ if(denormal_flip)
+ for (int i = 0; i < numsamples; i++)
+ input[i] = inputA[i] * again + 1E-20f;
+ else
+ for (int i = 0; i < numsamples; i++)
+ input[i] = inputA[i] * again - 1E-20f;

- for (int i = 0; i < numsamples; i++)
- input[i] = inputA[i] * again;
-
- delay.processReplace(input, input);
-
-
- if (right != null) {
- if (outR == null || outR.length < numsamples)
- outR = new float[numsamples];
- Arrays.fill(outR, 0);
- for (int i = 0; i < combR.length; i++)
- combR[i].processMix(input, outR);
+ delay.processReplace(input);
+
+ if(light && (right != null))
+ {
+ if (pre1 == null || pre1.length < numsamples)
+ {
+ pre1 = new float[numsamples];
+ pre2 = new float[numsamples];
+ pre3 = new float[numsamples];
+ }
+
for (int i = 0; i < allpassL.length; i++)
- allpassR[i].processReplace(outR, outR);
+ allpassL[i].processReplace(input);

- if (mix) {
- for (int i = 0; i < numsamples; i++)
- right[i] += outR[i];
- } else {
- for (int i = 0; i < numsamples; i++)
- right[i] = outR[i];
+ combL[0].processReplace(input, pre3);
+ combL[1].processReplace(input, pre3);
+
+ combL[2].processReplace(input, pre1);
+ for (int i = 4; i < combL.length-2; i+=2)
+ combL[i].processMix(input, pre1);
+
+ combL[3].processReplace(input, pre2);;
+ for (int i = 5; i < combL.length-2; i+=2)
+ combL[i].processMix(input, pre2);
+
+ if (!mix)
+ {
+ Arrays.fill(right, 0);
+ Arrays.fill(left, 0);
}
+ for (int i = combR.length-2; i < combR.length; i++)
+ combR[i].processMix(input, right);
+ for (int i = combL.length-2; i < combL.length; i++)
+ combL[i].processMix(input, left);
+
+ for (int i = 0; i < numsamples; i++)
+ {
+ float p = pre1[i] - pre2[i];
+ float m = pre3[i];
+ left[i] += m + p;
+ right[i] += m - p;
+ }
}
+ else
+ {
+ if (out == null || out.length < numsamples)
+ out = new float[numsamples];
+
+ if (right != null) {
+ if (!mix)
+ Arrays.fill(right, 0);
+ allpassR[0].processReplace(input, out);
+ for (int i = 1; i < allpassR.length; i++)
+ allpassR[i].processReplace(out);
+ for (int i = 0; i < combR.length; i++)
+ combR[i].processMix(out, right);
+ }

-
- if (outL == null || outL.length < numsamples)
- outL = new float[numsamples];
- Arrays.fill(outL, 0);
- for (int i = 0; i < combL.length; i++)
- combL[i].processMix(input, outL);
- for (int i = 0; i < allpassL.length; i++)
- allpassL[i].processReplace(outL, outL);
-
- if (mix) {
- for (int i = 0; i < numsamples; i++)
- left[i] += outL[i];
- } else {
- for (int i = 0; i < numsamples; i++)
- left[i] = outL[i];
+ if (!mix)
+ Arrays.fill(left, 0);
+ allpassL[0].processReplace(input, out);
+ for (int i = 1; i < allpassL.length; i++)
+ allpassL[i].processReplace(out);
+ for (int i = 0; i < combL.length; i++)
+ combL[i].processMix(out, left);
}
+
+
+
+
+

if (silent_input) {
- float avgpower = 0;
+ silent = true;
for (int i = 0; i < numsamples; i++)
- avgpower += outL[i]*outL[i];
- avgpower /= numsamples;
- avgpower = (float)Math.sqrt(avgpower);
- if(avgpower < 0.00001)
- silent = true;
- }
-
+ {
+ float v = left[i];
+ if(v > 1E-10 || v < -1E-10)
+ {
+ silent = false;
+ break;
+ }
+ }
+ }
+
}

public void globalParameterControlChange(int[] slothpath, long param,
@@ -440,7 +476,7 @@
public void setRoomSize(float value) {
roomsize = 1 - (0.17f / value);

- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < combL.length; i++) {
combL[i].feedback = roomsize;
combR[i].feedback = roomsize;
}
@@ -464,10 +500,16 @@
damp = 0;

// damp = value * 0.4f;
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < combL.length; i++) {
combL[i].setDamp(damp);
combR[i].setDamp(damp);
}

}
+
+ public void setLightMode(boolean light)
+ {
+ this.light = light;
+ }
}
+
--- old/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Sun Sep 14 23:15:40 2008
+++ new/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Sun Sep 14 23:15:40 2008
@@ -47,6 +47,8 @@
return new DLSSoundbank(url);
} catch (RIFFInvalidFormatException e) {
return null;
+ } catch(IOException ioe) {
+ return null;
}
}

--- old/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Sun Sep 14 23:15:40 2008
+++ new/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Sun Sep 14 23:15:40 2008
@@ -46,6 +46,8 @@
return new SF2Soundbank(url);
} catch (RIFFInvalidFormatException e) {
return null;
+ } catch(IOException ioe) {
+ return null;
}
}

--- old/src/share/classes/com/sun/media/sound/SoftChannel.java Sun Sep 14 23:15:41 2008
+++ new/src/share/classes/com/sun/media/sound/SoftChannel.java Sun Sep 14 23:15:41 2008
@@ -1215,7 +1215,9 @@

public int getController(int controller) {
synchronized (control_mutex) {
- return this.controller[controller];
+ // Should only return lower 7 bits,
+ // even when controller is "boosted" higher.
+ return this.controller[controller] & 127;
}
}

--- old/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Sun Sep 14 23:15:42 2008
+++ new/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Sun Sep 14 23:15:42 2008
@@ -177,6 +177,7 @@
// 1: DLS Voice Allocation
protected int voice_allocation_mode = 0;

+ protected boolean reverb_light = true;
protected boolean reverb_on = true;
protected boolean chorus_on = true;
protected boolean agc_on = true;
@@ -334,6 +335,7 @@
largemode = (Boolean)items[9].value;
number_of_midi_channels = (Integer)items[10].value;
jitter_correction = (Boolean)items[11].value;
+ reverb_light = (Boolean)items[12].value;
}

private String patchToString(Patch patch) {
@@ -742,6 +744,9 @@
}

public void unloadAllInstruments(Soundbank soundbank) {
+ if (soundbank == null || !isSoundbankSupported(soundbank))
+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
+
if (!isOpen())
return;

@@ -766,6 +771,9 @@
}

public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
+ if (soundbank == null || !isSoundbankSupported(soundbank))
+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
+
if (!isOpen())
return;

@@ -844,6 +852,10 @@
item.description = "Turn jitter correction on or off.";
list.add(item);

+ item = new AudioSynthesizerPropertyInfo("light reverb", o?reverb_light:true);
+ item.description = "Turn light reverb mode on or off";
+ list.add(item);
+
AudioSynthesizerPropertyInfo[] items;
items = list.toArray(new AudioSynthesizerPropertyInfo[list.size()]);

--- old/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java Sun Sep 14 23:15:43 2008
+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java Sun Sep 14 23:15:43 2008
@@ -43,11 +43,30 @@
testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
testarray[i] *= 0.3;
}
+
+ // Check conversion using PCM_FLOAT
+ for (int big = 0; big < 2; big+=1)
+ for (int bits = 32; bits <= 64; bits+=32) {
+ AudioFormat frm = new AudioFormat(
+ AudioFloatConverter.PCM_FLOAT,
+ 44100, bits, 1, bits/8,
+ 44100, big==1);
+ byte[] buff = new byte[testarray.length * frm.getFrameSize()];
+ float[] testarray2 = new float[testarray.length];
+ AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
+ conv.toByteArray(testarray, buff);
+ conv.toFloatArray(buff, testarray2);
+ for (int i = 0; i < testarray2.length; i++) {
+ if(Math.abs(testarray[i] - testarray2[i]) > 0.05)
+ throw new RuntimeException("Conversion failed for " + frm +" , arrays not equal enough!\n");
+ }
+
+ }

// Check conversion from float2byte and byte2float.
for (int big = 0; big < 2; big+=1)
for (int signed = 0; signed < 2; signed+=1)
- for (int bits = 8; bits <= 32; bits+=8) {
+ for (int bits = 6; bits <= 40; bits+=2) {
AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
byte[] buff = new byte[testarray.length * frm.getFrameSize()];
float[] testarray2 = new float[testarray.length];
@@ -63,7 +82,7 @@
// Check big/little
for (int big = 0; big < 2; big+=1)
for (int signed = 0; signed < 2; signed+=1)
- for (int bits = 8; bits <= 32; bits+=8) {
+ for (int bits = 6; bits <= 40; bits+=2) {
AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
byte[] buff = new byte[testarray.length * frm.getFrameSize()];
AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
@@ -89,7 +108,7 @@
// Check signed/unsigned
for (int big = 0; big < 2; big+=1)
for (int signed = 0; signed < 2; signed+=1)
- for (int bits = 8; bits <= 32; bits+=8) {
+ for (int bits = 6; bits <= 40; bits+=2) {
AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
byte[] b = new byte[testarray.length * frm.getFrameSize()];
AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
@@ -117,10 +136,10 @@
}

// Check if conversion 32->24, 24->16, 16->8 result in same float data
- AudioFormat frm = new AudioFormat(44100, 32, 1, true, true);
+ AudioFormat frm = new AudioFormat(44100, 40, 1, true, true);
byte[] b = new byte[testarray.length * frm.getFrameSize()];
AudioFloatConverter.getConverter(frm).toByteArray(testarray, b);
- for (int bits = 8; bits <= 32; bits+=8) {
+ for (int bits = 6; bits <= 40; bits+=2) {
AudioFormat frm2 = new AudioFormat(44100, bits, 1, true, true);
byte[] b2 = new byte[testarray.length * frm2.getFrameSize()];
int fs1 = frm.getFrameSize();
--- /dev/null Sun Sep 14 23:15:44 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java Sun Sep 14 23:15:44 2008
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream available() method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Available {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ int ret = is.available();
+ if(ret != capacity)
+ throw new RuntimeException("is.available() return unexpected value!");
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:44 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java Sun Sep 14 23:15:44 2008
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream close method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Close {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:45 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java Sun Sep 14 23:15:44 2008
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class MarkReset {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ is.mark(1000);
+ int ret = is.available();
+ int a = is.read();
+ is.skip(75);
+ is.reset();
+ if(is.available() != ret)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret)+") !");
+ int b = is.read();
+ if(a != b)
+ throw new RuntimeException(
+ "is doesn't return same value after reset ("
+ + a + "!="+b+") !");
+
+ is.skip(15);
+ ret = is.available();
+ is.mark(1000);
+ is.reset();
+ if(is.available() != ret)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret)+") !");
+
+
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:45 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java Sun Sep 14 23:15:45 2008
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class MarkSupported {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ if(!is.markSupported())
+ throw new RuntimeException("InputStream doesn't support mark/reset!");
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:45 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java Sun Sep 14 23:15:45 2008
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream read() method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Read {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ byte[] b = new byte[100];
+ int ret = is.available();
+ int n = is.read();
+ if(n == -1)
+ throw new RuntimeException("is.read shouldn't return -1!");
+ if(is.available() != ret - 1)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - 1)+") !");
+ is.skip(5000);
+ if(is.read() != -1)
+ throw new RuntimeException(
+ "is.read() doesn't return -1!");
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:45 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java Sun Sep 14 23:15:45 2008
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class ReadByte {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ byte[] b = new byte[100];
+ int ret = is.available();
+ int n = is.read(b);
+ if(n == -1)
+ throw new RuntimeException("is.read shouldn't return -1!");
+ if(is.available() != ret - n)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - n)+") !");
+ is.skip(5000);
+ if(is.read(b) != -1)
+ throw new RuntimeException(
+ "is.read() doesn't return -1!");
+
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:45 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java Sun Sep 14 23:15:45 2008
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class ReadByteIntInt {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ byte[] b = new byte[100];
+ int ret = is.available();
+ int n = is.read(b, 7, 50);
+ if(n == -1)
+ throw new RuntimeException("is.read shouldn't return -1!");
+ if(is.available() != ret - n)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - n)+") !");
+ is.skip(5000);
+ if(is.read(b, 7, 50) != -1)
+ throw new RuntimeException(
+ "is.read() doesn't return -1!");
+
+ }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}
--- /dev/null Sun Sep 14 23:15:46 2008
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java Sun Sep 14 23:15:46 2008
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Skip {
+
+ static float[] testarray;
+ static byte[] test_byte_array;
+ static File test_file;
+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+
+ static void setUp() throws Exception {
+ testarray = new float[1024];
+ for (int i = 0; i < 1024; i++) {
+ double ii = i / 1024.0;
+ ii = ii * ii;
+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+ testarray[i] *= 0.3;
+ }
+ test_byte_array = new byte[testarray.length*2];
+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+ test_file = File.createTempFile("test", ".raw");
+ FileOutputStream fos = new FileOutputStream(test_file);
+ fos.write(test_byte_array);
+ }
+
+ static void tearDown() throws Exception {
+ if(!test_file.delete())
+ test_file.deleteOnExit();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try
+ {
+ setUp();
+
+ for (int i = 0; i < 8; i++) {
+ ModelByteBuffer buff;
+ if(i % 2 == 0)
+ buff = new ModelByteBuffer(test_file);
+ else
+ buff = new ModelByteBuffer(test_byte_array);
+ if((i / 2) == 1)
+ buff.subbuffer(5);
+ if((i / 2) == 2)
+ buff.subbuffer(5,500);
+ if((i / 2) == 3)
+ buff.subbuffer(5,600,true);
+
+ long capacity = buff.capacity();
+ InputStream is = buff.getInputStream();
+ try
+ {
+ int ret = is.available();
+ long n = is.skip(75);
+ if(n == -1)
+ throw new RuntimeException("is.read shouldn't return -1!");
+ if(is.available() != ret - n)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - n)+") !");
+
+ ret = is.available();
+ n = is.skip(-100);
+ if(n != 0)
+ throw new RuntimeException("is.skip(-100) shouldn't skip values!");
+ if(is.available() != ret - n)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - n)+") !");
+
+ ret = is.available();
+ n = is.skip(5000);
+ if(is.available() != ret - n)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(ret - n)+") !");
+ if(is.available() != 0)
+ throw new RuntimeException(
+ "is.available() returns incorrect value ("
+ + is.available() + "!="+(0)+") !"); }
+ finally
+ {
+ is.close();
+ }
+ if(buff.capacity() != capacity)
+ throw new RuntimeException("Capacity variable should not change!");
+ }
+ }
+ finally
+ {
+ tearDown();
+ }
+ }
+
+}

Further updating Gervill for OpenJDK 6 build 12

2008-08-21T21:14:27Z

Hello.

I noticed the Gervill CVS tree has been updated since I last integrated
Gervill into OpenJDK 6 [1]. Here is a patch of the current differences:

--- old/src/share/classes/com/sun/media/sound/SoftMixingMixer.java Thu Aug 21 21:06:18 2008
+++ new/src/share/classes/com/sun/media/sound/SoftMixingMixer.java Thu Aug 21 21:06:18 2008
@@ -62,7 +62,7 @@

protected static final String INFO_DESCRIPTION = "Software Sound Mixer";

- protected static final String INFO_VERSION = "0.9";
+ protected static final String INFO_VERSION = "1.0";

protected final static Mixer.Info info = new Info();

--- old/src/share/classes/com/sun/media/sound/ModelInstrument.java Thu Aug 21 21:06:20 2008
+++ new/src/share/classes/com/sun/media/sound/ModelInstrument.java Thu Aug 21 21:06:20 2008
@@ -88,10 +88,10 @@
// This information is generated from ModelPerformer.getName()
// returned from getPerformers().
public String[] getKeys() {
- String[] keys = new String[127];
+ String[] keys = new String[128];
for (ModelPerformer performer : getPerformers()) {
for (int k = performer.getKeyFrom(); k <= performer.getKeyTo(); k++) {
- if (keys[k] == null) {
+ if (k >= 0 && k < 128 && keys[k] == null) {
String name = performer.getName();
if (name == null)
name = "untitled";
--- old/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Thu Aug 21 21:06:21 2008
+++ new/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Thu Aug 21 21:06:21 2008
@@ -45,7 +45,7 @@
private long fileoffset;
private byte[] buffer;
private long offset;
- private long len;
+ private final long len;

private class RandomFileInputStream extends InputStream {

@@ -107,11 +107,12 @@
}

public int read(byte[] b) throws IOException {
+ int len = b.length;
if (len > left)
len = (int)left;
if (left == 0)
return -1;
- int len = raf.read(b);
+ len = raf.read(b, 0, len);
if (len == -1)
return -1;
left -= len;
@@ -119,12 +120,12 @@
}

public int read() throws IOException {
- if (len == 0)
+ if (left == 0)
return -1;
int b = raf.read();
if (b == -1)
return -1;
- len--;
+ left--;
return b;
}

@@ -137,15 +138,15 @@
long beginIndex, long endIndex, boolean independent) {
this.root = parent.root;
this.offset = 0;
- this.len = parent.len;
+ long parent_len = parent.len;
if (beginIndex < 0)
beginIndex = 0;
- if (beginIndex > len)
- beginIndex = len;
+ if (beginIndex > parent_len)
+ beginIndex = parent_len;
if (endIndex < 0)
endIndex = 0;
- if (endIndex > len)
- endIndex = len;
+ if (endIndex > parent_len)
+ endIndex = parent_len;
if (beginIndex > endIndex)
beginIndex = endIndex;
offset = beginIndex;

I plan to apply this patch before OpenJDK 6 b12 is published, which
should be within a week or two. (Neither the test directory nor the
src.floatwav files seem to have been updated since the last integration.)

Cheers,

-Joe

[1] http://mail.openjdk.java.net/pipermail/sound-dev/2008-July/000064.html

Re: java sound implementation using pulseaudio - ports

2008-08-21T16:06:01Z

Ioana Ivan wrote:

> Hi,
>
> We've been trying to write an implementation of
> javax.sound.sampled.Mixer(and the associated classes: SourceDataLine,
> TargetDataLine, Clip, and Port) that uses pulseaudio as a backend. So
> far, SourceDataLine, TargetDataLine and Clip are working (somewhat,
> there are still issues that need to be fixed), but we're not sure how to
> approach Port.
>
> From the java API:
> "Ports are simple lines for input or output of audio to or from audio
> devices. Common examples of ports that act as source lines (mixer
> inputs) include the microphone, line input, and CD-ROM drive. Ports that
> act as target lines (mixer outputs) include the speaker, headphone, and
> line output. You can access port using a Port.Info object."
>
> Ports should have an open() and close() method, and ideally they should
> also support volume and mute controls. There currently is an
> implementation of Port in openjdk that uses alsa to enumerate the
> devices that could connect to the sound system, and implement the
> required methods.
>
> We were wondering whether there's anything in the pulseaudio API that
> could be used to do something similar, and, if not, how problematic
> using the old version of Port(that uses alsa directly) with our mixer
> that uses pulseaudio is.

I spoke to you on the mailing list but this is a little clearer I think.

Basically you just want to expose the volume of the various Sinks and
Sources here. I would just get a list of all the Sinks and provide
playback Ports that allow volume control and muting etc. and do a
similar exposure for the Sources.

I'd use the introspection stuff to do this (tho' not overly sure).

http://0pointer.de/lennart/projects/pulseaudio/doxygen/introspect_8h.html

You can probably use the source of pavucontrol to work out what to do here.

You can of course export a volume on a "per stream" basis, but I'd
imagine this doesn't map too well to the Java API seeing as streams will
come and go quickly but sinks/sources will be slightly more long term
(tho can still come and go (e.g. when a usb audio device is plugged in
or a network sink is detected etc.)

I think whatever is in the "Output devices" and "Input devices" tab in
pavucontrol (from git) is probably what you want...

HTHs

Col

--

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
Mandriva Linux Contributor [http://www.mandriva.com/]
PulseAudio Hacker [http://www.pulseaudio.org/]
Trac Hacker [http://trac.edgewall.org/]

java sound implementation using pulseaudio - ports

2008-08-21T13:49:01Z

Hi,

We've been trying to write an implementation of
javax.sound.sampled.Mixer(and the associated classes: SourceDataLine,
TargetDataLine, Clip, and Port) that uses pulseaudio as a backend. So
far, SourceDataLine, TargetDataLine and Clip are working (somewhat,
there are still issues that need to be fixed), but we're not sure how to
approach Port.

From the java API:
"Ports are simple lines for input or output of audio to or from audio
devices. Common examples of ports that act as source lines (mixer
inputs) include the microphone, line input, and CD-ROM drive. Ports that
act as target lines (mixer outputs) include the speaker, headphone, and
line output. You can access port using a Port.Info object."

Ports should have an open() and close() method, and ideally they should
also support volume and mute controls. There currently is an
implementation of Port in openjdk that uses alsa to enumerate the
devices that could connect to the sound system, and implement the
required methods.

We were wondering whether there's anything in the pulseaudio API that
could be used to do something similar, and, if not, how problematic
using the old version of Port(that uses alsa directly) with our mixer
that uses pulseaudio is.

Thank you,
Ioana Ivan

Re: Updating Gervill for OpenJDK 6 build 12

2008-07-30T18:28:44Z

Joseph D. Darcy wrote:
> Hello.
>
> I've synced up with Karl's regression test changes, added the changes
> for the three Wave* files, and integrated the updated version of
> Gervill into the internal OpenJDK 6 b12 code base. All Gervill
> regression tests now pass on all platforms :-)
>
> The source for build 12 should be posted within a week or two.
Thanks, Joe, you rock ;)

cheers,
dalibor topic

--
*******************************************************************
Dalibor Topic Tel: (+49 40) 23 646 738
Java F/OSS Ambassador AIM: robiladonaim
Sun Microsystems GmbH Mobile: (+49 177) 2664 192
Nagelsweg 55 http://openjdk.java.net
D-20097 Hamburg mailto:Dalibor.Topic@...
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht München: HRB 161028
Geschäftsführer: Thomas Schröder, Wolfgang Engels, Dr. Roland Bömer
Vorsitzender des Aufsichtsrates: Martin Häring

Re: Updating Gervill for OpenJDK 6 build 12

2008-07-29T22:22:19Z

Hello.

I've synced up with Karl's regression test changes, added the changes
for the three Wave* files, and integrated the updated version of Gervill
into the internal OpenJDK 6 b12 code base. All Gervill regression tests
now pass on all platforms :-)

The source for build 12 should be posted within a week or two.

Thanks,

-Joe

Joseph D. Darcy wrote:

> Karl Helgason wrote:
>> Adding PCM Float support into current WaveFileReader.java,
>> WaveFileWriter.java
>> would be best. And it is just question of adding few lines.
>> But until then I think you can use WaveFloatFileReader.java,
>> WaveFloatFileWriter.java.
>
> Just to be clear, you recommend for now I add WaveFloatFileReader.java
> and WaveFloatFileWriter.java. (from src.floatwav/ rather than src/) but
> not include WaveExtensibleFileReader.java.
>
> -Joe
>
>> ________________________________________
>> Frá: Joe.Darcy@... [Joe.Darcy@...]
>> Sent: 29. júlí 2008 00:25
>> Viðtakandi: Alex Menkov; Karl Helgason
>> Afrit: sound-dev@...; Alexey.Menkov@...;
>> Dalibor.Topic@...
>> Efni: Re: <Sound Dev> Updating Gervill for OpenJDK 6 build 12
>>
>> Alex Menkov wrote:
>>> Karl Helgason wrote:
>>>>>> WaveExtensibleFileReader,WaveFloatFileWriter,WaveFloatFileReader
>>>>>> has been
>>>>>> moved to src.floatwav in the Gervill CVS. Because they aren't
>>>>>> directly related with
>>>>>> Gervill Synthesizer. They simply add support for float encoded Wave
>>>>>> files.
>>>>>> And WaveExtensibleFileReader is also a proposal how we should store
>>>>>> channel mask in AudioFormat properties (used for multi-channel wave
>>>>>> files).
>>>>> So, should I add these files to OpenJDK 6?
>>>>>
>>>> It depends, Alexey thought we should rather add support for PCM Float
>>>> support
>>>> to current com.sun.media.sound.WaveFileReader and WaveFileWriter
>>>> classes
>>>> than introducing new one.
>>> All this wave readers (current PCM/ALAW/ULAW and Float & Extensible
>>> from Gervill) could be combined in different ways - basing on current
>>> WaveFileReader or basing on WaveFloatFileReader or
>>> WaveExtensibleFileReader.
>>> Main goal is to avoid functionality duplication.
>>
>> I'm personally agnostic toward how this functionality is implemented.
>> Alex and Karl, how about I add these files along with the other changes
>> I'm making?
>>
>> -Joe
>>
>>>>>> And WaveExtensibleFileReader is also a proposal how we should store
>>>>>> channel mask in AudioFormat properties (used for multi-channel
>>> wave files).
>>>
>>> Wow.. I've overlooked this :)
>>>
>>>
>>>
>>> Regards
>>> Alex
>>
>>
>>
>> No virus found in this incoming message.
>> Checked by AVG.
>> Version: 7.5.524 / Virus Database: 270.5.6/1576 - Release Date:
>> 27.7.2008 16:16
>>
>

Re: Updating Gervill for OpenJDK 6 build 12

2008-07-28T19:24:21Z

Karl Helgason wrote:
> Adding PCM Float support into current WaveFileReader.java, WaveFileWriter.java
> would be best. And it is just question of adding few lines.
> But until then I think you can use WaveFloatFileReader.java, WaveFloatFileWriter.java.

Just to be clear, you recommend for now I add WaveFloatFileReader.java
and WaveFloatFileWriter.java. (from src.floatwav/ rather than src/) but
not include WaveExtensibleFileReader.java.

-Joe

> ________________________________________
> Frá: Joe.Darcy@... [Joe.Darcy@...]
> Sent: 29. júlí 2008 00:25
> Viðtakandi: Alex Menkov; Karl Helgason
> Afrit: sound-dev@...; Alexey.Menkov@...; Dalibor.Topic@...
> Efni: Re: <Sound Dev> Updating Gervill for OpenJDK 6 build 12
>
> Alex Menkov wrote:
>> Karl Helgason wrote:
>>>>> WaveExtensibleFileReader,WaveFloatFileWriter,WaveFloatFileReader
>>>>> has been
>>>>> moved to src.floatwav in the Gervill CVS. Because they aren't
>>>>> directly related with
>>>>> Gervill Synthesizer. They simply add support for float encoded Wave
>>>>> files.
>>>>> And WaveExtensibleFileReader is also a proposal how we should store
>>>>> channel mask in AudioFormat properties (used for multi-channel wave
>>>>> files).
>>>> So, should I add these files to OpenJDK 6?
>>>>
>>> It depends, Alexey thought we should rather add support for PCM Float
>>> support
>>> to current com.sun.media.sound.WaveFileReader and WaveFileWriter classes
>>> than introducing new one.
>> All this wave readers (current PCM/ALAW/ULAW and Float & Extensible
>> from Gervill) could be combined in different ways - basing on current
>> WaveFileReader or basing on WaveFloatFileReader or
>> WaveExtensibleFileReader.
>> Main goal is to avoid functionality duplication.
>
> I'm personally agnostic toward how this functionality is implemented.
> Alex and Karl, how about I add these files along with the other changes
> I'm making?
>
> -Joe
>
>>>>> And WaveExtensibleFileReader is also a proposal how we should store
>>>>> channel mask in AudioFormat properties (used for multi-channel
>> wave files).
>>
>> Wow.. I've overlooked this :)
>>
>>
>>
>> Regards
>> Alex
>
>
>
> No virus found in this incoming message.
> Checked by AVG.
> Version: 7.5.524 / Virus Database: 270.5.6/1576 - Release Date: 27.7.2008 16:16
>