| 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 "key_system_config_selector.h" | 5 #include "key_system_config_selector.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 274 } |
| 275 | 275 |
| 276 bool KeySystemConfigSelector::IsSupportedContentType( | 276 bool KeySystemConfigSelector::IsSupportedContentType( |
| 277 const std::string& key_system, | 277 const std::string& key_system, |
| 278 EmeMediaType media_type, | 278 EmeMediaType media_type, |
| 279 const std::string& container_mime_type, | 279 const std::string& container_mime_type, |
| 280 const std::string& codecs, | 280 const std::string& codecs, |
| 281 KeySystemConfigSelector::ConfigState* config_state) { | 281 KeySystemConfigSelector::ConfigState* config_state) { |
| 282 // TODO(sandersd): Move contentType parsing from Blink to here so that invalid | 282 // TODO(sandersd): Move contentType parsing from Blink to here so that invalid |
| 283 // parameters can be rejected. http://crbug.com/417561 | 283 // parameters can be rejected. http://crbug.com/417561 |
| 284 std::string container_lower = base::StringToLowerASCII(container_mime_type); | 284 std::string container_lower = base::ToLowerASCII(container_mime_type); |
| 285 | 285 |
| 286 // Check that |container_mime_type| is supported by Chrome. | 286 // Check that |container_mime_type| is supported by Chrome. |
| 287 if (!media::IsSupportedMediaMimeType(container_lower)) | 287 if (!media::IsSupportedMediaMimeType(container_lower)) |
| 288 return false; | 288 return false; |
| 289 | 289 |
| 290 // Check that |codecs| are supported by Chrome. This is done primarily to | 290 // Check that |codecs| are supported by Chrome. This is done primarily to |
| 291 // validate extended codecs, but it also ensures that the CDM cannot support | 291 // validate extended codecs, but it also ensures that the CDM cannot support |
| 292 // codecs that Chrome does not (which could complicate the robustness | 292 // codecs that Chrome does not (which could complicate the robustness |
| 293 // algorithm). | 293 // algorithm). |
| 294 std::vector<std::string> codec_vector; | 294 std::vector<std::string> codec_vector; |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 | 777 |
| 778 void KeySystemConfigSelector::OnPermissionResult( | 778 void KeySystemConfigSelector::OnPermissionResult( |
| 779 scoped_ptr<SelectionRequest> request, | 779 scoped_ptr<SelectionRequest> request, |
| 780 bool is_permission_granted) { | 780 bool is_permission_granted) { |
| 781 request->was_permission_requested = true; | 781 request->was_permission_requested = true; |
| 782 request->is_permission_granted = is_permission_granted; | 782 request->is_permission_granted = is_permission_granted; |
| 783 SelectConfigInternal(request.Pass()); | 783 SelectConfigInternal(request.Pass()); |
| 784 } | 784 } |
| 785 | 785 |
| 786 } // namespace media | 786 } // namespace media |
| OLD | NEW |