| Index: media/mojo/services/media_type_converters.h
|
| diff --git a/media/mojo/services/media_type_converters.h b/media/mojo/services/media_type_converters.h
|
| index 7332bf951b22eb71ffab965bd9dad714bcd20adc..14a4562701fa12ada789c0d68c7c944c882554ff 100644
|
| --- a/media/mojo/services/media_type_converters.h
|
| +++ b/media/mojo/services/media_type_converters.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "media/mojo/interfaces/content_decryption_module.mojom.h"
|
| #include "media/mojo/interfaces/media_types.mojom.h"
|
|
|
| namespace media {
|
| @@ -15,6 +16,7 @@ class VideoDecoderConfig;
|
| class DecoderBuffer;
|
| class DecryptConfig;
|
| struct SubsampleEntry;
|
| +struct CdmKeyInformation;
|
| }
|
|
|
| namespace mojo {
|
| @@ -69,6 +71,17 @@ struct TypeConverter<media::VideoDecoderConfig, VideoDecoderConfigPtr> {
|
| static media::VideoDecoderConfig Convert(const VideoDecoderConfigPtr& input);
|
| };
|
|
|
| +template <>
|
| +struct TypeConverter<CdmKeyInformationPtr, media::CdmKeyInformation> {
|
| + static CdmKeyInformationPtr Convert(const media::CdmKeyInformation& input);
|
| +};
|
| +template <>
|
| +struct TypeConverter<scoped_ptr<media::CdmKeyInformation>,
|
| + CdmKeyInformationPtr> {
|
| + static scoped_ptr<media::CdmKeyInformation> Convert(
|
| + const CdmKeyInformationPtr& input);
|
| +};
|
| +
|
| } // namespace mojo
|
|
|
| #endif // MEDIA_MOJO_SERVICES_MEDIA_TYPE_CONVERTERS_H_
|
|
|