Web MIDI: split build rules for media/midi

Split MIDI related stuffs from media as a component in build files. Also, MIDI related unit tests are split into midi_unittests. BUG=475869 TEST=git cl try Review URL: https://codereview.chromium.org/1065743003 Cr-Commit-Position: refs/heads/master@{#326247}
cbchan · Apr 22, 2015 · 31624ca · 31624ca
1 parent 1ef6acc
commit 31624ca
Show file tree

Hide file tree

Showing 41 changed files with 739 additions and 158 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -65,6 +65,7 @@ group("gn_all") {
     "//mandoline:mandoline_all",
     "//media:media_unittests",
     "//media/cast:cast_unittests",
+    "//media/midi:midi_unittests",
     "//mojo",
     "//mojo/application",
     "//mojo/common:mojo_common_unittests",
@@ -720,8 +721,9 @@ if (is_linux) {
       "//ipc:ipc_tests",  # PASSES 2/25/2015
       "//ipc/mojo:ipc_mojo_unittests",  # PASSES 2/25/2015
       "//jingle:jingle_unittests",  # PASSES 2/25/2015
-      "//media/cast:cast_unittests",  # PASSES 2/25/2015
       "//media:media_unittests",  # PASSES 3/3/2015
+      "//media/cast:cast_unittests",  # PASSES 2/25/2015
+      "//media/midi:midi_unittests",  # PASSES 4/10/2015
       "//mojo/common:mojo_common_unittests",  # PASSES 2/25/2015
       "//net:net_unittests",  # PASSES 2/25/2015
       "//ppapi:ppapi_unittests",  # PASSES 2/26/2015

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
@@ -178,6 +178,7 @@
         '../gpu/gpu.gyp:gles2_implementation',
         '../gpu/gpu.gyp:gl_in_process_context',
         '../media/media.gyp:media',
+        '../media/midi/midi.gyp:midi',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',

diff --git a/build/all.gyp b/build/all.gyp
@@ -124,6 +124,7 @@
             '../jingle/jingle.gyp:*',
             '../media/cast/cast.gyp:*',
             '../media/media.gyp:*',
+            '../media/midi/midi.gyp:*',
             '../mojo/mojo.gyp:*',
             '../mojo/mojo_base.gyp:*',
             '../ppapi/ppapi.gyp:*',
@@ -344,6 +345,7 @@
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/cast/cast.gyp:cast_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../mojo/mojo.gyp:mojo',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -567,6 +569,7 @@
             '../content/content_shell_and_tests.gyp:content_shell',
             '../gpu/gpu.gyp:gpu_perftests',
             '../media/media.gyp:media_perftests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
             '../tools/telemetry/telemetry.gyp:*',
           ],
@@ -681,6 +684,7 @@
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
             '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
           ],
@@ -814,6 +818,8 @@
             '../ipc/ipc.gyp:ipc_tests',
             '../media/media.gyp:media_perftests_apk',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests_apk',
+            '../media/midi/midi.gyp:midi_unittests',
             '../net/net.gyp:net_unittests',
             '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
             '../skia/skia_tests.gyp:skia_unittests',
@@ -842,6 +848,7 @@
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',
+            '../media/midi/midi.gyp:midi_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
             '../skia/skia_tests.gyp:skia_unittests_apk',
@@ -928,6 +935,7 @@
             '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -967,6 +975,7 @@
             '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -994,6 +1003,7 @@
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -1017,6 +1027,7 @@
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../net/net.gyp:net_unittests',
             '../google_apis/gcm/gcm.gyp:gcm_unit_tests',
             '../printing/printing.gyp:printing_unittests',
@@ -1068,6 +1079,7 @@
             '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -1107,6 +1119,7 @@
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -1165,6 +1178,7 @@
             '../jingle/jingle.gyp:jingle_unittests',
             '../media/cast/cast.gyp:cast_unittests',
             '../media/media.gyp:media_unittests',
+            '../media/midi/midi.gyp:midi_unittests',
             '../mojo/mojo.gyp:mojo',
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
@@ -1233,6 +1247,7 @@
                 '../chrome/chrome.gyp:sync_integration_tests',
                 '../ipc/ipc.gyp:ipc_tests',
                 '../media/media.gyp:media_unittests',
+                '../media/midi/midi.gyp:midi_unittests',
                 '../net/net.gyp:net_unittests_run',
                 '../printing/printing.gyp:printing_unittests',
                 '../sql/sql.gyp:sql_unittests',

diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py
@@ -31,6 +31,7 @@
     'gpu_unittests',
     'ipc_tests',
     'media_unittests',
