diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h index 14ca344a7..7b5710c3f 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -46,7 +46,7 @@ public: static void Destroy(VideoCaptureModule* module); WebRtc_Word32 Init(const WebRtc_Word32 id, - const WebRtc_UWord8* deviceUniqueIdUTF8); + const char* deviceUniqueIdUTF8); // Start/Stop @@ -72,9 +72,9 @@ private: WebRtc_Word32 _captureWidth; WebRtc_Word32 _captureHeight; WebRtc_Word32 _captureFrameRate; - WebRtc_UWord8 _currentDeviceNameUTF8[MAX_NAME_LENGTH]; - WebRtc_UWord8 _currentDeviceUniqueIdUTF8[MAX_NAME_LENGTH]; - WebRtc_UWord8 _currentDeviceProductUniqueIDUTF8[MAX_NAME_LENGTH]; + char _currentDeviceNameUTF8[MAX_NAME_LENGTH]; + char _currentDeviceUniqueIdUTF8[MAX_NAME_LENGTH]; + char _currentDeviceProductUniqueIDUTF8[MAX_NAME_LENGTH]; WebRtc_Word32 _frameCount; }; } // namespace videocapturemodule diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm index c4a02c9a3..91e983d7e 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm @@ -56,7 +56,7 @@ VideoCaptureMacQTKit::~VideoCaptureMacQTKit() } WebRtc_Word32 VideoCaptureMacQTKit::Init( - const WebRtc_Word32 id, const WebRtc_UWord8* iDeviceUniqueIdUTF8) + const WebRtc_Word32 id, const char* iDeviceUniqueIdUTF8) { CriticalSectionScoped cs(_apiCs); @@ -67,7 +67,7 @@ WebRtc_Word32 VideoCaptureMacQTKit::Init( return -1; // Store the device name - _deviceUniqueId = new WebRtc_UWord8[nameLength+1]; + _deviceUniqueId = new char[nameLength+1]; memcpy(_deviceUniqueId, iDeviceUniqueIdUTF8,nameLength+1); _captureDevice = [[VideoCaptureMacQTKitObjC alloc] init]; @@ -108,9 +108,9 @@ WebRtc_Word32 VideoCaptureMacQTKit::Init( } const int NAME_LENGTH = 1024; - WebRtc_UWord8 deviceNameUTF8[1024] = ""; - WebRtc_UWord8 deviceUniqueIdUTF8[1024] = ""; - WebRtc_UWord8 deviceProductUniqueIDUTF8[1024] = ""; + char deviceNameUTF8[1024] = ""; + char deviceUniqueIdUTF8[1024] = ""; + char deviceProductUniqueIDUTF8[1024] = ""; bool captureDeviceFound = false; for(int index = 0; index < captureDeviceCount; index++){ diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h index 4c8b9e882..39847ea01 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h @@ -46,24 +46,24 @@ public: * otherwise. */ virtual WebRtc_Word32 GetDeviceName( - WebRtc_UWord32 deviceNumber, WebRtc_UWord8* deviceNameUTF8, - WebRtc_UWord32 deviceNameLength, WebRtc_UWord8* deviceUniqueIdUTF8, + WebRtc_UWord32 deviceNumber, char* deviceNameUTF8, + WebRtc_UWord32 deviceNameLength, char* deviceUniqueIdUTF8, WebRtc_UWord32 deviceUniqueIdUTF8Length, - WebRtc_UWord8* productUniqueIdUTF8 = 0, + char* productUniqueIdUTF8 = 0, WebRtc_UWord32 productUniqueIdUTF8Length = 0); /* * Returns the number of capabilities for this device */ virtual WebRtc_Word32 NumberOfCapabilities( - const WebRtc_UWord8* deviceUniqueIdUTF8); + const char* deviceUniqueIdUTF8); /* * Gets the capabilities of the named device */ virtual WebRtc_Word32 GetCapability( const char* deviceUniqueIdUTF8, - const char deviceCapabilityNumber, + const WebRtc_UWord32 deviceCapabilityNumber, VideoCaptureCapability& capability); /* diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm index b13a8ab80..df61f0839 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm @@ -47,9 +47,9 @@ WebRtc_UWord32 VideoCaptureMacQTKitInfo::NumberOfDevices() } WebRtc_Word32 VideoCaptureMacQTKitInfo::GetDeviceName( - WebRtc_UWord32 deviceNumber, WebRtc_UWord8* deviceNameUTF8, - WebRtc_UWord32 deviceNameLength, WebRtc_UWord8* deviceUniqueIdUTF8, - WebRtc_UWord32 deviceUniqueIdUTF8Length, WebRtc_UWord8* productUniqueIdUTF8, + WebRtc_UWord32 deviceNumber, char* deviceNameUTF8, + WebRtc_UWord32 deviceNameLength, char* deviceUniqueIdUTF8, + WebRtc_UWord32 deviceUniqueIdUTF8Length, char* productUniqueIdUTF8, WebRtc_UWord32 productUniqueIdUTF8Length) { int errNum = [[_captureInfo getDeviceNamesFromIndex:deviceNumber @@ -62,7 +62,7 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetDeviceName( } WebRtc_Word32 VideoCaptureMacQTKitInfo::NumberOfCapabilities( - const WebRtc_UWord8* deviceUniqueIdUTF8) + const char* deviceUniqueIdUTF8) { // Not implemented. Mac doesn't use discrete steps in capabilities, rather // "analog". QTKit will do it's best to convert frames to what ever format @@ -74,7 +74,7 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::NumberOfCapabilities( WebRtc_Word32 VideoCaptureMacQTKitInfo::GetCapability( - const WebRtc_UWord8* deviceUniqueIdUTF8, + const char* deviceUniqueIdUTF8, const WebRtc_UWord32 deviceCapabilityNumber, VideoCaptureCapability& capability) { @@ -88,7 +88,7 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetCapability( WebRtc_Word32 VideoCaptureMacQTKitInfo::GetBestMatchedCapability( - const WebRtc_UWord8*deviceUniqueIdUTF8, + const char*deviceUniqueIdUTF8, const VideoCaptureCapability& requested, VideoCaptureCapability& resulting) { // Not implemented. Mac doesn't use discrete steps in capabilities, rather @@ -100,8 +100,8 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetBestMatchedCapability( } WebRtc_Word32 VideoCaptureMacQTKitInfo::DisplayCaptureSettingsDialogBox( - const WebRtc_UWord8* deviceUniqueIdUTF8, - const WebRtc_UWord8* dialogTitleUTF8, void* parentWindow, + const char* deviceUniqueIdUTF8, + const char* dialogTitleUTF8, void* parentWindow, WebRtc_UWord32 positionX, WebRtc_UWord32 positionY) { @@ -113,7 +113,7 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::DisplayCaptureSettingsDialogBox( } WebRtc_Word32 VideoCaptureMacQTKitInfo::CreateCapabilityMap( - const WebRtc_UWord8* deviceUniqueIdUTF8) + const char* deviceUniqueIdUTF8) { // Not implemented. Mac doesn't use discrete steps in capabilities, rather // "analog". QTKit will do it's best to convert frames to what ever format diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h index 1d3ac8688..a77a6daaf 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -49,16 +49,16 @@ - (NSNumber*)getCaptureDeviceCount; - (NSNumber*)getDeviceNamesFromIndex:(WebRtc_UWord32)index - DefaultName:(WebRtc_UWord8*)deviceName + DefaultName:(char*)deviceName WithLength:(WebRtc_UWord32)deviceNameLength - AndUniqueID:(WebRtc_UWord8*)deviceUniqueID + AndUniqueID:(char*)deviceUniqueID WithLength:(WebRtc_UWord32)deviceUniqueIDLength - AndProductID:(WebRtc_UWord8*)deviceProductID + AndProductID:(char*)deviceProductID WithLength:(WebRtc_UWord32)deviceProductIDLength; - (NSNumber*)displayCaptureSettingsDialogBoxWithDevice: - (const WebRtc_UWord8*)deviceUniqueIdUTF8 - AndTitle:(const WebRtc_UWord8*)dialogTitleUTF8 + (const char*)deviceUniqueIdUTF8 + AndTitle:(const char*)dialogTitleUTF8 AndParentWindow:(void*) parentWindow AtX:(WebRtc_UWord32)positionX AndY:(WebRtc_UWord32) positionY; @end diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm index 57ab3d095..23b65bd47 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm @@ -49,8 +49,8 @@ using namespace webrtc; /// ***** Creates a message box with Cocoa framework /// ***** Returns 0 on success, -1 otherwise. -- (NSNumber*)displayCaptureSettingsDialogBoxWithDevice:(const WebRtc_UWord8*)deviceUniqueIdUTF8 - AndTitle:(const WebRtc_UWord8*)dialogTitleUTF8 +- (NSNumber*)displayCaptureSettingsDialogBoxWithDevice:(const char*)deviceUniqueIdUTF8 + AndTitle:(const char*)dialogTitleUTF8 AndParentWindow:(void*) parentWindow AtX:(WebRtc_UWord32)positionX AndY:(WebRtc_UWord32) positionY @@ -74,11 +74,11 @@ using namespace webrtc; - (NSNumber*)getDeviceNamesFromIndex:(WebRtc_UWord32)index - DefaultName:(WebRtc_UWord8*)deviceName + DefaultName:(char*)deviceName WithLength:(WebRtc_UWord32)deviceNameLength - AndUniqueID:(WebRtc_UWord8*)deviceUniqueID + AndUniqueID:(char*)deviceUniqueID WithLength:(WebRtc_UWord32)deviceUniqueIDLength - AndProductID:(WebRtc_UWord8*)deviceProductID + AndProductID:(char*)deviceProductID WithLength:(WebRtc_UWord32)deviceProductIDLength { if(NO == _OSSupportedInfo) diff --git a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc index f70923eda..b9d7bed2d 100644 --- a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc +++ b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc @@ -65,7 +65,7 @@ VideoCaptureMacQuickTime::~VideoCaptureMacQuickTime() } WebRtc_Word32 VideoCaptureMacQuickTime::Init( - const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) + const WebRtc_Word32 id, const char* deviceUniqueIdUTF8) { const WebRtc_Word32 nameLength = @@ -74,7 +74,7 @@ WebRtc_Word32 VideoCaptureMacQuickTime::Init( return -1; // Store the device name - _deviceUniqueId = new WebRtc_UWord8[nameLength + 1]; + _deviceUniqueId = new char[nameLength + 1]; memset(_deviceUniqueId, 0, nameLength + 1); memcpy(_deviceUniqueId, deviceUniqueIdUTF8, nameLength + 1); diff --git a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h index db42b565a..4cc84833d 100644 --- a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h +++ b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h @@ -56,10 +56,10 @@ public: * otherwise. */ virtual WebRtc_Word32 GetDeviceName( - WebRtc_UWord32 deviceNumber, WebRtc_UWord8* deviceNameUTF8, - WebRtc_UWord32 deviceNameLength, WebRtc_UWord8* deviceUniqueIdUTF8, + WebRtc_UWord32 deviceNumber, char* deviceNameUTF8, + WebRtc_UWord32 deviceNameLength, char* deviceUniqueIdUTF8, WebRtc_UWord32 deviceUniqueIdUTF8Length, - WebRtc_UWord8* productUniqueIdUTF8 = 0, + char* productUniqueIdUTF8 = 0, WebRtc_UWord32 productUniqueIdUTF8Length = 0); @@ -68,7 +68,7 @@ public: /* * Returns the number of capabilities for this device */ - virtual WebRtc_Word32 NumberOfCapabilities(const WebRtc_UWord8* deviceUniqueIdUTF8); + virtual WebRtc_Word32 NumberOfCapabilities(const char* deviceUniqueIdUTF8); /* * Gets the capabilities of the named device @@ -126,11 +126,11 @@ private: // private methods int GetCaptureDevices(WebRtc_UWord32 deviceNumber, - WebRtc_UWord8* deviceNameUTF8, + char* deviceNameUTF8, WebRtc_UWord32 deviceNameUTF8Length, - WebRtc_UWord8* deviceUniqueIdUTF8, + char* deviceUniqueIdUTF8, WebRtc_UWord32 deviceUniqueIdUTF8Length, - WebRtc_UWord8* productUniqueIdUTF8, + char* productUniqueIdUTF8, WebRtc_UWord32 productUniqueIdUTF8Length, int& numberOfDevices); diff --git a/src/modules/video_capture/main/source/Mac/video_capture_mac.mm b/src/modules/video_capture/main/source/Mac/video_capture_mac.mm index d32993672..6ed9ddbf8 100644 --- a/src/modules/video_capture/main/source/Mac/video_capture_mac.mm +++ b/src/modules/video_capture/main/source/Mac/video_capture_mac.mm @@ -113,7 +113,7 @@ bool CheckQTVersion() */ VideoCaptureModule* VideoCaptureImpl::Create( - const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) + const WebRtc_Word32 id, const char* deviceUniqueIdUTF8) { if (webrtc::videocapturemodule::CheckOSVersion() == false)