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

remove REINIT_STATE_DO_REINIT_NOW state, reinit directly when needed.

Browse source
This commit is contained in:
Martin Bonnin 2015-01-27 10:44:02 +01:00
parent 79708f43f8
commit 424b29f996
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
View file

@ -148,11 +148,6 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
* The end of stream has been sent, wait for the codec to acknowledge it. * The end of stream has been sent, wait for the codec to acknowledge it.
*/ */
private static final int REINIT_STATE_WAIT_END_OF_STREAM = 2; private static final int REINIT_STATE_WAIT_END_OF_STREAM = 2;
/**
* The last sample has been processed, we can safely reinit now.
*/
private static final int REINIT_STATE_DO_REINIT_NOW = 3;
public final CodecCounters codecCounters; public final CodecCounters codecCounters;
@ -521,12 +516,6 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
return false; return false;
} }
if (codecReinitState == REINIT_STATE_DO_REINIT_NOW) {
releaseCodec();
maybeInitCodec();
return false;
}
if (inputIndex < 0) { if (inputIndex < 0) {
inputIndex = codec.dequeueInputBuffer(0); inputIndex = codec.dequeueInputBuffer(0);
if (inputIndex < 0) { if (inputIndex < 0) {
@ -691,7 +680,8 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
} else { } else {
if (!hasQueuedOneInputBuffer) { if (!hasQueuedOneInputBuffer) {
// no need to signal end of stream if nothing has been queued, we can just reinit asap // no need to signal end of stream if nothing has been queued, we can just reinit asap
codecReinitState = REINIT_STATE_DO_REINIT_NOW; releaseCodec();
maybeInitCodec();
} else { } else {
codecReinitState = REINIT_STATE_SIGNAL_END_OF_STREAM; codecReinitState = REINIT_STATE_SIGNAL_END_OF_STREAM;
} }
@ -783,7 +773,9 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
if ((outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) { if ((outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
if (codecReinitState == REINIT_STATE_WAIT_END_OF_STREAM) { if (codecReinitState == REINIT_STATE_WAIT_END_OF_STREAM) {
codecReinitState = REINIT_STATE_DO_REINIT_NOW; // The last sample has been processed, we can safely reinit now
releaseCodec();
maybeInitCodec();
} else { } else {
outputStreamEnded = true; outputStreamEnded = true;
} }