stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Phil Race 2016-03-28 08:56:34 -07:00
commit 03bb7d11b7
6 changed files with 495 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,12 +39,12 @@ public final class RIFFReader extends InputStream {
private long filepointer = 0;
private final String fourcc;
private String riff_type = null;
private long ckSize = Integer.MAX_VALUE;
private final long ckSize;
private InputStream stream;
private long avail = Integer.MAX_VALUE;
private long avail = 0xffffffffL; // MAX_UNSIGNED_INT
private RIFFReader lastiterator = null;
public RIFFReader(InputStream stream) throws IOException {
public RIFFReader(final InputStream stream) throws IOException {
if (stream instanceof RIFFReader) {
root = ((RIFFReader) stream).root;
@ -63,11 +63,13 @@ public final class RIFFReader extends InputStream {
// because it is expected to
// always contain a string value
riff_type = null;
ckSize = 0;
avail = 0;
return;
}
if (b != 0)
if (b != 0) {
break;
}
}
byte[] fourcc = new byte[4];
@ -78,9 +80,6 @@ public final class RIFFReader extends InputStream {
avail = ckSize;
if (getFormat().equals("RIFF") || getFormat().equals("LIST")) {
if (avail > Integer.MAX_VALUE) {
throw new RIFFInvalidDataException("Chunk size too big");
}
byte[] format = new byte[4];
readFully(format);
this.riff_type = new String(format, "ascii");
@ -207,7 +206,7 @@ public final class RIFFReader extends InputStream {
@Override
public int available() {
return (int)avail;
return avail > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) avail;
}
public void finish() throws IOException {

8
jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
View File

@ -184,6 +184,7 @@ public final class WaveExtensibleFileReader extends SunFileReader {
// long framerate = 1;
int framesize = 1;
int bits = 1;
long dataSize = 0;
int validBitsPerSample = 1;
long channelMask = 0;
GUID subFormat = null;
@ -214,6 +215,7 @@ public final class WaveExtensibleFileReader extends SunFileReader {
}
if (chunk.getFormat().equals("data")) {
dataSize = chunk.getSize();
data_found = true;
break;
}
@ -247,8 +249,12 @@ public final class WaveExtensibleFileReader extends SunFileReader {
} else {
throw new UnsupportedAudioFileException();
}
long frameLength = dataSize / audioformat.getFrameSize();
if (frameLength > Integer.MAX_VALUE) {
frameLength = AudioSystem.NOT_SPECIFIED;
}
return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
AudioSystem.NOT_SPECIFIED);
(int) frameLength);
}
@Override

10
jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
View File

@ -59,10 +59,10 @@ public final class WaveFloatFileReader extends SunFileReader {
long samplerate = 1;
int framesize = 1;
int bits = 1;
long dataSize = 0;
while (riffiterator.hasNextChunk()) {
RIFFReader chunk = riffiterator.nextChunk();
if (chunk.getFormat().equals("fmt ")) {
fmt_found = true;
@ -77,6 +77,7 @@ public final class WaveFloatFileReader extends SunFileReader {
bits = chunk.readUnsignedShort();
}
if (chunk.getFormat().equals("data")) {
dataSize = chunk.getSize();
data_found = true;
break;
}
@ -87,8 +88,13 @@ public final class WaveFloatFileReader extends SunFileReader {
AudioFormat audioformat = new AudioFormat(
Encoding.PCM_FLOAT, samplerate, bits, channels,
framesize, samplerate, false);
long frameLength = dataSize / audioformat.getFrameSize();
if (frameLength > Integer.MAX_VALUE) {
frameLength = AudioSystem.NOT_SPECIFIED;
}
return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
AudioSystem.NOT_SPECIFIED);
(int) frameLength);
}
@Override

19
jdk/src/java.desktop/share/classes/javax/sound/sampled/AudioInputStream.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -249,10 +249,10 @@ public class AudioInputStream extends InputStream {
*/
@Override
public int read(byte[] b, int off, int len) throws IOException {
// make sure we don't read fractions of a frame.
if( (len%frameSize) != 0 ) {
len -= (len%frameSize);
final int reminder = len % frameSize;
if (reminder != 0) {
len -= reminder;
if (len == 0) {
return 0;
}
@ -312,6 +312,10 @@ public class AudioInputStream extends InputStream {
/**
* Skips over and discards a specified number of bytes from this audio input
* stream.
* <p>
* This method will always skip an integral number of frames. If {@code n}
* does not specify an integral number of frames, a maximum of
* {@code n - (n % frameSize)} bytes will be skipped.
*
* @param n the requested number of bytes to be skipped
* @return the actual number of bytes skipped
@ -321,15 +325,14 @@ public class AudioInputStream extends InputStream {
*/
@Override
public long skip(long n) throws IOException {
if (n <= 0) {
return 0;
}
// make sure not to skip fractional frames
final long reminder = n % frameSize;
if (reminder != 0) {
n -= reminder;
}
if (n <= 0) {
return 0;
}
if (frameLength != AudioSystem.NOT_SPECIFIED) {
// don't skip more than our set length in frames.

245
jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveExtFiles.java Normal file
View File

@ -0,0 +1,245 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.io.ByteArrayInputStream;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
/**
* @test
* @bug 8132782
*/
public final class RecognizeHugeWaveExtFiles {
/**
* The maximum size in bytes per WAVE specification.
*/
private static final /*unsigned int */ long MAX_UNSIGNED_INT = 0xffffffffL;
/**
* The supported wave ext format and sample size in bits.
*/
private static final int[][] waveTypeBits = {
{0xFFFE/*WAVE_FORMAT_EXTENSIBLE*/, 8}
};
/**
* The list of supported sample rates(stored as unsigned int).
*/
private static final int[] sampleRates = {
8000, 11025, 16000, 22050, 32000, 37800, 44056, 44100, 47250, 48000,
50000, 50400, 88200, 96000, 176400, 192000, 352800, 2822400,
5644800, Integer.MAX_VALUE
};
/**
* The list of supported channels (stored as unsigned int).
*/
private static final int[] channels = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10
};
/**
* The list of supported size of data (stored as unsigned int).
* <p>
* The {@code MAX_UNSIGNED_INT} is a maximum size.
*/
private static final long[] dataSizes = {
0, 1, 2, 3, Integer.MAX_VALUE - 1, Integer.MAX_VALUE,
(long) Integer.MAX_VALUE + 1, MAX_UNSIGNED_INT - 1, MAX_UNSIGNED_INT
};
public static void main(final String[] args) throws Exception {
for (final int[] type : waveTypeBits) {
for (final int sampleRate : sampleRates) {
for (final int channel : channels) {
for (final long dataSize : dataSizes) {
testAFF(type, sampleRate, channel, dataSize);
testAIS(type, sampleRate, channel, dataSize);
}
}
}
}
}
/**
* Tests the {@code AudioFileFormat} fetched from the fake header.
* <p>
* Note that the frameLength and byteLength are stored as int which means
* that {@code AudioFileFormat} will store the data above {@code MAX_INT} as
* NOT_SPECIFIED.
*/
private static void testAFF(final int[] type, final int rate,
final int channel, final long size)
throws Exception {
final byte[] header = createHeader(type, rate, channel, size);
final ByteArrayInputStream fake = new ByteArrayInputStream(header);
final AudioFileFormat aff = AudioSystem.getAudioFileFormat(fake);
final AudioFormat format = aff.getFormat();
if (aff.getType() != AudioFileFormat.Type.WAVE) {
throw new RuntimeException("Error");
}
final long frameLength = size / format.getFrameSize();
if (frameLength <= Integer.MAX_VALUE) {
if (aff.getFrameLength() != frameLength) {
System.err.println("Expected: " + frameLength);
System.err.println("Actual: " + aff.getFrameLength());
throw new RuntimeException();
}
} else {
if (aff.getFrameLength() != AudioSystem.NOT_SPECIFIED) {
System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
System.err.println("Actual: " + aff.getFrameLength());
throw new RuntimeException();
}
}
validateFormat(type[1], rate, channel, aff.getFormat());
}
/**
* Tests the {@code AudioInputStream} fetched from the fake header.
* <p>
* Note that the frameLength is stored as long which means that {@code
* AudioInputStream} must store all possible data from au file.
*/
private static void testAIS(final int[] type, final int rate,
final int channel, final long size)
throws Exception {
final byte[] header = createHeader(type, rate, channel, size);
final ByteArrayInputStream fake = new ByteArrayInputStream(header);
final AudioInputStream ais = AudioSystem.getAudioInputStream(fake);
final AudioFormat format = ais.getFormat();
final long frameLength = size / format.getFrameSize();
if (frameLength != ais.getFrameLength()) {
System.err.println("Expected: " + frameLength);
System.err.println("Actual: " + ais.getFrameLength());
throw new RuntimeException();
}
if (ais.available() < 0) {
System.err.println("available should be >=0: " + ais.available());
throw new RuntimeException();
}
validateFormat(type[1], rate, channel, format);
}
/**
* Tests that format contains the same data as were provided to the fake
* stream.
*/
private static void validateFormat(final int bits, final int rate,
final int channel,
final AudioFormat format) {
if (Float.compare(format.getSampleRate(), rate) != 0) {
System.err.println("Expected: " + rate);
System.err.println("Actual: " + format.getSampleRate());
throw new RuntimeException();
}
if (format.getChannels() != channel) {
System.err.println("Expected: " + channel);
System.err.println("Actual: " + format.getChannels());
throw new RuntimeException();
}
if (format.getFrameSize() != ((bits + 7) / 8) * channel) {
System.err.println("Expected: " + (bits * channel + 1) / 8);
System.err.println("Actual: " + format.getFrameSize());
throw new RuntimeException();
}
}
/**
* Creates the custom header of the WAVE file. It is expected that all
* passed data are supported.
*/
private static byte[] createHeader(final int[] type, final int rate,
final int channel, final long size) {
final int frameSize = ((type[1] + 7) / 8) * channel;
return new byte[]{
// RIFF_MAGIC
0x52, 0x49, 0x46, 0x46,
// fileLength
-1, -1, -1, -1,
// waveMagic
0x57, 0x41, 0x56, 0x45,
// FMT_MAGIC
0x66, 0x6d, 0x74, 0x20,
// size
40, 0, 0, 0,
// wav_type WAVE_FORMAT_EXTENSIBLE
(byte) (type[0]), (byte) (type[0] >> 8),
// channels
(byte) (channel), (byte) (channel >> 8),
// samplerate
(byte) (rate), (byte) (rate >> 8), (byte) (rate >> 16),
(byte) (rate >> 24),
// framerate
1, 0, 0, 0,
// framesize
(byte) (frameSize), (byte) (frameSize >> 8),
// bits
(byte) type[1], 0,
// cbsize
22, 0,
// validBitsPerSample
8, 0,
// channelMask
0, 0, 0, 0,
// SUBTYPE_IEEE_FLOAT
// i1
0x3, 0x0, 0x0, 0x0,
//s1
0x0, 0x0,
//s2
0x10, 0,
//x1
(byte) 0x80,
//x2
0x0,
//x3
0x0,
//x4
(byte) 0xaa,
//x5
0x0,
//x6
0x38,
//x7
(byte) 0x9b,
//x8
0x71,
// DATA_MAGIC
0x64, 0x61, 0x74, 0x61,
// data size
(byte) (size), (byte) (size >> 8), (byte) (size >> 16),
(byte) (size >> 24)
// data
, 0, 0, 0, 0, 0
};
}
}

216
jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFloatFiles.java Normal file
View File

@ -0,0 +1,216 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.io.ByteArrayInputStream;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
/**
* @test
* @bug 8132782
*/
public final class RecognizeHugeWaveFloatFiles {
/**
* The maximum size in bytes per WAVE specification.
*/
private static final /*unsigned int */ long MAX_UNSIGNED_INT = 0xffffffffL;
/**
* The supported wave pcm_float format and sample size in bits.
*/
private static final byte[][] waveTypeBits = {
{0x0003/*WAVE_FORMAT_IEEE_FLOAT*/, 32}
};
/**
* The list of supported sample rates(stored as unsigned int).
*/
private static final int[] sampleRates = {
8000, 11025, 16000, 22050, 32000, 37800, 44056, 44100, 47250, 48000,
50000, 50400, 88200, 96000, 176400, 192000, 352800, 2822400,
5644800, Integer.MAX_VALUE
};
/**
* The list of supported channels (stored as unsigned int).
*/
private static final int[] channels = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10
};
/**
* The list of supported size of data (stored as unsigned int).
* <p>
* The {@code MAX_UNSIGNED_INT} is a maximum size.
*/
private static final long[] dataSizes = {
0, 1, 2, 3, Integer.MAX_VALUE - 1, Integer.MAX_VALUE,
(long) Integer.MAX_VALUE + 1, MAX_UNSIGNED_INT - 1, MAX_UNSIGNED_INT
};
public static void main(final String[] args) throws Exception {
for (final byte[] type : waveTypeBits) {
for (final int sampleRate : sampleRates) {
for (final int channel : channels) {
for (final long dataSize : dataSizes) {
testAFF(type, sampleRate, channel, dataSize);
testAIS(type, sampleRate, channel, dataSize);
}
}
}
}
}
/**
* Tests the {@code AudioFileFormat} fetched from the fake header.
* <p>
* Note that the frameLength and byteLength are stored as int which means
* that {@code AudioFileFormat} will store the data above {@code MAX_INT} as
* NOT_SPECIFIED.
*/
private static void testAFF(final byte[] type, final int rate,
final int channel, final long size)
throws Exception {
final byte[] header = createHeader(type, rate, channel, size);
final ByteArrayInputStream fake = new ByteArrayInputStream(header);
final AudioFileFormat aff = AudioSystem.getAudioFileFormat(fake);
final AudioFormat format = aff.getFormat();
if (aff.getType() != AudioFileFormat.Type.WAVE) {
throw new RuntimeException("Error");
}
final long frameLength = size / format.getFrameSize();
if (frameLength <= Integer.MAX_VALUE) {
if (aff.getFrameLength() != frameLength) {
System.err.println("Expected: " + frameLength);
System.err.println("Actual: " + aff.getFrameLength());
throw new RuntimeException();
}
} else {
if (aff.getFrameLength() != AudioSystem.NOT_SPECIFIED) {
System.err.println("Expected: " + AudioSystem.NOT_SPECIFIED);
System.err.println("Actual: " + aff.getFrameLength());
throw new RuntimeException();
}
}
validateFormat(type[1], rate, channel, aff.getFormat());
}
/**
* Tests the {@code AudioInputStream} fetched from the fake header.
* <p>
* Note that the frameLength is stored as long which means that {@code
* AudioInputStream} must store all possible data from au file.
*/
private static void testAIS(final byte[] type, final int rate,
final int channel, final long size)
throws Exception {
final byte[] header = createHeader(type, rate, channel, size);
final ByteArrayInputStream fake = new ByteArrayInputStream(header);
final AudioInputStream ais = AudioSystem.getAudioInputStream(fake);
final AudioFormat format = ais.getFormat();
final long frameLength = size / format.getFrameSize();
if (frameLength != ais.getFrameLength()) {
System.err.println("Expected: " + frameLength);
System.err.println("Actual: " + ais.getFrameLength());
throw new RuntimeException();
}
if (ais.available() < 0) {
System.err.println("available should be >=0: " + ais.available());
throw new RuntimeException();
}
validateFormat(type[1], rate, channel, format);
}
/**
* Tests that format contains the same data as were provided to the fake
* stream.
*/
private static void validateFormat(final byte bits, final int rate,
final int channel,
final AudioFormat format) {
if (Float.compare(format.getSampleRate(), rate) != 0) {
System.err.println("Expected: " + rate);
System.err.println("Actual: " + format.getSampleRate());
throw new RuntimeException();
}
if (format.getChannels() != channel) {
System.err.println("Expected: " + channel);
System.err.println("Actual: " + format.getChannels());
throw new RuntimeException();
}
if (format.getFrameSize() != ((bits + 7) / 8) * channel) {
System.err.println("Expected: " + (bits * channel + 1) / 8);
System.err.println("Actual: " + format.getFrameSize());
throw new RuntimeException();
}
}
/**
* Creates the custom header of the WAVE file. It is expected that all
* passed data are supported.
*/
private static byte[] createHeader(final byte[] type, final int rate,
final int channel, final long size) {
final int frameSize = ((type[1] + 7) / 8) * channel;
return new byte[]{
// RIFF_MAGIC
0x52, 0x49, 0x46, 0x46,
// fileLength
-1, -1, -1, -1,
// waveMagic
0x57, 0x41, 0x56, 0x45,
// FMT_MAGIC
0x66, 0x6d, 0x74, 0x20,
// size
16, 0, 0, 0,
// wav_type WAVE_FORMAT_IEEE_FLOAT
type[0], 0,
// channels
(byte) (channel), (byte) (channel >> 8),
// samplerate
(byte) (rate), (byte) (rate >> 8), (byte) (rate >> 16),
(byte) (rate >> 24),
// framerate
1, 0, 0, 0,
// framesize
(byte) (frameSize), (byte) (frameSize >> 8),
// bits
type[1], 0,
// DATA_MAGIC
0x64, 0x61, 0x74, 0x61,
// data size
(byte) (size), (byte) (size >> 8), (byte) (size >> 16),
(byte) (size >> 24)
// data
, 0, 0, 0, 0, 0
};
}
}