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

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

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: rebase only Created 3 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
« no previous file with comments | « media/base/android/android_cdm_factory.h ('k') | media/base/android/media_drm_bridge.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/android_cdm_factory.h" 5 #include "media/base/android/android_cdm_factory.h"
6 6
7 #include "base/feature_list.h" 7 #include "base/feature_list.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "media/base/android/media_drm_bridge.h" 9 #include "media/base/android/media_drm_bridge.h"
10 #include "media/base/bind_to_current_loop.h" 10 #include "media/base/bind_to_current_loop.h"
11 #include "media/base/cdm_config.h" 11 #include "media/base/cdm_config.h"
12 #include "media/base/content_decryption_module.h" 12 #include "media/base/content_decryption_module.h"
13 #include "media/base/key_system_names.h" 13 #include "media/base/key_system_names.h"
14 #include "media/base/key_systems.h" 14 #include "media/base/key_systems.h"
15 #include "media/base/media_switches.h" 15 #include "media/base/media_switches.h"
16 #include "media/cdm/aes_decryptor.h" 16 #include "media/cdm/aes_decryptor.h"
17 #include "third_party/widevine/cdm/widevine_cdm_common.h" 17 #include "third_party/widevine/cdm/widevine_cdm_common.h"
18 #include "url/gurl.h" 18 #include "url/gurl.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb) 22 AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb,
23 : create_fetcher_cb_(create_fetcher_cb) {} 23 const CreateStorageCB& create_storage_cb)
24 : create_fetcher_cb_(create_fetcher_cb),
25 create_storage_cb_(create_storage_cb) {}
24 26
25 AndroidCdmFactory::~AndroidCdmFactory() {} 27 AndroidCdmFactory::~AndroidCdmFactory() {}
26 28
27 void AndroidCdmFactory::Create( 29 void AndroidCdmFactory::Create(
28 const std::string& key_system, 30 const std::string& key_system,
29 const GURL& security_origin, 31 const GURL& security_origin,
30 const CdmConfig& cdm_config, 32 const CdmConfig& cdm_config,
31 const SessionMessageCB& session_message_cb, 33 const SessionMessageCB& session_message_cb,
32 const SessionClosedCB& session_closed_cb, 34 const SessionClosedCB& session_closed_cb,
33 const SessionKeysChangeCB& session_keys_change_cb, 35 const SessionKeysChangeCB& session_keys_change_cb,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 error_message = 75 error_message =
74 key_system + 76 key_system +
75 " may require use_video_overlay_for_embedded_encrypted_video"; 77 " may require use_video_overlay_for_embedded_encrypted_video";
76 NOTREACHED() << error_message; 78 NOTREACHED() << error_message;
77 bound_cdm_created_cb.Run(nullptr, error_message); 79 bound_cdm_created_cb.Run(nullptr, error_message);
78 return; 80 return;
79 } 81 }
80 82
81 scoped_refptr<MediaDrmBridge> cdm(MediaDrmBridge::Create( 83 scoped_refptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(
82 key_system, security_origin, security_level, create_fetcher_cb_, 84 key_system, security_origin, security_level, create_fetcher_cb_,
83 session_message_cb, session_closed_cb, session_keys_change_cb, 85 create_storage_cb_, session_message_cb, session_closed_cb,
84 session_expiration_update_cb)); 86 session_keys_change_cb, session_expiration_update_cb));
85 if (!cdm) { 87 if (!cdm) {
86 error_message = "MediaDrmBridge cannot be created for " + key_system + 88 error_message = "MediaDrmBridge cannot be created for " + key_system +
87 " with security level " + base::IntToString(security_level); 89 " with security level " + base::IntToString(security_level);
88 LOG(ERROR) << error_message; 90 LOG(ERROR) << error_message;
89 bound_cdm_created_cb.Run(nullptr, error_message); 91 bound_cdm_created_cb.Run(nullptr, error_message);
90 return; 92 return;
91 } 93 }
92 94
93 // Success! 95 // Success!
94 bound_cdm_created_cb.Run(cdm, ""); 96 bound_cdm_created_cb.Run(cdm, "");
95 } 97 }
96 98
97 } // namespace media 99 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/android_cdm_factory.h ('k') | media/base/android/media_drm_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698