Hi Karl,
On Wed, 2008-06-04 at 11:25 +0200, Mark Wielaard wrote:
> On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
> Thanks for checking. These are all in the icedtea gervill overlay also.
> I'll make sure to upgrade to the latest CVS version in which I see you
> fixed some of the other issues I reported.
>
> > The code was also slightly reformatted:
> > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
> > sources);
> > b) line indention (to make lines no longer than 80 symbols);
> > c) tabs to spaces conversion;
> >
> > I will look into to reformat newest Gervill CVS code the same way.
>
> That would be great. Since 0.9 there have been lots of changes and fixes
> (which is why icedtea tracks your CVS tree and didn't use the old 0.9
> code). Would it be a good idea to do a new version upgrade after syncing
> the sources and reformatting to celebrate the inclusion?
Thanks a lot for you fixes and the reformatting. I imported the new
Gervill from CVS in two parts. First everything up to June 1st. Second
the reformatting itself. That way it should be easy to follow what
changed.
2008-08-08 Mark Wielaard <
mark@...>
* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
Import Gervill fixes from CVS. See CHANGES.txt.
* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
- Cleanup: Make inner classes static
AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
AudioFloatFormatConverter.AudioFloatInputStreamResampler
SimpleInstrument.SimpleInstrumentPart
SoftChorus.VariableDelay
SoftChorus.LFODelay
SoftMixingDataLine.AudioFloatInputStreamResampler
SoftMixingSourceDataLine.NonBlockingFloatInputStream
SoftReverb.AllPass
SoftReverb.Comb
SoftReverb.Delay
- Cleanup: Remove unused fields in:
SoftSincResampler.din, SoftLanczosResampler.din,
SoftMainMixer.finetuning, SoftMainMixer.coarsetuning
SoftJitterCorrector.JitterStream.nullbuff,
SoftAbstractResampler.ModelAbstractResampler.loopread
SoftAbstractResampler.ModelAbstractResampler.streammarked
- Cleanup: Remove dead code from FFT.
- Cleanup: Make constant fields in SoftFilter final.
- Cleanup: Let SoftSynthesizer.info be final.
- Cleanup: Let SoftProvider.info be final.
- Fix: Unnecessary call to sourceDataLine.drain() in
SoftSynthesizer
causes random hangs in SoftSynthesizer.open jtreg test.
This happens when the synthesizer is opened and right
after closed.
This will not happen if there is a delay between open and
close call.
- Fix: ModelByteBufferAudioFileSoundbankReader,
SoftAudioPusher, SoftJitterCorrector
don't ignore stream.read return value.
- Fix: NullPointerException in
SoftSynthesizer.unloadInstrument if instrument = null
- Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close
stream.
- Fix: Futile attempts to guard buffers variable in
SoftJitterCorrector.
- Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use
readfully instead of read
when reading from stream.
JTreg tests where created to test for this.
I like these cleanups. Your fix for the jtreg resources was nicer than
mine, so I dropped the icedtea one. I did take your change to the tests
needing a samplerate and controlrate argument to init the SoftLimiter to
just pass the constant values 44100 and 147. I also made the
SoftSynthesizer.getControlRate() protected again. I can kind of
understand using these constants in the tests. Although I find getting
them from the synthesizer nicer.
Is there a reason the control rate is always hardcoded to 147? There
actually doesn't seem to be any way to change it since the property info
always sets it explicitly.
With this there are only a few minor differences left between gervill
CVS and the icedtea overlay. I have attached the diff.
2008-06-08 Mark Wielaard <
mark@...>
* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
Import Gervill CVS source reformatting.
For the interested I have attached the current diff between the
gervil/cvs/icedtea/overlay version and what is in openjdk6-b10.
(Note that line endings are different, openjdk6 uses CRLF, which is
disregarded when creating the diff.)
Cheers,
Mark
Index: src/com/sun/media/sound/DLSSoundbankReader.java
===================================================================
RCS file: /cvs/gervill/src/com/sun/media/sound/DLSSoundbankReader.java,v
retrieving revision 1.3
diff -u -r1.3 DLSSoundbankReader.java
--- src/com/sun/media/sound/DLSSoundbankReader.java 5 Jun 2008 01:55:28 -0000 1.3
+++ src/com/sun/media/sound/DLSSoundbankReader.java 8 Jun 2008 19:50:05 -0000
@@ -47,6 +47,8 @@
return new DLSSoundbank(url);
} catch (RIFFInvalidFormatException e) {
return null;
+ } catch(IOException ioe) {
+ return null;
}
}
Index: src/com/sun/media/sound/SF2SoundbankReader.java
===================================================================
RCS file: /cvs/gervill/src/com/sun/media/sound/SF2SoundbankReader.java,v
retrieving revision 1.3
diff -u -r1.3 SF2SoundbankReader.java
--- src/com/sun/media/sound/SF2SoundbankReader.java 5 Jun 2008 01:55:33 -0000 1.3
+++ src/com/sun/media/sound/SF2SoundbankReader.java 8 Jun 2008 19:50:05 -0000
@@ -46,6 +46,8 @@
return new SF2Soundbank(url);
} catch (RIFFInvalidFormatException e) {
return null;
+ } catch(IOException ioe) {
+ return null;
}
}
Index: src/com/sun/media/sound/SoftChannel.java
===================================================================
RCS file: /cvs/gervill/src/com/sun/media/sound/SoftChannel.java,v
retrieving revision 1.9
diff -u -r1.9 SoftChannel.java
--- src/com/sun/media/sound/SoftChannel.java 5 Jun 2008 01:55:36 -0000 1.9
+++ src/com/sun/media/sound/SoftChannel.java 8 Jun 2008 19:50:06 -0000
@@ -1194,7 +1194,9 @@
public int getController(int controller) {
synchronized (control_mutex) {
- return this.controller[controller];
+ // Should only return lower 7 bits,
+ // even when controller is "boosted" higher.
+ return this.controller[controller] & 127;
}
}
Index: src/com/sun/media/sound/SoftSynthesizer.java
===================================================================
RCS file: /cvs/gervill/src/com/sun/media/sound/SoftSynthesizer.java,v
retrieving revision 1.36
diff -u -r1.36 SoftSynthesizer.java
--- src/com/sun/media/sound/SoftSynthesizer.java 5 Jun 2008 01:55:31 -0000 1.36
+++ src/com/sun/media/sound/SoftSynthesizer.java 8 Jun 2008 19:50:06 -0000
@@ -591,6 +591,9 @@
}
public void unloadAllInstruments(Soundbank soundbank) {
+ if (soundbank == null || !isSoundbankSupported(soundbank))
+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
+
if (!isOpen())
return;
@@ -615,6 +618,9 @@
}
public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
+ if (soundbank == null || !isSoundbankSupported(soundbank))
+ throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
+
if (!isOpen())
return;
_______________________________________________
audio-engine-dev mailing list
audio-engine-dev@...
http://mail.openjdk.java.net/mailman/listinfo/audio-engine-dev
icedtea-gervil-openjdk-b10.diff.gz (19K) 