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
5dca496b
authored
May 23, 2017
by
ojw28
Committed by
GitHub
May 23, 2017
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge pull request #2809 from mofneko/change-position-variable
Refactor: Change the position of variable.
parents
dbc0cf80
37ffb331
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View file @
5dca496b
...
@@ -239,7 +239,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
...
@@ -239,7 +239,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
Intent
intent
=
getIntent
();
Intent
intent
=
getIntent
();
boolean
needNewPlayer
=
player
==
null
;
boolean
needNewPlayer
=
player
==
null
;
if
(
needNewPlayer
)
{
if
(
needNewPlayer
)
{
boolean
preferExtensionDecoders
=
intent
.
getBooleanExtra
(
PREFER_EXTENSION_DECODERS
,
false
);
UUID
drmSchemeUuid
=
intent
.
hasExtra
(
DRM_SCHEME_UUID_EXTRA
)
UUID
drmSchemeUuid
=
intent
.
hasExtra
(
DRM_SCHEME_UUID_EXTRA
)
?
UUID
.
fromString
(
intent
.
getStringExtra
(
DRM_SCHEME_UUID_EXTRA
))
:
null
;
?
UUID
.
fromString
(
intent
.
getStringExtra
(
DRM_SCHEME_UUID_EXTRA
))
:
null
;
DrmSessionManager
<
FrameworkMediaCrypto
>
drmSessionManager
=
null
;
DrmSessionManager
<
FrameworkMediaCrypto
>
drmSessionManager
=
null
;
...
@@ -258,6 +257,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
...
@@ -258,6 +257,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
}
}
}
}
boolean
preferExtensionDecoders
=
intent
.
getBooleanExtra
(
PREFER_EXTENSION_DECODERS
,
false
);
@DefaultRenderersFactory
.
ExtensionRendererMode
int
extensionRendererMode
=
@DefaultRenderersFactory
.
ExtensionRendererMode
int
extensionRendererMode
=
((
DemoApplication
)
getApplication
()).
useExtensionRenderers
()
((
DemoApplication
)
getApplication
()).
useExtensionRenderers
()
?
(
preferExtensionDecoders
?
DefaultRenderersFactory
.
EXTENSION_RENDERER_MODE_PREFER
?
(
preferExtensionDecoders
?
DefaultRenderersFactory
.
EXTENSION_RENDERER_MODE_PREFER
...
...
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