Chromium Code Reviews| Index: media/base/eme_constants.h |
| diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h |
| index 0b246709eb0ec414e4b354defdb48b0dd1f7d489..d9ef5d209024ecbfe2b9b2de9e382318feabedd3 100644 |
| --- a/media/base/eme_constants.h |
| +++ b/media/base/eme_constants.h |
| @@ -129,6 +129,15 @@ enum class EmeConfigRule { |
| // The configuration option is supported if both a distinctive identifier and |
| // persistent state are available. |
| IDENTIFIER_AND_PERSISTENCE_REQUIRED, |
| +#if defined(OS_ANDROID) |
|
ddorwin
2015/05/01 20:39:11
I think this comment block is confusing and possib
sandersd (OOO until July 31)
2015/05/01 21:57:01
Acknowledged.
|
| + // The configuration option is supported if hardware-secure video codecs are |
|
ddorwin
2015/05/01 20:39:11
remove "video"
sandersd (OOO until July 31)
2015/05/01 21:57:01
Done.
|
| + // not used. |
| + SECURE_CODECS_NOT_ALLOWED, |
| + // The configuration option is supported if only hardware-secure video codecs |
|
ddorwin
2015/05/01 20:39:11
remove "video"
sandersd (OOO until July 31)
2015/05/01 21:57:01
Done.
|
| + // are used. In this mode only secure surfaces (hole-punching) will be |
| + // functional. |
|
ddorwin
2015/05/01 20:39:11
...for video.
(or something like that)
sandersd (OOO until July 31)
2015/05/01 21:57:01
Done.
|
| + SECURE_CODECS_REQUIRED, |
| +#endif // defined(OS_ANDROID) |
| // The configuration option is supported without conditions. |
| SUPPORTED, |
| }; |