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
926bc805
authored
Jun 05, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add some useful Systrace
parent
96c1e670
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
View file @
926bc805
...
@@ -19,6 +19,7 @@ import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
...
@@ -19,6 +19,7 @@ import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
import
com.google.android.exoplayer.drm.DrmInitData
;
import
com.google.android.exoplayer.drm.DrmInitData
;
import
com.google.android.exoplayer.drm.DrmSessionManager
;
import
com.google.android.exoplayer.drm.DrmSessionManager
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.TraceUtil
;
import
com.google.android.exoplayer.util.Util
;
import
com.google.android.exoplayer.util.Util
;
import
android.annotation.TargetApi
;
import
android.annotation.TargetApi
;
...
@@ -362,9 +363,15 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
...
@@ -362,9 +363,15 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
codecIsAdaptive
=
decoderInfo
.
adaptive
;
codecIsAdaptive
=
decoderInfo
.
adaptive
;
try
{
try
{
long
codecInitializingTimestamp
=
SystemClock
.
elapsedRealtime
();
long
codecInitializingTimestamp
=
SystemClock
.
elapsedRealtime
();
TraceUtil
.
beginSection
(
"createByCodecName("
+
decoderName
+
")"
);
codec
=
MediaCodec
.
createByCodecName
(
decoderName
);
codec
=
MediaCodec
.
createByCodecName
(
decoderName
);
TraceUtil
.
endSection
();
TraceUtil
.
beginSection
(
"configureCodec"
);
configureCodec
(
codec
,
decoderName
,
format
.
getFrameworkMediaFormatV16
(),
mediaCrypto
);
configureCodec
(
codec
,
decoderName
,
format
.
getFrameworkMediaFormatV16
(),
mediaCrypto
);
TraceUtil
.
endSection
();
TraceUtil
.
beginSection
(
"codec.start()"
);
codec
.
start
();
codec
.
start
();
TraceUtil
.
endSection
();
long
codecInitializedTimestamp
=
SystemClock
.
elapsedRealtime
();
long
codecInitializedTimestamp
=
SystemClock
.
elapsedRealtime
();
notifyDecoderInitialized
(
decoderName
,
codecInitializedTimestamp
,
notifyDecoderInitialized
(
decoderName
,
codecInitializedTimestamp
,
codecInitializedTimestamp
-
codecInitializingTimestamp
);
codecInitializedTimestamp
-
codecInitializingTimestamp
);
...
@@ -499,10 +506,12 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
...
@@ -499,10 +506,12 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
maybeInitCodec
();
maybeInitCodec
();
}
}
if
(
codec
!=
null
)
{
if
(
codec
!=
null
)
{
TraceUtil
.
beginSection
(
"drainAndFeed"
);
while
(
drainOutputBuffer
(
positionUs
,
elapsedRealtimeUs
))
{}
while
(
drainOutputBuffer
(
positionUs
,
elapsedRealtimeUs
))
{}
if
(
feedInputBuffer
(
true
))
{
if
(
feedInputBuffer
(
true
))
{
while
(
feedInputBuffer
(
false
))
{}
while
(
feedInputBuffer
(
false
))
{}
}
}
TraceUtil
.
endSection
();
}
}
codecCounters
.
ensureUpdated
();
codecCounters
.
ensureUpdated
();
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
View file @
926bc805
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
com
.
google
.
android
.
exoplayer
.
upstream
;
package
com
.
google
.
android
.
exoplayer
.
upstream
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.TraceUtil
;
import
com.google.android.exoplayer.util.Util
;
import
com.google.android.exoplayer.util.Util
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
...
@@ -204,7 +205,9 @@ public final class Loader {
...
@@ -204,7 +205,9 @@ public final class Loader {
try
{
try
{
executorThread
=
Thread
.
currentThread
();
executorThread
=
Thread
.
currentThread
();
if
(!
loadable
.
isLoadCanceled
())
{
if
(!
loadable
.
isLoadCanceled
())
{
TraceUtil
.
beginSection
(
loadable
.
getClass
().
getSimpleName
()
+
".load()"
);
loadable
.
load
();
loadable
.
load
();
TraceUtil
.
endSection
();
}
}
sendEmptyMessage
(
MSG_END_OF_SOURCE
);
sendEmptyMessage
(
MSG_END_OF_SOURCE
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
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