| Index: chromecast/media/media.gyp
|
| diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
|
| index 86879e5b24ad9658e7c27f0f9d127a0a52760e7b..0adf9ac66264640b855d583e30cb677791226ff2 100644
|
| --- a/chromecast/media/media.gyp
|
| +++ b/chromecast/media/media.gyp
|
| @@ -89,6 +89,8 @@
|
| '../..',
|
| ],
|
| 'sources': [
|
| + 'cma/base/backend_client_callbacks.cc',
|
| + 'cma/base/backend_client_callbacks.h',
|
| 'cma/base/balanced_media_task_runner_factory.cc',
|
| 'cma/base/balanced_media_task_runner_factory.h',
|
| 'cma/base/buffering_controller.cc',
|
| @@ -104,10 +106,12 @@
|
| 'cma/base/coded_frame_provider.h',
|
| 'cma/base/decoder_buffer_adapter.cc',
|
| 'cma/base/decoder_buffer_adapter.h',
|
| - 'cma/base/decoder_buffer_base.cc',
|
| - 'cma/base/decoder_buffer_base.h',
|
| + 'cma/base/decoder_buffer_impl.cc',
|
| + 'cma/base/decoder_buffer_impl.h',
|
| 'cma/base/decoder_config_adapter.cc',
|
| 'cma/base/decoder_config_adapter.h',
|
| + 'cma/base/decrypt_config_impl.cc',
|
| + 'cma/base/decrypt_config_impl.h',
|
| 'cma/base/media_task_runner.cc',
|
| 'cma/base/media_task_runner.h',
|
| 'cma/base/simple_media_task_runner.cc',
|
| @@ -115,52 +119,26 @@
|
| ],
|
| },
|
| {
|
| - 'target_name': 'cma_backend',
|
| + 'target_name': 'default_cma_backend',
|
| 'type': '<(component)',
|
| 'dependencies': [
|
| - 'cma_base',
|
| - 'media_base',
|
| + '../chromecast.gyp:cast_base',
|
| '../../base/base.gyp:base',
|
| - '../../media/media.gyp:media',
|
| ],
|
| 'include_dirs': [
|
| '../..',
|
| ],
|
| 'sources': [
|
| - 'cma/backend/audio_pipeline_device.cc',
|
| - 'cma/backend/audio_pipeline_device.h',
|
| 'cma/backend/audio_pipeline_device_default.cc',
|
| 'cma/backend/audio_pipeline_device_default.h',
|
| - 'cma/backend/media_clock_device.cc',
|
| - 'cma/backend/media_clock_device.h',
|
| 'cma/backend/media_clock_device_default.cc',
|
| 'cma/backend/media_clock_device_default.h',
|
| - 'cma/backend/media_component_device.cc',
|
| - 'cma/backend/media_component_device.h',
|
| 'cma/backend/media_component_device_default.cc',
|
| 'cma/backend/media_component_device_default.h',
|
| - 'cma/backend/media_pipeline_device.cc',
|
| - 'cma/backend/media_pipeline_device.h',
|
| - 'cma/backend/media_pipeline_device_factory.h',
|
| - 'cma/backend/media_pipeline_device_factory_default.cc',
|
| - 'cma/backend/media_pipeline_device_factory_default.h',
|
| - 'cma/backend/media_pipeline_device_params.cc',
|
| - 'cma/backend/media_pipeline_device_params.h',
|
| - 'cma/backend/video_pipeline_device.cc',
|
| + 'cma/backend/media_pipeline_backend_default.cc',
|
| + 'cma/backend/media_pipeline_backend_default.h',
|
| 'cma/backend/video_pipeline_device_default.cc',
|
| 'cma/backend/video_pipeline_device_default.h',
|
| - 'cma/backend/video_pipeline_device.h',
|
| - ],
|
| - 'conditions': [
|
| - ['chromecast_branding=="Chrome"', {
|
| - 'dependencies': [
|
| - '../internal/chromecast_internal.gyp:cma_backend_internal',
|
| - ],
|
| - }, {
|
| - 'sources': [
|
| - 'cma/backend/media_pipeline_device_factory_simple.cc'
|
| - ],
|
| - }],
|
| ],
|
| },
|
| {
|
| @@ -205,7 +183,6 @@
|
| 'target_name': 'cma_pipeline',
|
| 'type': '<(component)',
|
| 'dependencies': [
|
| - 'cma_backend',
|
| 'cma_base',
|
| 'media_base',
|
| 'media_cdm',
|
| @@ -260,12 +237,12 @@
|
| 'target_name': 'cast_media',
|
| 'type': 'none',
|
| 'dependencies': [
|
| - 'cma_backend',
|
| 'cma_base',
|
| 'cma_filters',
|
| 'cma_ipc',
|
| 'cma_ipc_streamer',
|
| 'cma_pipeline',
|
| + 'default_cma_backend',
|
| 'media_cdm',
|
| ],
|
| },
|
| @@ -321,7 +298,8 @@
|
| 'target_name': 'libcast_media_1.0',
|
| 'type': 'shared_library',
|
| 'dependencies': [
|
| - '../../chromecast/chromecast.gyp:cast_public_api'
|
| + '../../chromecast/chromecast.gyp:cast_public_api',
|
| + 'default_cma_backend'
|
| ],
|
| 'include_dirs': [
|
| '../..',
|
|
|