Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4adf8f77
authored
Sep 25, 2014
by
ojw28
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Tweak stop/disable cycles.
parent
fc230733
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
View file @
4adf8f77
...
...
@@ -417,11 +417,11 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override
protected
void
onStopped
()
{
super
.
onStopped
();
if
(
audioTrack
!=
null
)
{
resetSyncParams
();
audioTrack
.
pause
();
}
super
.
onStopped
();
}
@Override
...
...
@@ -563,9 +563,12 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override
protected
void
onDisabled
()
{
super
.
onDisabled
();
releaseAudioTrack
();
audioSessionId
=
0
;
try
{
releaseAudioTrack
();
}
finally
{
super
.
onDisabled
();
}
}
@Override
...
...
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
View file @
4adf8f77
...
...
@@ -269,20 +269,20 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
@Override
protected
void
onStopped
()
{
super
.
onStopped
();
joiningDeadlineUs
=
-
1
;
notifyAndResetDroppedFrameCount
();
super
.
onStopped
();
}
@Override
public
void
onDisabled
()
{
super
.
onDisabled
();
currentWidth
=
-
1
;
currentHeight
=
-
1
;
currentPixelWidthHeightRatio
=
-
1
;
lastReportedWidth
=
-
1
;
lastReportedHeight
=
-
1
;
lastReportedPixelWidthHeightRatio
=
-
1
;
super
.
onDisabled
();
}
@Override
...
...
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
View file @
4adf8f77
...
...
@@ -238,14 +238,17 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
Assertions
.
checkState
(
track
==
0
);
pendingDiscontinuity
=
false
;
state
=
STATE_PREPARED
;
loadControl
.
unregister
(
this
);
chunkSource
.
disable
(
mediaChunks
);
if
(
loader
.
isLoading
())
{
loader
.
cancelLoading
();
}
else
{
clearMediaChunks
();
clearCurrentLoadable
();
loadControl
.
trimAllocator
();
try
{
chunkSource
.
disable
(
mediaChunks
);
}
finally
{
loadControl
.
unregister
(
this
);
if
(
loader
.
isLoading
())
{
loader
.
cancelLoading
();
}
else
{
clearMediaChunks
();
clearCurrentLoadable
();
loadControl
.
trimAllocator
();
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment