zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRtc_Word32 -> int32_t in video_capture/

Browse Source 
BUG=314

Review URL: https://webrtc-codereview.appspot.com/1298005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3811 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-10 08:23:13 +00:00
parent ddf94e71e5
commit dfc5bb9c97
42 changed files with 642 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/modules/video_capture/linux/device_info_linux.h
View File

@ -21,29 +21,29 @@ namespace videocapturemodule
class DeviceInfoLinux: public DeviceInfoImpl
{
public:
DeviceInfoLinux(const WebRtc_Word32 id);
DeviceInfoLinux(const int32_t id);
virtual ~DeviceInfoLinux();
virtual WebRtc_UWord32 NumberOfDevices();
virtual WebRtc_Word32 GetDeviceName(
WebRtc_UWord32 deviceNumber,
virtual uint32_t NumberOfDevices();
virtual int32_t GetDeviceName(
uint32_t deviceNumber,
char* deviceNameUTF8,
WebRtc_UWord32 deviceNameLength,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
WebRtc_UWord32 deviceUniqueIdUTF8Length,
uint32_t deviceUniqueIdUTF8Length,
char* productUniqueIdUTF8=0,
WebRtc_UWord32 productUniqueIdUTF8Length=0);
uint32_t productUniqueIdUTF8Length=0);
/*
* Fills the membervariable _captureCapabilities with capabilites for the given device name.
*/
virtual WebRtc_Word32 CreateCapabilityMap (const char* deviceUniqueIdUTF8);
virtual WebRtc_Word32 DisplayCaptureSettingsDialogBox(
virtual int32_t CreateCapabilityMap (const char* deviceUniqueIdUTF8);
virtual int32_t DisplayCaptureSettingsDialogBox(
const char* /*deviceUniqueIdUTF8*/,
const char* /*dialogTitleUTF8*/,
void* /*parentWindow*/,
WebRtc_UWord32 /*positionX*/,
WebRtc_UWord32 /*positionY*/) { return -1;}
WebRtc_Word32 FillCapabilityMap(int fd);
WebRtc_Word32 Init();
uint32_t /*positionX*/,
uint32_t /*positionY*/) { return -1;}
int32_t FillCapabilityMap(int fd);
int32_t Init();
private:
bool IsDeviceNameMatches(const char* name, const char* deviceUniqueIdUTF8);