author | serb |
Sun, 10 Dec 2017 00:08:42 -0800 | |
changeset 48282 | 4483880d8811 |
parent 47216 | 71c04702a3d5 |
child 52248 | 2e330da7cbf4 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
48282
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package com.sun.media.sound; |
|
27 |
||
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
28 |
import java.io.BufferedOutputStream; |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
29 |
import java.io.ByteArrayInputStream; |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
30 |
import java.io.ByteArrayOutputStream; |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
31 |
import java.io.DataOutputStream; |
2 | 32 |
import java.io.File; |
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
33 |
import java.io.FileOutputStream; |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
34 |
import java.io.IOException; |
2 | 35 |
import java.io.InputStream; |
36 |
import java.io.OutputStream; |
|
37 |
import java.io.RandomAccessFile; |
|
38 |
import java.io.SequenceInputStream; |
|
34412
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
39 |
import java.util.Objects; |
2 | 40 |
|
41 |
import javax.sound.sampled.AudioFileFormat; |
|
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
42 |
import javax.sound.sampled.AudioFormat; |
2 | 43 |
import javax.sound.sampled.AudioInputStream; |
44 |
import javax.sound.sampled.AudioSystem; |
|
45 |
||
46 |
//$$fb this class is buggy. Should be replaced in future. |
|
47 |
||
48 |
/** |
|
49 |
* WAVE file writer. |
|
50 |
* |
|
51 |
* @author Jan Borgersen |
|
52 |
*/ |
|
18215 | 53 |
public final class WaveFileWriter extends SunFileWriter { |
2 | 54 |
|
55 |
/** |
|
56 |
* Constructs a new WaveFileWriter object. |
|
57 |
*/ |
|
58 |
public WaveFileWriter() { |
|
18215 | 59 |
super(new AudioFileFormat.Type[]{AudioFileFormat.Type.WAVE}); |
2 | 60 |
} |
61 |
||
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
62 |
@Override |
2 | 63 |
public AudioFileFormat.Type[] getAudioFileTypes(AudioInputStream stream) { |
64 |
||
65 |
AudioFileFormat.Type[] filetypes = new AudioFileFormat.Type[types.length]; |
|
66 |
System.arraycopy(types, 0, filetypes, 0, types.length); |
|
67 |
||
68 |
// make sure we can write this stream |
|
69 |
AudioFormat format = stream.getFormat(); |
|
70 |
AudioFormat.Encoding encoding = format.getEncoding(); |
|
71 |
||
72 |
if( AudioFormat.Encoding.ALAW.equals(encoding) || |
|
73 |
AudioFormat.Encoding.ULAW.equals(encoding) || |
|
74 |
AudioFormat.Encoding.PCM_SIGNED.equals(encoding) || |
|
75 |
AudioFormat.Encoding.PCM_UNSIGNED.equals(encoding) ) { |
|
76 |
||
77 |
return filetypes; |
|
78 |
} |
|
79 |
||
80 |
return new AudioFileFormat.Type[0]; |
|
81 |
} |
|
82 |
||
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
83 |
@Override |
2 | 84 |
public int write(AudioInputStream stream, AudioFileFormat.Type fileType, OutputStream out) throws IOException { |
34412
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
85 |
Objects.requireNonNull(stream); |
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
86 |
Objects.requireNonNull(fileType); |
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
87 |
Objects.requireNonNull(out); |
2 | 88 |
|
89 |
//$$fb the following check must come first ! Otherwise |
|
90 |
// the next frame length check may throw an IOException and |
|
91 |
// interrupt iterating File Writers. (see bug 4351296) |
|
92 |
||
93 |
// throws IllegalArgumentException if not supported |
|
94 |
WaveFileFormat waveFileFormat = (WaveFileFormat)getAudioFileFormat(fileType, stream); |
|
95 |
||
96 |
//$$fb when we got this far, we are committed to write this file |
|
97 |
||
98 |
// we must know the total data length to calculate the file length |
|
99 |
if( stream.getFrameLength() == AudioSystem.NOT_SPECIFIED ) { |
|
100 |
throw new IOException("stream length not specified"); |
|
101 |
} |
|
102 |
||
35687
78e8e8fea09b
8147407: Provide support of WaveExtensible sound format
serb
parents:
35686
diff
changeset
|
103 |
return writeWaveFile(stream, waveFileFormat, out); |
2 | 104 |
} |
105 |
||
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
106 |
@Override |
2 | 107 |
public int write(AudioInputStream stream, AudioFileFormat.Type fileType, File out) throws IOException { |
34412
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
108 |
Objects.requireNonNull(stream); |
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
109 |
Objects.requireNonNull(fileType); |
bed825be8cd8
8135100: Behavior of null arguments not specified in javax.sound.sampled.spi
serb
parents:
25859
diff
changeset
|
110 |
Objects.requireNonNull(out); |
2 | 111 |
|
112 |
// throws IllegalArgumentException if not supported |
|
113 |
WaveFileFormat waveFileFormat = (WaveFileFormat)getAudioFileFormat(fileType, stream); |
|
114 |
||
115 |
// first write the file without worrying about length fields |
|
48282
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
116 |
final int bytesWritten; |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
117 |
try (final FileOutputStream fos = new FileOutputStream(out); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
118 |
final BufferedOutputStream bos = new BufferedOutputStream(fos)) { |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
119 |
bytesWritten = writeWaveFile(stream, waveFileFormat, bos); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
120 |
} |
2 | 121 |
|
122 |
// now, if length fields were not specified, calculate them, |
|
123 |
// open as a random access file, write the appropriate fields, |
|
124 |
// close again.... |
|
125 |
if( waveFileFormat.getByteLength()== AudioSystem.NOT_SPECIFIED ) { |
|
126 |
||
127 |
int dataLength=bytesWritten-waveFileFormat.getHeaderSize(); |
|
128 |
int riffLength=dataLength + waveFileFormat.getHeaderSize() - 8; |
|
48282
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
129 |
try (final RandomAccessFile raf = new RandomAccessFile(out, "rw")) { |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
130 |
// skip RIFF magic |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
131 |
raf.skipBytes(4); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
132 |
raf.writeInt(big2little(riffLength)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
133 |
// skip WAVE magic, fmt_ magic, fmt_ length, fmt_ chunk, data magic |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
134 |
raf.skipBytes(4 + 4 + 4 + WaveFileFormat.getFmtChunkSize( |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
135 |
waveFileFormat.getWaveType()) + 4); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
136 |
raf.writeInt(big2little(dataLength)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
137 |
// that's all |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
138 |
} |
2 | 139 |
} |
140 |
||
141 |
return bytesWritten; |
|
142 |
} |
|
143 |
||
144 |
//-------------------------------------------------------------------- |
|
145 |
||
146 |
/** |
|
147 |
* Returns the AudioFileFormat describing the file that will be written from this AudioInputStream. |
|
148 |
* Throws IllegalArgumentException if not supported. |
|
149 |
*/ |
|
150 |
private AudioFileFormat getAudioFileFormat(AudioFileFormat.Type type, AudioInputStream stream) { |
|
35686
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
151 |
if (!isFileTypeSupported(type, stream)) { |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
152 |
throw new IllegalArgumentException("File type " + type + " not supported."); |
1c21a27682a5
8064800: AudioSystem/WaveFileWriter can't write PCM_FLOAT, but writes it anyway
serb
parents:
34412
diff
changeset
|
153 |
} |
2 | 154 |
AudioFormat format = null; |
155 |
WaveFileFormat fileFormat = null; |
|
156 |
AudioFormat.Encoding encoding = AudioFormat.Encoding.PCM_SIGNED; |
|
157 |
||
158 |
AudioFormat streamFormat = stream.getFormat(); |
|
159 |
AudioFormat.Encoding streamEncoding = streamFormat.getEncoding(); |
|
160 |
||
161 |
float sampleRate; |
|
162 |
int sampleSizeInBits; |
|
163 |
int channels; |
|
164 |
int frameSize; |
|
165 |
float frameRate; |
|
166 |
int fileSize; |
|
167 |
||
168 |
int waveType = WaveFileFormat.WAVE_FORMAT_PCM; |
|
169 |
||
170 |
if( AudioFormat.Encoding.ALAW.equals(streamEncoding) || |
|
171 |
AudioFormat.Encoding.ULAW.equals(streamEncoding) ) { |
|
172 |
||
173 |
encoding = streamEncoding; |
|
174 |
sampleSizeInBits = streamFormat.getSampleSizeInBits(); |
|
175 |
if (streamEncoding.equals(AudioFormat.Encoding.ALAW)) { |
|
35687
78e8e8fea09b
8147407: Provide support of WaveExtensible sound format
serb
parents:
35686
diff
changeset
|
176 |
waveType = WaveFileFormat.WAVE_FORMAT_ALAW; |
2 | 177 |
} else { |
35687
78e8e8fea09b
8147407: Provide support of WaveExtensible sound format
serb
parents:
35686
diff
changeset
|
178 |
waveType = WaveFileFormat.WAVE_FORMAT_MULAW; |
2 | 179 |
} |
180 |
} else if ( streamFormat.getSampleSizeInBits()==8 ) { |
|
181 |
encoding = AudioFormat.Encoding.PCM_UNSIGNED; |
|
182 |
sampleSizeInBits=8; |
|
183 |
} else { |
|
184 |
encoding = AudioFormat.Encoding.PCM_SIGNED; |
|
185 |
sampleSizeInBits=streamFormat.getSampleSizeInBits(); |
|
186 |
} |
|
187 |
||
188 |
||
189 |
format = new AudioFormat( encoding, |
|
190 |
streamFormat.getSampleRate(), |
|
191 |
sampleSizeInBits, |
|
192 |
streamFormat.getChannels(), |
|
193 |
streamFormat.getFrameSize(), |
|
194 |
streamFormat.getFrameRate(), |
|
195 |
false); // WAVE is little endian |
|
196 |
||
197 |
if( stream.getFrameLength()!=AudioSystem.NOT_SPECIFIED ) { |
|
198 |
fileSize = (int)stream.getFrameLength()*streamFormat.getFrameSize() |
|
199 |
+ WaveFileFormat.getHeaderSize(waveType); |
|
200 |
} else { |
|
201 |
fileSize = AudioSystem.NOT_SPECIFIED; |
|
202 |
} |
|
203 |
||
204 |
fileFormat = new WaveFileFormat( AudioFileFormat.Type.WAVE, |
|
205 |
fileSize, |
|
206 |
format, |
|
207 |
(int)stream.getFrameLength() ); |
|
208 |
||
209 |
return fileFormat; |
|
210 |
} |
|
211 |
||
212 |
||
213 |
private int writeWaveFile(InputStream in, WaveFileFormat waveFileFormat, OutputStream out) throws IOException { |
|
214 |
||
215 |
int bytesRead = 0; |
|
216 |
int bytesWritten = 0; |
|
217 |
InputStream fileStream = getFileStream(waveFileFormat, in); |
|
218 |
byte buffer[] = new byte[bisBufferSize]; |
|
219 |
int maxLength = waveFileFormat.getByteLength(); |
|
220 |
||
221 |
while( (bytesRead = fileStream.read( buffer )) >= 0 ) { |
|
222 |
||
223 |
if (maxLength>0) { |
|
224 |
if( bytesRead < maxLength ) { |
|
22584
eed64ee05369
8032733: Fix cast lint warnings in client libraries
darcy
parents:
18215
diff
changeset
|
225 |
out.write( buffer, 0, bytesRead ); |
2 | 226 |
bytesWritten += bytesRead; |
227 |
maxLength -= bytesRead; |
|
228 |
} else { |
|
22584
eed64ee05369
8032733: Fix cast lint warnings in client libraries
darcy
parents:
18215
diff
changeset
|
229 |
out.write( buffer, 0, maxLength ); |
2 | 230 |
bytesWritten += maxLength; |
231 |
maxLength = 0; |
|
232 |
break; |
|
233 |
} |
|
234 |
} else { |
|
22584
eed64ee05369
8032733: Fix cast lint warnings in client libraries
darcy
parents:
18215
diff
changeset
|
235 |
out.write( buffer, 0, bytesRead ); |
2 | 236 |
bytesWritten += bytesRead; |
237 |
} |
|
238 |
} |
|
239 |
||
240 |
return bytesWritten; |
|
241 |
} |
|
242 |
||
243 |
private InputStream getFileStream(WaveFileFormat waveFileFormat, InputStream audioStream) throws IOException { |
|
244 |
// private method ... assumes audioFileFormat is a supported file type |
|
245 |
||
246 |
// WAVE header fields |
|
247 |
AudioFormat audioFormat = waveFileFormat.getFormat(); |
|
248 |
int headerLength = waveFileFormat.getHeaderSize(); |
|
249 |
int riffMagic = WaveFileFormat.RIFF_MAGIC; |
|
250 |
int waveMagic = WaveFileFormat.WAVE_MAGIC; |
|
251 |
int fmtMagic = WaveFileFormat.FMT_MAGIC; |
|
252 |
int fmtLength = WaveFileFormat.getFmtChunkSize(waveFileFormat.getWaveType()); |
|
253 |
short wav_type = (short) waveFileFormat.getWaveType(); |
|
254 |
short channels = (short) audioFormat.getChannels(); |
|
255 |
short sampleSizeInBits = (short) audioFormat.getSampleSizeInBits(); |
|
256 |
int sampleRate = (int) audioFormat.getSampleRate(); |
|
22584
eed64ee05369
8032733: Fix cast lint warnings in client libraries
darcy
parents:
18215
diff
changeset
|
257 |
int frameSizeInBytes = audioFormat.getFrameSize(); |
2 | 258 |
int frameRate = (int) audioFormat.getFrameRate(); |
40444
afabcfc2f3ef
8163949: Cleanup of classes which are related to JavaSound
serb
parents:
35687
diff
changeset
|
259 |
int avgBytesPerSec = channels * sampleSizeInBits * sampleRate / 8; |
2 | 260 |
short blockAlign = (short) ((sampleSizeInBits / 8) * channels); |
261 |
int dataMagic = WaveFileFormat.DATA_MAGIC; |
|
262 |
int dataLength = waveFileFormat.getFrameLength() * frameSizeInBytes; |
|
263 |
int length = waveFileFormat.getByteLength(); |
|
264 |
int riffLength = dataLength + headerLength - 8; |
|
265 |
||
266 |
AudioFormat audioStreamFormat = null; |
|
267 |
AudioFormat.Encoding encoding = null; |
|
268 |
InputStream codedAudioStream = audioStream; |
|
269 |
||
270 |
// if audioStream is an AudioInputStream and we need to convert, do it here... |
|
271 |
if(audioStream instanceof AudioInputStream) { |
|
272 |
audioStreamFormat = ((AudioInputStream)audioStream).getFormat(); |
|
273 |
||
274 |
encoding = audioStreamFormat.getEncoding(); |
|
275 |
||
276 |
if(AudioFormat.Encoding.PCM_SIGNED.equals(encoding)) { |
|
277 |
if( sampleSizeInBits==8 ) { |
|
278 |
wav_type = WaveFileFormat.WAVE_FORMAT_PCM; |
|
279 |
// plug in the transcoder to convert from PCM_SIGNED to PCM_UNSIGNED |
|
280 |
codedAudioStream = AudioSystem.getAudioInputStream( new AudioFormat( |
|
281 |
AudioFormat.Encoding.PCM_UNSIGNED, |
|
282 |
audioStreamFormat.getSampleRate(), |
|
283 |
audioStreamFormat.getSampleSizeInBits(), |
|
284 |
audioStreamFormat.getChannels(), |
|
285 |
audioStreamFormat.getFrameSize(), |
|
286 |
audioStreamFormat.getFrameRate(), |
|
287 |
false), |
|
288 |
(AudioInputStream)audioStream); |
|
289 |
} |
|
290 |
} |
|
291 |
if( (AudioFormat.Encoding.PCM_SIGNED.equals(encoding) && audioStreamFormat.isBigEndian()) || |
|
292 |
(AudioFormat.Encoding.PCM_UNSIGNED.equals(encoding) && !audioStreamFormat.isBigEndian()) || |
|
293 |
(AudioFormat.Encoding.PCM_UNSIGNED.equals(encoding) && audioStreamFormat.isBigEndian()) ) { |
|
294 |
if( sampleSizeInBits!=8) { |
|
295 |
wav_type = WaveFileFormat.WAVE_FORMAT_PCM; |
|
296 |
// plug in the transcoder to convert to PCM_SIGNED_LITTLE_ENDIAN |
|
297 |
codedAudioStream = AudioSystem.getAudioInputStream( new AudioFormat( |
|
298 |
AudioFormat.Encoding.PCM_SIGNED, |
|
299 |
audioStreamFormat.getSampleRate(), |
|
300 |
audioStreamFormat.getSampleSizeInBits(), |
|
301 |
audioStreamFormat.getChannels(), |
|
302 |
audioStreamFormat.getFrameSize(), |
|
303 |
audioStreamFormat.getFrameRate(), |
|
304 |
false), |
|
305 |
(AudioInputStream)audioStream); |
|
306 |
} |
|
307 |
} |
|
308 |
} |
|
309 |
||
310 |
||
311 |
// Now push the header into a stream, concat, and return the new SequenceInputStream |
|
48282
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
312 |
final byte[] header; |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
313 |
try (final ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
314 |
final DataOutputStream dos = new DataOutputStream(baos)) { |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
315 |
// we write in littleendian... |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
316 |
dos.writeInt(riffMagic); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
317 |
dos.writeInt(big2little(riffLength)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
318 |
dos.writeInt(waveMagic); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
319 |
dos.writeInt(fmtMagic); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
320 |
dos.writeInt(big2little(fmtLength)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
321 |
dos.writeShort(big2littleShort(wav_type)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
322 |
dos.writeShort(big2littleShort(channels)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
323 |
dos.writeInt(big2little(sampleRate)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
324 |
dos.writeInt(big2little(avgBytesPerSec)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
325 |
dos.writeShort(big2littleShort(blockAlign)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
326 |
dos.writeShort(big2littleShort(sampleSizeInBits)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
327 |
//$$fb 2002-04-16: Fix for 4636355: RIFF audio headers could be _more_ spec compliant |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
328 |
if (wav_type != WaveFileFormat.WAVE_FORMAT_PCM) { |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
329 |
// add length 0 for "codec specific data length" |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
330 |
dos.writeShort(0); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
331 |
} |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
332 |
dos.writeInt(dataMagic); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
333 |
dos.writeInt(big2little(dataLength)); |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
334 |
header = baos.toByteArray(); |
2 | 335 |
} |
48282
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
336 |
return new SequenceInputStream(new ByteArrayInputStream(header), |
4483880d8811
8178401: Various audio files writers do not close file streams properly
serb
parents:
47216
diff
changeset
|
337 |
new NoCloseInputStream(codedAudioStream)); |
2 | 338 |
} |
339 |
} |