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

Side by Side Diff: android_webview/renderer/aw_key_systems.cc

Issue 1106263004: Support Android secure codecs in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include build_config.h. Created 5 years, 7 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 | « no previous file | chrome/renderer/media/chrome_key_systems.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "android_webview/renderer/aw_key_systems.h" 5 #include "android_webview/renderer/aw_key_systems.h"
6 #include "components/cdm/renderer/android_key_systems.h" 6 #include "components/cdm/renderer/android_key_systems.h"
7 7
8 namespace android_webview { 8 namespace android_webview {
9 9
10 void AwAddKeySystems( 10 void AwAddKeySystems(
11 std::vector<media::KeySystemInfo>* key_systems_info) { 11 std::vector<media::KeySystemInfo>* key_systems_info) {
12 // TODO(sandersd): Non-compositing support depends on the 12 cdm::AddAndroidWidevine(key_systems_info);
13 // use_video_overlay_for_embedded_encrypted_video pref, which may differ per
14 // WebContents. For now, err on the side of registering support.
15 // http://crbug.com/467779
16 cdm::AddAndroidWidevine(key_systems_info, true);
17 cdm::AddAndroidPlatformKeySystems(key_systems_info); 13 cdm::AddAndroidPlatformKeySystems(key_systems_info);
18 } 14 }
19 15
20 } // namespace android_webview 16 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/media/chrome_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698