Index: media/mojo/interfaces/media_types.typemap |
diff --git a/media/mojo/interfaces/media_types.typemap b/media/mojo/interfaces/media_types.typemap |
index b6a56ecd150a152363fbaafa25e57f563a4633b2..2f554f228ca37f46a30579844be144902eb7e018 100644 |
--- a/media/mojo/interfaces/media_types.typemap |
+++ b/media/mojo/interfaces/media_types.typemap |
@@ -7,16 +7,32 @@ mojom = "//media/mojo/interfaces/media_types.mojom" |
public_headers = [ |
"//media/base/buffering_state.h", |
"//media/base/subsample_entry.h", |
+ "//media/base/video_capture_types.h", |
] |
-traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ] |
+traits_headers = [ |
+ "//media/base/ipc/media_param_traits_macros.h", |
+ "//media/mojo/interfaces/media_types_typemap_traits.h", |
+] |
+ |
+sources = [ |
+ "//media/mojo/interfaces/media_types_typemap_traits.cc", |
+] |
deps = [ |
"//media", |
"//media/base/ipc", |
+ "//media/capture", |
xhwang
2016/10/12 18:22:37
drive-by comment: media/mojo shouldn't depend on m
Ken Rockot(use gerrit already)
2016/10/12 18:31:18
Does that mean the types being typemapped from med
xhwang
2016/10/12 18:47:25
I actually don't see any types in media/capture ar
chfremer
2016/10/12 20:07:42
I feel there is value in having the Mojo types and
chfremer
2016/10/26 23:07:13
Done.
|
+ "//ui/gfx/geometry/mojo", |
+ "//ui/gfx/geometry/mojo:struct_traits", |
] |
type_mappings = [ |
"media.mojom.BufferingState=media::BufferingState", |
"media.mojom.SubsampleEntry=media::SubsampleEntry", |
+ "media.mojom.ResolutionChangePolicy=media::ResolutionChangePolicy", |
+ "media.mojom.PowerLineFrequency=media::PowerLineFrequency", |
+ "media.mojom.VideoCaptureFormat=media::VideoCaptureFormat", |
+ "media.mojom.VideoPixelStorage=media::VideoPixelStorage", |
+ "media.mojom.VideoCaptureParams=media::VideoCaptureParams", |
] |