sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-01 10:35:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly propagate END_OF_STREAM through Opus decoder.

Browse source
This commit is contained in:
Oliver Woodman 2015-09-01 14:16:36 +01:00
parent a953e7217f
commit 4a9ff7b094
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderWrapper.java
View file

@ -203,6 +203,7 @@ import java.util.LinkedList;
}
// Decode.
boolean skipBuffer = false;
if (inputBuffer.getFlag(FLAG_END_OF_STREAM)) {
outputBuffer.setFlag(FLAG_END_OF_STREAM);
} else {
@ -221,13 +222,14 @@ import java.util.LinkedList;
if (skipSamples > 0) {
int bytesPerSample = opusHeader.channelCount * 2;
int skipBytes = skipSamples * bytesPerSample;
if (outputBuffer.size < skipBytes) {
if (outputBuffer.size <= skipBytes) {
skipSamples -= outputBuffer.size / bytesPerSample;
outputBuffer.size = 0;
skipBuffer = true;
} else {
skipSamples = 0;
outputBuffer.data.position(skipBytes);
outputBuffer.size -= skipBytes;
outputBuffer.data.position(skipBytes);
}
}
}
@ -235,7 +237,7 @@ import java.util.LinkedList;
synchronized (lock) {
if (flushDecodedOutputBuffer
|| inputBuffer.sampleHolder.isDecodeOnly()
|| outputBuffer.size == 0) {
|| skipBuffer) {
// In the following cases, we make the output buffer available again rather than queuing it
// to be consumed:
// 1) A flush occured whilst we were decoding.