ScreenCapture for Android phase1, part II

content/browser/renderer_host/media/video_capture_manager.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 21 matching lines @@
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video/video_capture_device.h"
 #include "media/capture/video/video_capture_device_factory.h"
 
 #if defined(ENABLE_SCREEN_CAPTURE)
 #include "content/browser/media/capture/desktop_capture_device.h"
 #if defined(USE_AURA)
 #include "content/browser/media/capture/desktop_capture_device_aura.h"
 #endif
+#if defined(OS_ANDROID)
+#include "content/browser/media/capture/screen_capture_device_android.h"
+#endif
 #endif
 
 #if defined(OS_MACOSX)
 #include "media/base/mac/avfoundation_glue.h"
 #endif
 
 namespace {
 
 // Compares two VideoCaptureFormat by checking smallest frame_size area, then
 // by _largest_ frame_rate. Used to order a VideoCaptureFormats vector so that
@@ skipping 525 matching lines @@
     device_client->OnError(FROM_HERE, "Desktop media ID is null");
     return nullptr;
   }
 
   if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
     video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id));
     IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED);
   } else {
 #if defined(USE_AURA)
     video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id);
+#elif defined(OS_ANDROID)
+    DCHECK(desktop_id.type == DesktopMediaID::TYPE_SCREEN);
+    video_capture_device = base::WrapUnique(new ScreenCaptureDeviceAndroid());
 #endif
     if (!video_capture_device)
       video_capture_device = DesktopCaptureDevice::Create(desktop_id);

[Sergey Ulanov, 2016/08/19 05:54:15]

DesktopCapture device is not applicable on Android so I think this code should
look as follows

#if ANDROIRD
  create ScreenCaptureDeviceAndroid
#else
#if AURA
  try create aura device
#endif
  create default capture device.
#endif

[braveyao, 2016/08/23 21:18:54]

Done.

   }
 #endif  // defined(ENABLE_SCREEN_CAPTURE)
 
   if (!video_capture_device) {
     device_client->OnError(FROM_HERE, "Could not create capture device");
     return nullptr;
   }
 
   video_capture_device->AllocateAndStart(params, std::move(device_client));
   return video_capture_device;
@@ skipping 569 matching lines @@
     if (!device_in_queue) {
       // Session ID is only valid for Screen capture. So we can fake it to
       // resume video capture devices here.
       QueueStartDevice(kFakeSessionId, entry.get(), entry->parameters);
     }
   }
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content