+    'midi_unittests',
     'net_unittests',
     'sandbox_linux_unittests',
     'skia_unittests',

diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
@@ -36,6 +36,7 @@
     'content_unittests': 'content/content_unittests.isolate',
     'media_perftests': 'media/media_perftests.isolate',
     'media_unittests': 'media/media_unittests.isolate',
+    'midi_unittests': 'media/midi/midi_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
     'sql_unittests': 'sql/sql_unittests.isolate',
     'sync_unit_tests': 'sync/sync_unit_tests.isolate',

diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
@@ -99,6 +99,7 @@
         '../media/media.gyp:ffmpeg_regression_tests',  # TODO(GYP) this should be conditional on media_use_ffmpeg
         '../media/media.gyp:media_perftests',
         '../media/media.gyp:media_unittests',
+        '../media/midi/midi.gyp:midi_unittests',
         '../media/cast/cast.gyp:cast_benchmarks',
         '../media/cast/cast.gyp:cast_unittests',
         '../media/cast/cast.gyp:generate_barcode_video',
@@ -522,6 +523,7 @@
             '../gpu/gpu.gyp:gpu_unittests_run',
             '../media/cast/cast.gyp:cast_unittests_run',
             '../media/media.gyp:media_unittests_run',
+            '../media/midi/midi.gyp:midi_unittests_run',
             '../net/net.gyp:net_unittests_run',
             '../sql/sql.gyp:sql_unittests_run',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',

diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi
@@ -45,6 +45,7 @@
         '../ipc/ipc.gyp:ipc_tests',
         '../jingle/jingle.gyp:jingle_unittests',
         '../media/media.gyp:media_unittests',
+        '../media/midi/midi.gyp:midi_unittests',
         '../net/net.gyp:net_unittests',
         '../sandbox/sandbox.gyp:sandbox_linux_unittests',
         '../sql/sql.gyp:sql_unittests',
@@ -188,6 +189,7 @@
             '../cc/cc_tests.gyp:cc_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',
+            '../media/midi/midi.gyp:midi_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',

diff --git a/content/app/DEPS b/content/app/DEPS
@@ -7,4 +7,5 @@ include_rules = [
   "+gin/public/snapshot_fd_data.h",
   "+gin/v8_initializer.h",
   "+media/base",  # For initializing media library.
+  "+media/midi",  # For initializing midi library.
 ]
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
@@ -24,6 +24,7 @@
 #include "content/public/common/result_codes.h"
 #include "device/vibration/android/vibration_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
+#include "media/midi/midi_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_android_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
@@ -70,6 +71,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!media::RegisterJni(env))
       return false;
 
