| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//media/media_options.gni") | 5 import("//media/media_options.gni") |
| 6 import("//services/catalog/public/tools/catalog.gni") | 6 import("//services/catalog/public/tools/catalog.gni") |
| 7 import("//services/service_manager/public/cpp/service.gni") | 7 import("//services/service_manager/public/cpp/service.gni") |
| 8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
| 9 import("//services/service_manager/public/tools/test/service_test.gni") | 9 import("//services/service_manager/public/tools/test/service_test.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 foreach(service, mojo_media_services) { | 22 foreach(service, mojo_media_services) { |
| 23 if (service == "renderer") { | 23 if (service == "renderer") { |
| 24 defines += [ "ENABLE_MOJO_RENDERER" ] | 24 defines += [ "ENABLE_MOJO_RENDERER" ] |
| 25 mojo_renderer_enabled = true | 25 mojo_renderer_enabled = true |
| 26 } else if (service == "cdm") { | 26 } else if (service == "cdm") { |
| 27 defines += [ "ENABLE_MOJO_CDM" ] | 27 defines += [ "ENABLE_MOJO_CDM" ] |
| 28 } else if (service == "audio_decoder") { | 28 } else if (service == "audio_decoder") { |
| 29 defines += [ "ENABLE_MOJO_AUDIO_DECODER" ] | 29 defines += [ "ENABLE_MOJO_AUDIO_DECODER" ] |
| 30 } else if (service == "video_decoder") { | 30 } else if (service == "video_decoder") { |
| 31 defines += [ "ENABLE_MOJO_VIDEO_DECODER" ] | 31 defines += [ "ENABLE_MOJO_VIDEO_DECODER" ] |
| 32 } else if (service == "demuxer") { |
| 33 defines += [ "ENABLE_MOJO_DEMUXER" ] |
| 32 } else { | 34 } else { |
| 33 assert(false, "Invalid mojo media service: $service") | 35 assert(false, "Invalid mojo media service: $service") |
| 34 } | 36 } |
| 35 } | 37 } |
| 36 assert( | 38 assert( |
| 37 mojo_renderer_enabled || !enable_runtime_media_renderer_selection, | 39 mojo_renderer_enabled || !enable_runtime_media_renderer_selection, |
| 38 "The mojo renderer must be enabled to use runtime media renderer selecti
on.") | 40 "The mojo renderer must be enabled to use runtime media renderer selecti
on.") |
| 39 | 41 |
| 40 if (mojo_media_host == "browser") { | 42 if (mojo_media_host == "browser") { |
| 41 defines += [ "ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS" ] | 43 defines += [ "ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS" ] |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 "mojo_audio_renderer_sink_adapter.cc", | 84 "mojo_audio_renderer_sink_adapter.cc", |
| 83 "mojo_audio_renderer_sink_adapter.h", | 85 "mojo_audio_renderer_sink_adapter.h", |
| 84 "mojo_cdm_allocator.cc", | 86 "mojo_cdm_allocator.cc", |
| 85 "mojo_cdm_allocator.h", | 87 "mojo_cdm_allocator.h", |
| 86 "mojo_cdm_promise.cc", | 88 "mojo_cdm_promise.cc", |
| 87 "mojo_cdm_promise.h", | 89 "mojo_cdm_promise.h", |
| 88 "mojo_cdm_service.cc", | 90 "mojo_cdm_service.cc", |
| 89 "mojo_cdm_service.h", | 91 "mojo_cdm_service.h", |
| 90 "mojo_cdm_service_context.cc", | 92 "mojo_cdm_service_context.cc", |
| 91 "mojo_cdm_service_context.h", | 93 "mojo_cdm_service_context.h", |
| 94 "mojo_data_source_adapter.cc", |
| 95 "mojo_data_source_adapter.h", |
| 92 "mojo_decryptor_service.cc", | 96 "mojo_decryptor_service.cc", |
| 93 "mojo_decryptor_service.h", | 97 "mojo_decryptor_service.h", |
| 98 "mojo_demuxer_service.cc", |
| 99 "mojo_demuxer_service.h", |
| 100 "mojo_demuxer_service_context.cc", |
| 101 "mojo_demuxer_service_context.h", |
| 94 "mojo_demuxer_stream_adapter.cc", | 102 "mojo_demuxer_stream_adapter.cc", |
| 95 "mojo_demuxer_stream_adapter.h", | 103 "mojo_demuxer_stream_adapter.h", |
| 96 "mojo_media_client.cc", | 104 "mojo_media_client.cc", |
| 97 "mojo_media_client.h", | 105 "mojo_media_client.h", |
| 98 "mojo_provision_fetcher.cc", | 106 "mojo_provision_fetcher.cc", |
| 99 "mojo_provision_fetcher.h", | 107 "mojo_provision_fetcher.h", |
| 100 "mojo_renderer_service.cc", | 108 "mojo_renderer_service.cc", |
| 101 "mojo_renderer_service.h", | 109 "mojo_renderer_service.h", |
| 110 "mojo_source_buffer_service.cc", |
| 111 "mojo_source_buffer_service.h", |
| 102 "mojo_video_decoder_service.cc", | 112 "mojo_video_decoder_service.cc", |
| 103 "mojo_video_decoder_service.h", | 113 "mojo_video_decoder_service.h", |
| 104 "mojo_video_renderer_sink_adapter.cc", | 114 "mojo_video_renderer_sink_adapter.cc", |
| 105 "mojo_video_renderer_sink_adapter.h", | 115 "mojo_video_renderer_sink_adapter.h", |
| 106 "strong_binding_set.h", | 116 "strong_binding_set.h", |
| 107 "test_mojo_media_client.cc", | 117 "test_mojo_media_client.cc", |
| 108 "test_mojo_media_client.h", | 118 "test_mojo_media_client.h", |
| 109 "utility_mojo_media_client.cc", | 119 "utility_mojo_media_client.cc", |
| 110 "utility_mojo_media_client.h", | 120 "utility_mojo_media_client.h", |
| 111 ] | 121 ] |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 | 238 |
| 229 catalog("media_service_unittests_catalog") { | 239 catalog("media_service_unittests_catalog") { |
| 230 embedded_services = [ ":test_manifest" ] | 240 embedded_services = [ ":test_manifest" ] |
| 231 standalone_services = [ ":media_manifest" ] | 241 standalone_services = [ ":media_manifest" ] |
| 232 } | 242 } |
| 233 | 243 |
| 234 catalog("media_pipeline_integration_unittests_catalog") { | 244 catalog("media_pipeline_integration_unittests_catalog") { |
| 235 embedded_services = [ ":pipeline_test_manifest" ] | 245 embedded_services = [ ":pipeline_test_manifest" ] |
| 236 standalone_services = [ ":media_manifest" ] | 246 standalone_services = [ ":media_manifest" ] |
| 237 } | 247 } |
| OLD | NEW |