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
d2ba5cfd
authored
May 05, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add TYPE_M4A, which is equivalent to TYPE_MP4.
parent
9dcb17f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
View file @
d2ba5cfd
...
@@ -50,6 +50,7 @@ public class DemoUtil {
...
@@ -50,6 +50,7 @@ public class DemoUtil {
public
static
final
int
TYPE_TS
=
6
;
public
static
final
int
TYPE_TS
=
6
;
public
static
final
int
TYPE_AAC
=
7
;
public
static
final
int
TYPE_AAC
=
7
;
public
static
final
int
TYPE_OTHER
=
8
;
public
static
final
int
TYPE_OTHER
=
8
;
public
static
final
int
TYPE_M4A
=
9
;
private
static
final
CookieManager
defaultCookieManager
;
private
static
final
CookieManager
defaultCookieManager
;
...
...
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
View file @
d2ba5cfd
...
@@ -231,6 +231,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
...
@@ -231,6 +231,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
new
WidevineTestMediaDrmCallback
(
contentId
),
debugTextView
,
audioCapabilities
);
new
WidevineTestMediaDrmCallback
(
contentId
),
debugTextView
,
audioCapabilities
);
case
DemoUtil
.
TYPE_HLS
:
case
DemoUtil
.
TYPE_HLS
:
return
new
HlsRendererBuilder
(
this
,
userAgent
,
contentUri
.
toString
(),
debugTextView
);
return
new
HlsRendererBuilder
(
this
,
userAgent
,
contentUri
.
toString
(),
debugTextView
);
case
DemoUtil
.
TYPE_M4A
:
// There are no file format differences between M4A and MP4.
case
DemoUtil
.
TYPE_MP4
:
case
DemoUtil
.
TYPE_MP4
:
return
new
ExtractorRendererBuilder
(
userAgent
,
contentUri
,
debugTextView
,
return
new
ExtractorRendererBuilder
(
userAgent
,
contentUri
,
debugTextView
,
new
Mp4Extractor
());
new
Mp4Extractor
());
...
...
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