+    if (!media::midi::RegisterJni(env))
+      return false;
+
     if (!ui::RegisterUIAndroidJni(env))
       return false;
 

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -177,6 +177,7 @@ source_set("common") {
       "//gpu/ipc",
       "//gpu/skia_bindings",
       "//media",
+      "//media/midi",
       "//media:shared_memory_support",
       "//mojo/environment:chromium",
       "//sandbox",

diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -590,6 +590,7 @@
         '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
+        '../media/midi/midi.gyp:midi',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -877,6 +877,7 @@
             '../ipc/mojo/ipc_mojo.gyp:*',
             '../media/blink/media_blink.gyp:media_blink',
             '../media/media.gyp:media',
+            '../media/midi/midi.gyp:midi',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',

diff --git a/media/BUILD.gn b/media/BUILD.gn
@@ -32,9 +32,6 @@ config("media_config") {
   if (use_cras) {
     defines += [ "USE_CRAS" ]
   }
-  if (use_alsa) {
-    defines += [ "USE_ALSA" ]
-  }
 }
 
 config("media_dependent_config") {
@@ -179,30 +176,6 @@ component("media") {
     "formats/webm/webm_video_client.h",
     "formats/webm/webm_webvtt_parser.cc",
     "formats/webm/webm_webvtt_parser.h",
-    "midi/midi_manager.cc",
-    "midi/midi_manager.h",
-    "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_port_info.cc",
-    "midi/midi_port_info.h",
-    "midi/midi_scheduler.cc",
-    "midi/midi_scheduler.h",
-    "midi/usb_midi_descriptor_parser.cc",
-    "midi/usb_midi_descriptor_parser.h",
-    "midi/usb_midi_device.h",
-    "midi/usb_midi_input_stream.cc",
-    "midi/usb_midi_input_stream.h",
-    "midi/usb_midi_jack.h",
-    "midi/usb_midi_output_stream.cc",
-    "midi/usb_midi_output_stream.h",
     "renderers/audio_renderer_impl.cc",
     "renderers/audio_renderer_impl.h",
     "renderers/gpu_video_accelerator_factories.h",
@@ -343,11 +316,6 @@ component("media") {
     ]
   } else {
     sources += [
-      "midi/midi_manager_android.cc",
-      "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",
       "video/capture/android/video_capture_device_android.cc",
       "video/capture/android/video_capture_device_android.h",
       "video/capture/android/video_capture_device_factory_android.cc",
@@ -368,18 +336,6 @@ component("media") {
     ]
   }
 
-  if (use_alsa) {
-    libs += [ "asound" ]
-    sources += [
-      "midi/midi_manager_alsa.cc",
-      "midi/midi_manager_alsa.h",
-    ]
-  }
-
-  if (use_udev) {
-    deps += [ "//device/udev_linux" ]
-  }
-
   # A simple WebM encoder for animated avatars on ChromeOS.
 
   if (use_ozone) {
@@ -403,7 +359,6 @@ component("media") {
       "//third_party/decklink",
     ]
     libs += [
-      "CoreMIDI.framework",
       "CoreVideo.framework",
       "OpenGL.framework",
       "QTKit.framework",
@@ -422,8 +377,6 @@ component("media") {
   }
 
   if (is_win) {
-    deps += [ "//device/usb" ]
-
     libs += [
       "mf.lib",
       "mfplat.lib",
@@ -575,13 +528,6 @@ test("media_unittests") {
     "formats/webm/webm_parser_unittest.cc",
     "formats/webm/webm_tracks_parser_unittest.cc",
     "formats/webm/webm_webvtt_parser_unittest.cc",
-    "midi/midi_manager_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",
     "renderers/audio_renderer_impl_unittest.cc",
     "renderers/renderer_impl_unittest.cc",
     "renderers/video_renderer_impl_unittest.cc",
@@ -669,18 +615,8 @@ test("media_unittests") {
   }
 
   if (is_mac) {
-    sources += [
-      "midi/midi_manager_mac_unittest.cc",
-      "video/capture/mac/video_capture_device_factory_mac_unittest.mm",
-    ]
-    libs = [
-      # Required by midi_manager_mac_unittest.cc.
-      "CoreMIDI.framework",
-    ]
-  }
-
-  if (use_alsa) {
-    sources += [ "midi/midi_manager_alsa_unittest.cc" ]
+    sources +=
+        [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
   }
 
   #      include_dirs += [

diff --git a/media/OWNERS b/media/OWNERS
@@ -6,10 +6,5 @@ scherkus@chromium.org
 wolenetz@chromium.org
 xhwang@chromium.org
 
-# Build rules for Web MIDI
-per-file BUILD.gn=toyoshim@chromium.org
-per-file *.gyp=toyoshim@chromium.org
-per-file *.gypi=toyoshim@chromium.org
-
 per-file *.isolate=csharp@chromium.org
 per-file *.isolate=maruel@chromium.org
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
@@ -81,8 +81,6 @@ generate_jni("media_jni_headers") {
     "java/src/org/chromium/media/MediaDrmBridge.java",
     "java/src/org/chromium/media/MediaPlayerBridge.java",
     "java/src/org/chromium/media/MediaPlayerListener.java",
-    "java/src/org/chromium/media/UsbMidiDeviceAndroid.java",
-    "java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java",
     "java/src/org/chromium/media/WebAudioMediaCodecBridge.java",
   ]
   jni_package = "media"

diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc
@@ -15,8 +15,6 @@
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_player_listener.h"
 #include "media/base/android/webaudio_media_codec_bridge.h"
-#include "media/midi/usb_midi_device_android.h"
-#include "media/midi/usb_midi_device_factory_android.h"
 #include "media/video/capture/android/video_capture_device_android.h"
 #include "media/video/capture/android/video_capture_device_factory_android.h"
 
@@ -35,10 +33,6 @@ static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
     MediaPlayerBridge::RegisterMediaPlayerBridge },
   { "MediaPlayerListener",
     MediaPlayerListener::RegisterMediaPlayerListener },
-  { "UsbMidiDevice",
-    UsbMidiDeviceAndroid::RegisterUsbMidiDevice },
-  { "UsbMidiDeviceFactory",
-    UsbMidiDeviceFactoryAndroid::RegisterUsbMidiDeviceFactory },
   { "VideoCaptureDevice",
     VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },
   { "VideoCaptureDeviceFactory",