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/renderer/widevine_key_systems.h" | 5 #include "components/cdm/renderer/widevine_key_systems.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 // TODO(sandersd): Violates DEPS. | |
ddorwin
2014/09/13 01:20:44
Didn't you fix this?
sandersd (OOO until July 31)
2014/09/22 23:45:52
Done.
| |
12 #include "content/public/common/eme_codec.h" | |
13 #include "content/public/common/eme_init_data_type.h" | |
11 | 14 |
12 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 15 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
13 | 16 |
14 #if defined(WIDEVINE_CDM_AVAILABLE) | 17 #if defined(WIDEVINE_CDM_AVAILABLE) |
15 | 18 |
16 using content::KeySystemInfo; | 19 using content::KeySystemInfo; |
17 using content::SupportedCodecs; | 20 using content::SupportedCodecs; |
18 | 21 |
19 namespace cdm { | 22 namespace cdm { |
20 | 23 |
(...skipping 21 matching lines...) Expand all Loading... | |
42 #endif // defined(OS_ANDROID) | 45 #endif // defined(OS_ANDROID) |
43 default: | 46 default: |
44 NOTREACHED(); | 47 NOTREACHED(); |
45 } | 48 } |
46 | 49 |
47 // TODO(xhwang): A container or an initDataType may be supported even though | 50 // TODO(xhwang): A container or an initDataType may be supported even though |
48 // there are no codecs supported in that container. Fix this when we support | 51 // there are no codecs supported in that container. Fix this when we support |
49 // initDataType. | 52 // initDataType. |
50 info.supported_codecs = supported_codecs; | 53 info.supported_codecs = supported_codecs; |
51 | 54 |
55 info.supported_init_data_types = (content::EME_INIT_DATA_TYPE_CENC | | |
ddorwin
2014/09/13 01:20:44
Note that the general logic will filter out unsupp
sandersd (OOO until July 31)
2014/09/22 23:45:52
Done.
| |
56 content::EME_INIT_DATA_TYPE_WEBM); | |
57 | |
52 #if defined(ENABLE_PEPPER_CDMS) | 58 #if defined(ENABLE_PEPPER_CDMS) |
53 info.pepper_type = kWidevineCdmPluginMimeType; | 59 info.pepper_type = kWidevineCdmPluginMimeType; |
54 #endif // defined(ENABLE_PEPPER_CDMS) | 60 #endif // defined(ENABLE_PEPPER_CDMS) |
55 | 61 |
56 concrete_key_systems->push_back(info); | 62 concrete_key_systems->push_back(info); |
57 } | 63 } |
58 | 64 |
59 } // namespace cdm | 65 } // namespace cdm |
60 | 66 |
61 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 67 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
OLD | NEW |