[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() and OnFrameReadyInBuffer(

media/capture/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
-component("capture") {
+group("capture") {
+  public_deps = [
+    ":capture_lib",
+    "//media/capture/mojo:capture_types",
+    "//services/service_manager/public/cpp",
+  ]
+}
+
+# Things needed by //media/capture/mojo:capture_types.
+component("capture_base") {
   defines = [ "CAPTURE_IMPLEMENTATION" ]
   sources = [
     "capture_export.h",
+    "video_capture_types.cc",
+    "video_capture_types.h",
+  ]
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//media",

[miu, 2017/02/14 00:41:27]

Is all of //media needed, or just //media:base?

[chfremer, 2017/02/14 21:15:16]

//media:base is a non-public part of //media, so we cannot depend on it
directly. (At least this is the case after having removed the visibility
exception that was previously granted for media/capture.)

+    "//ui/gfx",
+  ]
+}
+
+component("capture_lib") {
+  defines = [ "CAPTURE_IMPLEMENTATION" ]
+  sources = [
     "content/animated_content_sampler.cc",
     "content/animated_content_sampler.h",
     "content/capture_resolution_chooser.cc",
     "content/capture_resolution_chooser.h",
     "content/screen_capture_device_core.cc",
     "content/screen_capture_device_core.h",
     "content/smooth_event_sampler.cc",
     "content/smooth_event_sampler.h",
     "content/thread_safe_capture_oracle.cc",
     "content/thread_safe_capture_oracle.h",
@@ skipping 56 matching lines @@
     "video/win/sink_filter_win.cc",
     "video/win/sink_filter_win.h",
     "video/win/sink_input_pin_win.cc",
     "video/win/sink_input_pin_win.h",
     "video/win/video_capture_device_factory_win.cc",
     "video/win/video_capture_device_factory_win.h",
     "video/win/video_capture_device_mf_win.cc",
     "video/win/video_capture_device_mf_win.h",
     "video/win/video_capture_device_win.cc",
     "video/win/video_capture_device_win.h",
-    "video_capture_types.cc",
-    "video_capture_types.h",
     "video_capturer_source.cc",
     "video_capturer_source.h",
   ]
 
-  public_deps = []
+  public_deps = [
+    ":capture_base",
+  ]
+
   deps = [
     "//base",
     "//base:i18n",
     "//media",

[miu, 2017/02/14 00:41:27]

ditto: All of //media, or just one or two subtargets within?

[chfremer, 2017/02/14 21:15:16]

same as above

+    "//media/capture/mojo:capture_types",
     "//media/capture/mojo:image_capture",
-    "//skia",
+    "//media/mojo/interfaces:interfaces",
+    "//services/service_manager/public/cpp",
     "//third_party/libyuv",
     "//ui/display",
     "//ui/gfx",
   ]
 
-  configs += [
-    # TODO(mcasas): media/base should be a component and not a source_set, but
-    # it depends on parts of media/filters, media/ffmpeg etc. Until then, we
-    # pretend to be inside media.dll and duplicate the few symbols needed, see
-    # https://crbug.com/590017.
-    "//media:media_implementation",
-  ]
-
   if (is_android) {
     public_deps += [
       "content/android",
       "video/android",
     ]
     deps += [
       "content/android:screen_capture_jni_headers",
       "video/android:capture_jni_headers",
     ]
   }
 
   if (is_mac) {
     deps += [ "//third_party/decklink" ]
     libs = [
       "AVFoundation.framework",
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreMedia.framework",
       "CoreVideo.framework",
       "Foundation.framework",
     ]
   }
 
   if (is_win) {
-    deps += [
-      "//media/base",  # For media_switches.
-      "//media/base/win",
-    ]
+    deps += [ "//media/base/win" ]
     libs = [
       "mf.lib",
       "mfplat.lib",
       "mfreadwrite.lib",
       "mfuuid.lib",
     ]
     ldflags = [
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
       "/DELAYLOAD:mfreadwrite.dll",
@@ skipping 14 matching lines @@
 test("capture_unittests") {
   sources = [
     "content/animated_content_sampler_unittest.cc",
     "content/capture_resolution_chooser_unittest.cc",
     "content/smooth_event_sampler_unittest.cc",
     "content/video_capture_oracle_unittest.cc",
     "video/fake_video_capture_device_unittest.cc",
     "video/linux/camera_config_chromeos_unittest.cc",
     "video/linux/v4l2_capture_delegate_unittest.cc",
     "video/mac/video_capture_device_factory_mac_unittest.mm",
+    "video/video_capture_device_client_unittest.cc",
     "video/video_capture_device_unittest.cc",
   ]
 
   deps = [
     ":capture",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//media",

[miu, 2017/02/14 00:41:27]

ditto

[chfremer, 2017/02/14 21:15:16]

same as above

     "//media/base:test_support",
     "//media/capture/mojo:image_capture",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
   ]
 
   if (is_android) {
     deps += [
       "//media/capture/video/android",
       "//media/capture/video/android:capture_java",
     ]
   }
 
   if (is_win) {
     # TODO(jschuh): https://crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   }
 }