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

Replace the DestroyDeviceInfo with a virtual destructor.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@731 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2011-10-12 16:57:53 +00:00
parent 38e400a967
commit 77d7d5455e
15 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/video_capture/main/interface/video_capture.h
View File

@ -72,7 +72,6 @@ class VideoCaptureModule: public RefCountedModule {
WebRtc_UWord32 positionX,
WebRtc_UWord32 positionY) = 0;
protected:
virtual ~DeviceInfo() {}
};

1
src/modules/video_capture/main/interface/video_capture_factory.h
View File

@ -35,7 +35,6 @@ class VideoCaptureFactory {
static VideoCaptureModule::DeviceInfo* CreateDeviceInfo(
const WebRtc_Word32 id);
static void DestroyDeviceInfo(VideoCaptureModule::DeviceInfo* deviceInfo);
private:
~VideoCaptureFactory();

11
src/modules/video_capture/main/source/Android/device_info_android.cc
View File

@ -35,17 +35,6 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo (
return deviceInfo;
}
void VideoCaptureImpl::DestroyDeviceInfo(
VideoCaptureModule::DeviceInfo* deviceInfo)
{
WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, -1,
"%s", __FUNCTION__);
videocapturemodule::DeviceInfoAndroid* devInfo =
static_cast<videocapturemodule::DeviceInfoAndroid*> (deviceInfo);
delete devInfo;
}
DeviceInfoAndroid::DeviceInfoAndroid(const WebRtc_Word32 id) :
DeviceInfoImpl(id)
{

8
src/modules/video_capture/main/source/Linux/device_info_linux.cc
View File

@ -43,14 +43,6 @@ VideoCaptureImpl::CreateDeviceInfo(const WebRtc_Word32 id)
return deviceInfo;
}
void VideoCaptureImpl::DestroyDeviceInfo(DeviceInfo* deviceInfo)
{
videocapturemodule::DeviceInfoLinux* devInfo =
static_cast<videocapturemodule::DeviceInfoLinux*> (deviceInfo);
delete devInfo;
}
DeviceInfoLinux::DeviceInfoLinux(const WebRtc_Word32 id)
: DeviceInfoImpl(id)
{

9
src/modules/video_capture/main/source/Windows/device_info_windows.cc
View File

@ -31,19 +31,12 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(
if (!dsInfo || dsInfo->Init() != 0)
{
DestroyDeviceInfo(dsInfo);
delete dsInfo;
dsInfo = NULL;
}
return dsInfo;
}
void VideoCaptureImpl::DestroyDeviceInfo(DeviceInfo* deviceInfo)
{
videocapturemodule::DeviceInfoWindows* impl =
static_cast<videocapturemodule::DeviceInfoWindows*> (deviceInfo);
delete impl;
}
DeviceInfoWindows::DeviceInfoWindows(const WebRtc_Word32 id)
: DeviceInfoImpl(id), _dsDevEnum(NULL), _dsMonikerDevEnum(NULL),
_CoUninitializeIsRequired(true)

5
src/modules/video_capture/main/source/video_capture_factory.cc
View File

@ -29,9 +29,4 @@ VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo(
return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id);
}
void VideoCaptureFactory::DestroyDeviceInfo(
VideoCaptureModule::DeviceInfo* deviceInfo) {
videocapturemodule::VideoCaptureImpl::DestroyDeviceInfo(deviceInfo);
}
} // namespace webrtc

1
src/modules/video_capture/main/source/video_capture_impl.h
View File

@ -49,7 +49,6 @@ public:
VideoCaptureExternal*& externalCapture);
static DeviceInfo* CreateDeviceInfo(const WebRtc_Word32 id);
static void DestroyDeviceInfo(DeviceInfo* deviceInfo);
#ifdef WEBRTC_ANDROID
static WebRtc_Word32 SetAndroidObjects(void* javaVM, void* javaContext);

2
src/modules/video_capture/main/test/android/jni/video_capture_module_android_test_jni.cc
View File

@ -140,7 +140,7 @@ Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StopCapture(
{
if (jniData._videoCapture) {
jniData._videoCapture->StopCapture();
VideoCaptureModule::DestroyDeviceInfo(jniData._captureInfo);
delete jniData._captureInfo;
VideoCaptureModule::Destroy(jniData._videoCapture);
jniData._videoCapture = NULL;
jniData._captureInfo = NULL;

2
src/modules/video_capture/main/test/testAPI/testCameraEncoder.cpp
View File

@ -42,7 +42,7 @@ testCameraEncoder::testCameraEncoder(void)
testCameraEncoder::~testCameraEncoder(void)
{
VideoCaptureModule::DestroyDeviceInfo(_captureInfo);
delete _captureInfo;
#ifdef RENDER_PREVIEW
if(_renderer)

2
src/modules/video_capture/main/test/testAPI/testPlatformDependent.cpp
View File

@ -49,7 +49,7 @@ testPlatformDependent::testPlatformDependent(void) :
testPlatformDependent::~testPlatformDependent(void)
{
VideoCaptureModule::DestroyDeviceInfo(_captureInfo);
delete _captureInfo;
#ifdef RENDER_PREVIEW
if (_renderer[0])

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

@ -90,8 +90,7 @@ ViEInputManager::~ViEInputManager()
#ifndef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
if (_ptrCaptureDeviceInfo)
{
VideoCaptureFactory::DestroyDeviceInfo(
_ptrCaptureDeviceInfo);
delete _ptrCaptureDeviceInfo;
_ptrCaptureDeviceInfo = NULL;
}
#endif

2
src/video_engine/main/test/AutoTest/source/tb_capture_device.cc
View File

@ -56,7 +56,7 @@ tbCaptureDevice::tbCaptureDevice(tbInterfaces& Engine, int& nrOfErrors) :
break;
}
}
webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
delete devInfo;
numberOfErrors += ViETest::TestError(
captureDeviceSet, "ERROR: %s at line %d - Could not set capture device",
__FUNCTION__, __LINE__);

2
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
View File

@ -116,7 +116,7 @@ int ViEAutoTest::ViEBaseStandardTest()
vcpm = NULL;
}
}
webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
delete devInfo;
numberOfErrors+= ViETest::TestError(
captureDeviceSet,

4
src/video_engine/main/test/AutoTest/source/vie_autotest_capture.cc
View File

@ -338,7 +338,7 @@ int ViEAutoTest::ViECaptureStandardTest()
ViETest::Log(" ");
return numberOfErrors;
}
webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
delete devInfo;
ViETest::Log(" ");
ViETest::Log(" ViECapture Standard Test PASSED!");
@ -558,7 +558,7 @@ int ViEAutoTest::ViECaptureAPITest()
numberOfErrors += ViETest::TestError(error == 0, "ERROR: %s at line %d",
__FUNCTION__, __LINE__);
webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
delete devInfo;
vcpm->Release();
//***************************************************************

2
third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc
View File

@ -241,7 +241,7 @@ scoped_refptr<webrtc::VideoCaptureModule> Conductor::OpenVideoCaptureDevice() {
if (video_device.get())
break;
}
webrtc::VideoCaptureFactory::DestroyDeviceInfo(device_info);
delete device_info;
return video_device;
}