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

Unified Diff: webrtc/modules/video_capture/windows/device_info_ds.cc

Issue 2665113006: Delete DeviceInfoImpl::GetExpectedCaptureDelay and related declarations. (Closed)
Patch Set: Drop include of video_capture_delay.h, and definition of WindowsCaptureDelays. Created 3 years, 11 months 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: webrtc/modules/video_capture/windows/device_info_ds.cc
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.cc b/webrtc/modules/video_capture/windows/device_info_ds.cc
index 0b704abe954caa86038a96b81fbfa44f9fc0410a..fb2094c3f47b3792b9ebab69d6391011d7ef768f 100644
--- a/webrtc/modules/video_capture/windows/device_info_ds.cc
+++ b/webrtc/modules/video_capture/windows/device_info_ds.cc
@@ -11,7 +11,6 @@
#include "webrtc/modules/video_capture/windows/device_info_ds.h"
#include "webrtc/modules/video_capture/video_capture_config.h"
-#include "webrtc/modules/video_capture/video_capture_delay.h"
#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
#include "webrtc/system_wrappers/include/trace.h"
@@ -22,24 +21,6 @@ namespace webrtc
{
namespace videocapturemodule
{
-const int32_t NoWindowsCaptureDelays = 1;
-const DelayValues WindowsCaptureDelays[NoWindowsCaptureDelays] = {
- "Microsoft LifeCam Cinema",
- "usb#vid_045e&pid_075d",
- {
- {640,480,125},
- {640,360,117},
- {424,240,111},
- {352,288,111},
- {320,240,116},
- {176,144,101},
- {160,120,109},
- {1280,720,166},
- {960,544,126},
- {800,448,120},
- {800,600,127}
- },
-};
// static
DeviceInfoDS* DeviceInfoDS::Create()
@@ -658,13 +639,6 @@ int32_t DeviceInfoDS::CreateCapabilityMap(
continue;
}
- // Get the expected capture delay from the static list
- capability.expectedCaptureDelay
- = GetExpectedCaptureDelay(WindowsCaptureDelays,
- NoWindowsCaptureDelays,
- productId,
- capability.width,
- capability.height);
_captureCapabilities.push_back(capability);
_captureCapabilitiesWindows.push_back(capability);
WEBRTC_TRACE( webrtc::kTraceInfo, webrtc::kTraceVideoCapture, 0,
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | webrtc/modules/video_capture/windows/video_capture_ds.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698