X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia%2Fmedia.gyp;h=6790d2814a7ead05d957c732f5c51f1e6eb6f40a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=7da5c588ec317012f685f849e8355709225ac623;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/media/media.gyp b/src/media/media.gyp
index 7da5c58..6790d28 100644
--- a/src/media/media.gyp
+++ b/src/media/media.gyp
@@ -131,8 +131,6 @@
         'audio/fake_audio_output_stream.cc',
         'audio/fake_audio_output_stream.h',
         'audio/linux/audio_manager_linux.cc',
-        'audio/mac/aggregate_device_manager.cc',
-        'audio/mac/aggregate_device_manager.h',
         'audio/mac/audio_auhal_mac.cc',
         'audio/mac/audio_auhal_mac.h',
         'audio/mac/audio_device_listener_mac.cc',
@@ -145,10 +143,6 @@
         'audio/mac/audio_low_latency_output_mac.h',
         'audio/mac/audio_manager_mac.cc',
         'audio/mac/audio_manager_mac.h',
-        'audio/mac/audio_synchronized_mac.cc',
-        'audio/mac/audio_synchronized_mac.h',
-        'audio/mac/audio_unified_mac.cc',
-        'audio/mac/audio_unified_mac.h',
         'audio/null_audio_sink.cc',
         'audio/null_audio_sink.h',
         'audio/openbsd/audio_manager_openbsd.cc',
@@ -159,8 +153,6 @@
         'audio/pulse/pulse_input.h',
         'audio/pulse/pulse_output.cc',
         'audio/pulse/pulse_output.h',
-        'audio/pulse/pulse_unified.cc',
-        'audio/pulse/pulse_unified.h',
         'audio/pulse/pulse_util.cc',
         'audio/pulse/pulse_util.h',
         'audio/sample_rates.cc',
@@ -187,8 +179,6 @@
         'audio/win/audio_low_latency_output_win.h',
         'audio/win/audio_manager_win.cc',
         'audio/win/audio_manager_win.h',
-        'audio/win/audio_unified_win.cc',
-        'audio/win/audio_unified_win.h',
         'audio/win/avrt_wrapper_win.cc',
         'audio/win/avrt_wrapper_win.h',
         'audio/win/core_audio_util_win.cc',
@@ -317,6 +307,8 @@
         'base/stream_parser_buffer.h',
         'base/text_cue.cc',
         'base/text_cue.h',
+        'base/text_ranges.cc',
+        'base/text_ranges.h',
         'base/text_renderer.cc',
         'base/text_renderer.h',
         'base/text_track.h',
@@ -415,19 +407,26 @@
         'midi/midi_manager.h',
         'midi/midi_manager_alsa.cc',
         'midi/midi_manager_alsa.h',
+        'midi/midi_manager_android.cc',
         'midi/midi_manager_mac.cc',
         'midi/midi_manager_mac.h',
+        'midi/midi_manager_usb.cc',
+        'midi/midi_manager_usb.h',
+        'midi/midi_manager_win.cc',
+        'midi/midi_manager_win.h',
         'midi/midi_message_queue.cc',
         'midi/midi_message_queue.h',
         'midi/midi_message_util.cc',
         'midi/midi_message_util.h',
-        'midi/midi_manager_win.cc',
-        'midi/midi_manager_win.h',
         'midi/midi_port_info.cc',
         'midi/midi_port_info.h',
         'midi/usb_midi_descriptor_parser.cc',
         'midi/usb_midi_descriptor_parser.h',
         'midi/usb_midi_device.h',
+        'midi/usb_midi_device_android.cc',
+        'midi/usb_midi_device_android.h',
+        'midi/usb_midi_device_factory_android.cc',
+        'midi/usb_midi_device_factory_android.h',
         'midi/usb_midi_input_stream.cc',
         'midi/usb_midi_input_stream.h',
         'midi/usb_midi_jack.h',
@@ -480,6 +479,8 @@
         'video/video_decode_accelerator.h',
         'video/video_encode_accelerator.cc',
         'video/video_encode_accelerator.h',
+        'formats/common/offset_byte_queue.cc',
+        'formats/common/offset_byte_queue.h',
         'formats/webm/webm_audio_client.cc',
         'formats/webm/webm_audio_client.h',
         'formats/webm/webm_cluster_parser.cc',
