From mark at klomp.org  Sun Jun  8 15:23:48 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 09 Jun 2008 00:23:48 +0200
Subject: [Audio-engine-dev] New Gervill imported (Was: OpenJDK 6 b10 source
	posted)
In-Reply-To: <1212571525.3172.11.camel@dijkstra.wildebeest.org>
References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>
	<1212571525.3172.11.camel@dijkstra.wildebeest.org>
Message-ID: <1212963828.3111.23.camel@dijkstra.wildebeest.org>

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 at klomp.org>

       * 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 at klomp.org>

        * 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gervill-icedtea-changes.diff
Type: text/x-patch
Size: 3012 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/audio-engine-dev/attachments/20080609/3db18327/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-gervil-openjdk-b10.diff.gz
Type: application/x-gzip
Size: 14642 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/audio-engine-dev/attachments/20080609/3db18327/attachment-0001.bin