generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor cleanup of the videocapture code. No "real" code change :)

Browse Source 
Remove declaration of a function that doesn't exist.
Remove call to GetProductId from video_capture_factory_windows that's not necessary.
This was the only dependency on device_info_windows.h outside of video_capture_windows.cc.

TEST=There's no code change, so no manual testing is required.
BUG=none
Review URL: https://webrtc-codereview.appspot.com/936025

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3114 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org 2012-11-16 09:03:12 +00:00
parent d14ff54de2
commit 12773eaa8c
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_capture/windows/device_info_windows.cc
View File

@ -712,7 +712,7 @@ void DeviceInfoWindows::GetProductId(const char* devicePath,
"Failed to get the product Id"); "Failed to get the product Id");
return; return;
} }
// Find the second occurence // Find the second occurrence.
pos = strchr(pos + 1, '&'); pos = strchr(pos + 1, '&');
WebRtc_UWord32 bytesToCopy = (WebRtc_UWord32)(pos - startPos); WebRtc_UWord32 bytesToCopy = (WebRtc_UWord32)(pos - startPos);
if (pos && (bytesToCopy <= productUniqueIdUTF8Length) && bytesToCopy if (pos && (bytesToCopy <= productUniqueIdUTF8Length) && bytesToCopy

9
webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
View File

@ -10,7 +10,6 @@
#include "ref_count.h" #include "ref_count.h"
#include "video_capture_windows.h" #include "video_capture_windows.h"
#include "trace.h"
namespace webrtc namespace webrtc
{ {
@ -20,17 +19,9 @@ VideoCaptureModule* VideoCaptureImpl::Create(
const WebRtc_Word32 id, const WebRtc_Word32 id,
const char* deviceUniqueIdUTF8) const char* deviceUniqueIdUTF8)
{ {
if (deviceUniqueIdUTF8 == NULL) if (deviceUniqueIdUTF8 == NULL)
{
return NULL; return NULL;
}
char productId[kVideoCaptureProductIdLength];
videocapturemodule::DeviceInfoWindows::GetProductId(deviceUniqueIdUTF8,
productId,
sizeof(productId));
RefCountImpl<videocapturemodule::VideoCaptureDS>* newCaptureModule = RefCountImpl<videocapturemodule::VideoCaptureDS>* newCaptureModule =
new RefCountImpl<videocapturemodule::VideoCaptureDS>(id); new RefCountImpl<videocapturemodule::VideoCaptureDS>(id);

4
webrtc/modules/video_capture/windows/video_capture_windows.h
View File

@ -29,10 +29,6 @@ class CaptureSinkFilter;
class VideoCaptureDS: public VideoCaptureImpl class VideoCaptureDS: public VideoCaptureImpl
{ {
public: public:
static VideoCaptureModule* Create(const WebRtc_Word32 id,
const WebRtc_UWord8* deviceUniqueIdUTF8);
VideoCaptureDS(const WebRtc_Word32 id); VideoCaptureDS(const WebRtc_Word32 id);
virtual WebRtc_Word32 Init(const WebRtc_Word32 id, virtual WebRtc_Word32 Init(const WebRtc_Word32 id,