Move Mac media glue code from media/video/capture/mac to media/base/mac

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 71242666b7c665bd6af08c51b187190979576877..308095cc6bae4b316e804d4927d83db64ee4660d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -281,6 +281,10 @@
         'base/djb2.h',
         'base/keyboard_event_counter.cc',
         'base/keyboard_event_counter.h',
+        'base/mac/avfoundation_glue.h',
+        'base/mac/avfoundation_glue.mm',
+        'base/mac/coremedia_glue.h',
+        'base/mac/coremedia_glue.mm',
         'base/media.cc',
         'base/media.h',
         'base/media_file_checker.cc',
@@ -490,10 +494,6 @@
         'video/capture/linux/video_capture_device_linux.h',
         'video/capture/linux/video_capture_device_chromeos.cc',
         'video/capture/linux/video_capture_device_chromeos.h',
-        'video/capture/mac/avfoundation_glue.h',
-        'video/capture/mac/avfoundation_glue.mm',
-        'video/capture/mac/coremedia_glue.h',
-        'video/capture/mac/coremedia_glue.mm',
         'video/capture/mac/platform_video_capturing_mac.h',
         'video/capture/mac/video_capture_device_avfoundation_mac.h',
         'video/capture/mac/video_capture_device_avfoundation_mac.mm',
@@ -878,6 +878,25 @@
             ],
           },
         }],
+        ['OS == "ios" and _toolset != "host"', {
+          'sources/': [
+            # Pull in specific Mac files for iOS (which have been filtered out
+            # by file name rules).
+            ['include', '^base/mac/avfoundation_glue\\.'],
+            ['include', '^base/mac/coremedia_glue\\.'],
+          ],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',

[Robert Sesek, 2014/09/03 21:03:56]

This is a number of libraries. Are all of these necessary?

[jfroy, 2014/09/03 21:17:00]

I am matching the Mac frameworks. None of those are necessary for the glue code
files, but presumably an iOS binary will need those when incorporating the
media/base component.

I can remove this chunk from this CL and submit it separately. The purpose of
relocating the glue code is because it will be used by other other than the Mac
video capture implementation. Modifying media build files to better support iOS
is a separate concern.

[Robert Sesek, 2014/09/03 21:25:42]

Unless you can say definitely whether all of these are needed, I'd hold off.
It's not good to add unnecessary linkage, and I don't think someone would come
back and clean up the unnecessary ones later.

+              '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+              '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework',
+            ],
+          },
+        }],
         ['OS=="win"', {
           'link_settings':  {
             'libraries': [