loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak stop/disable cycles.

Browse Source
This commit is contained in:
ojw28 2014-09-25 20:13:40 +01:00
parent fc230733ae
commit 4adf8f77f4
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
View File

@ -417,11 +417,11 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override @Override
protected void onStopped() { protected void onStopped() {
super.onStopped();
if (audioTrack != null) { if (audioTrack != null) {
resetSyncParams(); resetSyncParams();
audioTrack.pause(); audioTrack.pause();
} }
super.onStopped();
} }
@Override @Override
@ -563,9 +563,12 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override @Override
protected void onDisabled() { protected void onDisabled() {
super.onDisabled();
releaseAudioTrack();
audioSessionId = 0; audioSessionId = 0;
try {
releaseAudioTrack();
} finally {
super.onDisabled();
}
} }
@Override @Override

4
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
View File

@ -269,20 +269,20 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
@Override @Override
protected void onStopped() { protected void onStopped() {
super.onStopped();
joiningDeadlineUs = -1; joiningDeadlineUs = -1;
notifyAndResetDroppedFrameCount(); notifyAndResetDroppedFrameCount();
super.onStopped();
} }
@Override @Override
public void onDisabled() { public void onDisabled() {
super.onDisabled();
currentWidth = -1; currentWidth = -1;
currentHeight = -1; currentHeight = -1;
currentPixelWidthHeightRatio = -1; currentPixelWidthHeightRatio = -1;
lastReportedWidth = -1; lastReportedWidth = -1;
lastReportedHeight = -1; lastReportedHeight = -1;
lastReportedPixelWidthHeightRatio = -1; lastReportedPixelWidthHeightRatio = -1;
super.onDisabled();
} }
@Override @Override

19
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
View File

@ -238,14 +238,17 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
Assertions.checkState(track == 0); Assertions.checkState(track == 0);
pendingDiscontinuity = false; pendingDiscontinuity = false;
state = STATE_PREPARED; state = STATE_PREPARED;
loadControl.unregister(this); try {
chunkSource.disable(mediaChunks); chunkSource.disable(mediaChunks);
if (loader.isLoading()) { } finally {
loader.cancelLoading(); loadControl.unregister(this);
} else { if (loader.isLoading()) {
clearMediaChunks(); loader.cancelLoading();
clearCurrentLoadable(); } else {
loadControl.trimAllocator(); clearMediaChunks();
clearCurrentLoadable();
loadControl.trimAllocator();
}
} }
} }