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
22a302c2
authored
Oct 26, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix widevine samples
parent
195c0c88
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
16 deletions
demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
View file @
22a302c2
...
...
@@ -15,17 +15,13 @@
*/
package
com
.
google
.
android
.
exoplayer
.
demo
;
import
com.google.android.exoplayer.MediaCodecUtil
;
import
com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException
;
import
com.google.android.exoplayer.demo.Samples.Sample
;
import
com.google.android.exoplayer.util.MimeTypes
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -56,19 +52,8 @@ public class SampleChooserActivity extends Activity {
sampleAdapter
.
addAll
((
Object
[])
Samples
.
WIDEVINE_GTS
);
sampleAdapter
.
add
(
new
Header
(
"Widevine DASH"
));
sampleAdapter
.
addAll
((
Object
[])
Samples
.
WIDEVINE_DASH_MP4
);
try
{
if
(
MediaCodecUtil
.
getDecoderInfo
(
MimeTypes
.
VIDEO_VP9
,
false
)
!=
null
)
{
sampleAdapter
.
addAll
((
Object
[])
Samples
.
WIDEVINE_DASH_WEBM
);
}
}
catch
(
DecoderQueryException
e
)
{
Log
.
e
(
TAG
,
"Failed to query vp9 decoder"
,
e
);
}
sampleAdapter
.
add
(
new
Header
(
"Widevine DASH Policy Tests (GTS)"
));
sampleAdapter
.
addAll
((
Object
[])
Samples
.
WIDEVINE_GTS
);
sampleAdapter
.
add
(
new
Header
(
"Widevine DASH"
));
sampleAdapter
.
addAll
((
Object
[])
Samples
.
WIDEVINE_DASH_MP4
);
// try {
// if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9,
fals
e) != null) {
// if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9,
tru
e) != null) {
// sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_WEBM);
// }
// } catch (DecoderQueryException 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