Add MJPEG support to FakeVideoCaptureDevice

media/capture/video/fake_video_capture_device_factory.cc

 // Copyright 2014 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 "media/capture/video/fake_video_capture_device_factory.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "media/base/media_switches.h"
 
-namespace {
+namespace media {
 
 static const size_t kDepthDeviceIndex = 1;
-static const char kDepthDeviceId[] = "/dev/video1";
-
-media::VideoPixelFormat GetPixelFormatFromDeviceId(
-    const std::string& device_id) {
-  return (device_id == kDepthDeviceId) ? media::PIXEL_FORMAT_Y16
-                                       : media::PIXEL_FORMAT_I420;
-}
-}
-
-namespace media {
 
 // Cap the frame rate command line input to reasonable values.
 static const float kFakeCaptureMinFrameRate = 5.0f;
 static const float kFakeCaptureMaxFrameRate = 60.0f;
 // Default rate if none is specified as part of the command line.
 static const float kFakeCaptureDefaultFrameRate = 20.0f;
 // Cap the device count command line input to reasonable values.
 static const int kFakeCaptureMinDeviceCount = 1;
 static const int kFakeCaptureMaxDeviceCount = 10;
 
 FakeVideoCaptureDeviceFactory::FakeVideoCaptureDeviceFactory()
     : number_of_devices_(1),
       delivery_mode_(FakeVideoCaptureDeviceMaker::DeliveryMode::
                          USE_DEVICE_INTERNAL_BUFFERS),
       frame_rate_(kFakeCaptureDefaultFrameRate) {}
 
+// static
+media::VideoPixelFormat
+FakeVideoCaptureDeviceFactory::GetPixelFormatFromDeviceId(
+    const std::string& device_id) {
+  if (device_id == "/dev/video1")
+    return media::PIXEL_FORMAT_Y16;
+  if (device_id == "/dev/video2")
+    return media::PIXEL_FORMAT_MJPEG;
+  return media::PIXEL_FORMAT_I420;
+}

[mcasas, 2017/02/17 18:35:47]

Yeah, make this again file static.

[chfremer, 2017/02/22 17:28:42]

See other comment.

+
 std::unique_ptr<VideoCaptureDevice> FakeVideoCaptureDeviceFactory::CreateDevice(
     const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   ParseCommandLine();
 
   for (int n = 0; n < number_of_devices_; ++n) {
     std::string possible_id = base::StringPrintf("/dev/video%d", n);
     if (device_descriptor.device_id.compare(possible_id) == 0) {
+      media::VideoPixelFormat pixel_format =
+          GetPixelFormatFromDeviceId(possible_id);
+      FakeVideoCaptureDeviceMaker::DeliveryMode delivery_mode = delivery_mode_;
+      if (delivery_mode == FakeVideoCaptureDeviceMaker::DeliveryMode::
+                               USE_CLIENT_PROVIDED_BUFFERS &&
+          pixel_format == media::PIXEL_FORMAT_MJPEG) {
+        // Incompatible options. Fall back to using internal buffers.
+        delivery_mode = FakeVideoCaptureDeviceMaker::DeliveryMode::
+            USE_DEVICE_INTERNAL_BUFFERS;
+      }
       return FakeVideoCaptureDeviceMaker::MakeInstance(
-          GetPixelFormatFromDeviceId(possible_id), delivery_mode_, frame_rate_);
+          pixel_format, delivery_mode, frame_rate_);
     }
   }
   return std::unique_ptr<VideoCaptureDevice>();
 }
 
 void FakeVideoCaptureDeviceFactory::GetDeviceDescriptors(
     VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(device_descriptors->empty());
 
@@ skipping 87 matching lines @@
       if (base::StringToUint(param.back(), &count)) {
         number_of_devices_ = std::min(
             kFakeCaptureMaxDeviceCount,
             std::max(kFakeCaptureMinDeviceCount, static_cast<int>(count)));
       }
     }
   }
 }
 
 }  // namespace media