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

Side by Side Diff: media/base/android/browser_cdm_factory_android.cc

Issue 774423002: Provides method for setting a BrowserCdmFactory for IPC-based CDM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include base/logging.h Created 6 years 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 unified diff | Download patch
« no previous file with comments | « media/base/android/browser_cdm_factory_android.h ('k') | media/base/browser_cdm_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/browser_cdm_factory.h" 5 #include "media/base/android/browser_cdm_factory_android.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/android/media_drm_bridge.h" 10 #include "media/base/android/media_drm_bridge.h"
11 #include "media/base/media_switches.h" 11 #include "media/base/media_switches.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 scoped_ptr<BrowserCdm> CreateBrowserCdm( 15 scoped_ptr<BrowserCdm> BrowserCdmFactoryAndroid::CreateBrowserCdm(
16 const std::string& key_system, 16 const std::string& key_system,
17 const BrowserCdm::SessionCreatedCB& session_created_cb, 17 const BrowserCdm::SessionCreatedCB& session_created_cb,
18 const BrowserCdm::SessionMessageCB& session_message_cb, 18 const BrowserCdm::SessionMessageCB& session_message_cb,
19 const BrowserCdm::SessionReadyCB& session_ready_cb, 19 const BrowserCdm::SessionReadyCB& session_ready_cb,
20 const BrowserCdm::SessionClosedCB& session_closed_cb, 20 const BrowserCdm::SessionClosedCB& session_closed_cb,
21 const BrowserCdm::SessionErrorCB& session_error_cb) { 21 const BrowserCdm::SessionErrorCB& session_error_cb) {
22 if (!MediaDrmBridge::IsKeySystemSupported(key_system)) { 22 if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
23 NOTREACHED() << "Unsupported key system: " << key_system; 23 NOTREACHED() << "Unsupported key system: " << key_system;
24 return scoped_ptr<BrowserCdm>(); 24 return scoped_ptr<BrowserCdm>();
25 } 25 }
(...skipping 18 matching lines...) Expand all
44 } 44 }
45 if (!cdm->SetSecurityLevel(security_level)) { 45 if (!cdm->SetSecurityLevel(security_level)) {
46 DVLOG(1) << "failed to set security level " << security_level; 46 DVLOG(1) << "failed to set security level " << security_level;
47 return scoped_ptr<BrowserCdm>(); 47 return scoped_ptr<BrowserCdm>();
48 } 48 }
49 49
50 return cdm.Pass(); 50 return cdm.Pass();
51 } 51 }
52 52
53 } // namespace media 53 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/browser_cdm_factory_android.h ('k') | media/base/browser_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698