Index: media/mojo/common/media_type_converters.h |
diff --git a/media/mojo/common/media_type_converters.h b/media/mojo/common/media_type_converters.h |
index 10b4d3e249273e7ccf5527ab3b693f4da8547835..0fea86a84841c24c54c0f1bcecd144521117e293 100644 |
--- a/media/mojo/common/media_type_converters.h |
+++ b/media/mojo/common/media_type_converters.h |
@@ -30,129 +30,126 @@ struct SubsampleEntry; |
namespace mojo { |
template <> |
-struct TypeConverter<media::interfaces::EncryptionSchemePtr, |
+struct TypeConverter<media::mojom::EncryptionSchemePtr, |
media::EncryptionScheme> { |
- static media::interfaces::EncryptionSchemePtr Convert( |
+ static media::mojom::EncryptionSchemePtr Convert( |
const media::EncryptionScheme& input); |
}; |
template <> |
struct TypeConverter<media::EncryptionScheme, |
- media::interfaces::EncryptionSchemePtr> { |
+ media::mojom::EncryptionSchemePtr> { |
static media::EncryptionScheme Convert( |
- const media::interfaces::EncryptionSchemePtr& input); |
+ const media::mojom::EncryptionSchemePtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::SubsampleEntryPtr, |
- media::SubsampleEntry> { |
- static media::interfaces::SubsampleEntryPtr Convert( |
+struct TypeConverter<media::mojom::SubsampleEntryPtr, media::SubsampleEntry> { |
+ static media::mojom::SubsampleEntryPtr Convert( |
const media::SubsampleEntry& input); |
}; |
template <> |
-struct TypeConverter<media::SubsampleEntry, |
- media::interfaces::SubsampleEntryPtr> { |
+struct TypeConverter<media::SubsampleEntry, media::mojom::SubsampleEntryPtr> { |
static media::SubsampleEntry Convert( |
- const media::interfaces::SubsampleEntryPtr& input); |
+ const media::mojom::SubsampleEntryPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::DecryptConfigPtr, |
- media::DecryptConfig> { |
- static media::interfaces::DecryptConfigPtr Convert( |
+struct TypeConverter<media::mojom::DecryptConfigPtr, media::DecryptConfig> { |
+ static media::mojom::DecryptConfigPtr Convert( |
const media::DecryptConfig& input); |
}; |
template <> |
struct TypeConverter<std::unique_ptr<media::DecryptConfig>, |
- media::interfaces::DecryptConfigPtr> { |
+ media::mojom::DecryptConfigPtr> { |
static std::unique_ptr<media::DecryptConfig> Convert( |
- const media::interfaces::DecryptConfigPtr& input); |
+ const media::mojom::DecryptConfigPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::DecoderBufferPtr, |
+struct TypeConverter<media::mojom::DecoderBufferPtr, |
scoped_refptr<media::DecoderBuffer>> { |
- static media::interfaces::DecoderBufferPtr Convert( |
+ static media::mojom::DecoderBufferPtr Convert( |
const scoped_refptr<media::DecoderBuffer>& input); |
}; |
template <> |
struct TypeConverter<scoped_refptr<media::DecoderBuffer>, |
- media::interfaces::DecoderBufferPtr> { |
+ media::mojom::DecoderBufferPtr> { |
static scoped_refptr<media::DecoderBuffer> Convert( |
- const media::interfaces::DecoderBufferPtr& input); |
+ const media::mojom::DecoderBufferPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::AudioDecoderConfigPtr, |
+struct TypeConverter<media::mojom::AudioDecoderConfigPtr, |
media::AudioDecoderConfig> { |
- static media::interfaces::AudioDecoderConfigPtr Convert( |
+ static media::mojom::AudioDecoderConfigPtr Convert( |
const media::AudioDecoderConfig& input); |
}; |
template <> |
struct TypeConverter<media::AudioDecoderConfig, |
- media::interfaces::AudioDecoderConfigPtr> { |
+ media::mojom::AudioDecoderConfigPtr> { |
static media::AudioDecoderConfig Convert( |
- const media::interfaces::AudioDecoderConfigPtr& input); |
+ const media::mojom::AudioDecoderConfigPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::VideoDecoderConfigPtr, |
+struct TypeConverter<media::mojom::VideoDecoderConfigPtr, |
media::VideoDecoderConfig> { |
- static media::interfaces::VideoDecoderConfigPtr Convert( |
+ static media::mojom::VideoDecoderConfigPtr Convert( |
const media::VideoDecoderConfig& input); |
}; |
template <> |
struct TypeConverter<media::VideoDecoderConfig, |
- media::interfaces::VideoDecoderConfigPtr> { |
+ media::mojom::VideoDecoderConfigPtr> { |
static media::VideoDecoderConfig Convert( |
- const media::interfaces::VideoDecoderConfigPtr& input); |
+ const media::mojom::VideoDecoderConfigPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::CdmKeyInformationPtr, |
+struct TypeConverter<media::mojom::CdmKeyInformationPtr, |
media::CdmKeyInformation> { |
- static media::interfaces::CdmKeyInformationPtr Convert( |
+ static media::mojom::CdmKeyInformationPtr Convert( |
const media::CdmKeyInformation& input); |
}; |
template <> |
struct TypeConverter<std::unique_ptr<media::CdmKeyInformation>, |
- media::interfaces::CdmKeyInformationPtr> { |
+ media::mojom::CdmKeyInformationPtr> { |
static std::unique_ptr<media::CdmKeyInformation> Convert( |
- const media::interfaces::CdmKeyInformationPtr& input); |
+ const media::mojom::CdmKeyInformationPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::CdmConfigPtr, media::CdmConfig> { |
- static media::interfaces::CdmConfigPtr Convert(const media::CdmConfig& input); |
+struct TypeConverter<media::mojom::CdmConfigPtr, media::CdmConfig> { |
+ static media::mojom::CdmConfigPtr Convert(const media::CdmConfig& input); |
}; |
template <> |
-struct TypeConverter<media::CdmConfig, media::interfaces::CdmConfigPtr> { |
- static media::CdmConfig Convert(const media::interfaces::CdmConfigPtr& input); |
+struct TypeConverter<media::CdmConfig, media::mojom::CdmConfigPtr> { |
+ static media::CdmConfig Convert(const media::mojom::CdmConfigPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::AudioBufferPtr, |
+struct TypeConverter<media::mojom::AudioBufferPtr, |
scoped_refptr<media::AudioBuffer>> { |
- static media::interfaces::AudioBufferPtr Convert( |
+ static media::mojom::AudioBufferPtr Convert( |
const scoped_refptr<media::AudioBuffer>& input); |
}; |
template <> |
struct TypeConverter<scoped_refptr<media::AudioBuffer>, |
- media::interfaces::AudioBufferPtr> { |
+ media::mojom::AudioBufferPtr> { |
static scoped_refptr<media::AudioBuffer> Convert( |
- const media::interfaces::AudioBufferPtr& input); |
+ const media::mojom::AudioBufferPtr& input); |
}; |
template <> |
-struct TypeConverter<media::interfaces::VideoFramePtr, |
+struct TypeConverter<media::mojom::VideoFramePtr, |
scoped_refptr<media::VideoFrame>> { |
- static media::interfaces::VideoFramePtr Convert( |
+ static media::mojom::VideoFramePtr Convert( |
const scoped_refptr<media::VideoFrame>& input); |
}; |
template <> |
struct TypeConverter<scoped_refptr<media::VideoFrame>, |
- media::interfaces::VideoFramePtr> { |
+ media::mojom::VideoFramePtr> { |
static scoped_refptr<media::VideoFrame> Convert( |
- const media::interfaces::VideoFramePtr& input); |
+ const media::mojom::VideoFramePtr& input); |
}; |
} // namespace mojo |