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

Unified Diff: chromecast/media/media.gyp

Issue 741863002: Chromecast: adds a media pipeline feeding data to CMA device backends. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cma-cdm
Patch Set: address nits, merge Pause/Flush Created 6 years, 1 month 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 | « chromecast/media/cma/pipeline/video_pipeline_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/media.gyp
diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
index b5bd62131b9a645763807f6961f96d29f540a5f1..8c09410b8b7d4fd44db1da02564ea84a744fa1b2 100644
--- a/chromecast/media/media.gyp
+++ b/chromecast/media/media.gyp
@@ -64,6 +64,8 @@
'cma/base/balanced_media_task_runner_factory.h',
'cma/base/buffering_controller.cc',
'cma/base/buffering_controller.h',
+ 'cma/base/buffering_defs.cc',
+ 'cma/base/buffering_defs.h',
'cma/base/buffering_frame_provider.cc',
'cma/base/buffering_frame_provider.h',
'cma/base/buffering_state.cc',
@@ -158,6 +160,54 @@
],
},
{
+ 'target_name': 'cma_pipeline',
+ 'type': '<(component)',
+ 'dependencies': [
+ 'cma_backend',
+ 'cma_base',
+ 'media_base',
+ 'media_cdm',
+ '../../base/base.gyp:base',
+ '../../crypto/crypto.gyp:crypto',
+ '../../media/media.gyp:media',
+ ],
+ 'conditions': [
+ ['chromecast_branding=="Chrome"', {
+ 'dependencies': [
+ '../internal/cast_system.gyp:openssl',
+ ],
+ }, {
+ 'dependencies': [
+ '../../third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ }],
+ ],
+ 'sources': [
+ 'cma/pipeline/audio_pipeline.cc',
+ 'cma/pipeline/audio_pipeline.h',
+ 'cma/pipeline/audio_pipeline_impl.cc',
+ 'cma/pipeline/audio_pipeline_impl.h',
+ 'cma/pipeline/av_pipeline_client.cc',
+ 'cma/pipeline/av_pipeline_client.h',
+ 'cma/pipeline/av_pipeline_impl.cc',
+ 'cma/pipeline/av_pipeline_impl.h',
+ 'cma/pipeline/decrypt_util.cc',
+ 'cma/pipeline/decrypt_util.h',
+ 'cma/pipeline/load_type.h',
+ 'cma/pipeline/media_pipeline.h',
+ 'cma/pipeline/media_pipeline_client.cc',
+ 'cma/pipeline/media_pipeline_client.h',
+ 'cma/pipeline/media_pipeline_impl.cc',
+ 'cma/pipeline/media_pipeline_impl.h',
+ 'cma/pipeline/video_pipeline.cc',
+ 'cma/pipeline/video_pipeline.h',
+ 'cma/pipeline/video_pipeline_client.cc',
+ 'cma/pipeline/video_pipeline_client.h',
+ 'cma/pipeline/video_pipeline_impl.cc',
+ 'cma/pipeline/video_pipeline_impl.h',
+ ],
+ },
+ {
'target_name': 'cma_filters',
'type': '<(component)',
'dependencies': [
@@ -179,6 +229,7 @@
'cma_filters',
'cma_ipc',
'cma_ipc_streamer',
+ 'cma_pipeline',
'media_cdm',
],
},
@@ -205,6 +256,7 @@
'cma/ipc/media_message_fifo_unittest.cc',
'cma/ipc/media_message_unittest.cc',
'cma/ipc_streamer/av_streamer_unittest.cc',
+ 'cma/pipeline/audio_video_pipeline_impl_unittest.cc',
'cma/test/frame_generator_for_test.cc',
'cma/test/frame_generator_for_test.h',
'cma/test/frame_segmenter_for_test.cc',
« no previous file with comments | « chromecast/media/cma/pipeline/video_pipeline_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698