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

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

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ScopedVector Created 5 years, 11 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 7332bf951b22eb71ffab965bd9dad714bcd20adc..cb3c0fea75a3a4ac9f90705c1f530260b63ecaf4 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(media::CdmKeyInformation* input);
xhwang 2015/01/05 22:53:15 For input-only param we should use const-ref per s
jrummell 2015/01/06 02:36:25 Done.
+};
+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_

Powered by Google App Engine
This is Rietveld 408576698