Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1365)

Unified Diff: media/video/capture/fake_video_capture_device.cc

Issue 91343002: Added supported formats caching to VideoCaptureManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mad formatting corrected in certain files. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/capture/fake_video_capture_device.cc
diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
index c6f5f61fa51c6b52c4c3537170fce23063ea0e75..f3bcea310fdbfbd0cf5df7ad4484cc6fb62343f6 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.cc
@@ -8,7 +8,6 @@
#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"
@@ -26,30 +25,43 @@ bool FakeVideoCaptureDevice::fail_next_create_ = false;
base::subtle::Atomic32 FakeVideoCaptureDevice::number_of_devices_ =
kNumberOfFakeDevices;
+// static
+int FakeVideoCaptureDevice::NumberOfFakeDevices(void) {
+ return number_of_devices_;
+}
+
+// static
void FakeVideoCaptureDevice::GetDeviceNames(Names* const device_names) {
// Empty the name list.
device_names->erase(device_names->begin(), device_names->end());
int number_of_devices = base::subtle::NoBarrier_Load(&number_of_devices_);
for (int32 n = 0; n < number_of_devices; n++) {
- Name name("fake_device_" + base::IntToString(n),
- "/dev/video" + base::IntToString(n));
+ Name name(base::StringPrintf("fake_device_%d", n),
perkj_chrome 2013/12/10 12:27:14 Seems like we keep swithing StringPrintF or and In
mcasas 2013/12/12 10:38:05 :D I thought this is more performant :D
+ base::StringPrintf("/dev/video%d", n));
device_names->push_back(name);
}
}
+// static
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);
+ VideoCaptureFormats* supported_formats) {
+
+ supported_formats->clear();
+ VideoCaptureFormat capture_format_640x480;
+ capture_format_640x480.pixel_format = media::PIXEL_FORMAT_I420;
+ capture_format_640x480.frame_size.SetSize(640, 480);
+ capture_format_640x480.frame_rate = 1000 / kFakeCaptureTimeoutMs;
+ supported_formats->push_back(capture_format_640x480);
+ VideoCaptureFormat capture_format_320x240;
+ capture_format_320x240.pixel_format = media::PIXEL_FORMAT_I420;
+ capture_format_320x240.frame_size.SetSize(320, 240);
+ capture_format_320x240.frame_rate = 1000 / kFakeCaptureTimeoutMs;
+ supported_formats->push_back(capture_format_320x240);
}
+// static
VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
if (fail_next_create_) {
fail_next_create_ = false;
@@ -57,7 +69,7 @@ VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
}
int number_of_devices = base::subtle::NoBarrier_Load(&number_of_devices_);
for (int32 n = 0; n < number_of_devices; ++n) {
- std::string possible_id = "/dev/video" + base::IntToString(n);
+ std::string possible_id = base::StringPrintf("/dev/video%d", n);
if (device_name.id().compare(possible_id) == 0) {
return new FakeVideoCaptureDevice();
}
@@ -65,10 +77,12 @@ VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
return NULL;
}
+// static
void FakeVideoCaptureDevice::SetFailNextCreate() {
fail_next_create_ = true;
}
+// static
void FakeVideoCaptureDevice::SetNumberOfFakeDevices(size_t number_of_devices) {
base::subtle::NoBarrier_AtomicExchange(&number_of_devices_,
number_of_devices);

Powered by Google App Engine
This is Rietveld 408576698