Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / media.gyp

diff --git a/src/media/media.gyp b/src/media/media.gyp
index 661d5c7..8b2606a 100644 (file)
--- a/src/media/media.gyp
+++ b/src/media/media.gyp
@@ -92,8 +92,6 @@
         'audio/android/opensles_output.cc',
         'audio/android/opensles_output.h',
         'audio/android/opensles_wrapper.cc',
-        'audio/audio_buffers_state.cc',
-        'audio/audio_buffers_state.h',
         'audio/audio_device_name.cc',
         'audio/audio_device_name.h',
         'audio/audio_device_thread.cc',
@@ -123,6 +121,8 @@
         'audio/audio_output_proxy.h',
         'audio/audio_output_resampler.cc',
         'audio/audio_output_resampler.h',
+        'audio/audio_output_stream_sink.cc',
+        'audio/audio_output_stream_sink.h',
         'audio/audio_power_monitor.cc',
         'audio/audio_power_monitor.h',
         'audio/audio_source_diverter.h',
@@ -201,12 +201,6 @@
         'audio/win/wavein_input_win.h',
         'audio/win/waveout_output_win.cc',
         'audio/win/waveout_output_win.h',
-        'base/android/demuxer_android.h',
-        'base/android/demuxer_stream_player_params.cc',
-        'base/android/demuxer_stream_player_params.h',
-        'base/android/media_player_manager.h',
-        'base/android/media_resource_getter.cc',
-        'base/android/media_resource_getter.h',
         'base/audio_block_fifo.cc',
         'base/audio_block_fifo.h',
         'base/audio_buffer.cc',
@@ -255,10 +249,16 @@
         'base/buffers.h',
         'base/byte_queue.cc',
         'base/byte_queue.h',
+        'base/cdm_callback_promise.cc',
+        'base/cdm_callback_promise.h',
+        'base/cdm_factory.cc',
+        'base/cdm_factory.h',
         'base/cdm_promise.cc',
         'base/cdm_promise.h',
         'base/channel_mixer.cc',
         'base/channel_mixer.h',
+        'base/channel_mixing_matrix.cc',
+        'base/channel_mixing_matrix.h',
         'base/container_names.cc',
         'base/container_names.h',
         'base/data_buffer.cc',
@@ -281,6 +281,9 @@
         'base/demuxer_stream_provider.h',
         'base/djb2.cc',
         'base/djb2.h',
+        'base/eme_constants.h',
+        'base/key_system_info.cc',
+        'base/key_system_info.h',
         'base/keyboard_event_counter.cc',
         'base/keyboard_event_counter.h',
         'base/mac/avfoundation_glue.h',
@@ -406,6 +409,7 @@
         'filters/decrypting_video_decoder.h',
         'filters/ffmpeg_audio_decoder.cc',
         'filters/ffmpeg_audio_decoder.h',
+        'filters/ffmpeg_bitstream_converter.h',
         'filters/ffmpeg_demuxer.cc',
         'filters/ffmpeg_demuxer.h',
         'filters/ffmpeg_glue.cc',
@@ -516,6 +520,8 @@
         'video/capture/video_capture_device.h',
         'video/capture/video_capture_device_factory.cc',
         'video/capture/video_capture_device_factory.h',
+        'video/capture/video_capture_device_info.cc',
+        'video/capture/video_capture_device_info.h',
         'video/capture/video_capture_types.cc',
         'video/capture/video_capture_types.h',
         'video/capture/win/capability_list_win.cc',
@@ -599,8 +605,11 @@
             'filters/audio_file_reader.h',
             'filters/blocking_url_protocol.cc',
             'filters/blocking_url_protocol.h',
+            'filters/ffmpeg_aac_bitstream_converter.cc',
+            'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_audio_decoder.cc',
             'filters/ffmpeg_audio_decoder.h',
+            'filters/ffmpeg_bitstream_converter.h',
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
             'filters/ffmpeg_glue.cc',
