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

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

Issue 1786733004: Revert of media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « media/media.gyp ('k') | media/mojo/common/media_type_converters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6b5664b978e3399efb9c57e6b713c4fa8b68ff09..50cc30b8054516f464ff33fe4ef4aa6de012b29a 100644
--- a/media/mojo/common/media_type_converters.h
+++ b/media/mojo/common/media_type_converters.h
@@ -16,7 +16,6 @@
class AudioDecoderConfig;
class DecoderBuffer;
class DecryptConfig;
-class EncryptionScheme;
class VideoDecoderConfig;
class VideoFrame;
struct CdmConfig;
@@ -27,19 +26,6 @@
// These are specializations of mojo::TypeConverter and have to be in the mojo
// namespace.
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,
« no previous file with comments | « media/media.gyp ('k') | media/mojo/common/media_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698