Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: content/browser/android/browser_media_player_manager.cc

Issue 23480036: Support creating secure decoder in MediaCodecBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/common/gpu/media/android_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/browser_media_player_manager.cc
diff --git a/content/browser/android/browser_media_player_manager.cc b/content/browser/android/browser_media_player_manager.cc
index daba884a0577e3c1e869e6e4f85c692fb1d856bf..bc7562092fd17214ad3bf0eb808f7432b883f8f9 100644
--- a/content/browser/android/browser_media_player_manager.cc
+++ b/content/browser/android/browser_media_player_manager.cc
@@ -524,7 +524,11 @@ void BrowserMediaPlayerManager::AddDrmBridge(int media_keys_id,
// the default L3.
scoped_ptr<MediaDrmBridge> drm_bridge(
MediaDrmBridge::Create(media_keys_id, uuid, "L3", this));
- DCHECK(drm_bridge) << "failed to create drm bridge. ";
+ if (!drm_bridge) {
+ DVLOG(1) << "failed to create drm bridge.";
+ return;
+ }
+
drm_bridges_.push_back(drm_bridge.release());
}
@@ -543,7 +547,7 @@ void BrowserMediaPlayerManager::OnSetMediaKeys(int player_id,
MediaPlayerAndroid* player = GetPlayer(player_id);
MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
if (!player || !drm_bridge) {
- NOTREACHED() << "OnSetMediaKeys(): Player and MediaKeys must be present.";
+ DVLOG(1) << "OnSetMediaKeys(): Player and MediaKeys must be present.";
return;
}
// TODO(qinmin): add the logic to decide whether we should create the
« no previous file with comments | « no previous file | content/common/gpu/media/android_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698