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

Handle non-empty EoS buffers, for audio

Browse source 
This fixes gapless playback of streams with encoder padding on devices where the
decoder could set the end of stream flag on a non-empty final buffer.

Issue: #3449

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192407924
This commit is contained in:
andrewlewis 2018-04-10 23:41:20 -07:00 committed by Oliver Woodman
parent ee8fc74d65
commit 3c78dc22f6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -41,6 +41,8 @@
* Fix an issue where playback of TrueHD streams would get stuck after seeking * Fix an issue where playback of TrueHD streams would get stuck after seeking
due to not finding a syncframe due to not finding a syncframe
((#3845)[https://github.com/google/ExoPlayer/issues/3845]). ((#3845)[https://github.com/google/ExoPlayer/issues/3845]).
* Handle non-empty end-of-stream buffers, to fix gapless playback of streams
with encoder padding when the decoder returns a non-empty final buffer.
* Caching: * Caching:
* Add release method to Cache interface. * Add release method to Cache interface.
* Prevent multiple instances of SimpleCache in the same folder. * Prevent multiple instances of SimpleCache in the same folder.

9
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View file

@ -1027,7 +1027,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
shouldSkipAdaptationWorkaroundOutputBuffer = false; shouldSkipAdaptationWorkaroundOutputBuffer = false;
codec.releaseOutputBuffer(outputIndex, false); codec.releaseOutputBuffer(outputIndex, false);
return true; return true;
} else if ((outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) { } else if (outputBufferInfo.size == 0
&& (outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
// The dequeued buffer indicates the end of the stream. Process it immediately. // The dequeued buffer indicates the end of the stream. Process it immediately.
processEndOfStream(); processEndOfStream();
return false; return false;
@ -1094,8 +1095,12 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
if (processedOutputBuffer) { if (processedOutputBuffer) {
onProcessedOutputBuffer(outputBufferInfo.presentationTimeUs); onProcessedOutputBuffer(outputBufferInfo.presentationTimeUs);
boolean isEndOfStream = (outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
resetOutputBuffer(); resetOutputBuffer();
return true; if (!isEndOfStream) {
return true;
}
processEndOfStream();
} }
return false; return false;