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

Side by Side Diff: media/cdm/default_cdm_factory.cc

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 8 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 unified diff | Download patch
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/cdm/default_cdm_factory.h" 5 #include "media/cdm/default_cdm_factory.h"
6 6
7 #include "base/bind.h"
8 #include "base/bind_helpers.h"
9 #include "base/location.h"
10 #include "base/message_loop/message_loop_proxy.h"
7 #include "media/base/key_systems.h" 11 #include "media/base/key_systems.h"
8 #include "media/cdm/aes_decryptor.h" 12 #include "media/cdm/aes_decryptor.h"
9 #include "url/gurl.h" 13 #include "url/gurl.h"
10 14
11 namespace media { 15 namespace media {
12 16
13 DefaultCdmFactory::DefaultCdmFactory() { 17 DefaultCdmFactory::DefaultCdmFactory() {
14 } 18 }
15 19
16 DefaultCdmFactory::~DefaultCdmFactory() { 20 DefaultCdmFactory::~DefaultCdmFactory() {
17 } 21 }
18 22
19 scoped_ptr<MediaKeys> DefaultCdmFactory::Create( 23 void DefaultCdmFactory::Create(
20 const std::string& key_system, 24 const std::string& key_system,
21 bool allow_distinctive_identifier, 25 bool allow_distinctive_identifier,
22 bool allow_persistent_state, 26 bool allow_persistent_state,
23 const GURL& security_origin, 27 const GURL& security_origin,
24 const SessionMessageCB& session_message_cb, 28 const SessionMessageCB& session_message_cb,
25 const SessionClosedCB& session_closed_cb, 29 const SessionClosedCB& session_closed_cb,
26 const LegacySessionErrorCB& legacy_session_error_cb, 30 const LegacySessionErrorCB& legacy_session_error_cb,
27 const SessionKeysChangeCB& session_keys_change_cb, 31 const SessionKeysChangeCB& session_keys_change_cb,
28 const SessionExpirationUpdateCB& session_expiration_update_cb) { 32 const SessionExpirationUpdateCB& session_expiration_update_cb,
29 if (!security_origin.is_valid()) 33 const CdmCreatedCB& cdm_created_cb) {
30 return nullptr; 34 scoped_ptr<MediaKeys> cdm;
31 35 if (security_origin.is_valid() && CanUseAesDecryptor(key_system)) {
32 if (CanUseAesDecryptor(key_system)) { 36 cdm.reset(new AesDecryptor(security_origin, session_message_cb,
33 return make_scoped_ptr(new AesDecryptor(security_origin, session_message_cb, 37 session_closed_cb, session_keys_change_cb));
34 session_closed_cb,
35 session_keys_change_cb));
36 } 38 }
37 39 base::MessageLoopProxy::current()->PostTask(
38 return nullptr; 40 FROM_HERE, base::Bind(cdm_created_cb, base::Passed(&cdm)));
ddorwin 2015/04/10 00:59:43 ditto on |cdm|. Also, perhaps fail at line 36 (an
xhwang 2015/04/10 17:41:17 Done.
39 } 41 }
40 42
41 } // namespace media 43 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698