summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2016-03-04 16:31:06 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-05 00:32:31 +0000
commit2ddf3b764c008dfe984af88c247a46815243ce16 (patch)
tree1050db56f2d9a04d7703db67cd510a64e6808372 /content/content_common.gypi
parent1f571c732fde129c7f9fdb366dbc7ed513541af1 (diff)
downloadchromium_src-2ddf3b764c008dfe984af88c247a46815243ce16.zip
chromium_src-2ddf3b764c008dfe984af88c247a46815243ce16.tar.gz
chromium_src-2ddf3b764c008dfe984af88c247a46815243ce16.tar.bz2
Decouple Media Service
This CL moves media object creation IPCs into a separate MediaChannel object that lives above GpuChannel. content/gpu (or mus in the future) becomes the layer that lives above both gpu and media and glues the two together. This may not reflect what a hypothetical future mojo interface might look like. If we want to preserve the ordering guarantees we have now, media interfaces should be associated interfaces that branch off a gpu channel and its gpu interfaces. This seems to suggest that gpu should know about media or else there should exist a factory interface that glues both media and gpu as we have here. I don't want to block this CL on long term mojo interface discussions as any direction we choose is just a refactor away. Until then, in the interest of making forward progress, I'd like to assume there exists a layer above both media and gpu. Thoughts? BUG=586384 Committed: https://crrev.com/028d76aa627788a7252fd6de39304f67e00837ab Cr-Commit-Position: refs/heads/master@{#379211} Review URL: https://codereview.chromium.org/1736643005 Cr-Commit-Position: refs/heads/master@{#379411}
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi10
1 files changed, 8 insertions, 2 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e472b9f..0400de3 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -414,8 +414,8 @@
'common/gpu/image_transport_surface_overlay_mac.h',
'common/gpu/image_transport_surface_overlay_mac.mm',
'common/gpu/image_transport_surface_win.cc',
- 'common/gpu/media_messages.cc',
- 'common/gpu/media_messages.h',
+ 'common/gpu/media/create_video_encoder_params.cc',
+ 'common/gpu/media/create_video_encoder_params.h',
'common/gpu/media/fake_video_decode_accelerator.cc',
'common/gpu/media/fake_video_decode_accelerator.h',
'common/gpu/media/gpu_jpeg_decode_accelerator.cc',
@@ -426,6 +426,12 @@
'common/gpu/media/gpu_video_decode_accelerator.h',
'common/gpu/media/gpu_video_encode_accelerator.cc',
'common/gpu/media/gpu_video_encode_accelerator.h',
+ 'common/gpu/media/media_channel.cc',
+ 'common/gpu/media/media_channel.h',
+ 'common/gpu/media/media_messages.cc',
+ 'common/gpu/media/media_messages.h',
+ 'common/gpu/media/media_service.cc',
+ 'common/gpu/media/media_service.h',
'common/gpu/stream_texture_android.cc',
'common/gpu/stream_texture_android.h',
'common/host_discardable_shared_memory_manager.cc',