sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-27 09:45:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WAV extractor fixes.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=118021575
This commit is contained in:
olly 2016-03-24 05:32:10 -07:00 committed by Oliver Woodman
parent 0ee45550c9
commit 1e78ee82ce
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeaderReader.java
View file

@ -72,6 +72,7 @@ import java.io.IOException;
throw new ParserException(
"Second chunk in RIFF WAV should be format; got: " + formatChunkHeader.id);
}
Assertions.checkState(formatChunkHeader.size >= 16);
input.peekFully(scratch.data, 0, 16);
scratch.setPosition(0);
@ -95,18 +96,14 @@ import java.io.IOException;
return null;
}
if (type == TYPE_PCM) {
Assertions.checkState(formatChunkHeader.size == 16);
// No more data to read.
} else if (type == TYPE_WAVE_FORMAT_EXTENSIBLE) {
Assertions.checkState(formatChunkHeader.size == 40);
// Skip extensionSize, validBitsPerSample, channelMask, subFormatGuid.
input.advancePeekPosition(2 + 2 + 4 + 16);
} else {
if (type != TYPE_PCM && type != TYPE_WAVE_FORMAT_EXTENSIBLE) {
Log.e(TAG, "Unsupported WAV format type: " + type);
return null;
}
// If present, skip extensionSize, validBitsPerSample, channelMask, subFormatGuid, ...
input.advancePeekPosition((int) formatChunkHeader.size - 16);
return new WavHeader(
numChannels, sampleRateHz, averageBytesPerSecond, blockAlignment, bitsPerSample);
}
@ -118,7 +115,7 @@ import java.io.IOException;
* If an exception is thrown, the input position will be left pointing to a chunk header.
*
* @param input Input stream to skip to the data chunk in. Its peek position must be pointing to
* a valid chunk header that is not the RIFF chunk.
* a valid chunk header.
* @param wavHeader WAV header to populate with data bounds.
* @throws IOException If reading from the input fails.
* @throws InterruptedException If interrupted while reading from input.
@ -135,6 +132,10 @@ import java.io.IOException;
while (chunkHeader.id != Util.getIntegerCodeForString("data")) {
Log.w(TAG, "Ignoring unknown WAV chunk: " + chunkHeader.id);
long bytesToSkip = ChunkHeader.SIZE_IN_BYTES + chunkHeader.size;
// Override size of RIFF chunk, since it describes its size as the entire file.
if (chunkHeader.id == Util.getIntegerCodeForString("RIFF")) {
bytesToSkip = ChunkHeader.SIZE_IN_BYTES + 4;
}
if (bytesToSkip > Integer.MAX_VALUE) {
throw new ParserException("Chunk is too large (~2GB+) to skip; id: " + chunkHeader.id);
}