Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1014)

Unified Diff: media/mojo/services/media_type_converters.h

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 92450c8d6f38a18ec5d73e3f2dfdd2ea36f68db2..c13c4c99d75ea492757d697a57527c6df6b9c0cb 100644
--- a/media/mojo/services/media_type_converters.h
+++ b/media/mojo/services/media_type_converters.h
@@ -16,6 +16,7 @@ class AudioBuffer;
class AudioDecoderConfig;
class DecoderBuffer;
class DecryptConfig;
+class EncryptionScheme;
class VideoDecoderConfig;
class VideoFrame;
struct CdmConfig;
@@ -28,6 +29,19 @@ struct SubsampleEntry;
namespace mojo {
template <>
+struct TypeConverter<media::interfaces::EncryptionSchemePtr,
+ media::EncryptionScheme> {
+ static media::interfaces::EncryptionSchemePtr Convert(
+ const media::EncryptionScheme& input);
+};
+template <>
+struct TypeConverter<media::EncryptionScheme,
+ media::interfaces::EncryptionSchemePtr> {
+ static media::EncryptionScheme Convert(
+ const media::interfaces::EncryptionSchemePtr& input);
+};
+
+template <>
struct TypeConverter<media::interfaces::SubsampleEntryPtr,
media::SubsampleEntry> {
static media::interfaces::SubsampleEntryPtr Convert(

Powered by Google App Engine
This is Rietveld 408576698