@@ -931,6 +940,8 @@
         }],
         ['proprietary_codecs==1', {
           'sources': [
+            'filters/ffmpeg_aac_bitstream_converter.cc',
+            'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
             'filters/h264_to_annex_b_bitstream_converter.cc',
@@ -1028,14 +1039,16 @@
         'mojo/interfaces/media_renderer.mojom',
         'mojo/interfaces/demuxer_stream.mojom',
       ],
-      'includes': [ 
+      'includes': [
         '../mojo/public/tools/bindings/mojom_bindings_generator.gypi'
        ],
       'export_dependent_settings': [
-        '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/services/public/mojo_services_public.gyp:mojo_geometry_bindings',
       ],
       'dependencies': [
-        '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/services/public/mojo_services_public.gyp:mojo_geometry_bindings',
       ],
     },
     {
@@ -1048,9 +1061,12 @@
         'media',
         'media_mojo_bindings',
         '../base/base.gyp:base',
-        '../mojo/mojo_base.gyp:mojo_application_base',
-        '../mojo/mojo_base.gyp:mojo_application_bindings',
+        '../mojo/mojo_geometry_converters.gyp:mojo_geometry_lib',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../mojo/public/mojo_public.gyp:mojo_application_base',
+        '../mojo/public/mojo_public.gyp:mojo_application_bindings',
+        '../skia/skia.gyp:skia',
+        '../ui/gfx/gfx.gyp:gfx_geometry',
         '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
@@ -1066,7 +1082,7 @@
       ],
     },
     {
-      'target_name': 'media_mojo_renderer_app',
+      'target_name': 'mojo_media_renderer_app',
       'type': 'loadable_module',
       'includes': [
         '../mojo/mojo_variables.gypi',
@@ -1079,10 +1095,15 @@
         'shared_memory_support',
       ],
       'sources': [
+        'mojo/services/demuxer_stream_provider_shim.cc',
+        'mojo/services/demuxer_stream_provider_shim.h',
         'mojo/services/mojo_demuxer_stream_adapter.cc',
         'mojo/services/mojo_demuxer_stream_adapter.h',
         'mojo/services/mojo_renderer_service.cc',
         'mojo/services/mojo_renderer_service.h',
+        'mojo/services/renderer_config.cc',
+        'mojo/services/renderer_config.h',
+        'mojo/services/renderer_config_default.cc',
       ],
     },
     {
@@ -1095,15 +1116,15 @@
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
+        '../mojo/edk/mojo_edk.gyp:mojo_run_all_unittests',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_base.gyp:mojo_run_all_unittests',
       ],
       'sources': [
         'mojo/services/media_type_converters_unittest.cc',
       ],
     },
     {
-      'target_name': 'media_mojo_renderer_apptest',
+      'target_name': 'mojo_media_renderer_apptest',
       'type': 'loadable_module',
       'includes': [
         '../mojo/mojo_variables.gypi',
@@ -1112,8 +1133,8 @@
         'media',
         'media_mojo_bindings',
         'media_mojo_lib',
-        'media_mojo_renderer_app',
         'media_test_support',
+        'mojo_media_renderer_app',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
@@ -1123,15 +1144,15 @@
       'sources': [
         'mojo/services/renderer_unittest.cc',
       ],
-    }, 
+    },
     {
       'target_name': 'media_mojo',
       'type': 'none',
       'dependencies': [
         'media_mojo_lib',
         'media_mojo_lib_unittests',
-        'media_mojo_renderer_app',
-        'media_mojo_renderer_apptest',
+        'mojo_media_renderer_apptest',
+        'mojo_media_renderer_app',
       ]
     },
     {
@@ -1209,6 +1230,7 @@
         'base/callback_holder.h',
         'base/callback_holder_unittest.cc',
         'base/channel_mixer_unittest.cc',
+        'base/channel_mixing_matrix_unittest.cc',
         'base/container_names_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/decoder_buffer_queue_unittest.cc',
@@ -1317,6 +1339,7 @@
             'filters/audio_decoder_unittest.cc',
             'filters/audio_file_reader_unittest.cc',
             'filters/blocking_url_protocol_unittest.cc',
+            'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
@@ -1385,6 +1408,7 @@
         }],
         ['proprietary_codecs==1', {
           'sources': [
+            'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
             'formats/common/stream_parser_test_base.cc',
@@ -1764,6 +1788,9 @@
             'base/android/audio_decoder_job.cc',
             'base/android/audio_decoder_job.h',
             'base/android/browser_cdm_factory_android.cc',
+            'base/android/demuxer_android.h',
+            'base/android/demuxer_stream_player_params.cc',
+            'base/android/demuxer_stream_player_params.h',
             'base/android/media_codec_bridge.cc',
             'base/android/media_codec_bridge.h',
             'base/android/media_common_android.h',
@@ -1779,6 +1806,9 @@
             'base/android/media_player_bridge.h',
             'base/android/media_player_listener.cc',
             'base/android/media_player_listener.h',
+            'base/android/media_player_manager.h',
+            'base/android/media_resource_getter.cc',
+            'base/android/media_resource_getter.h',
             'base/android/media_source_player.cc',
             'base/android/media_source_player.h',
             'base/android/media_url_interceptor.h',
@@ -1809,7 +1839,7 @@
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
-            'media_android_imageformat_list',
+            'media_android_imageformat',
           ],
           'export_dependent_settings': [
             '../base/base.gyp:base',
@@ -1820,17 +1850,13 @@
           'includes': ['../build/java.gypi'],
         },
         {
-          # GN: //media/base/android:media_android_imageformat_list
-          'target_name': 'media_android_imageformat_list',
+          # GN: //media/base/android:media_android_imageformat
+          'target_name': 'media_android_imageformat',
           'type': 'none',
-          'sources': [
-            'base/android/java/src/org/chromium/media/ImageFormat.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/media',
-            'template_deps': ['video/capture/android/imageformat_list.h'],
+            'source_file': 'video/capture/android/video_capture_device_android.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
       ],
     }],
@@ -1946,5 +1972,22 @@
         },
       ],
     }],
+    ['test_isolation_mode != "noop" and archive_gpu_tests==1', {
+      'targets': [
+        {
+          'target_name': 'media_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'media_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'media_unittests.isolate',
+          ],
+        },
+      ],
+    }],
   ],
 }