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

When WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER is defined, we should never try to use _ptrCaptureDeviceInfo.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/167001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@631 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2011-09-20 17:38:57 +00:00
parent 657f483c26
commit a1930427af
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video_engine/main/source/vie_input_manager.cc
View File

@ -118,6 +118,9 @@ int ViEInputManager::NumberOfCaptureDevices()
{
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId), "%s",
__FUNCTION__);
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return 0;
#endif
assert(_ptrCaptureDeviceInfo);
return _ptrCaptureDeviceInfo->NumberOfDevices();
}
@ -134,6 +137,9 @@ int ViEInputManager::GetDeviceName(WebRtc_UWord32 deviceNumber,
{
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId),
"%s(deviceNumber: %d)", __FUNCTION__, deviceNumber);
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return 0;
#endif
assert(_ptrCaptureDeviceInfo);
return _ptrCaptureDeviceInfo->GetDeviceName(deviceNumber, deviceNameUTF8,
deviceNameLength,
@ -150,6 +156,9 @@ int ViEInputManager::GetDeviceName(WebRtc_UWord32 deviceNumber,
int ViEInputManager::NumberOfCaptureCapabilities(
const WebRtc_UWord8* deviceUniqueIdUTF8)
{
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return 0;
#endif
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId), "%s",
__FUNCTION__);
assert(_ptrCaptureDeviceInfo);
@ -167,6 +176,9 @@ int ViEInputManager::GetCaptureCapability(const WebRtc_UWord8* deviceUniqueIdUTF
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId),
"%s(deviceUniqueIdUTF8: %s, deviceCapabilityNumber: %d)",
__FUNCTION__, deviceUniqueIdUTF8, deviceCapabilityNumber);
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return -1;
#endif
assert(_ptrCaptureDeviceInfo);
VideoCaptureCapability moduleCapability;
int result = _ptrCaptureDeviceInfo->GetCapability(deviceUniqueIdUTF8,
@ -188,6 +200,9 @@ int ViEInputManager::GetOrientation(const WebRtc_UWord8* deviceUniqueIdUTF8,
{
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId),
"%s(deviceUniqueIdUTF8: %s,)", __FUNCTION__, deviceUniqueIdUTF8);
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return -1;
#endif
assert(_ptrCaptureDeviceInfo);
VideoCaptureRotation moduleOrientation;
int result = _ptrCaptureDeviceInfo->GetOrientation(deviceUniqueIdUTF8,
@ -226,6 +241,9 @@ int ViEInputManager::DisplayCaptureSettingsDialogBox(
WebRtc_UWord32 positionX,
WebRtc_UWord32 positionY)
{
#ifdef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
return -1;
#endif
assert(_ptrCaptureDeviceInfo);
return _ptrCaptureDeviceInfo->DisplayCaptureSettingsDialogBox(
deviceUniqueIdUTF8,