@@ -636,15 +637,13 @@
           },
           'conditions': [
             ['use_x11==1', {
-              'link_settings': {
-                'libraries': [
-                  '-lX11',
-                  '-lXdamage',
-                  '-lXext',
-                  '-lXfixes',
-                  '-lXtst',
-                ],
-              },
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+                '../build/linux/system.gyp:xdamage',
+                '../build/linux/system.gyp:xext',
+                '../build/linux/system.gyp:xfixes',
+                '../build/linux/system.gyp:xtst',
+              ],
             }, {  # else: use_x11==0
               'sources!': [
                 'base/user_input_monitor_linux.cc',
@@ -767,8 +766,6 @@
             'audio/pulse/pulse_input.h',
             'audio/pulse/pulse_output.cc',
             'audio/pulse/pulse_output.h',
-            'audio/pulse/pulse_unified.cc',
-            'audio/pulse/pulse_unified.h',
             'audio/pulse/pulse_util.cc',
             'audio/pulse/pulse_util.h',
           ],
@@ -846,8 +843,6 @@
             'formats/mp2t/ts_section_pmt.h',
             'formats/mp2t/ts_section_psi.cc',
             'formats/mp2t/ts_section_psi.h',
-            'formats/mp3/mp3_stream_parser.cc',
-            'formats/mp3/mp3_stream_parser.h',
             'formats/mp4/aac.cc',
             'formats/mp4/aac.h',
             'formats/mp4/avc.cc',
@@ -862,10 +857,16 @@
             'formats/mp4/es_descriptor.h',
             'formats/mp4/mp4_stream_parser.cc',
             'formats/mp4/mp4_stream_parser.h',
-            'formats/mp4/offset_byte_queue.cc',
-            'formats/mp4/offset_byte_queue.h',
             'formats/mp4/track_run_iterator.cc',
             'formats/mp4/track_run_iterator.h',
+            'formats/mpeg/adts_constants.cc',
+            'formats/mpeg/adts_constants.h',
+            'formats/mpeg/adts_stream_parser.cc',
+            'formats/mpeg/adts_stream_parser.h',
+            'formats/mpeg/mp3_stream_parser.cc',
+            'formats/mpeg/mp3_stream_parser.h',
+            'formats/mpeg/mpeg_audio_stream_parser_base.cc',
+            'formats/mpeg/mpeg_audio_stream_parser_base.h',
           ],
         }],
         ['toolkit_uses_gtk==1', {
@@ -939,7 +940,6 @@
         'audio/win/audio_low_latency_input_win_unittest.cc',
         'audio/win/audio_low_latency_output_win_unittest.cc',
         'audio/win/audio_output_win_unittest.cc',
-        'audio/win/audio_unified_win_unittest.cc',
         'audio/win/core_audio_util_win_unittest.cc',
         'base/android/media_codec_bridge_unittest.cc',
         'base/android/media_source_player_unittest.cc',
@@ -977,8 +977,10 @@
         'base/serial_runner_unittest.cc',
         'base/seekable_buffer_unittest.cc',
         'base/sinc_resampler_unittest.cc',
+        'base/stream_parser_unittest.cc',
         'base/test_data_util.cc',
         'base/test_data_util.h',
+        'base/text_ranges_unittest.cc',
         'base/text_renderer_unittest.cc',
         'base/user_input_monitor_unittest.cc',
         'base/vector_math_testing.h',
@@ -1022,12 +1024,14 @@
         'filters/video_frame_painter_unittest.cc',
         'filters/video_frame_stream_unittest.cc',
         'filters/video_renderer_impl_unittest.cc',
+        'midi/midi_manager_usb_unittest.cc',
         'midi/midi_message_queue_unittest.cc',
         'midi/midi_message_util_unittest.cc',
         'midi/usb_midi_descriptor_parser_unittest.cc',
         'midi/usb_midi_input_stream_unittest.cc',
         'midi/usb_midi_output_stream_unittest.cc',
         'video/capture/video_capture_device_unittest.cc',
+        'formats/common/offset_byte_queue_unittest.cc',
         'formats/webm/cluster_builder.cc',
         'formats/webm/cluster_builder.h',
         'formats/webm/tracks_builder.cc',
@@ -1123,15 +1127,17 @@
         }],
         ['proprietary_codecs==1', {
           'sources': [
+            'formats/common/stream_parser_test_base.cc',
+            'formats/common/stream_parser_test_base.h',
             'formats/mp2t/mp2t_stream_parser_unittest.cc',
-            'formats/mp3/mp3_stream_parser_unittest.cc',
             'formats/mp4/aac_unittest.cc',
             'formats/mp4/avc_unittest.cc',
             'formats/mp4/box_reader_unittest.cc',
             'formats/mp4/es_descriptor_unittest.cc',
             'formats/mp4/mp4_stream_parser_unittest.cc',
-            'formats/mp4/offset_byte_queue_unittest.cc',
             'formats/mp4/track_run_iterator_unittest.cc',
+            'formats/mpeg/adts_stream_parser_unittest.cc',
+            'formats/mpeg/mp3_stream_parser_unittest.cc',
           ],
         }],
         # TODO(wolenetz): Fix size_t to int truncations in win64. See
@@ -1210,6 +1216,8 @@
       'sources': [
         'audio/mock_audio_manager.cc',
         'audio/mock_audio_manager.h',
+        'audio/mock_audio_source_callback.cc',
+        'audio/mock_audio_source_callback.h',
         'audio/test_audio_input_controller_factory.cc',
         'audio/test_audio_input_controller_factory.h',
         'base/fake_audio_render_callback.cc',
@@ -1439,14 +1447,10 @@
             '../ui/gl/gl.gyp:gl',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xext',
+            '../build/linux/system.gyp:xrender',
           ],
-          'link_settings': {
-            'libraries': [
-              '-lX11',
-              '-lXrender',
-              '-lXext',
-            ],
-          },
           'conditions': [
             # Linux/Solaris need libdl for dlopen() and friends.
             ['OS=="linux" or OS=="solaris"', {
@@ -1513,6 +1517,8 @@
             'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
+            'base/android/java/src/org/chromium/media/UsbMidiDeviceAndroid.java',
+            'base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java',
             'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java',
           ],
           'variables': {