Reland review 34393006: Refactor MediaStreamManager to not output real device id.

media/video/capture/fake_video_capture_device.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 "media/video/capture/fake_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace media {
 
 static const int kFakeCaptureTimeoutMs = 50;
 static const int kFakeCaptureBeepCycle = 20;  // Visual beep every 1s.
 static const int kFakeCaptureCapabilityChangePeriod = 30;
 enum { kNumberOfFakeDevices = 2 };
 
 bool FakeVideoCaptureDevice::fail_next_create_ = false;
+base::subtle::Atomic32 FakeVideoCaptureDevice::number_of_devices_ =
+    kNumberOfFakeDevices;
 
 void FakeVideoCaptureDevice::GetDeviceNames(Names* const device_names) {
   // Empty the name list.
   device_names->erase(device_names->begin(), device_names->end());
 
-  for (int n = 0; n < kNumberOfFakeDevices; n++) {
-    Name name(base::StringPrintf("fake_device_%d", n),
-              base::StringPrintf("/dev/video%d", n));
+  for (int32 n = 0; n < number_of_devices_; n++) {

[tommi (sloooow) - chröme, 2013/11/27 22:09:43]

for atomic values you need to fetch/load their value with an atomic operation. 
there's probably an example in atomicops.h.

[perkj_chrome, 2013/11/28 09:46:43]

Done.

+    Name name("fake_device_" + base::IntToString(n),
+              "/dev/video" + base::IntToString(n));
     device_names->push_back(name);
   }
 }
 
 void FakeVideoCaptureDevice::GetDeviceSupportedFormats(
     const Name& device,
     VideoCaptureCapabilities* formats) {
   VideoCaptureCapability capture_format_640x480;
   capture_format_640x480.supported_format.frame_size.SetSize(640, 480);
   capture_format_640x480.supported_format.frame_rate =
       1000 / kFakeCaptureTimeoutMs;
   capture_format_640x480.supported_format.pixel_format =
       media::PIXEL_FORMAT_I420;
   formats->push_back(capture_format_640x480);
 }
 
 VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
   if (fail_next_create_) {
     fail_next_create_ = false;
     return NULL;
   }
-  for (int n = 0; n < kNumberOfFakeDevices; ++n) {
-    std::string possible_id = base::StringPrintf("/dev/video%d", n);
+  for (int32 n = 0; n < number_of_devices_; ++n) {

[tommi (sloooow) - chröme, 2013/11/27 22:09:43]

atomic load

[perkj_chrome, 2013/11/28 09:46:43]

Done.

+    std::string possible_id = "/dev/video" + base::IntToString(n);
     if (device_name.id().compare(possible_id) == 0) {
       return new FakeVideoCaptureDevice();
     }
   }
   return NULL;
 }
 
 void FakeVideoCaptureDevice::SetFailNextCreate() {
   fail_next_create_ = true;
 }
 
+void FakeVideoCaptureDevice::SetNumberOfFakeDevices(size_t number_of_devices) {
+  number_of_devices_ = number_of_devices;

[tommi (sloooow) - chröme, 2013/11/27 22:09:43]

you need to use atomic operations on the Atomic32 type.  otherwise it's just an
int.

[perkj_chrome, 2013/11/28 09:46:43]

Done.

+}
+
 FakeVideoCaptureDevice::FakeVideoCaptureDevice()
     : state_(kIdle),
       capture_thread_("CaptureThread"),
       frame_count_(0),
       format_roster_index_(0) {}
 
 FakeVideoCaptureDevice::~FakeVideoCaptureDevice() {
   // Check if the thread is running.
   // This means that the device have not been DeAllocated properly.
   DCHECK(!capture_thread_.IsRunning());
@@ skipping 140 matching lines @@
       media::VideoCaptureFormat(gfx::Size(320, 240), 30, PIXEL_FORMAT_I420));
   format_roster_.push_back(
       media::VideoCaptureFormat(gfx::Size(640, 480), 30, PIXEL_FORMAT_I420));
   format_roster_.push_back(
       media::VideoCaptureFormat(gfx::Size(800, 600), 30, PIXEL_FORMAT_I420));
 
   format_roster_index_ = 0;
 }
 
 }  // namespace media