sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

webm_extractor: Fix issue in vorbis extraction.

Browse source 
Vorbis decoder in android MediaCodec [1] expects the last 4 bytes of the sample to be the number of samples in the current page. This definition holds good only for Ogg and is irrelevant for WebM. So we always set this to -1 (the decoder will ignore this value if we set it to -1). The android platform media extractor [2] does the same.
This commit is contained in:
Oliver Woodman 2015-04-17 20:09:45 +01:00
parent b1aac839e6
commit 4c94a846d5
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
View file

@ -104,6 +104,7 @@ public final class WebmExtractor implements Extractor {
private final EbmlReader reader;
private final VarintReader varintReader;
private final ParsableByteArray sampleHeaderScratch;
private ParsableByteArray vorbisNumPageSamples;
private long segmentContentPosition = UNKNOWN;
private long segmentContentSize = UNKNOWN;
@ -468,6 +469,23 @@ public final class WebmExtractor implements Extractor {
blockBytesRead += trackOutput.sampleData(input, contentSize - blockBytesRead);
}
if (CODEC_ID_VORBIS.equals(codecId)) {
// Vorbis decoder in android MediaCodec [1] expects the last 4 bytes of the sample to be
// the number of samples in the current page. This definition holds good only for Ogg and
// irrelevant for WebM. So we always set this to -1 (the decoder will ignore this value if
// we set it to -1). The android platform media extractor [2] does the same.
// [1] https://android.googlesource.com/platform/frameworks/av/+/lollipop-release/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp#314
// [2] https://android.googlesource.com/platform/frameworks/av/+/lollipop-release/media/libstagefright/NuMediaExtractor.cpp#474
if (vorbisNumPageSamples == null) {
vorbisNumPageSamples =
new ParsableByteArray(ByteBuffer.allocate(4).putInt(-1).array());
} else {
vorbisNumPageSamples.setPosition(0);
}
trackOutput.sampleData(vorbisNumPageSamples, 4);
sampleSize += 4;
}
trackOutput.sampleMetadata(sampleTimeUs, sampleFlags, sampleSize, 0, null);
sampleState = SAMPLE_STATE_START;
sampleRead = true;