| OLD | NEW |
| 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 "components/cdm/browser/cdm_message_filter_android.h" | 5 #include "components/cdm/browser/cdm_message_filter_android.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <string> | 9 #include <string> |
| 8 #include <vector> | 10 #include <vector> |
| 9 | 11 |
| 12 #include "base/macros.h" |
| 10 #include "components/cdm/common/cdm_messages_android.h" | 13 #include "components/cdm/common/cdm_messages_android.h" |
| 11 #include "ipc/ipc_message_macros.h" | 14 #include "ipc/ipc_message_macros.h" |
| 12 #include "media/base/android/media_codec_util.h" | 15 #include "media/base/android/media_codec_util.h" |
| 13 #include "media/base/android/media_drm_bridge.h" | 16 #include "media/base/android/media_drm_bridge.h" |
| 14 | 17 |
| 15 using content::BrowserThread; | 18 using content::BrowserThread; |
| 16 using media::MediaDrmBridge; | 19 using media::MediaDrmBridge; |
| 17 using media::SupportedCodecs; | 20 using media::SupportedCodecs; |
| 18 | 21 |
| 19 namespace cdm { | 22 namespace cdm { |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 response->compositing_codecs = GetSupportedCodecs(request, true); | 115 response->compositing_codecs = GetSupportedCodecs(request, true); |
| 113 response->non_compositing_codecs = GetSupportedCodecs(request, false); | 116 response->non_compositing_codecs = GetSupportedCodecs(request, false); |
| 114 } | 117 } |
| 115 | 118 |
| 116 void CdmMessageFilterAndroid::OnGetPlatformKeySystemNames( | 119 void CdmMessageFilterAndroid::OnGetPlatformKeySystemNames( |
| 117 std::vector<std::string>* key_systems) { | 120 std::vector<std::string>* key_systems) { |
| 118 *key_systems = MediaDrmBridge::GetPlatformKeySystemNames(); | 121 *key_systems = MediaDrmBridge::GetPlatformKeySystemNames(); |
| 119 } | 122 } |
| 120 | 123 |
| 121 } // namespace cdm | 124 } // namespace cdm |
| OLD | NEW |