tag:old.nabble.com,2006:forum-27652
Nabble - OpenJDK Audio Engine Development
2008-11-20T19:04:50Z
tag:old.nabble.com,2006:post-20614493
Issue with AudioSystem.getSoundbank() plus proposed patch.
2008-11-20T19:04:50Z
2008-11-20T19:04:50Z
Bill Brown
Greetings Audio Devs: <br><br>I did not find this issue discussed previously in the archives. I have run into an issue with the current Openjdk implementation of AudioSystem.getSoundbank() that applies to all three variants File, URL and InputStream. The current implementation only considers the first valid javax.sound.midi.spi.SoundbankReader instead of checking the Soundbank instance for use with the loaded or default Synthesizer. This consideration is arbitrary based on the order in which the SoundBankReader implementations are made available and my be wrong when there are multiple providers for different synths that handle the same file type / format. <br>
<br>The Soundbank returned from the method is only useable by a Synthesizer (the currently loaded Synthesizer) and each Synthesizer's soundbanks are unique for that synthesizer by design (<a href="http://www.j2ee.me/j2se/1.3/pdf/javasound.pdf" target="_top" rel="nofollow">http://www.j2ee.me/j2se/1.3/pdf/javasound.pdf</a> section "Providing Soundbank File-Reading Services" p. 148). My current project (code named EMAP) provides a SoundbankReader for the same .sf2 file type as Gervill. This current MidiSystem.getSoundbank() breaks my app and have not figured out a workaround that doesn't involve the proposed patch. <br>
<br>Because it is possible to enforce which Synthesizer is used by setting the system property javax.sound.midi.Synthesizer, it should be possible to load a soundbank from a file that is supported by the loaded Synthesizer. Here is a patch suggestion that can somewhat handle this request without adding a big implementation change:<code></code><br>
<br><br>public static Soundbank getSoundbank(File file) //can be used also for the URLand InputStream signatures<br> throws InvalidMidiDataException, IOException {<br> SoundbankReader sp = null;<br> Soundbank s = null;<br>
Soundbank validSoundbank = null;<br><br> List providers = getSoundbankReaders();<br><br> for(int i = 0; i < providers.size(); i++) {<br> sp = (SoundbankReader)providers.get(i);<br>
try{<br> s = sp.getSoundbank(file);<br> }catch(IOException io){}<br> catch (InvalidMidiDataException ime){}<br> <br> if( s!= null) {<br>
//crosscheck support with the current default synthesizer.<br> //because the soundbank is not much use otherwise.<br> //there may be more than on synth in the system <br>
//that supports this file format.<br> try{<br> Synthesizer synth = (Synthesizer)<br> getDefaultDeviceWrapper(Synthesizer.class);<br>
if(synth.isSoundbankSupported(s)){<br> return s;<br> }<br> //still arbitrary at this point but at least we have <br>
//checked against the default synthesizer.<br> validSoundbank = s;<br> }catch(MidiUnavailableException e){}<br> <br> }<br>
}<br> if(validSoundbank != null){<br> return validSoundbank;<br> }<br> throw new InvalidMidiDataException("cannot get soundbank from stream");<br>
}<br><br><br>I think the API would be more robust if it could handle the scenario
where there are multiple providers that can handle the same file type.
I think the extra overhead that this patch creates is small compared to the usefullness of being able to get a handle on a Soundbank that will work with the currently loaded Synthesizer. Another way to handle this issue could be to add signatures and implementations in the API to allow a Synthesizer to load a Soundbank in the same manner as the MidiSystem. But it you did that, I don't see much use for the MidiSystem versions.<br>
<br>Please consider this patch, or something like it, for inclusion to the openjdk implementation or possibly provide some workaround for loading a useable Soundbank when there are multiple synths in the system that support the same format. <br>
<br>Thanks for looking at this..<br>Bill.<br> <br><br><br>
<br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=20614493&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-20418511
New Gervill CVS imported into IcedTea6
2008-11-10T03:45:48Z
2008-11-10T03:45:48Z
Mark Wielaard
Hi,
<br><br>I updated the IcedTea6 Gervill overlay with current Gervill CVS.
<br><br>Out current set of changes compared with upstream are now really minimal
<br>(diff attached). It incorporates a couple of the fixes for the
<br>unloadInstruments methods from icedtea. It also fixes an imported bug
<br>reported against icedtea "freezes on simple midi app":
<br><a href="http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213" target="_top" rel="nofollow">http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213</a><br><br>Also since openjdk6 imported a newer Gervill and incorporated a couple
<br>of the changes in the icedtea gervill not yet upstream, we are a bit
<br>closer again. diff between icedtea6-openjdk6 attached. Some of this is
<br>just reformatting changed done in the openjdk6 on the upstream sources.
<br>Not included in the diff is the renaming/changes to the upstream tests
<br>(most of which are similar to our and upstream tests, but repackaged and
<br>slightly reformatted).
<br><br>All jtreg tests, both the com/sun/media/sound ones from upstream, as the
<br>older javax/sound/midi in openjdk6 (which are almost all a copy of the
<br>upstream tests renamed into a different package) pass.
<br>And you can run them with the new jtreg -s flag, which gives an enormous
<br>speed boost! That is in 45 seconds. Compared to 4.5 minutes without -s.
<br>Test results: passed: 475
<br><br>2008-11-10 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=20418511&i=0" target="_top" rel="nofollow">mark@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
<br> CHANGES.txt,SoftAudioPusher.java,SoftFilter.java,
<br> SoftJitterCorrector.java,SoftMainMixer.java,SoftVoice.java:
<br> Updated to new Gervill CVS.
<br><br>Changes to the icedtea overlays since last import attached.
<br><br>The actual changes to Gervill since our last import:
<br><br>- Fix: Throw IllegalArgumentException Exception on
<br> invalid soundbank to:
<br> SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
<br> SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[] patchList)
<br> just like done in:
<br> SoftSynthesizer.unloadInstrument(Instrument instrument).
<br>- Change: SoftMainMixer, SoftVoice optimized for mono voices.
<br>- Change: SoftFilter optimized.
<br>- Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
<br> These threads prevented the VM to exit when synthesizer was open.
<br> See: <a href="http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213" target="_top" rel="nofollow">http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213</a>
<br><br>Cheers,
<br><br>Mark
<br><br />Index: build.xml
<br>===================================================================
<br>RCS file: /cvs/gervill/build.xml,v
<br>retrieving revision 1.2
<br>diff -u -r1.2 build.xml
<br>--- build.xml 14 Dec 2007 03:33:11 -0000 1.2
<br>+++ build.xml 10 Nov 2008 10:09:28 -0000
<br>@@ -29,7 +29,8 @@
<br> <!-- run javac to compile the source files -->
<br> <target name="compile" depends="init">
<br> <javac srcdir="${src}"
<br>-destdir="${build}">
<br>+destdir="${build}"
<br>+debug="true">
<br> <classpath>
<br> <path refid="lib.path"/>
<br> </classpath>
<br>@@ -69,4 +70,4 @@
<br> <delete dir="${lib}"/>
<br> <delete dir="${docs}"/>
<br> </target>
<br>-</project>
<br>\ No newline at end of file
<br>+</project>
<br>Index: src/com/sun/media/sound/DLSSoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/DLSSoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 DLSSoundbankReader.java
<br>--- src/com/sun/media/sound/DLSSoundbankReader.java 5 Jun 2008 01:55:28 -0000 1.3
<br>+++ src/com/sun/media/sound/DLSSoundbankReader.java 10 Nov 2008 10:09:28 -0000
<br>@@ -47,6 +47,8 @@
<br> return new DLSSoundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SF2SoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SF2SoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 SF2SoundbankReader.java
<br>--- src/com/sun/media/sound/SF2SoundbankReader.java 5 Jun 2008 01:55:33 -0000 1.3
<br>+++ src/com/sun/media/sound/SF2SoundbankReader.java 10 Nov 2008 10:09:28 -0000
<br>@@ -46,6 +46,8 @@
<br> return new SF2Soundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SoftChannel.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftChannel.java,v
<br>retrieving revision 1.11
<br>diff -u -r1.11 SoftChannel.java
<br>--- src/com/sun/media/sound/SoftChannel.java 27 Jul 2008 19:06:21 -0000 1.11
<br>+++ src/com/sun/media/sound/SoftChannel.java 10 Nov 2008 10:09:28 -0000
<br>@@ -1215,7 +1215,9 @@
<br>
<br> public int getController(int controller) {
<br> synchronized (control_mutex) {
<br>- return this.controller[controller];
<br>+ // Should only return lower 7 bits,
<br>+ // even when controller is "boosted" higher.
<br>+ return this.controller[controller] & 127;
<br> }
<br> }
<br>
<br><br /><tt>[icedtea-openjdk.diff]</tt><br /><hr align="left" width="300" /><tt>--- /home/mark/src/openjdk6/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java 2008-11-05 10:12:10.000000000 +0100
<br>+++ jdk/src/share/classes/com/sun/media/sound/SoftFilter.java 2008-11-10 10:40:49.000000000 +0100
<br>@@ -543,8 +543,6 @@
<br>
<br> public void filter1(SoftAudioBuffer sbuffer) {
<br>
<br>- float[] buffer = sbuffer.array();
<br>-
<br> if (dirty) {
<br> filter1calc();
<br> dirty = false;
<br>@@ -559,6 +557,7 @@
<br>
<br> if (wet > 0 || last_wet > 0) {
<br>
<br>+ float[] buffer = sbuffer.array();
<br> int len = buffer.length;
<br> float a0 = this.last_a0;
<br> float q = this.last_q;
<br>@@ -577,14 +576,16 @@
<br> q += q_delta;
<br> gain += gain_delta;
<br> wet += wet_delta;
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ float ga0 = (1 - q * a0);
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain * wet + buffer[i] * (1 - wet);
<br> }
<br> } else if (a0_delta == 0 && q_delta == 0) {
<br>+ float ga0 = (1 - q * a0);
<br> for (int i = 0; i < len; i++) {
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain;
<br> }
<br> } else {
<br>@@ -592,8 +593,9 @@
<br> a0 += a0_delta;
<br> q += q_delta;
<br> gain += gain_delta;
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ float ga0 = (1 - q * a0);
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain;
<br> }
<br> }
<br>@@ -611,4 +613,4 @@
<br> this.last_gain = this.gain;
<br> this.last_wet = this.wet;
<br> }
<br>-}
<br>+}
<br>\ No newline at end of file
<br>--- /home/mark/src/openjdk6/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java 2008-11-05 10:12:10.000000000 +0100
<br>+++ jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java 2008-11-10 10:40:49.000000000 +0100
<br>@@ -48,16 +48,18 @@
<br>
<br> public final static int CHANNEL_LEFT = 0;
<br> public final static int CHANNEL_RIGHT = 1;
<br>- public final static int CHANNEL_EFFECT1 = 2;
<br>- public final static int CHANNEL_EFFECT2 = 3;
<br>- public final static int CHANNEL_EFFECT3 = 4;
<br>- public final static int CHANNEL_EFFECT4 = 5;
<br>+ public final static int CHANNEL_MONO = 2;
<br>+ public final static int CHANNEL_EFFECT1 = 3;
<br>+ public final static int CHANNEL_EFFECT2 = 4;
<br>+ public final static int CHANNEL_EFFECT3 = 5;
<br>+ public final static int CHANNEL_EFFECT4 = 6;
<br> public final static int CHANNEL_LEFT_DRY = 10;
<br> public final static int CHANNEL_RIGHT_DRY = 11;
<br> public final static int CHANNEL_SCRATCH1 = 12;
<br> public final static int CHANNEL_SCRATCH2 = 13;
<br> public final static int CHANNEL_CHANNELMIXER_LEFT = 14;
<br> public final static int CHANNEL_CHANNELMIXER_RIGHT = 15;
<br>+ public final static int CHANNEL_CHANNELMIXER_MONO = 16;
<br> protected boolean active_sensing_on = false;
<br> private long msec_last_activity = -1;
<br> private boolean pusher_silent = false;
<br>@@ -485,8 +487,10 @@
<br> // to channelmixer left,right input/output
<br> SoftAudioBuffer leftbak = buffers[CHANNEL_LEFT];
<br> SoftAudioBuffer rightbak = buffers[CHANNEL_RIGHT];
<br>+ SoftAudioBuffer monobak = buffers[CHANNEL_MONO];
<br> buffers[CHANNEL_LEFT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
<br>- buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
<br>+ buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_RIGHT];
<br>+ buffers[CHANNEL_MONO] = buffers[CHANNEL_CHANNELMIXER_MONO];
<br>
<br> int bufferlen = buffers[CHANNEL_LEFT].getSize();
<br>
<br>@@ -503,6 +507,7 @@
<br> for (ModelChannelMixer cmixer : act_registeredMixers) {
<br> for (int i = 0; i < cbuffer.length; i++)
<br> Arrays.fill(cbuffer[i], 0);
<br>+ buffers[CHANNEL_MONO].clear();
<br> boolean hasactivevoices = false;
<br> for (int i = 0; i < voicestatus.length; i++)
<br> if (voicestatus[i].active)
<br>@@ -516,6 +521,26 @@
<br> cur_registeredMixers = null;
<br> }
<br> }
<br>+
<br>+ if(!buffers[CHANNEL_MONO].isSilent())
<br>+ {
<br>+ float[] mono = buffers[CHANNEL_MONO].array();
<br>+ float[] left = buffers[CHANNEL_LEFT].array();
<br>+ if (nrofchannels != 1) {
<br>+ float[] right = buffers[CHANNEL_RIGHT].array();
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ float v = mono[i];
<br>+ left[i] += v;
<br>+ right[i] += v;
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ left[i] += mono[i];
<br>+ }
<br>+ }
<br>+ }
<br>
<br> for (int i = 0; i < cbuffer.length; i++) {
<br> float[] cbuff = cbuffer[i];
<br>@@ -539,6 +564,7 @@
<br>
<br> buffers[CHANNEL_LEFT] = leftbak;
<br> buffers[CHANNEL_RIGHT] = rightbak;
<br>+ buffers[CHANNEL_MONO] = monobak;
<br>
<br> }
<br>
<br>@@ -546,6 +572,27 @@
<br> if (voicestatus[i].active)
<br> if (voicestatus[i].channelmixer == null)
<br> voicestatus[i].processAudioLogic(buffers);
<br>+
<br>+ if(!buffers[CHANNEL_MONO].isSilent())
<br>+ {
<br>+ float[] mono = buffers[CHANNEL_MONO].array();
<br>+ float[] left = buffers[CHANNEL_LEFT].array();
<br>+ int bufferlen = buffers[CHANNEL_LEFT].getSize();
<br>+ if (nrofchannels != 1) {
<br>+ float[] right = buffers[CHANNEL_RIGHT].array();
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ float v = mono[i];
<br>+ left[i] += v;
<br>+ right[i] += v;
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ left[i] += mono[i];
<br>+ }
<br>+ }
<br>+ }
<br>
<br> // Run effects
<br> if (synth.chorus_on)
<br>@@ -665,7 +712,7 @@
<br> / synth.getControlRate());
<br>
<br> control_mutex = synth.control_mutex;
<br>- buffers = new SoftAudioBuffer[16];
<br>+ buffers = new SoftAudioBuffer[17];
<br> for (int i = 0; i < buffers.length; i++) {
<br> buffers[i] = new SoftAudioBuffer(buffersize, synth.getFormat());
<br> }
<br>--- /home/mark/src/openjdk6/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java 2008-11-05 10:12:10.000000000 +0100
<br>+++ jdk/src/share/classes/com/sun/media/sound/SoftVoice.java 2008-11-10 10:40:49.000000000 +0100
<br>@@ -782,6 +782,7 @@
<br>
<br> SoftAudioBuffer left = buffer[SoftMainMixer.CHANNEL_LEFT];
<br> SoftAudioBuffer right = buffer[SoftMainMixer.CHANNEL_RIGHT];
<br>+ SoftAudioBuffer mono = buffer[SoftMainMixer.CHANNEL_MONO];
<br> SoftAudioBuffer eff1 = buffer[SoftMainMixer.CHANNEL_EFFECT1];
<br> SoftAudioBuffer eff2 = buffer[SoftMainMixer.CHANNEL_EFFECT2];
<br> SoftAudioBuffer leftdry = buffer[SoftMainMixer.CHANNEL_LEFT_DRY];
<br>@@ -802,17 +803,26 @@
<br> if (rightdry != null)
<br> mixAudioStream(rightdry, left, last_out_mixer_left,
<br> out_mixer_left);
<br>- } else {
<br>- mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
<br>- if (rightdry != null)
<br>- mixAudioStream(rightdry, right, last_out_mixer_right,
<br>- out_mixer_right);
<br>+ } else {
<br>+ if(rightdry == null &&
<br>+ last_out_mixer_left == last_out_mixer_right &&
<br>+ out_mixer_left == out_mixer_right)
<br>+ {
<br>+ mixAudioStream(leftdry, mono, last_out_mixer_left, out_mixer_left);
<br>+ }
<br> else
<br>- mixAudioStream(leftdry, right, last_out_mixer_right,
<br>+ {
<br>+ mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
<br>+ if (rightdry != null)
<br>+ mixAudioStream(rightdry, right, last_out_mixer_right,
<br>+ out_mixer_right);
<br>+ else
<br>+ mixAudioStream(leftdry, right, last_out_mixer_right,
<br> out_mixer_right);
<br>+ }
<br> }
<br>
<br>- if (rightdry == null) {
<br>+ if (rightdry == null) {
<br> mixAudioStream(leftdry, eff1, last_out_mixer_effect1,
<br> out_mixer_effect1);
<br> mixAudioStream(leftdry, eff2, last_out_mixer_effect2,
<br>--- /home/mark/src/openjdk6/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java 2008-11-05 10:12:10.000000000 +0100
<br>+++ jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java 2008-11-10 10:40:49.000000000 +0100
<br>@@ -216,6 +216,7 @@
<br> };
<br>
<br> thread = new Thread(runnable);
<br>+ thread.setDaemon(true);
<br> thread.setPriority(Thread.MAX_PRIORITY);
<br> thread.start();
<br> }
<br>--- /home/mark/src/openjdk6/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java 2008-11-05 10:12:09.000000000 +0100
<br>+++ jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java 2008-11-10 10:40:49.000000000 +0100
<br>@@ -54,6 +54,7 @@
<br> return;
<br> active = true;
<br> audiothread = new Thread(this);
<br>+ audiothread.setDaemon(true);
<br> audiothread.setPriority(Thread.MAX_PRIORITY);
<br> audiothread.start();
<br> }
<br></tt><hr align="left" width="300" /><br /><tt>[gervill-overlay.patch]</tt><br /><hr align="left" width="300" /><tt>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Mon Nov 10 12:07:31 2008 +0100
<br>@@ -1,3 +1,14 @@
<br>+ - Fix: Throw IllegalArgumentException Exception on
<br>+ invalid soundbank to:
<br>+ SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
<br>+ SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[] patchList)
<br>+ just like done in:
<br>+ SoftSynthesizer.unloadInstrument(Instrument instrument).
<br>+ - Change: SoftMainMixer, SoftVoice optimized for mono voices.
<br>+ - Change: SoftFilter optimized.
<br>+ - Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
<br>+ These threads prevented the VM to exit when synthesizer was open.
<br>+ See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213
<br> - Add: More JTreg tests added:
<br> EmergencySoundbank
<br> SoftFilter
<br>@@ -6,6 +17,8 @@
<br> - Fix: ModelByteBuffer.skip called super.skip
<br> instead to call to RandomAccessFile directly.
<br> JTreg tests added: ModelByteBuffer/RandomFileInputStream/*.java
<br>+
<br>+Version 1.0.2 (released in OpenJDK 6 b12)
<br> - Fix: ModelByteBuffer.len was being modified in inner
<br> class RandomFileInputStream. The variable was made final
<br> and RandomFileInputStream.read methods where fixed.
<br>@@ -13,7 +26,7 @@
<br> Keys array was to small, it couldn't
<br> hold all possible midi notes (0..127).
<br>
<br>-Version 1.0.1
<br>+Version 1.0.1 (released as 1.0)
<br> - Fix: Created dummy SourceDataline so that following
<br> jtreg test can be tested without using
<br> a real Audio Device SourceDataLine.
<br>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java Mon Nov 10 12:07:31 2008 +0100
<br>@@ -54,6 +54,7 @@
<br> return;
<br> active = true;
<br> audiothread = new Thread(this);
<br>+ audiothread.setDaemon(true);
<br> audiothread.setPriority(Thread.MAX_PRIORITY);
<br> audiothread.start();
<br> }
<br>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Mon Nov 10 12:07:31 2008 +0100
<br>@@ -543,8 +543,6 @@
<br>
<br> public void filter1(SoftAudioBuffer sbuffer) {
<br>
<br>- float[] buffer = sbuffer.array();
<br>-
<br> if (dirty) {
<br> filter1calc();
<br> dirty = false;
<br>@@ -559,6 +557,7 @@
<br>
<br> if (wet > 0 || last_wet > 0) {
<br>
<br>+ float[] buffer = sbuffer.array();
<br> int len = buffer.length;
<br> float a0 = this.last_a0;
<br> float q = this.last_q;
<br>@@ -577,14 +576,16 @@
<br> q += q_delta;
<br> gain += gain_delta;
<br> wet += wet_delta;
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ float ga0 = (1 - q * a0);
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain * wet + buffer[i] * (1 - wet);
<br> }
<br> } else if (a0_delta == 0 && q_delta == 0) {
<br>+ float ga0 = (1 - q * a0);
<br> for (int i = 0; i < len; i++) {
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain;
<br> }
<br> } else {
<br>@@ -592,8 +593,9 @@
<br> a0 += a0_delta;
<br> q += q_delta;
<br> gain += gain_delta;
<br>- y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
<br>- y2 = (1 - q * a0) * y2 + (a0) * y1;
<br>+ float ga0 = (1 - q * a0);
<br>+ y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
<br>+ y2 = ga0 * y2 + (a0) * y1;
<br> buffer[i] = y2 * gain;
<br> }
<br> }
<br>@@ -611,4 +613,4 @@
<br> this.last_gain = this.gain;
<br> this.last_wet = this.wet;
<br> }
<br>-}
<br>+}
<br>\ No newline at end of file
<br>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java Mon Nov 10 12:07:31 2008 +0100
<br>@@ -216,6 +216,7 @@
<br> };
<br>
<br> thread = new Thread(runnable);
<br>+ thread.setDaemon(true);
<br> thread.setPriority(Thread.MAX_PRIORITY);
<br> thread.start();
<br> }
<br>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Mon Nov 10 12:07:31 2008 +0100
<br>@@ -48,16 +48,18 @@
<br>
<br> public final static int CHANNEL_LEFT = 0;
<br> public final static int CHANNEL_RIGHT = 1;
<br>- public final static int CHANNEL_EFFECT1 = 2;
<br>- public final static int CHANNEL_EFFECT2 = 3;
<br>- public final static int CHANNEL_EFFECT3 = 4;
<br>- public final static int CHANNEL_EFFECT4 = 5;
<br>+ public final static int CHANNEL_MONO = 2;
<br>+ public final static int CHANNEL_EFFECT1 = 3;
<br>+ public final static int CHANNEL_EFFECT2 = 4;
<br>+ public final static int CHANNEL_EFFECT3 = 5;
<br>+ public final static int CHANNEL_EFFECT4 = 6;
<br> public final static int CHANNEL_LEFT_DRY = 10;
<br> public final static int CHANNEL_RIGHT_DRY = 11;
<br> public final static int CHANNEL_SCRATCH1 = 12;
<br> public final static int CHANNEL_SCRATCH2 = 13;
<br> public final static int CHANNEL_CHANNELMIXER_LEFT = 14;
<br> public final static int CHANNEL_CHANNELMIXER_RIGHT = 15;
<br>+ public final static int CHANNEL_CHANNELMIXER_MONO = 16;
<br> protected boolean active_sensing_on = false;
<br> private long msec_last_activity = -1;
<br> private boolean pusher_silent = false;
<br>@@ -485,8 +487,10 @@
<br> // to channelmixer left,right input/output
<br> SoftAudioBuffer leftbak = buffers[CHANNEL_LEFT];
<br> SoftAudioBuffer rightbak = buffers[CHANNEL_RIGHT];
<br>+ SoftAudioBuffer monobak = buffers[CHANNEL_MONO];
<br> buffers[CHANNEL_LEFT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
<br>- buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
<br>+ buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_RIGHT];
<br>+ buffers[CHANNEL_MONO] = buffers[CHANNEL_CHANNELMIXER_MONO];
<br>
<br> int bufferlen = buffers[CHANNEL_LEFT].getSize();
<br>
<br>@@ -503,6 +507,7 @@
<br> for (ModelChannelMixer cmixer : act_registeredMixers) {
<br> for (int i = 0; i < cbuffer.length; i++)
<br> Arrays.fill(cbuffer[i], 0);
<br>+ buffers[CHANNEL_MONO].clear();
<br> boolean hasactivevoices = false;
<br> for (int i = 0; i < voicestatus.length; i++)
<br> if (voicestatus[i].active)
<br>@@ -516,6 +521,26 @@
<br> cur_registeredMixers = null;
<br> }
<br> }
<br>+
<br>+ if(!buffers[CHANNEL_MONO].isSilent())
<br>+ {
<br>+ float[] mono = buffers[CHANNEL_MONO].array();
<br>+ float[] left = buffers[CHANNEL_LEFT].array();
<br>+ if (nrofchannels != 1) {
<br>+ float[] right = buffers[CHANNEL_RIGHT].array();
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ float v = mono[i];
<br>+ left[i] += v;
<br>+ right[i] += v;
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ left[i] += mono[i];
<br>+ }
<br>+ }
<br>+ }
<br>
<br> for (int i = 0; i < cbuffer.length; i++) {
<br> float[] cbuff = cbuffer[i];
<br>@@ -539,6 +564,7 @@
<br>
<br> buffers[CHANNEL_LEFT] = leftbak;
<br> buffers[CHANNEL_RIGHT] = rightbak;
<br>+ buffers[CHANNEL_MONO] = monobak;
<br>
<br> }
<br>
<br>@@ -546,6 +572,27 @@
<br> if (voicestatus[i].active)
<br> if (voicestatus[i].channelmixer == null)
<br> voicestatus[i].processAudioLogic(buffers);
<br>+
<br>+ if(!buffers[CHANNEL_MONO].isSilent())
<br>+ {
<br>+ float[] mono = buffers[CHANNEL_MONO].array();
<br>+ float[] left = buffers[CHANNEL_LEFT].array();
<br>+ int bufferlen = buffers[CHANNEL_LEFT].getSize();
<br>+ if (nrofchannels != 1) {
<br>+ float[] right = buffers[CHANNEL_RIGHT].array();
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ float v = mono[i];
<br>+ left[i] += v;
<br>+ right[i] += v;
<br>+ }
<br>+ }
<br>+ else
<br>+ {
<br>+ for (int i = 0; i < bufferlen; i++) {
<br>+ left[i] += mono[i];
<br>+ }
<br>+ }
<br>+ }
<br>
<br> // Run effects
<br> if (synth.chorus_on)
<br>@@ -665,7 +712,7 @@
<br> / synth.getControlRate());
<br>
<br> control_mutex = synth.control_mutex;
<br>- buffers = new SoftAudioBuffer[16];
<br>+ buffers = new SoftAudioBuffer[17];
<br> for (int i = 0; i < buffers.length; i++) {
<br> buffers[i] = new SoftAudioBuffer(buffersize, synth.getFormat());
<br> }
<br>diff -r 688efd120766 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java
<br>--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Sun Nov 09 22:31:21 2008 +0100
<br>+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Mon Nov 10 12:07:31 2008 +0100
<br>@@ -782,6 +782,7 @@
<br>
<br> SoftAudioBuffer left = buffer[SoftMainMixer.CHANNEL_LEFT];
<br> SoftAudioBuffer right = buffer[SoftMainMixer.CHANNEL_RIGHT];
<br>+ SoftAudioBuffer mono = buffer[SoftMainMixer.CHANNEL_MONO];
<br> SoftAudioBuffer eff1 = buffer[SoftMainMixer.CHANNEL_EFFECT1];
<br> SoftAudioBuffer eff2 = buffer[SoftMainMixer.CHANNEL_EFFECT2];
<br> SoftAudioBuffer leftdry = buffer[SoftMainMixer.CHANNEL_LEFT_DRY];
<br>@@ -802,17 +803,26 @@
<br> if (rightdry != null)
<br> mixAudioStream(rightdry, left, last_out_mixer_left,
<br> out_mixer_left);
<br>- } else {
<br>- mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
<br>- if (rightdry != null)
<br>- mixAudioStream(rightdry, right, last_out_mixer_right,
<br>+ } else {
<br>+ if(rightdry == null &&
<br>+ last_out_mixer_left == last_out_mixer_right &&
<br>+ out_mixer_left == out_mixer_right)
<br>+ {
<br>+ mixAudioStream(leftdry, mono, last_out_mixer_left, out_mixer_left);
<br>+ }
<br>+ else
<br>+ {
<br>+ mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
<br>+ if (rightdry != null)
<br>+ mixAudioStream(rightdry, right, last_out_mixer_right,
<br> out_mixer_right);
<br>- else
<br>- mixAudioStream(leftdry, right, last_out_mixer_right,
<br>+ else
<br>+ mixAudioStream(leftdry, right, last_out_mixer_right,
<br> out_mixer_right);
<br>+ }
<br> }
<br>
<br>- if (rightdry == null) {
<br>+ if (rightdry == null) {
<br> mixAudioStream(leftdry, eff1, last_out_mixer_effect1,
<br> out_mixer_effect1);
<br> mixAudioStream(leftdry, eff2, last_out_mixer_effect2,
<br></tt><hr align="left" width="300" /><br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=20418511&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-19618442
Re: Updating Gervill for OpenJDK 6 build 13
2008-09-22T16:15:20Z
2008-09-22T16:15:20Z
joe.darcy
Joe Darcy wrote:
<div class='shrinkable-quote'><br>> Hello.
<br>>
<br>> Since OpenJDK 6 took a snapshot of Gervill for b12, Gervill was been
<br>> updated. Also, Mark Wielaard has a patch which address some JCK
<br>> failures:
<br>>
<br>> <a href="http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html" target="_top" rel="nofollow">http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html</a>
<br>>
<br>>
<br>> For the next build of OpenJDK 6, build 13, I'd like to include both
<br>> sets of changes; below is patch of those changes compared to build 12.
<br>>
<br>> Please review by September 19.
<br>>
<br>> Thanks,
<br>>
<br>> -Joe
<br>>
</div><br>I've applied the previously sent patch to the OpenJDK 6 b13 sources.
<br><br>Cheers,
<br><br>-Joe
<br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=19618442&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-19504685
Updating Gervill for OpenJDK 6 build 13
2008-09-15T20:24:47Z
2008-09-15T20:24:47Z
joe.darcy
Hello.
<br><br>Since OpenJDK 6 took a snapshot of Gervill for b12, Gervill was been
<br>updated. Also, Mark Wielaard has a patch which address some JCK failures:
<br><br><a href="http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html" target="_top" rel="nofollow">http://mail.openjdk.java.net/pipermail/audio-engine-dev/2008-September/000059.html</a><br><br>For the next build of OpenJDK 6, build 13, I'd like to include both
<br>sets of changes; below is patch of those changes compared to build 12.
<br><br>Please review by September 19.
<br><br>Thanks,
<br><br>-Joe
<br><br>--- old/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Sun Sep 14 23:15:37 2008
<br>+++ new/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Sun Sep 14 23:15:37 2008
<br>@@ -85,11 +85,12 @@
<br> }
<br>
<br> public long skip(long n) throws IOException {
<br>+ if( n < 0)
<br>+ return 0;
<br> if (n > left)
<br> n = left;
<br>- n = super.skip(n);
<br>- if (n == -1)
<br>- return -1;
<br>+ long p = raf.getFilePointer();
<br>+ raf.seek(p + n);
<br> left -= n;
<br> return n;
<br> }
<br>--- old/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun Sep 14 23:15:38 2008
<br>+++ new/src/share/classes/com/sun/media/sound/SoftMainMixer.java Sun Sep 14 23:15:38 2008
<br>@@ -69,7 +69,7 @@
<br> private int nrofchannels = 2;
<br> private SoftVoice[] voicestatus = null;
<br> private SoftAudioBuffer[] buffers;
<br>- private SoftAudioProcessor reverb;
<br>+ private SoftReverb reverb;
<br> private SoftAudioProcessor chorus;
<br> private SoftAudioProcessor agc;
<br> private long msec_buffer_len = 0;
<br>@@ -681,6 +681,8 @@
<br> chorus.init(samplerate, controlrate);
<br> agc.init(samplerate, controlrate);
<br>
<br>+ reverb.setLightMode(synth.reverb_light);
<br>+
<br> reverb.setMixMode(true);
<br> chorus.setMixMode(true);
<br> agc.setMixMode(false);
<br>--- old/src/share/classes/com/sun/media/sound/SoftReverb.java Sun Sep 14 23:15:39 2008
<br>+++ new/src/share/classes/com/sun/media/sound/SoftReverb.java Sun Sep 14 23:15:39 2008
<br>@@ -35,7 +35,7 @@
<br> */
<br> public class SoftReverb implements SoftAudioProcessor {
<br>
<br>- private static class Delay {
<br>+ private final static class Delay {
<br>
<br> private float[] delaybuffer;
<br> private int rovepos = 0;
<br>@@ -52,31 +52,28 @@
<br> rovepos = 0;
<br> }
<br>
<br>- public void processReplace(float[] in, float[] out) {
<br>- float[] delaybuffer = this.delaybuffer;
<br>+ public void processReplace(float[] inout) {
<br> if (delaybuffer == null)
<br> return;
<br>- int len = in.length;
<br>+ int len = inout.length;
<br> int rnlen = delaybuffer.length;
<br> int rovepos = this.rovepos;
<br>
<br> for (int i = 0; i < len; i++) {
<br>- float x = in[i];
<br>- out[i] = delaybuffer[rovepos];
<br>+ float x = inout[i];
<br>+ inout[i] = delaybuffer[rovepos];
<br> delaybuffer[rovepos] = x;
<br>- rovepos = rovepos + 1;
<br>- if (rovepos == rnlen)
<br>+ if (++rovepos == rnlen)
<br> rovepos = 0;
<br>- //rovepos = (rovepos + 1) % rnlen;
<br> }
<br> this.rovepos = rovepos;
<br> }
<br> }
<br>
<br>- private static class AllPass {
<br>+ private final static class AllPass {
<br>
<br>- private float[] delaybuffer;
<br>- private int delaybuffersize;
<br>+ private final float[] delaybuffer;
<br>+ private final int delaybuffersize;
<br> private int rovepos = 0;
<br> private float feedback;
<br>
<br>@@ -88,47 +85,42 @@
<br> public void setFeedBack(float feedback) {
<br> this.feedback = feedback;
<br> }
<br>- int ucount = 0;
<br>
<br>+ public void processReplace(float inout[]) {
<br>+ int len = inout.length;
<br>+ int delaybuffersize = this.delaybuffersize;
<br>+ int rovepos = this.rovepos;
<br>+ for (int i = 0; i < len; i++) {
<br>+ float delayout = delaybuffer[rovepos];
<br>+ float input = inout[i];
<br>+ inout[i] = delayout - input;
<br>+ delaybuffer[rovepos] = input + delayout * feedback;
<br>+ if (++rovepos == delaybuffersize)
<br>+ rovepos = 0;
<br>+ }
<br>+ this.rovepos = rovepos;
<br>+ }
<br>+
<br> public void processReplace(float in[], float out[]) {
<br> int len = in.length;
<br>+ int delaybuffersize = this.delaybuffersize;
<br>+ int rovepos = this.rovepos;
<br> for (int i = 0; i < len; i++) {
<br>-
<br> float delayout = delaybuffer[rovepos];
<br>-
<br>- // undenormalise(delayout)
<br>- /*
<br>- if (((delayout > 0.0) && (delayout < 1.0E-10))
<br>- || ((delayout < 0.0) && (delayout > -1.0E-10)))
<br>- delayout = 0;
<br>- */
<br>-
<br> float input = in[i];
<br>- out[i] = -input + delayout;
<br>+ out[i] = delayout - input;
<br> delaybuffer[rovepos] = input + delayout * feedback;
<br> if (++rovepos == delaybuffersize)
<br> rovepos = 0;
<br> }
<br>-
<br>- ucount++;
<br>- if (ucount == 10) {
<br>- ucount = 0;
<br>- for (int i = 0; i < delaybuffer.length; i++) {
<br>- double v = delaybuffer[i];
<br>- if (((v > 0.0) && (v < 1.0E-10))
<br>- || ((v < 0.0) && (v > -1.0E-10))) {
<br>- delaybuffer[i] = 0;
<br>- }
<br>- }
<br>- }
<br>-
<br>- }
<br>+ this.rovepos = rovepos;
<br>+ }
<br> }
<br>
<br>- private static class Comb {
<br>+ private final static class Comb {
<br>
<br>- private float[] delaybuffer;
<br>- private int delaybuffersize;
<br>+ private final float[] delaybuffer;
<br>+ private final int delaybuffersize;
<br> private int rovepos = 0;
<br> private float feedback;
<br> private float filtertemp = 0;
<br>@@ -142,56 +134,54 @@
<br>
<br> public void setFeedBack(float feedback) {
<br> this.feedback = feedback;
<br>+ filtercoeff2 = (1 - filtercoeff1)* feedback;
<br> }
<br>- int ucount = 0;
<br>
<br> public void processMix(float in[], float out[]) {
<br>- int len = in.length;
<br>-
<br>- float filtercoeff2 = this.filtercoeff2 * feedback;
<br>-
<br>+ int len = in.length;
<br>+ int delaybuffersize = this.delaybuffersize;
<br>+ int rovepos = this.rovepos;
<br>+ float filtertemp = this.filtertemp;
<br>+ float filtercoeff1 = this.filtercoeff1;
<br>+ float filtercoeff2 = this.filtercoeff2;
<br> for (int i = 0; i < len; i++) {
<br> float delayout = delaybuffer[rovepos];
<br>-
<br> // One Pole Lowpass Filter
<br> filtertemp = (delayout * filtercoeff2)
<br> + (filtertemp * filtercoeff1);
<br>-
<br>- // undenormalise(filtertemp)
<br>- /*
<br>- if (((filtertemp > 0.0) && (filtertemp < 1.0E-10))
<br>- || ((filtertemp < 0.0) && (filtertemp > -1.0E-10)))
<br>- filtertemp = 0;
<br>- */
<br> out[i] += delayout;
<br>- delaybuffer[rovepos] = in[i] + (filtertemp);// * feedback);
<br>-
<br>+ delaybuffer[rovepos] = in[i] + filtertemp;
<br> if (++rovepos == delaybuffersize)
<br> rovepos = 0;
<br>+ }
<br>+ this.filtertemp = filtertemp;
<br>+ this.rovepos = rovepos;
<br>+ }
<br>
<br>- }
<br>- ucount++;
<br>- if (ucount == 10) {
<br>- ucount = 0;
<br>- if (((filtertemp > 0.0) && (filtertemp < 1.0E-10))
<br>- || ((filtertemp < 0.0) && (filtertemp > -1.0E-10))) {
<br>- filtertemp = 0;
<br>- }
<br>- for (int i = 0; i < delaybuffer.length; i++) {
<br>- double v = delaybuffer[i];
<br>- if (((v > 0.0) && (v < 1.0E-10))
<br>- || ((v < 0.0) && (v > -1.0E-10))) {
<br>- delaybuffer[i] = 0;
<br>- }
<br>- }
<br>- }
<br>-
<br>-
<br>+ public void processReplace(float in[], float out[]) {
<br>+ int len = in.length;
<br>+ int delaybuffersize = this.delaybuffersize;
<br>+ int rovepos = this.rovepos;
<br>+ float filtertemp = this.filtertemp;
<br>+ float filtercoeff1 = this.filtercoeff1;
<br>+ float filtercoeff2 = this.filtercoeff2;
<br>+ for (int i = 0; i < len; i++) {
<br>+ float delayout = delaybuffer[rovepos];
<br>+ // One Pole Lowpass Filter
<br>+ filtertemp = (delayout * filtercoeff2)
<br>+ + (filtertemp * filtercoeff1);
<br>+ out[i] = delayout;
<br>+ delaybuffer[rovepos] = in[i] + filtertemp;
<br>+ if (++rovepos == delaybuffersize)
<br>+ rovepos = 0;
<br>+ }
<br>+ this.filtertemp = filtertemp;
<br>+ this.rovepos = rovepos;
<br> }
<br>
<br> public void setDamp(float val) {
<br> filtercoeff1 = val;
<br>- filtercoeff2 = 1 - filtercoeff1;
<br>+ filtercoeff2 = (1 - filtercoeff1)* feedback;
<br> }
<br> }
<br> private float roomsize;
<br>@@ -203,8 +193,11 @@
<br> private AllPass[] allpassL;
<br> private AllPass[] allpassR;
<br> private float[] input;
<br>- private float[] outR;
<br>- private float[] outL;
<br>+ private float[] out;
<br>+ private float[] pre1;
<br>+ private float[] pre2;
<br>+ private float[] pre3;
<br>+ private boolean denormal_flip = false;
<br> private boolean mix = true;
<br> private SoftAudioBuffer inputA;
<br> private SoftAudioBuffer left;
<br>@@ -214,7 +207,8 @@
<br> private float dirty_damp;
<br> private float dirty_predelay;
<br> private float dirty_gain;
<br>- private float samplerate;
<br>+ private float samplerate;
<br>+ private boolean light = true;
<br>
<br> public void init(float samplerate, float controlrate) {
<br> this.samplerate = samplerate;
<br>@@ -237,7 +231,7 @@
<br> combL[3] = new Comb((int) (freqscale * (1356)));
<br> combR[3] = new Comb((int) (freqscale * (1356 + stereospread)));
<br> combL[4] = new Comb((int) (freqscale * (1422)));
<br>- combR[4] = new Comb((int) (freqscale * (1422 + stereospread)));
<br>+ combR[4] = new Comb((int) (freqscale * (1422 + stereospread)));
<br> combL[5] = new Comb((int) (freqscale * (1491)));
<br> combR[5] = new Comb((int) (freqscale * (1491 + stereospread)));
<br> combL[6] = new Comb((int) (freqscale * (1557)));
<br>@@ -306,58 +300,100 @@
<br> input = new float[numsamples];
<br>
<br> float again = gain * 0.018f / 2;
<br>+
<br>+ denormal_flip = !denormal_flip;
<br>+ if(denormal_flip)
<br>+ for (int i = 0; i < numsamples; i++)
<br>+ input[i] = inputA[i] * again + 1E-20f;
<br>+ else
<br>+ for (int i = 0; i < numsamples; i++)
<br>+ input[i] = inputA[i] * again - 1E-20f;
<br>
<br>- for (int i = 0; i < numsamples; i++)
<br>- input[i] = inputA[i] * again;
<br>-
<br>- delay.processReplace(input, input);
<br>-
<br>-
<br>- if (right != null) {
<br>- if (outR == null || outR.length < numsamples)
<br>- outR = new float[numsamples];
<br>- Arrays.fill(outR, 0);
<br>- for (int i = 0; i < combR.length; i++)
<br>- combR[i].processMix(input, outR);
<br>+ delay.processReplace(input);
<br>+
<br>+ if(light && (right != null))
<br>+ {
<br>+ if (pre1 == null || pre1.length < numsamples)
<br>+ {
<br>+ pre1 = new float[numsamples];
<br>+ pre2 = new float[numsamples];
<br>+ pre3 = new float[numsamples];
<br>+ }
<br>+
<br> for (int i = 0; i < allpassL.length; i++)
<br>- allpassR[i].processReplace(outR, outR);
<br>+ allpassL[i].processReplace(input);
<br>
<br>- if (mix) {
<br>- for (int i = 0; i < numsamples; i++)
<br>- right[i] += outR[i];
<br>- } else {
<br>- for (int i = 0; i < numsamples; i++)
<br>- right[i] = outR[i];
<br>+ combL[0].processReplace(input, pre3);
<br>+ combL[1].processReplace(input, pre3);
<br>+
<br>+ combL[2].processReplace(input, pre1);
<br>+ for (int i = 4; i < combL.length-2; i+=2)
<br>+ combL[i].processMix(input, pre1);
<br>+
<br>+ combL[3].processReplace(input, pre2);;
<br>+ for (int i = 5; i < combL.length-2; i+=2)
<br>+ combL[i].processMix(input, pre2);
<br>+
<br>+ if (!mix)
<br>+ {
<br>+ Arrays.fill(right, 0);
<br>+ Arrays.fill(left, 0);
<br> }
<br>+ for (int i = combR.length-2; i < combR.length; i++)
<br>+ combR[i].processMix(input, right);
<br>+ for (int i = combL.length-2; i < combL.length; i++)
<br>+ combL[i].processMix(input, left);
<br>+
<br>+ for (int i = 0; i < numsamples; i++)
<br>+ {
<br>+ float p = pre1[i] - pre2[i];
<br>+ float m = pre3[i];
<br>+ left[i] += m + p;
<br>+ right[i] += m - p;
<br>+ }
<br> }
<br>+ else
<br>+ {
<br>+ if (out == null || out.length < numsamples)
<br>+ out = new float[numsamples];
<br>+
<br>+ if (right != null) {
<br>+ if (!mix)
<br>+ Arrays.fill(right, 0);
<br>+ allpassR[0].processReplace(input, out);
<br>+ for (int i = 1; i < allpassR.length; i++)
<br>+ allpassR[i].processReplace(out);
<br>+ for (int i = 0; i < combR.length; i++)
<br>+ combR[i].processMix(out, right);
<br>+ }
<br>
<br>-
<br>- if (outL == null || outL.length < numsamples)
<br>- outL = new float[numsamples];
<br>- Arrays.fill(outL, 0);
<br>- for (int i = 0; i < combL.length; i++)
<br>- combL[i].processMix(input, outL);
<br>- for (int i = 0; i < allpassL.length; i++)
<br>- allpassL[i].processReplace(outL, outL);
<br>-
<br>- if (mix) {
<br>- for (int i = 0; i < numsamples; i++)
<br>- left[i] += outL[i];
<br>- } else {
<br>- for (int i = 0; i < numsamples; i++)
<br>- left[i] = outL[i];
<br>+ if (!mix)
<br>+ Arrays.fill(left, 0);
<br>+ allpassL[0].processReplace(input, out);
<br>+ for (int i = 1; i < allpassL.length; i++)
<br>+ allpassL[i].processReplace(out);
<br>+ for (int i = 0; i < combL.length; i++)
<br>+ combL[i].processMix(out, left);
<br> }
<br>+
<br>+
<br>+
<br>+
<br>+
<br>
<br> if (silent_input) {
<br>- float avgpower = 0;
<br>+ silent = true;
<br> for (int i = 0; i < numsamples; i++)
<br>- avgpower += outL[i]*outL[i];
<br>- avgpower /= numsamples;
<br>- avgpower = (float)Math.sqrt(avgpower);
<br>- if(avgpower < 0.00001)
<br>- silent = true;
<br>- }
<br>-
<br>+ {
<br>+ float v = left[i];
<br>+ if(v > 1E-10 || v < -1E-10)
<br>+ {
<br>+ silent = false;
<br>+ break;
<br>+ }
<br>+ }
<br>+ }
<br>+
<br> }
<br>
<br> public void globalParameterControlChange(int[] slothpath, long param,
<br>@@ -440,7 +476,7 @@
<br> public void setRoomSize(float value) {
<br> roomsize = 1 - (0.17f / value);
<br>
<br>- for (int i = 0; i < 8; i++) {
<br>+ for (int i = 0; i < combL.length; i++) {
<br> combL[i].feedback = roomsize;
<br> combR[i].feedback = roomsize;
<br> }
<br>@@ -464,10 +500,16 @@
<br> damp = 0;
<br>
<br> // damp = value * 0.4f;
<br>- for (int i = 0; i < 8; i++) {
<br>+ for (int i = 0; i < combL.length; i++) {
<br> combL[i].setDamp(damp);
<br> combR[i].setDamp(damp);
<br> }
<br>
<br> }
<br>+
<br>+ public void setLightMode(boolean light)
<br>+ {
<br>+ this.light = light;
<br>+ }
<br> }
<br>+
<br>--- old/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Sun Sep 14 23:15:40 2008
<br>+++ new/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Sun Sep 14 23:15:40 2008
<br>@@ -47,6 +47,8 @@
<br> return new DLSSoundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>--- old/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Sun Sep 14 23:15:40 2008
<br>+++ new/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Sun Sep 14 23:15:40 2008
<br>@@ -46,6 +46,8 @@
<br> return new SF2Soundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>--- old/src/share/classes/com/sun/media/sound/SoftChannel.java Sun Sep 14 23:15:41 2008
<br>+++ new/src/share/classes/com/sun/media/sound/SoftChannel.java Sun Sep 14 23:15:41 2008
<br>@@ -1215,7 +1215,9 @@
<br>
<br> public int getController(int controller) {
<br> synchronized (control_mutex) {
<br>- return this.controller[controller];
<br>+ // Should only return lower 7 bits,
<br>+ // even when controller is "boosted" higher.
<br>+ return this.controller[controller] & 127;
<br> }
<br> }
<br>
<br>--- old/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Sun Sep 14 23:15:42 2008
<br>+++ new/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Sun Sep 14 23:15:42 2008
<br>@@ -177,6 +177,7 @@
<br> // 1: DLS Voice Allocation
<br> protected int voice_allocation_mode = 0;
<br>
<br>+ protected boolean reverb_light = true;
<br> protected boolean reverb_on = true;
<br> protected boolean chorus_on = true;
<br> protected boolean agc_on = true;
<br>@@ -334,6 +335,7 @@
<br> largemode = (Boolean)items[9].value;
<br> number_of_midi_channels = (Integer)items[10].value;
<br> jitter_correction = (Boolean)items[11].value;
<br>+ reverb_light = (Boolean)items[12].value;
<br> }
<br>
<br> private String patchToString(Patch patch) {
<br>@@ -742,6 +744,9 @@
<br> }
<br>
<br> public void unloadAllInstruments(Soundbank soundbank) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br>@@ -766,6 +771,9 @@
<br> }
<br>
<br> public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br>@@ -844,6 +852,10 @@
<br> item.description = "Turn jitter correction on or off.";
<br> list.add(item);
<br>
<br>+ item = new AudioSynthesizerPropertyInfo("light reverb", o?reverb_light:true);
<br>+ item.description = "Turn light reverb mode on or off";
<br>+ list.add(item);
<br>+
<br> AudioSynthesizerPropertyInfo[] items;
<br> items = list.toArray(new AudioSynthesizerPropertyInfo[list.size()]);
<br>
<br>--- old/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java Sun Sep 14 23:15:43 2008
<br>+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java Sun Sep 14 23:15:43 2008
<br>@@ -43,11 +43,30 @@
<br> testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br> testarray[i] *= 0.3;
<br> }
<br>+
<br>+ // Check conversion using PCM_FLOAT
<br>+ for (int big = 0; big < 2; big+=1)
<br>+ for (int bits = 32; bits <= 64; bits+=32) {
<br>+ AudioFormat frm = new AudioFormat(
<br>+ AudioFloatConverter.PCM_FLOAT,
<br>+ 44100, bits, 1, bits/8,
<br>+ 44100, big==1);
<br>+ byte[] buff = new byte[testarray.length * frm.getFrameSize()];
<br>+ float[] testarray2 = new float[testarray.length];
<br>+ AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
<br>+ conv.toByteArray(testarray, buff);
<br>+ conv.toFloatArray(buff, testarray2);
<br>+ for (int i = 0; i < testarray2.length; i++) {
<br>+ if(Math.abs(testarray[i] - testarray2[i]) > 0.05)
<br>+ throw new RuntimeException("Conversion failed for " + frm +" , arrays not equal enough!\n");
<br>+ }
<br>+
<br>+ }
<br>
<br> // Check conversion from float2byte and byte2float.
<br> for (int big = 0; big < 2; big+=1)
<br> for (int signed = 0; signed < 2; signed+=1)
<br>- for (int bits = 8; bits <= 32; bits+=8) {
<br>+ for (int bits = 6; bits <= 40; bits+=2) {
<br> AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
<br> byte[] buff = new byte[testarray.length * frm.getFrameSize()];
<br> float[] testarray2 = new float[testarray.length];
<br>@@ -63,7 +82,7 @@
<br> // Check big/little
<br> for (int big = 0; big < 2; big+=1)
<br> for (int signed = 0; signed < 2; signed+=1)
<br>- for (int bits = 8; bits <= 32; bits+=8) {
<br>+ for (int bits = 6; bits <= 40; bits+=2) {
<br> AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
<br> byte[] buff = new byte[testarray.length * frm.getFrameSize()];
<br> AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
<br>@@ -89,7 +108,7 @@
<br> // Check signed/unsigned
<br> for (int big = 0; big < 2; big+=1)
<br> for (int signed = 0; signed < 2; signed+=1)
<br>- for (int bits = 8; bits <= 32; bits+=8) {
<br>+ for (int bits = 6; bits <= 40; bits+=2) {
<br> AudioFormat frm = new AudioFormat(44100, bits, 1, signed==1, big==1);
<br> byte[] b = new byte[testarray.length * frm.getFrameSize()];
<br> AudioFloatConverter conv = AudioFloatConverter.getConverter(frm);
<br>@@ -117,10 +136,10 @@
<br> }
<br>
<br> // Check if conversion 32->24, 24->16, 16->8 result in same float data
<br>- AudioFormat frm = new AudioFormat(44100, 32, 1, true, true);
<br>+ AudioFormat frm = new AudioFormat(44100, 40, 1, true, true);
<br> byte[] b = new byte[testarray.length * frm.getFrameSize()];
<br> AudioFloatConverter.getConverter(frm).toByteArray(testarray, b);
<br>- for (int bits = 8; bits <= 32; bits+=8) {
<br>+ for (int bits = 6; bits <= 40; bits+=2) {
<br> AudioFormat frm2 = new AudioFormat(44100, bits, 1, true, true);
<br> byte[] b2 = new byte[testarray.length * frm2.getFrameSize()];
<br> int fs1 = frm.getFrameSize();
<br>--- /dev/null Sun Sep 14 23:15:44 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java Sun Sep 14 23:15:44 2008
<br>@@ -0,0 +1,107 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream available() method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class Available {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ int ret = is.available();
<br>+ if(ret != capacity)
<br>+ throw new RuntimeException("is.available() return unexpected value!");
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:44 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java Sun Sep 14 23:15:44 2008
<br>@@ -0,0 +1,104 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream close method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class Close {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:45 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java Sun Sep 14 23:15:44 2008
<br>@@ -0,0 +1,129 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class MarkReset {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ is.mark(1000);
<br>+ int ret = is.available();
<br>+ int a = is.read();
<br>+ is.skip(75);
<br>+ is.reset();
<br>+ if(is.available() != ret)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret)+") !");
<br>+ int b = is.read();
<br>+ if(a != b)
<br>+ throw new RuntimeException(
<br>+ "is doesn't return same value after reset ("
<br>+ + a + "!="+b+") !");
<br>+
<br>+ is.skip(15);
<br>+ ret = is.available();
<br>+ is.mark(1000);
<br>+ is.reset();
<br>+ if(is.available() != ret)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret)+") !");
<br>+
<br>+
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:45 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java Sun Sep 14 23:15:45 2008
<br>@@ -0,0 +1,106 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class MarkSupported {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ if(!is.markSupported())
<br>+ throw new RuntimeException("InputStream doesn't support mark/reset!");
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:45 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java Sun Sep 14 23:15:45 2008
<br>@@ -0,0 +1,117 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream read() method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class Read {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ byte[] b = new byte[100];
<br>+ int ret = is.available();
<br>+ int n = is.read();
<br>+ if(n == -1)
<br>+ throw new RuntimeException("is.read shouldn't return -1!");
<br>+ if(is.available() != ret - 1)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - 1)+") !");
<br>+ is.skip(5000);
<br>+ if(is.read() != -1)
<br>+ throw new RuntimeException(
<br>+ "is.read() doesn't return -1!");
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:45 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java Sun Sep 14 23:15:45 2008
<br>@@ -0,0 +1,118 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class ReadByte {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ byte[] b = new byte[100];
<br>+ int ret = is.available();
<br>+ int n = is.read(b);
<br>+ if(n == -1)
<br>+ throw new RuntimeException("is.read shouldn't return -1!");
<br>+ if(is.available() != ret - n)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - n)+") !");
<br>+ is.skip(5000);
<br>+ if(is.read(b) != -1)
<br>+ throw new RuntimeException(
<br>+ "is.read() doesn't return -1!");
<br>+
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:45 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java Sun Sep 14 23:15:45 2008
<br>@@ -0,0 +1,118 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class ReadByteIntInt {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ byte[] b = new byte[100];
<br>+ int ret = is.available();
<br>+ int n = is.read(b, 7, 50);
<br>+ if(n == -1)
<br>+ throw new RuntimeException("is.read shouldn't return -1!");
<br>+ if(is.available() != ret - n)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - n)+") !");
<br>+ is.skip(5000);
<br>+ if(is.read(b, 7, 50) != -1)
<br>+ throw new RuntimeException(
<br>+ "is.read() doesn't return -1!");
<br>+
<br>+ }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br>--- /dev/null Sun Sep 14 23:15:46 2008
<br>+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java Sun Sep 14 23:15:46 2008
<br>@@ -0,0 +1,131 @@
<br>+/*
<br>+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
<br>+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
<br>+ *
<br>+ * This code is free software; you can redistribute it and/or modify it
<br>+ * under the terms of the GNU General Public License version 2 only, as
<br>+ * published by the Free Software Foundation. Sun designates this
<br>+ * particular file as subject to the "Classpath" exception as provided
<br>+ * by Sun in the LICENSE file that accompanied this code.
<br>+ *
<br>+ * This code is distributed in the hope that it will be useful, but WITHOUT
<br>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
<br>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
<br>+ * version 2 for more details (a copy is included in the LICENSE file that
<br>+ * accompanied this code).
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License version
<br>+ * 2 along with this work; if not, write to the Free Software Foundation,
<br>+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
<br>+ *
<br>+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
<br>+ * CA 95054 USA or visit www.sun.com if you need additional information or
<br>+ * have any questions.
<br>+ */
<br>+
<br>+/* @test
<br>+ @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method */
<br>+
<br>+import java.io.File;
<br>+import java.io.FileOutputStream;
<br>+import java.io.IOException;
<br>+import java.io.InputStream;
<br>+
<br>+import javax.sound.sampled.*;
<br>+
<br>+import com.sun.media.sound.*;
<br>+
<br>+public class Skip {
<br>+
<br>+ static float[] testarray;
<br>+ static byte[] test_byte_array;
<br>+ static File test_file;
<br>+ static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
<br>+
<br>+ static void setUp() throws Exception {
<br>+ testarray = new float[1024];
<br>+ for (int i = 0; i < 1024; i++) {
<br>+ double ii = i / 1024.0;
<br>+ ii = ii * ii;
<br>+ testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
<br>+ testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
<br>+ testarray[i] *= 0.3;
<br>+ }
<br>+ test_byte_array = new byte[testarray.length*2];
<br>+ AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
<br>+ test_file = File.createTempFile("test", ".raw");
<br>+ FileOutputStream fos = new FileOutputStream(test_file);
<br>+ fos.write(test_byte_array);
<br>+ }
<br>+
<br>+ static void tearDown() throws Exception {
<br>+ if(!test_file.delete())
<br>+ test_file.deleteOnExit();
<br>+ }
<br>+
<br>+ public static void main(String[] args) throws Exception {
<br>+ try
<br>+ {
<br>+ setUp();
<br>+
<br>+ for (int i = 0; i < 8; i++) {
<br>+ ModelByteBuffer buff;
<br>+ if(i % 2 == 0)
<br>+ buff = new ModelByteBuffer(test_file);
<br>+ else
<br>+ buff = new ModelByteBuffer(test_byte_array);
<br>+ if((i / 2) == 1)
<br>+ buff.subbuffer(5);
<br>+ if((i / 2) == 2)
<br>+ buff.subbuffer(5,500);
<br>+ if((i / 2) == 3)
<br>+ buff.subbuffer(5,600,true);
<br>+
<br>+ long capacity = buff.capacity();
<br>+ InputStream is = buff.getInputStream();
<br>+ try
<br>+ {
<br>+ int ret = is.available();
<br>+ long n = is.skip(75);
<br>+ if(n == -1)
<br>+ throw new RuntimeException("is.read shouldn't return -1!");
<br>+ if(is.available() != ret - n)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - n)+") !");
<br>+
<br>+ ret = is.available();
<br>+ n = is.skip(-100);
<br>+ if(n != 0)
<br>+ throw new RuntimeException("is.skip(-100) shouldn't skip values!");
<br>+ if(is.available() != ret - n)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - n)+") !");
<br>+
<br>+ ret = is.available();
<br>+ n = is.skip(5000);
<br>+ if(is.available() != ret - n)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(ret - n)+") !");
<br>+ if(is.available() != 0)
<br>+ throw new RuntimeException(
<br>+ "is.available() returns incorrect value ("
<br>+ + is.available() + "!="+(0)+") !"); }
<br>+ finally
<br>+ {
<br>+ is.close();
<br>+ }
<br>+ if(buff.capacity() != capacity)
<br>+ throw new RuntimeException("Capacity variable should not change!");
<br>+ }
<br>+ }
<br>+ finally
<br>+ {
<br>+ tearDown();
<br>+ }
<br>+ }
<br>+
<br>+}
<br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=19504685&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-19441778
New Gervill imported into IcedTea
2008-09-11T11:49:05Z
2008-09-11T11:49:05Z
Mark Wielaard
Hi,
<br><br>Since Joe was working on getting an updated Gervill into openjdk(6) and
<br>adopting any remaining patches to the new version, I made sure to sync
<br>our Gervill import into icedtea6 with the latest Gervill from CVS
<br>(September 1st). We only have a few small patches left against upstream
<br>Gervill (attached).
<br><br>All jtreg tests, both the com/sun/media/sound ones from upstream, as the
<br>older javax/sound/midi in openjdk6 (which are almost all a copy of the
<br>upstream tests renamed into a different package) pass, with only a small
<br>patch needed for the old tests now that SoftLimiter.init() changed
<br>arguments. See the patches/icedtea-gervill.patch.
<br><br>Attached are the actual changes to the icedtea overlays.
<br><br>2008-09-11 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=19441778&i=0" target="_top" rel="nofollow">mark@...</a>>
<br><br> * patches/icedtea-gervill.patch: Updated patch for old tests.
<br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*:
<br> New Gervill files (sept 1).
<br><br>The actual changes to Gervill since our last import:
<br><br>- Add: More JTreg tests added:
<br> EmergencySoundbank
<br> SoftFilter
<br> AudioFloatConverter.ToFloatArray (improved)
<br>- Change: SoftReverb optimized, about 2 times faster.
<br>- Fix: ModelByteBuffer.skip called super.skip
<br> instead to call to RandomAccessFile directly.
<br> JTreg tests added: ModelByteBuffer/RandomFileInputStream/*.java
<br>- Fix: ModelByteBuffer.len was being modified in inner
<br> class RandomFileInputStream. The variable was made final
<br> and RandomFileInputStream.read methods where fixed.
<br>- Fix: ArrayOutOfException error in ModelInstrument.getKeys(),
<br> Keys array was to small, it couldn't
<br> hold all possible midi notes (0..127).
<br><br>Version 1.0.1
<br>- Fix: Created dummy SourceDataline so that following
<br> jtreg test can be tested without using
<br> a real Audio Device SourceDataLine.
<br> javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java
<br> javax/sound/midi/Gervill/SoftSynthesizer/Open.java
<br>- Fix: Make open SoftSynthesizer garbage-collectable
<br> when user don't have reference to it and it is not
<br> producing any sound.
<br>- Fix: SoftReverb silent detection improved.
<br>- Added: SoftSynthesizer.getPropertyInfo returns
<br> current properties values if it is open.
<br>- Fix: Restrict input values in SoftChannel to 7 and 14 bit in these
<br>methods:
<br> noteOn
<br> noteOff
<br> setPolyPressure
<br> setChannelPressure
<br> controlChange
<br> programChange(program)
<br> programChange(bank, program)
<br> setPitchBend
<br>- Fix: Store generated soundbank to disk for faster future use.
<br><br><br /><tt>[icedtea-gervill.diff]</tt><br /><hr align="left" width="300" /><tt>Index: build.xml
<br>===================================================================
<br>RCS file: /cvs/gervill/build.xml,v
<br>retrieving revision 1.2
<br>diff -u -r1.2 build.xml
<br>--- build.xml 14 Dec 2007 03:33:11 -0000 1.2
<br>+++ build.xml 11 Sep 2008 18:30:29 -0000
<br>@@ -29,7 +29,8 @@
<br> <!-- run javac to compile the source files -->
<br> <target name="compile" depends="init">
<br> <javac srcdir="${src}"
<br>-destdir="${build}">
<br>+destdir="${build}"
<br>+debug="true">
<br> <classpath>
<br> <path refid="lib.path"/>
<br> </classpath>
<br>@@ -69,4 +70,4 @@
<br> <delete dir="${lib}"/>
<br> <delete dir="${docs}"/>
<br> </target>
<br>-</project>
<br>\ No newline at end of file
<br>+</project>
<br>Index: src/com/sun/media/sound/DLSSoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/DLSSoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 DLSSoundbankReader.java
<br>--- src/com/sun/media/sound/DLSSoundbankReader.java 5 Jun 2008 01:55:28 -0000 1.3
<br>+++ src/com/sun/media/sound/DLSSoundbankReader.java 11 Sep 2008 18:30:29 -0000
<br>@@ -47,6 +47,8 @@
<br> return new DLSSoundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SF2SoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SF2SoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 SF2SoundbankReader.java
<br>--- src/com/sun/media/sound/SF2SoundbankReader.java 5 Jun 2008 01:55:33 -0000 1.3
<br>+++ src/com/sun/media/sound/SF2SoundbankReader.java 11 Sep 2008 18:30:29 -0000
<br>@@ -46,6 +46,8 @@
<br> return new SF2Soundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SoftChannel.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftChannel.java,v
<br>retrieving revision 1.11
<br>diff -u -r1.11 SoftChannel.java
<br>--- src/com/sun/media/sound/SoftChannel.java 27 Jul 2008 19:06:21 -0000 1.11
<br>+++ src/com/sun/media/sound/SoftChannel.java 11 Sep 2008 18:30:29 -0000
<br>@@ -1215,7 +1215,9 @@
<br>
<br> public int getController(int controller) {
<br> synchronized (control_mutex) {
<br>- return this.controller[controller];
<br>+ // Should only return lower 7 bits,
<br>+ // even when controller is "boosted" higher.
<br>+ return this.controller[controller] & 127;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SoftSynthesizer.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftSynthesizer.java,v
<br>retrieving revision 1.43
<br>diff -u -r1.43 SoftSynthesizer.java
<br>--- src/com/sun/media/sound/SoftSynthesizer.java 27 Aug 2008 17:21:23 -0000 1.43
<br>+++ src/com/sun/media/sound/SoftSynthesizer.java 11 Sep 2008 18:30:29 -0000
<br>@@ -744,6 +744,9 @@
<br> }
<br>
<br> public void unloadAllInstruments(Soundbank soundbank) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br>@@ -768,6 +771,9 @@
<br> }
<br>
<br> public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br></tt><hr align="left" width="300" /><br /> <br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=19441778&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br><div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>gervill-overlays.diff.gz</strong> (14K) <a href="http://old.nabble.com/attachment/19441778/0/gervill-overlays.diff.gz" target="_top">Download Attachment</a></div>
tag:old.nabble.com,2006:post-19296160
FREE Online Test at www.yfrindia.com
2008-09-03T12:20:45Z
2008-09-03T12:20:45Z
Prize
<a href="http://www.yfrindia.com/" target="_top" rel="nofollow">http://www.yfrindia.com/</a><br>Take FREE online TEST, read FREE articles, download FREE presentation, use FREE source code, useful links, competition updates, free ONLINE TEST TESTS,
<br><a href="http://www.yfrindia.com/resources/Tests" target="_top" rel="nofollow">http://www.yfrindia.com/resources/Tests</a><br>free APTITUDE TEST, English Test, Computer Test, Mechanical Test, Electronics Test, Electrical Test, GATE preparation, CAT preparation, Job preparation, resume.
<br><a href="http://www.yfrindia.com/" target="_top" rel="nofollow">http://www.yfrindia.com/</a><br>
tag:old.nabble.com,2006:post-18643888
Re: New Gervill imported (Was: OpenJDK 6 b10 source posted)
2008-07-24T19:02:34Z
2008-07-24T19:02:34Z
Karl Helgason-2
Hi Mark,
<br><br>Control rate can be fetched from the synthesizer using the AudioSynthesizer interface.
<br> AudioSynthesizer.getPropertyInfo()
<br>And if you want to use another control rate you'll have to open the synthesizer
<br>with the open(SourceDataLine line, Map<String, Object> info) using different
<br>control rate value in the info parameter.
<br>But it could be a good idea that getPropertyInfo() would return current values
<br>when the synthesizer is open and default ones when it is closed.
<br><br>I changed these methods in the SoftChannel
<br> noteOn
<br> noteOff
<br> setPolyPressure
<br> setChannelPressure
<br> controlChange
<br> programChange(program)
<br> programChange(bank, program)
<br> setPitchBend
<br>So they won't accept out of range values (e.g. only 7 or 14 bit values).
<br><br>I didn't like your idea of masking the getController output, and it also
<br>didn't handle when we used negative values in the controlChange.
<br>By restricting the input values we make the MidiChannel object more predictable
<br>and getController will then always return true value not clipped one.
<br><br>I am not sure we should hide the IOException in SF2SoundbankReader and DLSSoundbankReader.
<br>This is not done in AudioFileReader classes from Sun.
<br>For example in com.sun.media.sound.WaveFileReader
<br><br>cheers,
<br>Karl
<br><br><br>________________________________________
<br>Frá: Mark Wielaard [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=0" target="_top" rel="nofollow">mark@...</a>]
<br>Sent: 8. júní 2008 22:23
<br>Viðtakandi: Karl Helgason
<br>Afrit: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>; <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=2" target="_top" rel="nofollow">distro-pkg-dev@...</a>
<br>Efni: New Gervill imported (Was: OpenJDK 6 b10 source posted)
<br><br>Hi Karl,
<br><br>On Wed, 2008-06-04 at 11:25 +0200, Mark Wielaard wrote:
<div class='shrinkable-quote'><br>> On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
<br>> Thanks for checking. These are all in the icedtea gervill overlay also.
<br>> I'll make sure to upgrade to the latest CVS version in which I see you
<br>> fixed some of the other issues I reported.
<br>>
<br>> > The code was also slightly reformatted:
<br>> > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
<br>> > sources);
<br>> > b) line indention (to make lines no longer than 80 symbols);
<br>> > c) tabs to spaces conversion;
<br>> >
<br>> > I will look into to reformat newest Gervill CVS code the same way.
<br>>
<br>> That would be great. Since 0.9 there have been lots of changes and fixes
<br>> (which is why icedtea tracks your CVS tree and didn't use the old 0.9
<br>> code). Would it be a good idea to do a new version upgrade after syncing
<br>> the sources and reformatting to celebrate the inclusion?
</div><br>Thanks a lot for you fixes and the reformatting. I imported the new
<br>Gervill from CVS in two parts. First everything up to June 1st. Second
<br>the reformatting itself. That way it should be easy to follow what
<br>changed.
<br><br>2008-08-08 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=3" target="_top" rel="nofollow">mark@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
<br> Import Gervill fixes from CVS. See CHANGES.txt.
<br> * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
<br><br> - Cleanup: Make inner classes static
<br><br> AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
<br><br> AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
<br><br> AudioFloatFormatConverter.AudioFloatInputStreamResampler
<br> SimpleInstrument.SimpleInstrumentPart
<br> SoftChorus.VariableDelay
<br> SoftChorus.LFODelay
<br> SoftMixingDataLine.AudioFloatInputStreamResampler
<br> SoftMixingSourceDataLine.NonBlockingFloatInputStream
<br> SoftReverb.AllPass
<br> SoftReverb.Comb
<br> SoftReverb.Delay
<br> - Cleanup: Remove unused fields in:
<br> SoftSincResampler.din, SoftLanczosResampler.din,
<br> SoftMainMixer.finetuning, SoftMainMixer.coarsetuning
<br> SoftJitterCorrector.JitterStream.nullbuff,
<br> SoftAbstractResampler.ModelAbstractResampler.loopread
<br><br> SoftAbstractResampler.ModelAbstractResampler.streammarked
<br> - Cleanup: Remove dead code from FFT.
<br> - Cleanup: Make constant fields in SoftFilter final.
<br> - Cleanup: Let SoftSynthesizer.info be final.
<br> - Cleanup: Let SoftProvider.info be final.
<br> - Fix: Unnecessary call to sourceDataLine.drain() in
<br> SoftSynthesizer
<br> causes random hangs in SoftSynthesizer.open jtreg test.
<br> This happens when the synthesizer is opened and right
<br> after closed.
<br> This will not happen if there is a delay between open and
<br> close call.
<br> - Fix: ModelByteBufferAudioFileSoundbankReader,
<br> SoftAudioPusher, SoftJitterCorrector
<br> don't ignore stream.read return value.
<br> - Fix: NullPointerException in
<br> SoftSynthesizer.unloadInstrument if instrument = null
<br> - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close
<br> stream.
<br> - Fix: Futile attempts to guard buffers variable in
<br> SoftJitterCorrector.
<br> - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use
<br> readfully instead of read
<br> when reading from stream.
<br> JTreg tests where created to test for this.
<br><br>I like these cleanups. Your fix for the jtreg resources was nicer than
<br>mine, so I dropped the icedtea one. I did take your change to the tests
<br>needing a samplerate and controlrate argument to init the SoftLimiter to
<br>just pass the constant values 44100 and 147. I also made the
<br>SoftSynthesizer.getControlRate() protected again. I can kind of
<br>understand using these constants in the tests. Although I find getting
<br>them from the synthesizer nicer.
<br><br>Is there a reason the control rate is always hardcoded to 147? There
<br>actually doesn't seem to be any way to change it since the property info
<br>always sets it explicitly.
<br><br>With this there are only a few minor differences left between gervill
<br>CVS and the icedtea overlay. I have attached the diff.
<br><br><br>2008-06-08 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=4" target="_top" rel="nofollow">mark@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
<br> Import Gervill CVS source reformatting.
<br><br>For the interested I have attached the current diff between the
<br>gervil/cvs/icedtea/overlay version and what is in openjdk6-b10.
<br>(Note that line endings are different, openjdk6 uses CRLF, which is
<br>disregarded when creating the diff.)
<br><br>Cheers,
<br><br>Mark
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18643888&i=5" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-18601259
Updating Gervill for OpenJDK 6 build 12
2008-07-22T15:53:44Z
2008-07-22T15:53:44Z
joe.darcy
Hello.
<br><br>With my OpenJDK 6 release manager hat on, I've been working to update
<br>the version of Gervill used to OpenJDK 6 to a newer version that passes
<br>the JCK tests, etc. and I'd like some review of my integration work.
<br>Before this exercise, I don't have any prior experience with sound code.
<br><br>A few comments, the copyright header in file SoftCubicResampler.java in
<br>the Gervill CVS master contains the typo "suabject" instead of
<br>"subject." From some casual examination of the code, it seems to use
<br>raw types throughout, that is "List" rather than "List<String>", etc.
<br>It would be better to covert to using generics; I think IDEs have
<br>refactorings to help this now.
<br><br>There are some differences between the latest Gervill CVS from the
<br>project's site and the Gervill overlays in IcedTea 6. In particular,
<br>IcedTea has changes to SoftMixingMixer.java and SoftSynthesizer.java as
<br>well as some additional files, WaveExtensibleFileReader.java and
<br>WaveFloatFileWriter.java. I'd prefer to limit future merging work
<br>between the three code bases, Gervill CVS, OpenJDK 6, and IcedTea
<br>overlays, so in the context of updating Gervill for OpenJDK 6 b12, I
<br>think it would be good to resolve these remaining few differences. The
<br>test directories are the same in all three code bases, except I don't
<br>pick up a missing newline at the end of
<br>./SoftCubicResampler/Interpolate.java.
<br><br>During the update I ran into some testing issues, both with the original
<br>Gervill integration in OpenJDK 6 b10 as well as the new code for b12.
<br>Specifically, the 9 regression tests
<br><br>javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java
<br>javax/sound/midi/Gervill/SoftSynthesizer/Open.java
<br><br>can fail, seemingly dependent on how one logs into the machine. What
<br>are the necessary and sufficient conditions for permissions to run these
<br>tests? When they occur, the failures I see look like:
<br><br> Windows
<br>=========
<br><br>java.lang.IllegalArgumentException: No line matching interface
<br>SourceDataLine supporting format PCM_SIGNED 44100.0 Hz, 16 bit, stereo,
<br>4 bytes/frame, little-endian is supported.
<br> at javax.sound.sampled.AudioSystem.getLine(AudioSystem.java:476)
<br> at
<br>javax.sound.sampled.AudioSystem.getSourceDataLine(AudioSystem.java:604)
<br> at com.sun.media.sound.SoftSynthesizer.open(SoftSynthesizer.java:762)
<br> at com.sun.media.sound.SoftSynthesizer.open(SoftSynthesizer.java:744)
<br> at Open.main(Open.java:53)
<br> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br> at
<br>sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
<br> at
<br>sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
<br> at java.lang.reflect.Method.invoke(Method.java:616)
<br> at
<br>com.sun.javatest.regtest.MainWrapper$MainThread.run(MainWrapper.java:96)
<br> at java.lang.Thread.run(Thread.java:636)
<br><br> Linux
<br>======
<br><br>STDERR:
<br>java: conf.c:3109: snd_config_update_free: Assertion `update->count > 0
<br>&& update->finfo' failed.
<br><br>TEST RESULT: Failed. Unexpected exit from test [exit code: 134]
<br><br> Solaris
<br>=======
<br><br>java.lang.IllegalArgumentException: No line matching interface
<br>SourceDataLine supporting format PCM_SIGNED 44100.0 Hz, 16 bit, stereo,
<br>4 bytes/frame, little-endian is supported.
<br> at javax.sound.sampled.AudioSystem.getLine(AudioSystem.java:476)
<br> at
<br>javax.sound.sampled.AudioSystem.getSourceDataLine(AudioSystem.java:604)
<br> at com.sun.media.sound.SoftSynthesizer.open(SoftSynthesizer.java:762)
<br> at com.sun.media.sound.SoftSynthesizer.open(SoftSynthesizer.java:744)
<br> at Open.main(Open.java:53)
<br> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
<br> at
<br>sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
<br> at
<br>sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
<br> at java.lang.reflect.Method.invoke(Method.java:616)
<br> at
<br>com.sun.javatest.regtest.MainWrapper$MainThread.run(MainWrapper.java:96)
<br> at java.lang.Thread.run(Thread.java:636)
<br><br>These failures occur with the essentially Gervill CVS files I'm using as
<br>well as the IcedTea versions.
<br><br>I've uploaded my webrev compared to the OpenJDK 6 b11 sources to
<br><br><a href="http://dcstaff.invokedynamic.info/index.php?title=Image:darcy-6717691.tgz" target="_top" rel="nofollow">http://dcstaff.invokedynamic.info/index.php?title=Image:darcy-6717691.tgz</a><br><br>Below are the diffs of between Gervill CVS and my workspace and the
<br>recent IcedTea overlays and my workspace; I just loop over the Java
<br>files in the base directory, print out the file name, and then the
<br>result of diff-ing with the corresponding files in my workspace.
<br><br>Thanks,
<br><br>-Joe
<br><br><br> Latest Gervill CVS (July 21, 2008) vs my workspace:
<br>========================================
<br><br>AudioFileSoundbankReader.java
<br>AudioFloatConverter.java
<br>AudioFloatFormatConverter.java
<br>AudioFloatInputStream.java
<br>AudioSynthesizer.java
<br>AudioSynthesizerPropertyInfo.java
<br>DLSInfo.java
<br>DLSInstrument.java
<br>DLSModulator.java
<br>DLSRegion.java
<br>DLSSample.java
<br>DLSSampleLoop.java
<br>DLSSampleOptions.java
<br>DLSSoundbank.java
<br>DLSSoundbankReader.java
<br>EmergencySoundbank.java
<br>FFT.java
<br>InvalidDataException.java
<br>InvalidFormatException.java
<br>JARSoundbankReader.java
<br>ModelAbstractChannelMixer.java
<br>ModelAbstractOscillator.java
<br>ModelByteBuffer.java
<br>ModelByteBufferWavetable.java
<br>ModelChannelMixer.java
<br>ModelConnectionBlock.java
<br>ModelDestination.java
<br>ModelDirectedPlayer.java
<br>ModelDirector.java
<br>ModelIdentifier.java
<br>ModelInstrument.java
<br>ModelInstrumentComparator.java
<br>ModelMappedInstrument.java
<br>ModelOscillator.java
<br>ModelOscillatorStream.java
<br>ModelPatch.java
<br>ModelPerformer.java
<br>ModelSource.java
<br>ModelStandardDirector.java
<br>ModelStandardTransform.java
<br>ModelTransform.java
<br>ModelWavetable.java
<br>RIFFInvalidDataException.java
<br>RIFFInvalidFormatException.java
<br>RIFFReader.java
<br>RIFFWriter.java
<br>SF2GlobalRegion.java
<br>SF2Instrument.java
<br>SF2InstrumentRegion.java
<br>SF2Layer.java
<br>SF2LayerRegion.java
<br>SF2Modulator.java
<br>SF2Region.java
<br>SF2Sample.java
<br>SF2Soundbank.java
<br>SF2SoundbankReader.java
<br>SimpleInstrument.java
<br>SimpleSoundbank.java
<br>SoftAbstractResampler.java
<br>SoftAudioBuffer.java
<br>SoftAudioProcessor.java
<br>SoftAudioPusher.java
<br>SoftChannel.java
<br>SoftChannelProxy.java
<br>SoftChorus.java
<br>SoftControl.java
<br>SoftCubicResampler.java
<br>8c8
<br>< * particular file as suabject to the "Classpath" exception as provided
<br>---
<br> > * particular file as subject to the "Classpath" exception as provided
<br>SoftEnvelopeGenerator.java
<br>SoftFilter.java
<br>SoftInstrument.java
<br>SoftJitterCorrector.java
<br>SoftLanczosResampler.java
<br>SoftLimiter.java
<br>SoftLinearResampler.java
<br>SoftLinearResampler2.java
<br>SoftLowFrequencyOscillator.java
<br>SoftMainMixer.java
<br>SoftMidiAudioFileReader.java
<br>SoftMixingClip.java
<br>SoftMixingDataLine.java
<br>SoftMixingMainMixer.java
<br>SoftMixingMixer.java
<br>SoftMixingMixerProvider.java
<br>SoftMixingSourceDataLine.java
<br>SoftPerformer.java
<br>SoftPointResampler.java
<br>SoftProcess.java
<br>SoftProvider.java
<br>SoftReceiver.java
<br>SoftResampler.java
<br>SoftResamplerStreamer.java
<br>SoftReverb.java
<br>SoftShortMessage.java
<br>SoftSincResampler.java
<br>SoftSynthesizer.java
<br>SoftTuning.java
<br>SoftVoice.java
<br><br><br> IcedTea 6 58510fd936ff overlays vs my workspace
<br>======================================
<br><br>AudioFileSoundbankReader.java
<br>AudioFloatConverter.java
<br>AudioFloatFormatConverter.java
<br>AudioFloatInputStream.java
<br>AudioSynthesizer.java
<br>AudioSynthesizerPropertyInfo.java
<br>DLSInfo.java
<br>DLSInstrument.java
<br>DLSModulator.java
<br>DLSRegion.java
<br>DLSSample.java
<br>DLSSampleLoop.java
<br>DLSSampleOptions.java
<br>DLSSoundbank.java
<br>DLSSoundbankReader.java
<br>50,51d49
<br>< } catch(IOException ioe) {
<br>< return null;
<br>EmergencySoundbank.java
<br>FFT.java
<br>InvalidDataException.java
<br>InvalidFormatException.java
<br>JARSoundbankReader.java
<br>ModelAbstractChannelMixer.java
<br>ModelAbstractOscillator.java
<br>ModelByteBuffer.java
<br>ModelByteBufferWavetable.java
<br>ModelChannelMixer.java
<br>ModelConnectionBlock.java
<br>ModelDestination.java
<br>ModelDirectedPlayer.java
<br>ModelDirector.java
<br>ModelIdentifier.java
<br>ModelInstrument.java
<br>ModelInstrumentComparator.java
<br>ModelMappedInstrument.java
<br>ModelOscillator.java
<br>ModelOscillatorStream.java
<br>ModelPatch.java
<br>ModelPerformer.java
<br>ModelSource.java
<br>ModelStandardDirector.java
<br>ModelStandardTransform.java
<br>ModelTransform.java
<br>ModelWavetable.java
<br>RIFFInvalidDataException.java
<br>RIFFInvalidFormatException.java
<br>RIFFReader.java
<br>RIFFWriter.java
<br>SF2GlobalRegion.java
<br>SF2Instrument.java
<br>SF2InstrumentRegion.java
<br>SF2Layer.java
<br>SF2LayerRegion.java
<br>SF2Modulator.java
<br>SF2Region.java
<br>SF2Sample.java
<br>SF2Soundbank.java
<br>SF2SoundbankReader.java
<br>49,50d48
<br>< } catch(IOException ioe) {
<br>< return null;
<br>SimpleInstrument.java
<br>SimpleSoundbank.java
<br>SoftAbstractResampler.java
<br>SoftAudioBuffer.java
<br>SoftAudioProcessor.java
<br>SoftAudioPusher.java
<br>SoftChannel.java
<br>1197,1199c1197
<br>< // Should only return lower 7 bits,
<br>< // even when controller is "boosted" higher.
<br>< return this.controller[controller] & 127;
<br>---
<br> > return this.controller[controller];
<br>SoftChannelProxy.java
<br>SoftChorus.java
<br>SoftControl.java
<br>SoftCubicResampler.java
<br>8c8
<br>< * particular file as suabject to the "Classpath" exception as provided
<br>---
<br> > * particular file as subject to the "Classpath" exception as provided
<br>SoftEnvelopeGenerator.java
<br>SoftFilter.java
<br>SoftInstrument.java
<br>SoftJitterCorrector.java
<br>SoftLanczosResampler.java
<br>SoftLimiter.java
<br>SoftLinearResampler.java
<br>SoftLinearResampler2.java
<br>SoftLowFrequencyOscillator.java
<br>SoftMainMixer.java
<br>SoftMidiAudioFileReader.java
<br>SoftMixingClip.java
<br>SoftMixingDataLine.java
<br>SoftMixingMainMixer.java
<br>SoftMixingMixer.java
<br>357,359d356
<br>< DataLine.Info info = new DataLine.Info(
<br>< SourceDataLine.class, format);
<br><
<br>368,369c365,413
<br>< line = (SourceDataLine)
<br>defaultmixer.getLine(info);
<br>< else
<br>---
<br> > {
<br> > // Search for suitable line
<br> >
<br> > DataLine.Info idealinfo = null;
<br> > AudioFormat idealformat = null;
<br> >
<br> > Line.Info[] lineinfos =
<br>defaultmixer.getSourceLineInfo();
<br> > idealFound:
<br> > for (int i = 0; i < lineinfos.length; i++) {
<br> > if(lineinfos[i].getLineClass() ==
<br>SourceDataLine.class)
<br> > {
<br> > DataLine.Info info =
<br>(DataLine.Info)lineinfos[i];
<br> > AudioFormat[] formats =
<br>info.getFormats();
<br> > for (int j = 0; j <
<br>formats.length; j++) {
<br> > AudioFormat format = formats[j];
<br> > if(format.getChannels() == 2 ||
<br> > format.getChannels()
<br>== AudioSystem.NOT_SPECIFIED)
<br> >
<br>if(format.getEncoding().equals(Encoding.PCM_SIGNED) ||
<br> >
<br>format.getEncoding().equals(Encoding.PCM_UNSIGNED))
<br> > if(format.getSampleRate() ==
<br>AudioSystem.NOT_SPECIFIED ||
<br> >
<br>format.getSampleRate() == 48000.0)
<br> >
<br>if(format.getSampleSizeInBits() == AudioSystem.NOT_SPECIFIED ||
<br> >
<br>format.getSampleSizeInBits() == 16)
<br> > {
<br> > idealinfo = info;
<br> > int ideal_channels =
<br>format.getChannels();
<br> > boolean ideal_signed =
<br>format.getEncoding().equals(Encoding.PCM_SIGNED);
<br> > float ideal_rate =
<br>format.getSampleRate();
<br> > boolean ideal_endian =
<br>format.isBigEndian();
<br> > int ideal_bits =
<br>format.getSampleSizeInBits();
<br> > if(ideal_bits ==
<br>AudioSystem.NOT_SPECIFIED) ideal_bits = 16;
<br> > if(ideal_channels ==
<br>AudioSystem.NOT_SPECIFIED) ideal_channels = 2;
<br> > if(ideal_rate ==
<br>AudioSystem.NOT_SPECIFIED) ideal_rate = 48000;
<br> > idealformat = new
<br>AudioFormat(ideal_rate, ideal_bits,
<br> > ideal_channels,
<br>ideal_signed, ideal_endian);
<br> > break idealFound;
<br> > }
<br> > }
<br> > }
<br> > }
<br> >
<br> > if(idealformat != null)
<br> > {
<br> > format = idealformat;
<br> > line = (SourceDataLine)
<br>defaultmixer.getLine(idealinfo);
<br> > }
<br> > }
<br> >
<br> > if(line == null)
<br>SoftMixingMixerProvider.java
<br>SoftMixingSourceDataLine.java
<br>SoftPerformer.java
<br>SoftPointResampler.java
<br>SoftProcess.java
<br>SoftProvider.java
<br>SoftReceiver.java
<br>SoftResampler.java
<br>SoftResamplerStreamer.java
<br>SoftReverb.java
<br>SoftShortMessage.java
<br>SoftSincResampler.java
<br>SoftSynthesizer.java
<br>540a541,546
<br> > File userhome = null;
<br> > File emg_soundbank_file = null;
<br> >
<br> > /*
<br> > * Try to load saved generated soundbank
<br> > */
<br>541a548,563
<br> > userhome = new File(System.getProperty("user.home"),
<br> > ".gervill");
<br> > emg_soundbank_file = new File(userhome,
<br>"soundbank-emg.sf2");
<br> > Soundbank sbk =
<br>MidiSystem.getSoundbank(emg_soundbank_file);
<br> > defaultSoundBank = sbk;
<br> > return defaultSoundBank;
<br> > } catch (AccessControlException e) {
<br> > } catch (Exception e) {
<br> > //e.printStackTrace();
<br> > }
<br> >
<br> > try {
<br> >
<br> > /*
<br> > * Generate emergency soundbank
<br> > */
<br>542a565,574
<br> >
<br> > /*
<br> > * Save generated soundbank to disk for faster
<br>future use.
<br> > */
<br> > if(defaultSoundBank != null)
<br> > {
<br> > if(!userhome.exists()) userhome.mkdirs();
<br> > if(!emg_soundbank_file.exists())
<br> >
<br>((SF2Soundbank)defaultSoundBank).save(emg_soundbank_file);
<br> > }
<br>594,596d625
<br>< if (soundbank == null || !isSoundbankSupported(soundbank))
<br>< throw new IllegalArgumentException("Unsupported soundbank:
<br>" + soundbank);
<br><
<br>621,623d649
<br>< if (soundbank == null || !isSoundbankSupported(soundbank))
<br>< throw new IllegalArgumentException("Unsupported soundbank:
<br>" + soundbank);
<br><
<br>SoftTuning.java
<br>SoftVoice.java
<br>WaveExtensibleFileReader.java
<br>diff:
<br>/net/hest.sfbay/w/darcy/ws/6-open.new/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java:
<br>No such file or directory
<br>WaveFloatFileReader.java
<br>74a75
<br> > long framerate = 1;
<br>89c90
<br>< /* framerate = */chunk.readUnsignedInt();
<br>---
<br> > framerate = chunk.readUnsignedInt();
<br>106c107
<br>< framesize, samplerate, false);
<br>---
<br> > framesize, framerate, false);
<br>WaveFloatFileWriter.java
<br>diff:
<br>/net/hest.sfbay/w/darcy/ws/6-open.new/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java:
<br>No such file or directory
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=18601259&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17723918
New Gervill imported (Was: OpenJDK 6 b10 source posted)
2008-06-08T15:23:48Z
2008-06-08T15:23:48Z
Mark Wielaard
Hi Karl,
<br><br>On Wed, 2008-06-04 at 11:25 +0200, Mark Wielaard wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
<br>> Thanks for checking. These are all in the icedtea gervill overlay also.
<br>> I'll make sure to upgrade to the latest CVS version in which I see you
<br>> fixed some of the other issues I reported.
<br>>
<br>> > The code was also slightly reformatted:
<br>> > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
<br>> > sources);
<br>> > b) line indention (to make lines no longer than 80 symbols);
<br>> > c) tabs to spaces conversion;
<br>> >
<br>> > I will look into to reformat newest Gervill CVS code the same way.
<br>>
<br>> That would be great. Since 0.9 there have been lots of changes and fixes
<br>> (which is why icedtea tracks your CVS tree and didn't use the old 0.9
<br>> code). Would it be a good idea to do a new version upgrade after syncing
<br>> the sources and reformatting to celebrate the inclusion?
</div></div>Thanks a lot for you fixes and the reformatting. I imported the new
<br>Gervill from CVS in two parts. First everything up to June 1st. Second
<br>the reformatting itself. That way it should be easy to follow what
<br>changed.
<br><br>2008-08-08 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17723918&i=0" target="_top" rel="nofollow">mark@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
<br> Import Gervill fixes from CVS. See CHANGES.txt.
<br> * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
<br><br> - Cleanup: Make inner classes static
<br>
<br> AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
<br>
<br> AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
<br>
<br> AudioFloatFormatConverter.AudioFloatInputStreamResampler
<br> SimpleInstrument.SimpleInstrumentPart
<br> SoftChorus.VariableDelay
<br> SoftChorus.LFODelay
<br> SoftMixingDataLine.AudioFloatInputStreamResampler
<br> SoftMixingSourceDataLine.NonBlockingFloatInputStream
<br> SoftReverb.AllPass
<br> SoftReverb.Comb
<br> SoftReverb.Delay
<br> - Cleanup: Remove unused fields in:
<br> SoftSincResampler.din, SoftLanczosResampler.din,
<br> SoftMainMixer.finetuning, SoftMainMixer.coarsetuning
<br> SoftJitterCorrector.JitterStream.nullbuff,
<br> SoftAbstractResampler.ModelAbstractResampler.loopread
<br>
<br> SoftAbstractResampler.ModelAbstractResampler.streammarked
<br> - Cleanup: Remove dead code from FFT.
<br> - Cleanup: Make constant fields in SoftFilter final.
<br> - Cleanup: Let SoftSynthesizer.info be final.
<br> - Cleanup: Let SoftProvider.info be final.
<br> - Fix: Unnecessary call to sourceDataLine.drain() in
<br> SoftSynthesizer
<br> causes random hangs in SoftSynthesizer.open jtreg test.
<br> This happens when the synthesizer is opened and right
<br> after closed.
<br> This will not happen if there is a delay between open and
<br> close call.
<br> - Fix: ModelByteBufferAudioFileSoundbankReader,
<br> SoftAudioPusher, SoftJitterCorrector
<br> don't ignore stream.read return value.
<br> - Fix: NullPointerException in
<br> SoftSynthesizer.unloadInstrument if instrument = null
<br> - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close
<br> stream.
<br> - Fix: Futile attempts to guard buffers variable in
<br> SoftJitterCorrector.
<br> - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use
<br> readfully instead of read
<br> when reading from stream.
<br> JTreg tests where created to test for this.
<br><br>I like these cleanups. Your fix for the jtreg resources was nicer than
<br>mine, so I dropped the icedtea one. I did take your change to the tests
<br>needing a samplerate and controlrate argument to init the SoftLimiter to
<br>just pass the constant values 44100 and 147. I also made the
<br>SoftSynthesizer.getControlRate() protected again. I can kind of
<br>understand using these constants in the tests. Although I find getting
<br>them from the synthesizer nicer.
<br><br>Is there a reason the control rate is always hardcoded to 147? There
<br>actually doesn't seem to be any way to change it since the property info
<br>always sets it explicitly.
<br><br>With this there are only a few minor differences left between gervill
<br>CVS and the icedtea overlay. I have attached the diff.
<br><br><br>2008-06-08 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17723918&i=1" target="_top" rel="nofollow">mark@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
<br> Import Gervill CVS source reformatting.
<br><br>For the interested I have attached the current diff between the
<br>gervil/cvs/icedtea/overlay version and what is in openjdk6-b10.
<br>(Note that line endings are different, openjdk6 uses CRLF, which is
<br>disregarded when creating the diff.)
<br><br>Cheers,
<br><br>Mark
<br><br />Index: src/com/sun/media/sound/DLSSoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/DLSSoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 DLSSoundbankReader.java
<br>--- src/com/sun/media/sound/DLSSoundbankReader.java 5 Jun 2008 01:55:28 -0000 1.3
<br>+++ src/com/sun/media/sound/DLSSoundbankReader.java 8 Jun 2008 19:50:05 -0000
<br>@@ -47,6 +47,8 @@
<br> return new DLSSoundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SF2SoundbankReader.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SF2SoundbankReader.java,v
<br>retrieving revision 1.3
<br>diff -u -r1.3 SF2SoundbankReader.java
<br>--- src/com/sun/media/sound/SF2SoundbankReader.java 5 Jun 2008 01:55:33 -0000 1.3
<br>+++ src/com/sun/media/sound/SF2SoundbankReader.java 8 Jun 2008 19:50:05 -0000
<br>@@ -46,6 +46,8 @@
<br> return new SF2Soundbank(url);
<br> } catch (RIFFInvalidFormatException e) {
<br> return null;
<br>+ } catch(IOException ioe) {
<br>+ return null;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SoftChannel.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftChannel.java,v
<br>retrieving revision 1.9
<br>diff -u -r1.9 SoftChannel.java
<br>--- src/com/sun/media/sound/SoftChannel.java 5 Jun 2008 01:55:36 -0000 1.9
<br>+++ src/com/sun/media/sound/SoftChannel.java 8 Jun 2008 19:50:06 -0000
<br>@@ -1194,7 +1194,9 @@
<br>
<br> public int getController(int controller) {
<br> synchronized (control_mutex) {
<br>- return this.controller[controller];
<br>+ // Should only return lower 7 bits,
<br>+ // even when controller is "boosted" higher.
<br>+ return this.controller[controller] & 127;
<br> }
<br> }
<br>
<br>Index: src/com/sun/media/sound/SoftSynthesizer.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftSynthesizer.java,v
<br>retrieving revision 1.36
<br>diff -u -r1.36 SoftSynthesizer.java
<br>--- src/com/sun/media/sound/SoftSynthesizer.java 5 Jun 2008 01:55:31 -0000 1.36
<br>+++ src/com/sun/media/sound/SoftSynthesizer.java 8 Jun 2008 19:50:06 -0000
<br>@@ -591,6 +591,9 @@
<br> }
<br>
<br> public void unloadAllInstruments(Soundbank soundbank) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br>@@ -615,6 +618,9 @@
<br> }
<br>
<br> public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
<br>+ if (soundbank == null || !isSoundbankSupported(soundbank))
<br>+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
<br>+
<br> if (!isOpen())
<br> return;
<br>
<br><br /> <br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17723918&i=2" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br><div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>icedtea-gervil-openjdk-b10.diff.gz</strong> (19K) <a href="http://old.nabble.com/attachment/17723918/0/icedtea-gervil-openjdk-b10.diff.gz" target="_top">Download Attachment</a></div>
tag:old.nabble.com,2006:post-17461316
Re: <Sound Dev> Opening multiple output lines
2008-05-25T12:16:28Z
2008-05-25T12:16:28Z
Mark Wielaard
Hi Karl,
<br><br>On Fri, 2008-05-09 at 19:58 +0000, Karl Helgason wrote:
<br>> I added software sound mixing to the gervill Project which writes to default directaudio backend.
<br>> And thus allows true sharing of audio device (within the Java application).
<br><br>This is great! Sorry for the late response. I integrated it into
<br>icedtea. But I haven't set it as default yet because I didn't have time
<br>to fully test it. I do want to have it integrated so others can play
<br>with it though.
<br><br>Also thanks for your AudioFloatFormatConverter.getTargetFormats() fix, I
<br>removed my own attempt of fixing that. And for integrating the dls/sf2
<br>soundbank opening issues.
<br><br>Also since we now have jtreg integrated I imported all the tests so they
<br>will now all be run by default on a make check (or make jtregcheck).
<br>That found two issues.
<br><br>One with a test. TestRender1 accesses its test files through
<br>getResourceAsStream(), but the jtreg tag specification recommends
<br>opening files through the system property test.src so that the test can
<br>be run inside another work directory. See
<br><a href="http://www.openjdk.org/jtreg/tag-spec.txt" target="_top" rel="nofollow">http://www.openjdk.org/jtreg/tag-spec.txt</a><br>Patch to change this attached.
<br><br>The other issue is with the change that made SoftAudioProcessor
<br>(limiter, reverb, chorus, agc) more general. Since you cannot provide a
<br>Synthesizer directly to one of these classes you need a way to pass it
<br>the control rate. Unfortunately SoftSynthesizer.getControlRate() is
<br>currently protected and there is as far as I can see no other way to get
<br>the control rate. So I believe the method should be made public. A
<br>change to do this and adapt the tests to use this is attached.
<br><br>With these changes all tests pass.
<br><br>Cheers,
<br><br>Mark
<br><br /><tt>[TestRender1-test.src.patch]</tt><br /><hr align="left" width="300" /><tt>Index: test/com/sun/media/sound/SoftSynthesizer/TestRender1.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 TestRender1.java
<br>--- test/com/sun/media/sound/SoftSynthesizer/TestRender1.java 2 Jan 2008 12:24:16 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftSynthesizer/TestRender1.java 25 May 2008 19:07:10 -0000
<br>@@ -29,6 +29,8 @@
<br> import java.io.BufferedInputStream;
<br> import java.io.IOException;
<br> import java.io.InputStream;
<br>+import java.io.File;
<br>+import java.io.FileInputStream;
<br> import java.io.OutputStream;
<br> import java.util.HashMap;
<br> import java.util.Map;
<br>@@ -134,13 +136,15 @@
<br>
<br> public static void main(String[] args) throws Exception {
<br>
<br>- InputStream sb = new BufferedInputStream(TestRender1.class
<br>- .getResourceAsStream("/ding.sf2"));
<br>+ File fb = new File(System.getProperty("test.src", "."),
<br>+ "ding.sf2");
<br>+ InputStream sb = new FileInputStream(fb);
<br> soundbank = MidiSystem.getSoundbank(sb);
<br> sb.close();
<br>
<br>- InputStream si = new BufferedInputStream(TestRender1.class
<br>- .getResourceAsStream("/expresso.mid"));
<br>+ File fi = new File(System.getProperty("test.src", "."),
<br>+ "expresso.mid");
<br>+ InputStream si = new FileInputStream(fi);
<br> sequence = MidiSystem.getSequence(si);
<br> si.close();
<br>
<br></tt><hr align="left" width="300" /><br /><tt>[controlrate.patch]</tt><br /><hr align="left" width="300" /><tt>Index: src/com/sun/media/sound/SoftSynthesizer.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/SoftSynthesizer.java,v
<br>retrieving revision 1.31
<br>diff -u -r1.31 SoftSynthesizer.java
<br>--- src/com/sun/media/sound/SoftSynthesizer.java 5 Mar 2008 03:35:22 -0000 1.31
<br>+++ src/com/sun/media/sound/SoftSynthesizer.java 25 May 2008 19:12:24 -0000
<br>@@ -331,7 +331,10 @@
<br> return deviceid;
<br> }
<br>
<br>- protected float getControlRate() {
<br>+ /**
<br>+ * Returns the number of control changes per second.
<br>+ */
<br>+ public float getControlRate() {
<br> return controlrate;
<br> }
<br>
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_mix.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java 11 Dec 2007 02:49:18 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java 25 May 2008 19:12:24 -0000
<br>@@ -71,7 +71,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(true);
<br> limiter.setInput(0, in1);
<br> limiter.setInput(1, in2);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_mix_mono.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java 11 Dec 2007 02:49:19 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java 25 May 2008 19:12:24 -0000
<br>@@ -63,7 +63,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(true);
<br> limiter.setInput(0, in1);
<br> limiter.setOutput(0, out1);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_mix_mono_overdrive.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java 11 Dec 2007 02:49:17 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java 25 May 2008 19:12:24 -0000
<br>@@ -64,7 +64,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(true);
<br> limiter.setInput(0, in1);
<br> limiter.setOutput(0, out1);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_mix_overdrive.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java 11 Dec 2007 02:50:21 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java 25 May 2008 19:12:24 -0000
<br>@@ -71,7 +71,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(true);
<br> limiter.setInput(0, in1);
<br> limiter.setInput(1, in2);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_normal.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java 11 Dec 2007 02:50:22 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java 25 May 2008 19:12:24 -0000
<br>@@ -71,7 +71,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(false);
<br> limiter.setInput(0, in1);
<br> limiter.setInput(1, in2);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_normal_mono.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java 11 Dec 2007 02:50:23 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java 25 May 2008 19:12:24 -0000
<br>@@ -63,7 +63,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(false);
<br> limiter.setInput(0, in1);
<br> limiter.setOutput(0, out1);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_overdrive.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java 11 Dec 2007 02:49:50 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java 25 May 2008 19:12:24 -0000
<br>@@ -71,7 +71,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(false);
<br> limiter.setInput(0, in1);
<br> limiter.setInput(1, in2);
<br>Index: test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java
<br>===================================================================
<br>RCS file: /cvs/gervill/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java,v
<br>retrieving revision 1.1
<br>diff -u -r1.1 ProcessAudio_replace_overdrive_mono.java
<br>--- test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java 11 Dec 2007 02:50:23 -0000 1.1
<br>+++ test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java 25 May 2008 19:12:24 -0000
<br>@@ -63,7 +63,8 @@
<br> }
<br>
<br> SoftLimiter limiter = new SoftLimiter();
<br>- limiter.init(synth);
<br>+ limiter.init(synth.getFormat().getSampleRate(),
<br>+ synth.getControlRate());
<br> limiter.setMixMode(false);
<br> limiter.setInput(0, in1);
<br> limiter.setOutput(0, out1);
<br>
<br></tt><hr align="left" width="300" /><br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17461316&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17155492
Re: <Sound Dev> Opening multiple output lines
2008-05-09T12:58:51Z
2008-05-09T12:58:51Z
Karl Helgason-2
Hi,
<br><br>I added software sound mixing to the gervill Project which writes to default directaudio backend.
<br>And thus allows true sharing of audio device (within the Java application).
<br><br>cheers,
<br>Karl Helgason
<br>________________________________________
<br>Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=0" target="_top" rel="nofollow">sound-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=1" target="_top" rel="nofollow">sound-dev-bounces@...</a>] Fyrir hönd Mark Wielaard [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=2" target="_top" rel="nofollow">mark@...</a>]
<br>Sent: 9. maí 2008 00:48
<br>Viðtakandi: Thomas Fitzsimmons
<br>Afrit: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=3" target="_top" rel="nofollow">sound-dev@...</a>; <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=4" target="_top" rel="nofollow">distro-pkg-dev@...</a>
<br>Efni: Re: <Sound Dev> Opening multiple output lines
<br><br>Hi,
<br><br>On Sun, 2008-05-04 at 19:19 +0200, Mark Wielaard wrote:
<div class='shrinkable-quote'><br>> I had the same problem with a similar setup and with applications that
<br>> forget to close a line they don't use anymore (unfortunately this seems
<br>> very common). With the current directaudio backend I don't see how multiple
<br>> lines for the same hardware device could work though. So I am using a
<br>> trick to look for "sloppy" applications. If the last line opened in the
<br>> directaudio device was for the same hardware format then we silence that
<br>> one first so we can hand out a new one. This seems to work surprisingly
<br>> well. And it doesn't seem to interfere with applications that handle the
<br>> hardware formats they need explicitly.
<br>>
<br>> With gcjwebplugin and this patch we can happily play the vNES games :)
<br>>
<br>> Of course a real solution would be to import or write a better mixer
<br>> that does share lines properly.
</div><br>I updated the patch a little to make it all a bit more robust. It splits
<br>the locks, so there is no longer one gaint static one (I shouldn't have
<br>reused the lockNative one and made that static in the original patch).
<br><br>And it makes sure that all methods that require the nativeLock check the
<br>doIO inside their synchronized block and the lock around nStop() isn't
<br>released before the flag is set. ALSA can actually hang when called on a
<br>pcm you already stopped or closed. This race was already in the code,
<br>since a DataSourceLine could be asynchronously stopped or closed at any
<br>time. My patch just exposed it more easily, because DirectAudioDevice is
<br>the mixer that is now always used by defailt.
<br><br>2008-05-08 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=5" target="_top" rel="nofollow">mark@...</a>>
<br><br> * patches/icedtea-directaudio-close-trick.patch: Use new static
<br> lockLast for nOpen/nClose guarding. Make lockNative non-static
<br> again. Do all checks before native calls of doIO inside
<br> lockNative guard. Set doIO to false after nClose before dropping
<br> lockNative guard.
<br><br>I do think we should write a new MixerProvider based on a modern
<br>soundserver, like pulseaudio. The current DirectAudioDeviceProvider code
<br>cannot easily be extended to provide true software sound mixing. And the
<br>way it opens direct hardware alsa devices means it locks out other
<br>applications.
<br><br>Cheers,
<br><br>Mark
<br><br>Patch against original code (updated patch file in icedtea6).
<br><br>No virus found in this incoming message.
<br>Checked by AVG.
<br>Version: 7.5.524 / Virus Database: 269.23.10/1421 - Release Date: 7.5.2008 17:23
<br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17155492&i=6" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17152555
Re: Some small Gervill fixes
2008-05-09T10:14:28Z
2008-05-09T10:14:28Z
Mark Wielaard-3
Hi Karl,
<br><br>On Mon, 2008-05-05 at 00:30 +0200, Mark Wielaard wrote:
<br>> > I especially proud of the new AudioFloatFormatConverter, it makes
<br>> > sample rate conversion available via a FormatConversionProvider.
<br>> > <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960" target="_top" rel="nofollow">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960</a><br>>
<br>> O wow, very nice. I imported the new Gervill CVS version into IcedTea.
<br><br>And then I forgot to add the AudioFloatFormatConverter class to the
<br>javax.sound.sampled.spi.FormatConversionProvider file. DOH!
<br><br>Added that now to the icedtea-gervill.patch and imported a fresh Gervill
<br>CVS into the overlays.
<br><br>One small nit. AudioFloatFormatConverter.getTargetFormats() happily
<br>tells me that it will convert to lots of AudioFormats even if it doesn't
<br>actually know the given target encoding. I added a check on
<br>isConversionSupported() like the other converter methods do.
<br><br>2008-05-09 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17152555&i=0" target="_top" rel="nofollow">mwielaard@...</a>>
<br><br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
<br> Import Gervill fixes from CVS. See CHANGES.txt.
<br> Check isConversionSupported() in
<br> AudioFloatFormatConverter.getTargetFormats().
<br> * patches/icedtea-gervill.patch: Add AudioFloatFormatConverter to
<br> javax.sound.sampled.spi.FormatConversionProvider.
<br><br>AudioFloatFormatConverter patch against Gervill CVS attached.
<br><br>Cheers,
<br><br>Mark
<br><br />Index: src/com/sun/media/sound/AudioFloatFormatConverter.java
<br>===================================================================
<br>RCS file: /cvs/gervill/src/com/sun/media/sound/AudioFloatFormatConverter.java,v
<br>retrieving revision 1.2
<br>diff -u -r1.2 AudioFloatFormatConverter.java
<br>--- src/com/sun/media/sound/AudioFloatFormatConverter.java 8 May 2008 16:38:02 -0000 1.2
<br>+++ src/com/sun/media/sound/AudioFloatFormatConverter.java 9 May 2008 17:10:49 -0000
<br>@@ -489,7 +489,7 @@
<br> }
<br>
<br> public AudioFormat[] getTargetFormats(Encoding targetEncoding, AudioFormat sourceFormat) {
<br>- if(AudioFloatConverter.getConverter(sourceFormat) == null) return new AudioFormat[0];
<br>+ if(!isConversionSupported(targetEncoding, sourceFormat)) return new AudioFormat[0];
<br> int channels = sourceFormat.getChannels();
<br> ArrayList<AudioFormat> formats = new ArrayList<AudioFormat>();
<br> formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, 8, channels, channels, AudioSystem.NOT_SPECIFIED, false));
<br><br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17152555&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17052102
Re: Some small Gervill fixes
2008-05-04T15:30:30Z
2008-05-04T15:30:30Z
Mark Wielaard
Hi Karl,
<br><br>On Fri, 2008-05-02 at 16:25 +0000, Karl Helgason wrote:
<br>> I am not currently filtering the control values to 0..127 because some
<br>> user likes to be able to overdrive the values
<br>> for example to set Volume to 255 which mean more than 100% volume (it
<br>> was possible with the previous beatnik synthesizer).
<br>> This could however result in unpredictable behaviors.
<br>> If we want to prevent out of range values we should do that at the
<br>> beginning in the controlChange method with if statement.
<br><br>Aha, yes, I see. If the user is allowed to "boost" a control then maybe
<br>we should just let them. Reading those "weird" values back in
<br>getController() can lead to some strangeness though.
<br><br>> But it is cool to get more code reviewers :) Sun is planning to add
<br>> Gervill into OpenJDK 6 after JavaOne.
<br><br>That would be very cool. I am playing with frinika now on top of
<br>icedtea/openjdk with gervill integrated (frinika obviously works since
<br>it already had an older gervill imported). I never knew midi could be so
<br>much fun!
<br><div class='shrinkable-quote'><br>> I have added this fix into the CVS and these also:
<br>>
<br>> - Added: AudioFloatFormatConverter, used to convert
<br>> between PCM_SIGNED, PCM_UNSIGNED, PCM_FLOAT in 8/16/24/32 bit (big/little endian),
<br>> and resample using (linear/cubic/sinc...) if needed.
<br>> - Added: WaveExtensibleReader, used to read WAV files using WAVE_FORMAT_EXTENSIBLE format.
<br>> - Added: WaveFloatFileWriter, used to writing WAV files with PCM_FLOAT encoding.
<br>> - Fix: AudioFloatConverter tests incorrectly AudioFormat frameSize against SampleSizeInBits
<br>> Support for 64-byte float added, and support for 32+ bit PCM samples.
<br>> SampleSizeInBits not dividable by 8 are now handled correctly.
<br>> - Fix: DLSID(GUID) values incorrectly read from files in DLSSoundBank.
<br>> - Fix: WaveFloatFileReader incorrectly sets framrate.
<br>> - Fix: DLSSoundbank writes avgBytesPerSec incorrectly if SampleSizeInBits is not dividable by 8.
<br>> - Fix: SoftChannel didn't reset concept of LSB control to 0 when MSB control value is set
<br>> (according to MIDI 1.0 Detailed Spec. page 12)
<br>> - Fix: SoftChannel, added check for illegal noteNumbers.
<br>> If illegal notenumber was used in NoteOn/NoteOff
<br>> a ArrayOutOfIndex exception was thrown.
<br>>
<br>> I especially proud of the new AudioFloatFormatConverter, it makes
<br>> sample rate conversion available via a FormatConversionProvider.
<br>> <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960" target="_top" rel="nofollow">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960</a></div><br>O wow, very nice. I imported the new Gervill CVS version into IcedTea.
<br><br>Thanks,
<br><br>Mark
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17052102&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17022998
Re: Some small Gervill fixes
2008-05-02T09:25:39Z
2008-05-02T09:25:39Z
Karl Helgason-2
Hi,
<br><br>You are correct according to the MIDI 1.0 Detailed Spec. page 12 :)
<br><br>Thanks for noticing this. Although LSB controls (32..64) aren't used in the synthesizer except for bank select and data entry.
<br>And your patch didn't apply for those cases, because it happened earlier in the code.
<br>Support for LSB controls could be easily added by adding more ModelConnectionBlock entries into SoftPerformer.java
<br><br>I am not currently filtering the control values to 0..127 because some user likes to be able to overdrive the values
<br>for example to set Volume to 255 which mean more than 100% volume (it was possible with the previous beatnik synthesizer).
<br>This could however result in unpredictable behaviors.
<br>If we want to prevent out of range values we should do that at the beginning in the controlChange method with if statement.
<br><br>But it is cool to get more code reviewers :) Sun is planning to add Gervill into OpenJDK 6 after JavaOne.
<br><br>I have added this fix into the CVS and these also:
<br><br> - Added: AudioFloatFormatConverter, used to convert
<br> between PCM_SIGNED, PCM_UNSIGNED, PCM_FLOAT in 8/16/24/32 bit (big/little endian),
<br> and resample using (linear/cubic/sinc...) if needed.
<br> - Added: WaveExtensibleReader, used to read WAV files using WAVE_FORMAT_EXTENSIBLE format.
<br> - Added: WaveFloatFileWriter, used to writing WAV files with PCM_FLOAT encoding.
<br> - Fix: AudioFloatConverter tests incorrectly AudioFormat frameSize against SampleSizeInBits
<br> Support for 64-byte float added, and support for 32+ bit PCM samples.
<br> SampleSizeInBits not dividable by 8 are now handled correctly.
<br> - Fix: DLSID(GUID) values incorrectly read from files in DLSSoundBank.
<br> - Fix: WaveFloatFileReader incorrectly sets framrate.
<br> - Fix: DLSSoundbank writes avgBytesPerSec incorrectly if SampleSizeInBits is not dividable by 8.
<br> - Fix: SoftChannel didn't reset concept of LSB control to 0 when MSB control value is set
<br> (according to MIDI 1.0 Detailed Spec. page 12)
<br> - Fix: SoftChannel, added check for illegal noteNumbers.
<br> If illegal notenumber was used in NoteOn/NoteOff
<br> a ArrayOutOfIndex exception was thrown.
<br><br>I especially proud of the new AudioFloatFormatConverter, it makes sample rate conversion available via a FormatConversionProvider.
<br> <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960" target="_top" rel="nofollow">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916960</a><br><br>cheers,
<br>Karl
<br><br>________________________________________
<br>Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=0" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=1" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a>] Fyrir hönd Mark Wielaard [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=2" target="_top" rel="nofollow">mwielaard@...</a>]
<br>Sent: 1. maí 2008 23:33
<br>Viðtakandi: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=3" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>Afrit: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=4" target="_top" rel="nofollow">distro-pkg-dev@...</a>
<br>Efni: Re: [Audio-engine-dev] Some small Gervill fixes
<br><br>Hi,
<br><br>Another small nit. In SoftChannel.controlChange() the controller values
<br>for least significant values (32-64) weren't reset to zero when the most
<br>significant values were set. This showed up when calling
<br>getController().
<br><br>2008-05-01 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=5" target="_top" rel="nofollow">mwielaard@...</a>>
<br><br> * com/sun/media/sound/SoftChannel.java (controlChange):
<br> Reset least significant controller if necessary.
<br><br>Let me know what you think. I added this patch to IcedTea.
<br><br>Cheers,
<br><br>Mark
<br><br>No virus found in this incoming message.
<br>Checked by AVG.
<br>Version: 7.5.524 / Virus Database: 269.23.7/1408 - Release Date: 30.4.2008 18:10
<br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17022998&i=6" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-17011267
Re: Some small Gervill fixes
2008-05-01T16:33:45Z
2008-05-01T16:33:45Z
Mark Wielaard-3
Hi,
<br><br>Another small nit. In SoftChannel.controlChange() the controller values
<br>for least significant values (32-64) weren't reset to zero when the most
<br>significant values were set. This showed up when calling
<br>getController().
<br><br>2008-05-01 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17011267&i=0" target="_top" rel="nofollow">mwielaard@...</a>>
<br><br> * com/sun/media/sound/SoftChannel.java (controlChange):
<br> Reset least significant controller if necessary.
<br><br>Let me know what you think. I added this patch to IcedTea.
<br><br>Cheers,
<br><br>Mark
<br><br />--- com/sun/media/sound/SoftChannel.java Thu May 01 10:57:58 2008 +0200
<br>+++ com/sun/media/sound/SoftChannel.java Fri May 02 01:29:20 2008 +0200
<br>@@ -1170,7 +1170,13 @@ public class SoftChannel implements Midi
<br> return;
<br> }
<br>
<br>- this.controller[controller] = value;
<br>+ // Keep track of values (capped to 7 bit).
<br>+ // Reset least significant (32 through 63)
<br>+ // controller value when most significant
<br>+ // (0 through 31) is set.
<br>+ this.controller[controller] = value & 127;
<br>+ if (controller < 32)
<br>+ this.controller[controller + 32] = 0;
<br>
<br> for (int i = 0; i < voices.length; i++)
<br> if (voices[i].active)
<br><br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=17011267&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-16990664
Gervill integrated into IcedTea
2008-04-30T13:13:33Z
2008-04-30T13:13:33Z
Mark Wielaard
Hi,
<br><br>Gervill [1] is a software sound synthesizer, written by Karl Helgason,
<br>which was created as a proposal for the Audio Synthesis Engine Project
<br>[2] and it was recently accepted as one of the projects for the
<br>Innovators' Challenge [3].
<br><br>Since this is one of the major pieces missing, because it is fun to play
<br>with sounds and to give the code a little more exposure I integrated it
<br>into IcedTea.
<br><br>I took the version from Gervill CVS which is already assigned to Sun and
<br>distributed under the GPL + Classpath exception (README.txt, CHANGES.txt
<br>and LICENSE also included of course).
<br><br>This provides the following new service providers
<br><br>javax.sound.sampled.spi.AudioFileReader:
<br> com.sun.media.sound.WaveFloatFileReader
<br> com.sun.media.sound.SoftMidiAudioFileReader
<br><br>javax.sound.midi.spi.MidiDeviceProvider:
<br> com.sun.media.sound.SoftProvider
<br><br>javax.sound.midi.spi.SoundbankReader:
<br> com.sun.media.sound.SF2SoundbankReader
<br> com.sun.media.sound.DLSSoundbankReader
<br> com.sun.media.sound.PATSoundbankReader
<br> com.sun.media.sound.AudioFileSoundbankReader
<br> com.sun.media.sound.JARSoundbankReader
<br><br>It is added as an overlay for the code under
<br>openjdk/jdk/src/share/classes/com/sun/media/sound/ and a patch against
<br>the service provider files in patches/icedtea-gervill.patch.
<br><br>2008-04-30 Mark Wielaard <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=16990664&i=0" target="_top" rel="nofollow">mark@...</a>>
<br><br> * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch.
<br> * Makefile.in: Regenerated.
<br> * patches/icedtea-gervill.patch: New patch.
<br> * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*:
<br> New Gervill files.
<br><br>I also ran the testsuite in Gervill against a freshly build IcedTea and
<br>all all test PASS. I haven't included the tests yet since I thought they
<br>would not run without jtreg, but a quick little dirty fake jtreg harness
<br>was easy to come up with [*]. If this works for other jtreg based tests
<br>I will try and integrate it so we don't have to wait till jtreg is
<br>liberate to run more test.
<br><br>If you can please test and report any issues (best to CC audio-engine-dev).
<br><br>Cheers,
<br><br>Mark
<br><br>[1] <a href="https://gervill.dev.java.net/" target="_top" rel="nofollow">https://gervill.dev.java.net/</a><br>[2] <a href="http://openjdk.java.net/projects/audio-engine/" target="_top" rel="nofollow">http://openjdk.java.net/projects/audio-engine/</a><br>[3] <a href="http://blogs.sun.com/rsands/entry/the_challenge_of_the_challenge" target="_top" rel="nofollow">http://blogs.sun.com/rsands/entry/the_challenge_of_the_challenge</a><br><br>[*]
<br>for i in `find com -name \*.java`; do echo -n "$i: "; grep 'static void main' $i > /dev/null; if test $? == 0; then javac -cp `dirname $i` $i; java -cp `dirname $i` `basename $i .java`; if test $? == 0; then echo PASS; else echo FAIL; fi; else echo "SKIPPED"; fi; done
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=16990664&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15630997
Re: Gervill 0.9 just released
2008-02-22T01:59:47Z
2008-02-22T01:59:47Z
Alex Menkov-2
Hi everybody!
<br><br>With version 0.9 all reported issues has been fixed.
<br>I'm going to start integration Gervill into openJDK6 (dropping encumbered code)
<br>next Tuesday, February 26. After completion of the integration into openJDK6,
<br>the same thing will be done with openJDK7.
<br><br>If somebody is still in progress with testing/reviewing please let us know.
<br><br>Regards
<br>Alex
<br><br>Karl Helgason wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> Version 0.9 has just been released, and can be downloaded here:
<br>> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=577578" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=577578</a><br>>
<br>> Gervill project page at java.net is:
<br>> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br>>
<br>> Change log:
<br>> - Fix: JTreg SoftSynthesizer\ImplicitOpenClose.java
<br>> did not test correctly.
<br>> - Fix: SoftSynthesizer.isSoundbankSupported
<br>> now only returns false if
<br>> there is any instrument which is not supported.
<br>> - Fix: SoftSynthesizer.remapInstrument
<br>> did not work correctly.
<br>> - Fix: SoftSynthesizer.loadInstrument
<br>> SoftSynthesizer.loadInstruments
<br>> SoftSynthesizer.loadAllInstruments
<br>> SoftSynthesizer.unloadInstrument
<br>> SoftSynthesizer.unloadInstruments
<br>> SoftSynthesizer.unloadAllInstruments
<br>> SoftSynthesizer.getAvailableInstruments
<br>> SoftSynthesizer.getLoadedInstruments
<br>> now throws IllegalArgumentException
<br>> if instrument is not supported
<br>> and false if instrument can't be loaded
<br>> for some other reason.
<br>> - Fix: SoftSynthesizer.getReceivers()
<br>> SoftSynthesizer.getMicrosecondPosition()
<br>> SoftSynthesizer.getVoiceStatus()
<br>> SoftSynthesizer.getChannels()
<br>> SoftMidiAudioFileReader.getAudioInputStream(Sequence seq)
<br>> now no longer throw IllegalStateException.
<br>> - Fix: SoftSynthesizer.getChannels() and
<br>> SoftSynthesizer.getVoiceStatus()
<br>> now no longer return internal array.
<br>> - Fix: CPU spiking caused by denormal floats in SoftReverb.
<br>> - Fix: Calling getReceiver before opening the synthesizer results in NullPointerException.
<br>> JTreg test added: SoftSynthesizer/GetReceiver2
<br>> - Fix: Removed checksum check on
<br>> BULK TUNING DUMP (NON-REAL-TIME)
<br>> Because MIDI Tuning Spec was ambigous about
<br>> how to calculate the checksum
<br>> and different programs tested calculated
<br>> different checksum.
<br>> JTreg test SoftTuning/Load1 fixed.
<br>>
<br>> regards,
<br>> Karl Helgason
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15630997&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a></div>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15630997&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15549391
Gervill 0.9 just released
2008-02-18T08:48:29Z
2008-02-18T08:48:29Z
Karl Helgason-2
Hi,
<br><br>Version 0.9 has just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=577578" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=577578</a><br><br>Gervill project page at java.net is:
<br> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Change log:
<br> - Fix: JTreg SoftSynthesizer\ImplicitOpenClose.java
<br> did not test correctly.
<br> - Fix: SoftSynthesizer.isSoundbankSupported
<br> now only returns false if
<br> there is any instrument which is not supported.
<br> - Fix: SoftSynthesizer.remapInstrument
<br> did not work correctly.
<br> - Fix: SoftSynthesizer.loadInstrument
<br> SoftSynthesizer.loadInstruments
<br> SoftSynthesizer.loadAllInstruments
<br> SoftSynthesizer.unloadInstrument
<br> SoftSynthesizer.unloadInstruments
<br> SoftSynthesizer.unloadAllInstruments
<br> SoftSynthesizer.getAvailableInstruments
<br> SoftSynthesizer.getLoadedInstruments
<br> now throws IllegalArgumentException
<br> if instrument is not supported
<br> and false if instrument can't be loaded
<br> for some other reason.
<br> - Fix: SoftSynthesizer.getReceivers()
<br> SoftSynthesizer.getMicrosecondPosition()
<br> SoftSynthesizer.getVoiceStatus()
<br> SoftSynthesizer.getChannels()
<br> SoftMidiAudioFileReader.getAudioInputStream(Sequence seq)
<br> now no longer throw IllegalStateException.
<br> - Fix: SoftSynthesizer.getChannels() and
<br> SoftSynthesizer.getVoiceStatus()
<br> now no longer return internal array.
<br> - Fix: CPU spiking caused by denormal floats in SoftReverb.
<br> - Fix: Calling getReceiver before opening the synthesizer results in NullPointerException.
<br> JTreg test added: SoftSynthesizer/GetReceiver2
<br> - Fix: Removed checksum check on
<br> BULK TUNING DUMP (NON-REAL-TIME)
<br> Because MIDI Tuning Spec was ambigous about
<br> how to calculate the checksum
<br> and different programs tested calculated
<br> different checksum.
<br> JTreg test SoftTuning/Load1 fixed.
<br><br>regards,
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15549391&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15485943
SoftSynthesizer: getChannels() and getVoiceStatus()
2008-02-14T10:08:59Z
2008-02-14T10:08:59Z
Alex Menkov-2
<br>SoftSynthesizer.getChannels() returns internal channels array.
<br>If somebody modify the array it may causes failures. It should return copy of
<br>the array.
<br><br>SoftSynthesizer.getVoiceStatus() returns "internal" tempVoiceStatusArray array.
<br>This may causes sharing violation. also it make impossible to do something like:
<br>VoiceStatus[] voices1 = synth.getVoiceStatus();
<br><some actions>
<br>VoiceStatus[] voices2 = synth.getVoiceStatus();
<br><compare voices1 & voices2 and do something if voices are changed>
<br><br><br>Regards
<br>Alex
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15485943&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15485601
SotfSynthesizer.remapInstrument
2008-02-14T09:49:09Z
2008-02-14T09:49:09Z
Alex Menkov-2
Hi again,
<br><br>Karl, did you see that Synthesizer.remapInstrument() spec has been changed in
<br>Java6? It look like you used spec from 1.5.
<br><br>new spec is:
<br>boolean remapInstrument(Instrument from, Instrument to)
<br><br> Remaps an instrument. Instrument to takes the place of instrument from.
<br> For example, if from was located at bank number 2, program number 11,
<br>remapping causes that bank and program location to be occupied instead by to.
<br> If the function succeeds, instrument from is unloaded.
<br><br> To cancel the remapping reload instrument from by invoking one of
<br>loadInstrument(javax.sound.midi.Instrument),
<br>loadInstruments(javax.sound.midi.Soundbank, javax.sound.midi.Patch[]) or
<br>loadAllInstruments(javax.sound.midi.Soundbank).
<br><br> Parameters:
<br> from - the Instrument object to be replaced
<br> to - the Instrument object to be used in place of the old instrument,
<br>it should be loaded into the synthesizer
<br> Returns:
<br> true if the instrument succeessfully remapped, false if feature is not
<br>implemented by synthesizer
<br> Throws:
<br> IllegalArgumentException - if instrument from or instrument to aren't
<br>supported by synthesizer or if instrument to is not loaded
<br> NullPointerException - if from or to parameters have null value
<br><br>Regards
<br>Alex
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15485601&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15485510
SoftSynthesizer exceptions
2008-02-14T09:45:06Z
2008-02-14T09:45:06Z
Alex Menkov-2
Hi,
<br><br>This is some notes about exception in SoftSynthesizer class.
<br><br>1) SoftSynthesizer throws IllegalStateException from a number of methods when it
<br>is not open.
<br>Old synthesizer implementation does not throw such exception, so the behavior
<br>may cause compatibility problems in some applications (for example JSInfo from
<br>jsresources.org - it calls getChannels() to discover how many channels a
<br>synthesizer supports).
<br>Although IllegalStateException is not required to be declared in "throws" list
<br>of a method, it should be explicitly described in spec (see Receiver.send for
<br>example).
<br><br>The methods which throw IllegalStateException:
<br>getChannels();
<br>getVoiceStatus();
<br>loadInstrument(Instrument instrument);
<br>unloadInstrument(Instrument instrument);
<br>remapInstrument(Instrument from, Instrument to);
<br>getAvailableInstruments();
<br>getLoadedInstruments();
<br>loadAllInstruments(Soundbank soundbank);
<br>unloadAllInstruments(Soundbank soundbank);
<br>loadInstruments(Soundbank soundbank, Patch[] patchList);
<br>unloadInstruments(Soundbank soundbank, Patch[] patchList);
<br>getMicrosecondPosition();
<br>getReceivers();
<br><br>also the exception can be thrown by loadSamples (called from
<br>loadAllInstruments(Soundbank soundbank) and loadInstrument(Instrument
<br>instrument); this are the cases when loadAllInstruments/loadInstrument should
<br>return "false" - see 2) ), from ModelByteBuffer class methods and from
<br>SoftMidiAudioFileReader.getAudioInputStream(Sequence seq) (called from other
<br>SoftMidiAudioFileReader methods)
<br><br><br>2) a number of methods (instrument loading/unloading) should throw
<br>IllegalArgumentException if the instrument (or sounbank) is unsupported (in our
<br>case instrument is not instance of ModelInstrument). "false" (for methods which
<br>returns boolean) means that instrument is supported, but could not be loaded by
<br>some reason.
<br>The methods are:
<br>loadInstrument(Instrument instrument);
<br>unloadInstrument(Instrument instrument);
<br>remapInstrument(Instrument from, Instrument to);
<br>loadAllInstruments(Soundbank soundbank);
<br>unloadAllInstruments(Soundbank soundbank);
<br>loadInstruments(Soundbank soundbank, Patch[] patchList);
<br>unloadInstruments(Soundbank soundbank, Patch[] patchList);
<br><br><br><br>Regards
<br>Alex
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15485510&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15336237
Re: Bug in RealTimeSequencer when used with Gervill
2008-02-07T07:21:30Z
2008-02-07T07:21:30Z
Alex Menkov-2
Karl,
<br><br>Yes, it's real mis-synchronization of the code.
<br>I've created a CR for the bug.
<br>I'm going to update the code along with RealTimeSequencer code cleaning
<br>(removing obsolete references to Beatnik code).
<br><br>Regards
<br>Alex
<br><br>Karl Helgason wrote:
<div class='shrinkable-quote'><br>> I found a bug in RealTimeSequencer when used with Gervill.
<br>> The doAutoConnect opens Gervill synthesizer explicitly
<br>> when it is supposed to open Gervill implicitly.
<br>>
<br>> Here is the code that reproduced the bug:
<br>>
<br>> // When we call MidiSystem.getSequencer()
<br>> // a instance of RealTimeSequencer is created
<br>> // that is connected to Gervill Receiver opened implicitly
<br>> Sequencer seqr = MidiSystem.getSequencer();
<br>> seqr.open();
<br>>
<br>> // When we call seqr.close the Receiver is also closed and
<br>> // hence the gervill synthesizer is also closed because the
<br>> // receiver was opened implicitly.
<br>> seqr.close();
<br>>
<br>> // Here is the bug, RealTimeSequencer tries to auto connect
<br>> // again, but opens the Gervill synthesizer explicitly
<br>> // before it tries to get instance of Receiver opened implicitly.
<br>> seqr.open();
<br>>
<br>> // Gervill synthesizer is never closed
<br>> // when we finally call seqr.close,
<br>> // because it was opened explicitly above.
<br>> seqr.close();
<br>>
<br>> --------------------------------------
<br>> The error lies here below:
<br>> The doAutoConnect performs synth.open();
<br>> before it tries to get Receiver opened implicity
<br>> by calling getReceiverReferenceCounting.
<br>>
<br>> private void doAutoConnect() {
<br>> if (Printer.trace) Printer.trace(">> RealTimeSequencer: doAutoConnect()");
<br>> Receiver rec = null;
<br>> // first try to connect to the default synthesizer
<br>> // IMPORTANT: this code needs to be synch'ed with
<br>> // MidiSystem.getReceiver(boolean), because the same
<br>> // algorithm needs to be used!
<br>> try {
<br>> Synthesizer synth = MidiSystem.getSynthesizer();
<br>> synth.open();
<br>> if (synth instanceof ReferenceCountingDevice) {
<br>> rec = ((ReferenceCountingDevice) synth).getReceiverReferenceCounting();
<br>> if (synth.getClass().toString().contains("com.sun.media.sound.MixerSynth")
<br>> && (synth.getDefaultSoundbank() == null)) {
<br>> // don't use this receiver if no soundbank available
<br>> rec = null;
<br>> synth.close();
<br>> }
<br>> } else {
<br>> rec = synth.getReceiver();
<br>> }
<br>> } catch (Exception e) {
<br>> // something went wrong with synth
<br>> }
<br>> if (rec == null) {
<br>> // then try to connect to the default Receiver
<br>> try {
<br>> rec = MidiSystem.getReceiver();
<br>> } catch (Exception e) {
<br>> // something went wrong. Nothing to do then!
<br>> }
<br>> }
<br>> if (rec != null) {
<br>> autoConnectedReceiver = rec;
<br>> try {
<br>> getTransmitter().setReceiver(rec);
<br>> } catch (Exception e) {}
<br>> }
<br>> if (Printer.trace) Printer.trace("<< RealTimeSequencer: doAutoConnect() succeeded");
<br>> }
<br>>
<br>> ------------------------
<br>> Here is a example of corrected RealTimeSequencer.
<br>> It now works like MidiSystem.getSequencer(boolean).
<br>> e.g. is now correctly synch'ed with MidiSystem.getReceiver(boolean).
<br>>
<br>>
<br>> private void doAutoConnect() {
<br>> if (Printer.trace) Printer.trace(">> RealTimeSequencer: doAutoConnect()");
<br>> Receiver rec = null;
<br>> // first try to connect to the default synthesizer
<br>> // IMPORTANT: this code needs to be synch'ed with
<br>> // MidiSystem.getReceiver(boolean), because the same
<br>> // algorithm needs to be used!
<br>> try {
<br>> Synthesizer synth = MidiSystem.getSynthesizer();
<br>> if (synth instanceof ReferenceCountingDevice) {
<br>> rec = ((ReferenceCountingDevice) synth).getReceiverReferenceCounting();
<br>> if (synth.getClass().toString().contains("com.sun.media.sound.MixerSynth")
<br>> && (synth.getDefaultSoundbank() == null)) {
<br>> // don't use this receiver if no soundbank available
<br>> rec = null;
<br>> synth.close();
<br>> }
<br>> } else {
<br>> synth.open();
<br>> try {
<br>> rec = synth.getReceiver();
<br>> } finally {
<br>> // make sure that the synth is properly closed
<br>> if (rec == null) {
<br>> synth.close();
<br>> }
<br>> }
<br>> }
<br>> } catch (Exception e) {
<br>> // something went wrong with synth
<br>> }
<br>> if (rec == null) {
<br>> // then try to connect to the default Receiver
<br>> try {
<br>> rec = MidiSystem.getReceiver();
<br>> } catch (Exception e) {
<br>> // something went wrong. Nothing to do then!
<br>> }
<br>> }
<br>> if (rec != null) {
<br>> autoConnectedReceiver = rec;
<br>> try {
<br>> getTransmitter().setReceiver(rec);
<br>> } catch (Exception e) {}
<br>> }
<br>> if (Printer.trace) Printer.trace("<< RealTimeSequencer: doAutoConnect() succeeded");
<br>> }
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15336237&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a></div>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15336237&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15332345
Re: Possible bugs
2008-02-07T03:56:42Z
2008-02-07T03:56:42Z
Karl Helgason-2
Hi Andi,
<br><br>I glad to hear that gervill-0.8-fix1.jar fixed those problems.
<br><br>The reason volume did not work for you
<br>is that the statements:
<br> sequencer = MidiSystem.getSequencer();
<br> synthesizer = MidiSystem.getSynthesizer();
<br>returns different instance of Gervill Synthesizer.
<br><br>This mean that volume change on for example synthesizer object
<br>won't affect playback on the sequencer object.
<br><br>In Gervill the midi volume 127 means that the signal is not affected.
<br>And 64 means that signal is attenuated by12 dB, while midi volume 256
<br>will amplify the signal by 12 dB. So by specifying 256 as maximum volume
<br>you are overdriving the output.
<br><br>regards,
<br>Karl
<br>________________________________________
<br>Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=0" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=1" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a>] Fyrir hönd Andreas Wenger [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=2" target="_top" rel="nofollow">info@...</a>]
<br>Sent: 7. febrúar 2008 08:56
<br>Viðtakandi: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=3" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>Efni: [Audio-engine-dev] Re: Possible bugs
<br><br>Hi Karl,
<br><br><br>gervill-0.8-fix1.jar fixed both problems.
<br><br><br>Volume did not work, because I could only test Gervill with
<br><br><br> > sequencer = MidiSystem.getSequencer();
<br> > synthesizer = MidiSystem.getSynthesizer();
<br><br><br>When using the now perfectly working
<br><br>> sequencer = MidiSystem.getSequencer(false);
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br><br><br>volume changes too (no idea why this is necessary, but it's the same
<br>with old Java Sound. Perhaps anybody can tell me?
<br>This is how I get the channels: MidiChannel[] channels =
<br>synthesizer.getChannels();)
<br><br><br>BTW, another thing I don't understand is the following (but same
<br>thing in old Java Sound).
<br>Many sites tell me, that volume control is between 0 and 127, see e.g.
<br><a href="http://www.musicmarkup.info/midi/control.html" target="_top" rel="nofollow">http://www.musicmarkup.info/midi/control.html</a><br><br>In fact I get max volume with 255, min with 0.
<br><br>Here is my complete setVolume method.
<br><div class='shrinkable-quote'><br>> /**
<br>> * Sets the volume.
<br>> * @param volume value between 0 (silent) and 1 (loud)
<br>> */
<br>> public void setVolume(float volume)
<br>> {
<br>> this.volume = volume;
<br>> MidiChannel[] channels = synthesizer.getChannels();
<br>>
<br>> //TODO: should be 127 (some websites say this)
<br>> //but 255 is the real max volume!
<br>> int max = 255;
<br>>
<br>> for (int i = 0; i < channels.length; i++)
<br>> {
<br>> channels[i].controlChange(7, (int) (volume * max));
<br>> }
<br>> }
</div><br>Did I already mention that Gervill is just GREAT?!
<br>Keep on your brilliant work! :-)
<br><br><br>Andi
<br><br><br><br><br>Karl Helgason schrieb:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> First:
<br>>
<br>> I can confirm this is a bug.
<br>>
<br>> Calling getReceiver before opening the synthesizer results in NullPointerException.
<br>> This is not supposed to happen. Thanks for noticing this.
<br>>
<br>> Second:
<br>>
<br>> I tried our way to change volume, and it does work with Gervill.
<br>> Please explain better how it failed.
<br>>
<br>> I uploaded updated version of gervill with this bug fixed:
<br>> Please download "gervill-0.8-fix1.jar" from:
<br>> <a href="https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0" target="_top" rel="nofollow">https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0</a><br>> and let me know how this works.
<br>>
<br>> regards,
<br>> Karl
<br>>
<br>> ________________________________________
<br>> Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=4" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=5" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a>] Fyrir hönd Andreas Wenger [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=6" target="_top" rel="nofollow">info@...</a>]
<br>> Sent: 6. febrúar 2008 17:08
<br>> Viðtakandi: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=7" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> Efni: [Audio-engine-dev] Possible bugs
<br>>
<br>> Hi,
<br>>
<br>>
<br>> I'm no experienced Java Sound user, so please forgive me if the following
<br>> "bugs" are not caused by Gervill but my own program.
<br>>
<br>> I tried to integrate Gervill into my program Xenoage Player, which
<br>> is a free MIDI player for MusicXML files, <a href="http://www.xenoage.com/player/" target="_top" rel="nofollow">http://www.xenoage.com/player/</a><br>>
<br>>
<br>> First:
<br>>
<br>> This works:
<br>>
<br>>> sequencer = MidiSystem.getSequencer();
<br>>> synthesizer = MidiSystem.getSynthesizer();
<br>>>
<br>> But this fails (works perfectly with old Java Sound):
<br>>
<br>>
<br>>> sequencer = MidiSystem.getSequencer(false);
<br>>> synthesizer = MidiSystem.getSynthesizer();
<br>>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br>>>
<br>> with
<br>>
<br>>> java.lang.NullPointerException
<br>>> at com.sun.media.sound.SoftReceiver.<init>(Unknown Source)
<br>>> at com.sun.media.sound.SoftSynthesizer.getReceiver(Unknown Source)
<br>>> at com.xenoage.player.Player.<init>(Player.java:79)
<br>>>
<br>> Line 79 is "seqTransmitter.setReceiver(synthesizer.getReceiver());"
<br>>
<br>>
<br>> Second:
<br>>
<br>> This is the way I change the playback volume (maybe this is bad code,
<br>> but it was the only way it worked for me with old Java Sound):
<br>>
<br>>
<br>>> MidiChannel[] channels = synthesizer.getChannels();
<br>>> //...
<br>>> for (int i = 0; i < channels.length; i++)
<br>>> {
<br>>> channels[i].controlChange(7, (int) (volume * max));
<br>>> }
<br>>>
<br>> This doesn't change the volume, while old Java Sound does.
<br>>
<br>>
<br>> If it helps, code is available by SVN, see the website.
<br>> If these are no bugs, please forgive me ;-)
<br>>
<br>> Bye,
<br>>
<br>>
<br>> Andi
<br>>
<br>>
<br>>
<br>>
<br>>
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=8" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>>
<br>> No virus found in this incoming message.
<br>> Checked by AVG Free Edition.
<br>> Version: 7.5.516 / Virus Database: 269.19.20/1261 - Release Date: 5.2.2008 20:57
<br>>
<br>>
</div><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=9" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br><br>No virus found in this incoming message.
<br>Checked by AVG Free Edition.
<br>Version: 7.5.516 / Virus Database: 269.19.20/1261 - Release Date: 5.2.2008 20:57
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15332345&i=10" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15329680
Re: Possible bugs
2008-02-07T00:56:20Z
2008-02-07T00:56:20Z
Andreas Wenger
Hi Karl,
<br><br><br>gervill-0.8-fix1.jar fixed both problems.
<br><br><br>Volume did not work, because I could only test Gervill with
<br><br><br> > sequencer = MidiSystem.getSequencer();
<br> > synthesizer = MidiSystem.getSynthesizer();
<br><br><br>When using the now perfectly working
<br><br>> sequencer = MidiSystem.getSequencer(false);
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br><br><br>volume changes too (no idea why this is necessary, but it's the same
<br>with old Java Sound. Perhaps anybody can tell me?
<br>This is how I get the channels: MidiChannel[] channels =
<br>synthesizer.getChannels();)
<br><br><br>BTW, another thing I don't understand is the following (but same
<br>thing in old Java Sound).
<br>Many sites tell me, that volume control is between 0 and 127, see e.g.
<br><a href="http://www.musicmarkup.info/midi/control.html" target="_top" rel="nofollow">http://www.musicmarkup.info/midi/control.html</a><br><br>In fact I get max volume with 255, min with 0.
<br><br>Here is my complete setVolume method.
<br><div class='shrinkable-quote'><br>> /**
<br>> * Sets the volume.
<br>> * @param volume value between 0 (silent) and 1 (loud)
<br>> */
<br>> public void setVolume(float volume)
<br>> {
<br>> this.volume = volume;
<br>> MidiChannel[] channels = synthesizer.getChannels();
<br>>
<br>> //TODO: should be 127 (some websites say this)
<br>> //but 255 is the real max volume!
<br>> int max = 255;
<br>>
<br>> for (int i = 0; i < channels.length; i++)
<br>> {
<br>> channels[i].controlChange(7, (int) (volume * max));
<br>> }
<br>> }
</div><br>Did I already mention that Gervill is just GREAT?!
<br>Keep on your brilliant work! :-)
<br><br><br>Andi
<br><br><br><br><br>Karl Helgason schrieb:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> First:
<br>>
<br>> I can confirm this is a bug.
<br>>
<br>> Calling getReceiver before opening the synthesizer results in NullPointerException.
<br>> This is not supposed to happen. Thanks for noticing this.
<br>>
<br>> Second:
<br>>
<br>> I tried our way to change volume, and it does work with Gervill.
<br>> Please explain better how it failed.
<br>>
<br>> I uploaded updated version of gervill with this bug fixed:
<br>> Please download "gervill-0.8-fix1.jar" from:
<br>> <a href="https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0" target="_top" rel="nofollow">https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0</a><br>> and let me know how this works.
<br>>
<br>> regards,
<br>> Karl
<br>>
<br>> ________________________________________
<br>> Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=0" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=1" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a>] Fyrir hönd Andreas Wenger [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=2" target="_top" rel="nofollow">info@...</a>]
<br>> Sent: 6. febrúar 2008 17:08
<br>> Viðtakandi: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=3" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> Efni: [Audio-engine-dev] Possible bugs
<br>>
<br>> Hi,
<br>>
<br>>
<br>> I'm no experienced Java Sound user, so please forgive me if the following
<br>> "bugs" are not caused by Gervill but my own program.
<br>>
<br>> I tried to integrate Gervill into my program Xenoage Player, which
<br>> is a free MIDI player for MusicXML files, <a href="http://www.xenoage.com/player/" target="_top" rel="nofollow">http://www.xenoage.com/player/</a><br>>
<br>>
<br>> First:
<br>>
<br>> This works:
<br>>
<br>>> sequencer = MidiSystem.getSequencer();
<br>>> synthesizer = MidiSystem.getSynthesizer();
<br>>>
<br>> But this fails (works perfectly with old Java Sound):
<br>>
<br>>
<br>>> sequencer = MidiSystem.getSequencer(false);
<br>>> synthesizer = MidiSystem.getSynthesizer();
<br>>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br>>>
<br>> with
<br>>
<br>>> java.lang.NullPointerException
<br>>> at com.sun.media.sound.SoftReceiver.<init>(Unknown Source)
<br>>> at com.sun.media.sound.SoftSynthesizer.getReceiver(Unknown Source)
<br>>> at com.xenoage.player.Player.<init>(Player.java:79)
<br>>>
<br>> Line 79 is "seqTransmitter.setReceiver(synthesizer.getReceiver());"
<br>>
<br>>
<br>> Second:
<br>>
<br>> This is the way I change the playback volume (maybe this is bad code,
<br>> but it was the only way it worked for me with old Java Sound):
<br>>
<br>>
<br>>> MidiChannel[] channels = synthesizer.getChannels();
<br>>> //...
<br>>> for (int i = 0; i < channels.length; i++)
<br>>> {
<br>>> channels[i].controlChange(7, (int) (volume * max));
<br>>> }
<br>>>
<br>> This doesn't change the volume, while old Java Sound does.
<br>>
<br>>
<br>> If it helps, code is available by SVN, see the website.
<br>> If these are no bugs, please forgive me ;-)
<br>>
<br>> Bye,
<br>>
<br>>
<br>> Andi
<br>>
<br>>
<br>>
<br>>
<br>>
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=4" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>>
<br>> No virus found in this incoming message.
<br>> Checked by AVG Free Edition.
<br>> Version: 7.5.516 / Virus Database: 269.19.20/1261 - Release Date: 5.2.2008 20:57
<br>>
<br>>
</div><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15329680&i=5" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15319534
Re: Possible bugs
2008-02-06T11:21:20Z
2008-02-06T11:21:20Z
Karl Helgason-2
Hi,
<br><br>First:
<br><br>I can confirm this is a bug.
<br><br>Calling getReceiver before opening the synthesizer results in NullPointerException.
<br>This is not supposed to happen. Thanks for noticing this.
<br><br>Second:
<br><br>I tried our way to change volume, and it does work with Gervill.
<br>Please explain better how it failed.
<br><br>I uploaded updated version of gervill with this bug fixed:
<br>Please download "gervill-0.8-fix1.jar" from:
<br> <a href="https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0" target="_top" rel="nofollow">https://gervill.dev.java.net/servlets/ProjectDocumentList?folderID=0</a><br>and let me know how this works.
<br><br>regards,
<br>Karl
<br><br>________________________________________
<br>Frá: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=0" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a> [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=1" target="_top" rel="nofollow">audio-engine-dev-bounces@...</a>] Fyrir hönd Andreas Wenger [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=2" target="_top" rel="nofollow">info@...</a>]
<br>Sent: 6. febrúar 2008 17:08
<br>Viðtakandi: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=3" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>Efni: [Audio-engine-dev] Possible bugs
<br><br>Hi,
<br><br><br>I'm no experienced Java Sound user, so please forgive me if the following
<br>"bugs" are not caused by Gervill but my own program.
<br><br>I tried to integrate Gervill into my program Xenoage Player, which
<br>is a free MIDI player for MusicXML files, <a href="http://www.xenoage.com/player/" target="_top" rel="nofollow">http://www.xenoage.com/player/</a><br><br><br>First:
<br><br>This works:
<br>> sequencer = MidiSystem.getSequencer();
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>But this fails (works perfectly with old Java Sound):
<br><br>> sequencer = MidiSystem.getSequencer(false);
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br>with
<br>> java.lang.NullPointerException
<br>> at com.sun.media.sound.SoftReceiver.<init>(Unknown Source)
<br>> at com.sun.media.sound.SoftSynthesizer.getReceiver(Unknown Source)
<br>> at com.xenoage.player.Player.<init>(Player.java:79)
<br>Line 79 is "seqTransmitter.setReceiver(synthesizer.getReceiver());"
<br><br><br>Second:
<br><br>This is the way I change the playback volume (maybe this is bad code,
<br>but it was the only way it worked for me with old Java Sound):
<br><br>> MidiChannel[] channels = synthesizer.getChannels();
<br>> //...
<br>> for (int i = 0; i < channels.length; i++)
<br>> {
<br>> channels[i].controlChange(7, (int) (volume * max));
<br>> }
<br>This doesn't change the volume, while old Java Sound does.
<br><br><br>If it helps, code is available by SVN, see the website.
<br>If these are no bugs, please forgive me ;-)
<br><br>Bye,
<br><br><br>Andi
<br><br><br><br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=4" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br><br>No virus found in this incoming message.
<br>Checked by AVG Free Edition.
<br>Version: 7.5.516 / Virus Database: 269.19.20/1261 - Release Date: 5.2.2008 20:57
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15319534&i=5" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15316732
Possible bugs
2008-02-06T09:08:10Z
2008-02-06T09:08:10Z
Andreas Wenger
Hi,
<br><br><br>I'm no experienced Java Sound user, so please forgive me if the following
<br>"bugs" are not caused by Gervill but my own program.
<br><br>I tried to integrate Gervill into my program Xenoage Player, which
<br>is a free MIDI player for MusicXML files, <a href="http://www.xenoage.com/player/" target="_top" rel="nofollow">http://www.xenoage.com/player/</a><br><br><br>First:
<br><br>This works:
<br>> sequencer = MidiSystem.getSequencer();
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>But this fails (works perfectly with old Java Sound):
<br><br>> sequencer = MidiSystem.getSequencer(false);
<br>> synthesizer = MidiSystem.getSynthesizer();
<br>> Transmitter seqTransmitter = sequencer.getTransmitter();
<br>> seqTransmitter.setReceiver(synthesizer.getReceiver());
<br>with
<br>> java.lang.NullPointerException
<br>> at com.sun.media.sound.SoftReceiver.<init>(Unknown Source)
<br>> at com.sun.media.sound.SoftSynthesizer.getReceiver(Unknown Source)
<br>> at com.xenoage.player.Player.<init>(Player.java:79)
<br>Line 79 is "seqTransmitter.setReceiver(synthesizer.getReceiver());"
<br><br><br>Second:
<br><br>This is the way I change the playback volume (maybe this is bad code,
<br>but it was the only way it worked for me with old Java Sound):
<br><br>> MidiChannel[] channels = synthesizer.getChannels();
<br>> //...
<br>> for (int i = 0; i < channels.length; i++)
<br>> {
<br>> channels[i].controlChange(7, (int) (volume * max));
<br>> }
<br>This doesn't change the volume, while old Java Sound does.
<br><br><br>If it helps, code is available by SVN, see the website.
<br>If these are no bugs, please forgive me ;-)
<br><br>Bye,
<br><br><br>Andi
<br><br><br><br><br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15316732&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15313355
Bug in RealTimeSequencer when used with Gervill
2008-02-06T06:40:09Z
2008-02-06T06:40:09Z
Karl Helgason-2
I found a bug in RealTimeSequencer when used with Gervill.
<br>The doAutoConnect opens Gervill synthesizer explicitly
<br>when it is supposed to open Gervill implicitly.
<br><br>Here is the code that reproduced the bug:
<br><br>// When we call MidiSystem.getSequencer()
<br>// a instance of RealTimeSequencer is created
<br>// that is connected to Gervill Receiver opened implicitly
<br>Sequencer seqr = MidiSystem.getSequencer();
<br>seqr.open();
<br><br>// When we call seqr.close the Receiver is also closed and
<br>// hence the gervill synthesizer is also closed because the
<br>// receiver was opened implicitly.
<br>seqr.close();
<br><br>// Here is the bug, RealTimeSequencer tries to auto connect
<br>// again, but opens the Gervill synthesizer explicitly
<br>// before it tries to get instance of Receiver opened implicitly.
<br>seqr.open();
<br><br>// Gervill synthesizer is never closed
<br>// when we finally call seqr.close,
<br>// because it was opened explicitly above.
<br>seqr.close();
<br><br>--------------------------------------
<br>The error lies here below:
<br>The doAutoConnect performs synth.open();
<br>before it tries to get Receiver opened implicity
<br>by calling getReceiverReferenceCounting.
<br><br> private void doAutoConnect() {
<br> if (Printer.trace) Printer.trace(">> RealTimeSequencer: doAutoConnect()");
<br> Receiver rec = null;
<br> // first try to connect to the default synthesizer
<br> // IMPORTANT: this code needs to be synch'ed with
<br> // MidiSystem.getReceiver(boolean), because the same
<br> // algorithm needs to be used!
<br> try {
<br> Synthesizer synth = MidiSystem.getSynthesizer();
<br> synth.open();
<br> if (synth instanceof ReferenceCountingDevice) {
<br> rec = ((ReferenceCountingDevice) synth).getReceiverReferenceCounting();
<br> if (synth.getClass().toString().contains("com.sun.media.sound.MixerSynth")
<br> && (synth.getDefaultSoundbank() == null)) {
<br> // don't use this receiver if no soundbank available
<br> rec = null;
<br> synth.close();
<br> }
<br> } else {
<br> rec = synth.getReceiver();
<br> }
<br> } catch (Exception e) {
<br> // something went wrong with synth
<br> }
<br> if (rec == null) {
<br> // then try to connect to the default Receiver
<br> try {
<br> rec = MidiSystem.getReceiver();
<br> } catch (Exception e) {
<br> // something went wrong. Nothing to do then!
<br> }
<br> }
<br> if (rec != null) {
<br> autoConnectedReceiver = rec;
<br> try {
<br> getTransmitter().setReceiver(rec);
<br> } catch (Exception e) {}
<br> }
<br> if (Printer.trace) Printer.trace("<< RealTimeSequencer: doAutoConnect() succeeded");
<br> }
<br><br>------------------------
<br>Here is a example of corrected RealTimeSequencer.
<br>It now works like MidiSystem.getSequencer(boolean).
<br>e.g. is now correctly synch'ed with MidiSystem.getReceiver(boolean).
<br><br><br> private void doAutoConnect() {
<br> if (Printer.trace) Printer.trace(">> RealTimeSequencer: doAutoConnect()");
<br> Receiver rec = null;
<br> // first try to connect to the default synthesizer
<br> // IMPORTANT: this code needs to be synch'ed with
<br> // MidiSystem.getReceiver(boolean), because the same
<br> // algorithm needs to be used!
<br> try {
<br> Synthesizer synth = MidiSystem.getSynthesizer();
<br> if (synth instanceof ReferenceCountingDevice) {
<br> rec = ((ReferenceCountingDevice) synth).getReceiverReferenceCounting();
<br> if (synth.getClass().toString().contains("com.sun.media.sound.MixerSynth")
<br> && (synth.getDefaultSoundbank() == null)) {
<br> // don't use this receiver if no soundbank available
<br> rec = null;
<br> synth.close();
<br> }
<br> } else {
<br> synth.open();
<br> try {
<br> rec = synth.getReceiver();
<br> } finally {
<br> // make sure that the synth is properly closed
<br> if (rec == null) {
<br> synth.close();
<br> }
<br> }
<br> }
<br> } catch (Exception e) {
<br> // something went wrong with synth
<br> }
<br> if (rec == null) {
<br> // then try to connect to the default Receiver
<br> try {
<br> rec = MidiSystem.getReceiver();
<br> } catch (Exception e) {
<br> // something went wrong. Nothing to do then!
<br> }
<br> }
<br> if (rec != null) {
<br> autoConnectedReceiver = rec;
<br> try {
<br> getTransmitter().setReceiver(rec);
<br> } catch (Exception e) {}
<br> }
<br> if (Printer.trace) Printer.trace("<< RealTimeSequencer: doAutoConnect() succeeded");
<br> }
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15313355&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15270549
Development freeze (Was: Gervill 0.8 just released)
2008-02-04T07:24:31Z
2008-02-04T07:24:31Z
Alex Menkov-2
Hi everybody,
<br><br>With the recent 0.8 version of Gervill I want to announce development freeze for
<br>the project.
<br>After testing stage Gervill will be integrated into open-jdk as replacement for
<br>the current software synthesizer. All other encumbered code in JavaSound will
<br>also be dropped (OSS mixer for Linux, .GM soundbank reader, RMF file reader, RMF
<br>sequencer), so JavaSound becomes completely open.
<br>Due new synthesizer implementation is a big code change, I want to ask the list
<br>members to take part in the testing of it with different midi applications
<br>(developed by you or just used by you) to minimize risk to introduce new bugs
<br>into open-jdk codebase.
<br>Code reviews are also welcome.
<br><br>If you find some issues in the code (bugs while testing or notes from code
<br>review) please send the reports to the list.
<br><br>Regards
<br>Alex
<br><br>Karl Helgason wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> Version 0.8 has just been released, and can be downloaded here:
<br>> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=573635" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=573635</a><br>>
<br>> Gervill project page at java.net is:
<br>> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br>>
<br>> Change log:
<br>> - Fix: Active Sense Messages where incorrectly handled.
<br>> JTreg test: SoftReceiver/Send_ActiveSense.java
<br>> - Fix: SoftAudioPusher doesn't longer try to prevent blocking.
<br>> - Added: SoftJitterCorrector added to fix jitter on long buffers.
<br>>
<br>> regards,
<br>> Karl Helgason
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15270549&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a></div>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15270549&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-15256861
Gervill 0.8 just released
2008-02-03T11:04:44Z
2008-02-03T11:04:44Z
Karl Helgason-2
Hi,
<br><br>Version 0.8 has just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=573635" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=573635</a><br><br>Gervill project page at java.net is:
<br> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Change log:
<br> - Fix: Active Sense Messages where incorrectly handled.
<br> JTreg test: SoftReceiver/Send_ActiveSense.java
<br> - Fix: SoftAudioPusher doesn't longer try to prevent blocking.
<br> - Added: SoftJitterCorrector added to fix jitter on long buffers.
<br><br>regards,
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=15256861&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-14992642
Gervill 0.7 just released
2008-01-20T23:56:19Z
2008-01-20T23:56:19Z
Karl Helgason-2
Hi,
<br><br>Version 0.7 has also just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=570228" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=570228</a><br><br>Gervill project page at java.net is:
<br> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Change log:
<br> - Fix: General MIDI mode,
<br> and voice_allocation_mode flag wasn't reseted on open/close cycle.
<br> - Fix: Added support for implicit open/close
<br> (as described in <a href="http://java.sun.com/javase/6/docs/api/javax/sound/midi/MidiDevice.html" target="_top" rel="nofollow">http://java.sun.com/javase/6/docs/api/javax/sound/midi/MidiDevice.html</a>)
<br> (JTreg test also added)
<br> This done by implementing com.sun.media.sound.ReferenceCountingDevice interface.
<br> - Fix: SoftReceiver.close doesn't throw exception if closed.
<br> (now behaves like SoftSynthesizer.close)
<br> - Fix: Close variable wasn't accessed in Thread safe way in:
<br> SoftReceiver, SoftSynthesizer.
<br> - Fix: Hang in SoftSynthesizer.close.
<br> SoftAudioPusher must not be closed synchronized against control_mutex
<br> this may result in synchronized conflict between pusher and caller thread.
<br> - Fix: Bad handling of mono output in SoftVoice.processAudioLogic,
<br> this error was found running the new SoftSynthesizer/TestRender1 jtreg test.
<br> - Added: ModelDirector to support conditional layers/performers.
<br> - Added: ReleaseTrigger property to ModelPerformer.
<br> - Added: ModelAbstractOscillator to simplify creation custom oscillators.
<br> - Added: ModelChannelMixer to support for example non-voice oriented instruments.
<br> - Added: Support for more than 16 midi channels.
<br> - Added: JARSoundBankReader.
<br> - Change default latency from 400 to 200 mec.
<br><br>regards,
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=14992642&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-14333387
Re: Gervill 0.6 just released with jtreg tests
2007-12-14T02:30:00Z
2007-12-14T02:30:00Z
Peter Salomonsen
Gervill is also part of the latest released Frinika (2007-12-12), not this latest version though..<br><br>cheers,<br><br>Peter<br><br><div class="gmail_quote">On Dec 14, 2007 4:49 AM, Karl Helgason <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=14333387&i=0" target="_top" rel="nofollow">kalli@...</a>> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Hi,<br><br>Version 0.6 has also just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=561521" target="_blank" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=561521
</a><br><br>Gervill project page at <a href="http://java.net" target="_blank" rel="nofollow">java.net</a> is:<br> <a href="http://gervill.dev.java.net/" target="_blank" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Change log:<br> - Added RIFFWriter(OutputStream) constructor.
<br> - Added save(OutputStream out) to DLSSoundbank and SF2Soundbank.<br> - Renamed : isAddDefaultConnections to setDefaultConnectionsEnabled<br> - Renamed : getAddDefaultConnections to isDefaultConnectionsEnabled
<br> - Created JTreg Unit Tests<br> - Fixed error found in Unit Tests<br> * AudioFloatConversion8U.toFloatArray, did not convert correctly<br> * SoftSynthesizer.remapInstrument did not work<br> The error was in ModelMappedInstrument
<br> * SoftSynthesizer.getMaxReceivers did not return -1<br> * SoftTuning.checksumOK calculated incorrect checksums.<br> * RIFFReader.close didn't work<br> * AudioFloatInputStream.getFrameLength returned incorrect value.
<br> * ModelByteBuffer.writeTo didn't work when ModelByteBuffer uses file pointer.<br> * ModelIdentifier.equals, didn't compare the variable "instance".<br> * SimpleSoundbank.removeResource
did not remove resource.<br> * RIFFWriter.close never closed underlying stream.<br><br>regards,<br><font color="#888888">Karl Helgason<br>_______________________________________________<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=14333387&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a><br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_blank" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev
</a><br></font></blockquote></div><br>
<br />_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=14333387&i=2" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-14329710
Gervill 0.6 just released with jtreg tests
2007-12-13T19:49:04Z
2007-12-13T19:49:04Z
Karl Helgason-2
Hi,
<br><br>Version 0.6 has also just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=561521" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=561521</a><br><br>Gervill project page at java.net is:
<br> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Change log:
<br> - Added RIFFWriter(OutputStream) constructor.
<br> - Added save(OutputStream out) to DLSSoundbank and SF2Soundbank.
<br> - Renamed : isAddDefaultConnections to setDefaultConnectionsEnabled
<br> - Renamed : getAddDefaultConnections to isDefaultConnectionsEnabled
<br> - Created JTreg Unit Tests
<br> - Fixed error found in Unit Tests
<br> * AudioFloatConversion8U.toFloatArray, did not convert correctly
<br> * SoftSynthesizer.remapInstrument did not work
<br> The error was in ModelMappedInstrument
<br> * SoftSynthesizer.getMaxReceivers did not return -1
<br> * SoftTuning.checksumOK calculated incorrect checksums.
<br> * RIFFReader.close didn't work
<br> * AudioFloatInputStream.getFrameLength returned incorrect value.
<br> * ModelByteBuffer.writeTo didn't work when ModelByteBuffer uses file pointer.
<br> * ModelIdentifier.equals, didn't compare the variable "instance".
<br> * SimpleSoundbank.removeResource did not remove resource.
<br> * RIFFWriter.close never closed underlying stream.
<br><br>regards,
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=14329710&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-13819343
Re: Gervill 0.4 - emergency soundbank included
2007-11-18T05:48:48Z
2007-11-18T05:48:48Z
Florian Bomers-3
the emergency soundbank is a great idea! Though we should still
<br>try to find a way to download on demand a "real" soundbank. For
<br>the sake of audio fidelity...
<br><br>Florian
<br><br>On 10/29/2007 7:47 AM, Karl Helgason wrote:
<div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> I have updated the midi synthesizer, it is now up to 50% faster and includes emergency soundbank.
<br>> The emergency soundbank is generated when no default soundbank can be found.
<br>>
<br>> Also included is "javax.sound.sampled.spi.AudioFileReader" which support reading
<br>> MIDI files as if they where audio files.
<br>> Audio player like <a href="http://www.javazoom.net/jlgui/jlgui.html" target="_top" rel="nofollow">http://www.javazoom.net/jlgui/jlgui.html</a> can now play back midi files
<br>> using this synthesizer.
<br>>
<br>> The synthesizer can be downloaded here:
<br>> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=550308" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=550308</a><br>>
<br>> New features:
<br>> - MIDI files can be opened as audio streams
<br>> thru javax.sound.sampled.spi.AudioFileReader.
<br>> - Emergency SoundBank included.
<br>> - Optimizations, rendering is up to 50 percent faster.
<br>> - Loading soundbank in large mode supported using
<br>> MidiSystem.getSoundBank(URL)
<br>> Where url is on the form:
<br>> file:/C:/soundbank.sf2?largemode=true
<br>> - Reverb,Chorus,AGC can be turned on/off.
<br>>
<br>> Bug fixes:
<br>> - Fixed ArrayOutOfBoundsException in SoftAbstractResmpler.
<br>> - Fixed NullPointerException in SoundFont.save(File).
<br>> Saving global zone for layers resulted in NullPointerException.
<br>> - Fixed PATSoundbankReader.getInputStream
<br>> so it doesn't throw InvalidFormatException.
<br>> This prevented use of MidiSystem.getSoundBank(InputStream).
<br>> - Fix: Delay wasn't implemented in AHDSR envelopes.
<br>>
<br>> regards
<br>> Karl Helgason
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13819343&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>>
<br>> No virus found in this incoming message.
<br>> Checked by AVG Free Edition.
<br>> Version: 7.5.488 / Virus Database: 269.14.11/1071 - Release Date: 15.10.2007 06:48
<br>>
<br>> _______________________________________________
<br>> audio-engine-dev mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13819343&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br>> <a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>>
<br>>
</div><br>--
<br>Florian Bomers
<br>Bome Software
<br><br>-------------------------------------------------------
<br>Music Software, Development Tools: <a href="http://www.bome.com" target="_top" rel="nofollow">http://www.bome.com</a><br>Java Sound extensions, plugins: <a href="http://www.tritonus.org" target="_top" rel="nofollow">http://www.tritonus.org</a><br>The Java Sound Resources: <a href="http://www.jsresources.org" target="_top" rel="nofollow">http://www.jsresources.org</a><br>-------------------------------------------------------
<br>Please quote this email in your reply. Thanks!
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13819343&i=2" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-13688026
Gervill 0.5 just released with improved emergency soundbank
2007-11-10T18:59:17Z
2007-11-10T18:59:17Z
Karl Helgason-2
Hi,
<br><br>Gervill now has a project page at java.net:
<br><br> <a href="http://gervill.dev.java.net/" target="_top" rel="nofollow">http://gervill.dev.java.net/</a><br><br>Version 0.5 has also just been released, and can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=553303" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=553303</a><br><br> - New instruments in Emergency Soundbank:
<br> * Acoustic Grand Piano
<br> * Bright Acoustic Piano
<br> * Honky-tonk Piano
<br> * Guitar
<br> * Distortion Guitar
<br> * Trumpet
<br> * Trombone
<br> * Brass Section
<br> * Horn
<br> * Sax
<br> * Oboe
<br> * Bassoon
<br> * Clarient
<br> * Flute
<br> * Timpani
<br> * Melodic Toms
<br> * Reverse Cymbal
<br> * Orch Hit
<br> - Faster Linear Interpolation
<br> with no float to int casting.
<br> - LargeSoundBankReader removed,
<br> Loading soundbank in large mode using urls removed.
<br> - Soundbank aren't loaded into memory
<br> until loadInstrument/loadAllInstrument
<br> is called in SoftSynthesizer.
<br> This enable loading only single instrument
<br> from soundbank collection into memory.
<br> - New "large mode" property added to SoftSynthesizer.
<br> - "getInstrument" method in DLS/SF2/SimpleSoundbank
<br> now returns ordered list by program,bank,percussion.
<br> - Fix AccessControlException in "SoftSynthesizer.getDefaultSoundbank",
<br> which occurred when using SoftSynthesizer in Applets.
<br><br>regards,
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13688026&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>
tag:old.nabble.com,2006:post-13462313
Gervill 0.4 - emergency soundbank included
2007-10-29T00:47:13Z
2007-10-29T00:47:13Z
Karl Helgason-2
Hi,
<br><br>I have updated the midi synthesizer, it is now up to 50% faster and includes emergency soundbank.
<br>The emergency soundbank is generated when no default soundbank can be found.
<br><br>Also included is "javax.sound.sampled.spi.AudioFileReader" which support reading
<br>MIDI files as if they where audio files.
<br>Audio player like <a href="http://www.javazoom.net/jlgui/jlgui.html" target="_top" rel="nofollow">http://www.javazoom.net/jlgui/jlgui.html</a> can now play back midi files
<br>using this synthesizer.
<br><br>The synthesizer can be downloaded here:
<br> <a href="http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=550308" target="_top" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=175084&package_id=246500&release_id=550308</a><br><br>New features:
<br> - MIDI files can be opened as audio streams
<br> thru javax.sound.sampled.spi.AudioFileReader.
<br> - Emergency SoundBank included.
<br> - Optimizations, rendering is up to 50 percent faster.
<br> - Loading soundbank in large mode supported using
<br> MidiSystem.getSoundBank(URL)
<br> Where url is on the form:
<br> file:/C:/soundbank.sf2?largemode=true
<br> - Reverb,Chorus,AGC can be turned on/off.
<br><br>Bug fixes:
<br> - Fixed ArrayOutOfBoundsException in SoftAbstractResmpler.
<br> - Fixed NullPointerException in SoundFont.save(File).
<br> Saving global zone for layers resulted in NullPointerException.
<br> - Fixed PATSoundbankReader.getInputStream
<br> so it doesn't throw InvalidFormatException.
<br> This prevented use of MidiSystem.getSoundBank(InputStream).
<br> - Fix: Delay wasn't implemented in AHDSR envelopes.
<br><br>regards
<br>Karl Helgason
<br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13462313&i=0" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br><br>No virus found in this incoming message.
<br>Checked by AVG Free Edition.
<br>Version: 7.5.488 / Virus Database: 269.14.11/1071 - Release Date: 15.10.2007 06:48
<br><br>_______________________________________________
<br>audio-engine-dev mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=13462313&i=1" target="_top" rel="nofollow">audio-engine-dev@...</a>
<br><a href="http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev" target="_top" rel="nofollow">http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev</a><br>