Chromium Code Reviews| Index: content/public/common/cdm_info.h |
| diff --git a/content/public/common/cdm_info.h b/content/public/common/cdm_info.h |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..a6097d32c355a3c831ef3933d4f5b5be723c7b2c |
| --- /dev/null |
| +++ b/content/public/common/cdm_info.h |
| @@ -0,0 +1,45 @@ |
| +// Copyright 2016 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| + |
| +#ifndef CONTENT_PUBLIC_COMMON_CDM_INFO_H_ |
| +#define CONTENT_PUBLIC_COMMON_CDM_INFO_H_ |
| + |
| +#include <string> |
| +#include <vector> |
| + |
| +#include "base/files/file_path.h" |
| +#include "base/strings/string16.h" |
|
ddorwin
2016/03/18 19:24:18
Don't use string16.
jrummell
2016/03/23 21:38:10
Done.
|
| +#include "content/common/content_export.h" |
| + |
| +namespace content { |
| + |
| +// Collects information about Content Decryption Modules. |
|
ddorwin
2016/03/18 19:24:18
An object does not perform actions. Contains? Repr
jrummell
2016/03/23 21:38:10
Done.
|
| +struct CONTENT_EXPORT CdmInfo { |
| + // Identifier for the CDM. |
| + std::string cdm_id; |
|
ddorwin
2016/03/18 19:24:18
"CDM ID" is already overloaded. For example, in Cd
xhwang
2016/03/18 19:35:38
What is this for?
If we need this, we are already
jrummell
2016/03/23 21:38:09
Renamed.
|
| + |
| + // Version of the CDM. |
|
ddorwin
2016/03/18 19:24:18
May be empty.
(Pretty much everywhere except desk
jrummell
2016/03/23 21:38:09
Done.
|
| + std::string version; |
|
xhwang
2016/03/18 19:35:38
use base::Version?
jrummell
2016/03/23 21:38:09
Done.
|
| + |
| + // Path to the library implementing the CDM. May be empty() if the |
|
ddorwin
2016/03/18 19:24:18
Remove "()".
This should probably be ifdef'd to t
jrummell
2016/03/23 21:38:09
I'd like to avoid #ifdefs.
|
| + // CDM is already included as part of the system. |
|
ddorwin
2016/03/18 19:24:18
If we don't ifdef this, we should clean up this li
jrummell
2016/03/23 21:38:09
Done.
|
| + base::FilePath module_library_path; |
|
xhwang
2016/03/18 19:35:38
nit: s/module_library_path/path?
See:
https://co
jrummell
2016/03/23 21:38:09
Done.
|
| + |
| + // List of codecs supported by the CDM. |
|
ddorwin
2016/03/18 19:24:18
How we use this information varies depending on th
jrummell
2016/03/23 21:38:09
Acknowledged.
|
| + std::vector<base::string16> supported_codecs; |
|
xhwang
2016/03/18 19:35:38
why these need to be string16 instead of string?
jrummell
2016/03/23 21:38:09
Copied from what the Pepper code for WV did. Now s
|
| + |
| + // List of init_data_types supported by the CDM. |
|
ddorwin
2016/03/18 19:24:18
s/init_data_types/Initialization Data Types/
jrummell
2016/03/23 21:38:09
Removed since we aren't using this yet.
|
| + std::vector<base::string16> supported_init_data_types; |
|
xhwang
2016/03/18 19:35:38
Are we using these init_data_types in this CL? If
jrummell
2016/03/23 21:38:10
Done.
|
| + |
| + CdmInfo(const std::string& cdm_id, |
| + const std::string& version, |
| + const base::FilePath& module_library_path, |
|
ddorwin
2016/03/18 19:24:18
The reordering suggestion above would complicate t
jrummell
2016/03/23 21:38:10
Acknowledged.
|
| + const std::vector<base::string16>& supported_codecs, |
| + const std::vector<base::string16>& supported_init_data_types); |
| + ~CdmInfo(); |
|
xhwang
2016/03/18 19:35:38
Declare ctor/dtor before member variables
jrummell
2016/03/23 21:38:10
Done.
|
| +}; |
| + |
| +} // namespace content |
| + |
| +#endif // CONTENT_PUBLIC_COMMON_CDM_INFO_H_ |