diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-09 14:25:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:25:49 -0800 |
| commit | 901e78d96eec495bda0dbe2e2b73009951301817 (patch) | |
| tree | ce0df52bd6db87dbbd294b0b0260ec9af29dd3db /media/libstagefright/AwesomePlayer.cpp | |
| parent | eebeceec684a36222b4559e3157b0db04c0a67ed (diff) | |
| parent | d276313bf895a6810404123c0affb4b7a6a07582 (diff) | |
| download | frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.zip frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.tar.gz frameworks_av-901e78d96eec495bda0dbe2e2b73009951301817.tar.bz2 | |
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 964cb1f..8405264 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2091,7 +2091,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { String8 mimeType; float confidence; sp<AMessage> dummy; - bool success = SniffDRM(dataSource, &mimeType, &confidence, &dummy); + bool success = SniffWVM(dataSource, &mimeType, &confidence, &dummy); if (!success || strcasecmp( @@ -2099,6 +2099,8 @@ status_t AwesomePlayer::finishSetDataSource_l() { return ERROR_UNSUPPORTED; } + dataSource->DrmInitialization(); + mWVMExtractor = new WVMExtractor(dataSource); mWVMExtractor->setAdaptiveStreamingMode(true); extractor = mWVMExtractor; |