diff --git a/src/modules/video_capture/main/source/Android/device_info_android.cc b/src/modules/video_capture/main/source/Android/device_info_android.cc index df4e3e2636..3c5e052d54 100644 --- a/src/modules/video_capture/main/source/Android/device_info_android.cc +++ b/src/modules/video_capture/main/source/Android/device_info_android.cc @@ -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 @@ -23,8 +23,6 @@ namespace videocapturemodule VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo ( const WebRtc_Word32 id) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "%s", __FUNCTION__); videocapturemodule::DeviceInfoAndroid *deviceInfo = new videocapturemodule::DeviceInfoAndroid(id); if (deviceInfo && deviceInfo->Init() != 0) // Failed to init @@ -51,8 +49,6 @@ DeviceInfoAndroid::~DeviceInfoAndroid() WebRtc_UWord32 DeviceInfoAndroid::NumberOfDevices() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s", __FUNCTION__); JNIEnv *env; jclass javaCmDevInfoClass; @@ -97,8 +93,6 @@ WebRtc_Word32 DeviceInfoAndroid::GetDeviceName( WebRtc_UWord8* /*productUniqueIdUTF8*/, WebRtc_UWord32 /*productUniqueIdUTF8Length*/) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s", __FUNCTION__); JNIEnv *env; jclass javaCmDevInfoClass; @@ -180,8 +174,6 @@ WebRtc_Word32 DeviceInfoAndroid::GetDeviceName( WebRtc_Word32 DeviceInfoAndroid::CreateCapabilityMap( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s", __FUNCTION__); MapItem* item = NULL; while ((item = _captureCapabilities.Last())) @@ -302,8 +294,6 @@ WebRtc_Word32 DeviceInfoAndroid::GetOrientation( const WebRtc_UWord8* deviceUniqueIdUTF8, VideoCaptureRotation& orientation) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s", __FUNCTION__); JNIEnv *env; jclass javaCmDevInfoClass; diff --git a/src/modules/video_capture/main/source/Android/video_capture_android.cc b/src/modules/video_capture/main/source/Android/video_capture_android.cc index e6e9f5728c..acf7e3b249 100644 --- a/src/modules/video_capture/main/source/Android/video_capture_android.cc +++ b/src/modules/video_capture/main/source/Android/video_capture_android.cc @@ -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 @@ -23,8 +23,6 @@ VideoCaptureModule* VideoCaptureImpl::Create( const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, -1, - "%s:", __FUNCTION__); RefCountImpl* implementation = new RefCountImpl(id); @@ -54,8 +52,6 @@ jobject VideoCaptureAndroid::g_javaContext = NULL; WebRtc_Word32 VideoCaptureAndroid::SetAndroidObjects(void* javaVM, void* javaContext) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, -1, - "%s:", __FUNCTION__); g_jvm = static_cast (javaVM); g_javaContext = static_cast (javaContext); 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 c043837f3b..c4a02c9a33 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 @@ -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 @@ -32,8 +32,6 @@ VideoCaptureMacQTKit::VideoCaptureMacQTKit(const WebRtc_Word32 id) : _captureFrameRate(QTKIT_DEFAULT_FRAME_RATE), _frameCount(0) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "VideoCaptureMacQTKit::VideoCaptureMacQTKit() called"); memset(_currentDeviceNameUTF8, 0, MAX_NAME_LENGTH); memset(_currentDeviceUniqueIdUTF8, 0, MAX_NAME_LENGTH); @@ -62,9 +60,6 @@ WebRtc_Word32 VideoCaptureMacQTKit::Init( { CriticalSectionScoped cs(_apiCs); - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "VideoCaptureMacQTKit::Init() called with id %d and unique " - "device %s", id, iDeviceUniqueIdUTF8); const WebRtc_Word32 nameLength = (WebRtc_Word32) strlen((char*)iDeviceUniqueIdUTF8); @@ -171,9 +166,6 @@ WebRtc_Word32 VideoCaptureMacQTKit::Init( WebRtc_Word32 VideoCaptureMacQTKit::StartCapture( const VideoCaptureCapability& capability) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "StartCapture width %d, height %d, frameRate %d", - capability.width, capability.height, capability.maxFPS); _captureWidth = capability.width; _captureHeight = capability.height; 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 3010fd58da..b13a8ab80e 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 @@ -22,15 +22,11 @@ namespace videocapturemodule VideoCaptureMacQTKitInfo::VideoCaptureMacQTKitInfo(const WebRtc_Word32 id) : DeviceInfoImpl(id) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); _captureInfo = [[VideoCaptureMacQTKitInfoObjC alloc] init]; } VideoCaptureMacQTKitInfo::~VideoCaptureMacQTKitInfo() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); [_captureInfo release]; } @@ -38,16 +34,12 @@ VideoCaptureMacQTKitInfo::~VideoCaptureMacQTKitInfo() WebRtc_Word32 VideoCaptureMacQTKitInfo::Init() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); return 0; } WebRtc_UWord32 VideoCaptureMacQTKitInfo::NumberOfDevices() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); WebRtc_UWord32 captureDeviceCount = [[_captureInfo getCaptureDeviceCount]intValue]; return captureDeviceCount; @@ -60,8 +52,6 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetDeviceName( WebRtc_UWord32 deviceUniqueIdUTF8Length, WebRtc_UWord8* productUniqueIdUTF8, WebRtc_UWord32 productUniqueIdUTF8Length) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); int errNum = [[_captureInfo getDeviceNamesFromIndex:deviceNumber DefaultName:deviceNameUTF8 WithLength:deviceNameLength AndUniqueID:deviceUniqueIdUTF8 @@ -74,8 +64,6 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetDeviceName( WebRtc_Word32 VideoCaptureMacQTKitInfo::NumberOfCapabilities( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); // 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 // you ask for. @@ -90,8 +78,6 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::GetCapability( const WebRtc_UWord32 deviceCapabilityNumber, VideoCaptureCapability& capability) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); // 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 // you ask for. @@ -118,8 +104,6 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::DisplayCaptureSettingsDialogBox( const WebRtc_UWord8* dialogTitleUTF8, void* parentWindow, WebRtc_UWord32 positionX, WebRtc_UWord32 positionY) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); return [[_captureInfo displayCaptureSettingsDialogBoxWithDevice:deviceUniqueIdUTF8 @@ -131,8 +115,6 @@ WebRtc_Word32 VideoCaptureMacQTKitInfo::DisplayCaptureSettingsDialogBox( WebRtc_Word32 VideoCaptureMacQTKitInfo::CreateCapabilityMap( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); // 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 // you ask for. 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 3f0e7cb76d..57ab3d095d 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 @@ -1,11 +1,15 @@ -// -// VideoCaptureMacQTKitInfoObjC.cpp -// -// +/* + * 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 + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ #pragma mark **** imports/includes - #import "video_capture_qtkit_info_objc.h" #include "trace.h" @@ -14,7 +18,6 @@ using namespace webrtc; #pragma mark **** hidden class interface - @implementation VideoCaptureMacQTKitInfoObjC // ****************** over-written OS methods *********************** @@ -38,8 +41,6 @@ using namespace webrtc; /// ***** Objective-C. Similar to C++ destructor /// ***** Returns nothing - (void)dealloc { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); [super dealloc]; } diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm index 73322424a3..48f734cc39 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm @@ -1,8 +1,12 @@ -// -// VideoCaptureMacQTKitObjC.cpp -// -// - +/* + * 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 + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ #define DEFAULT_CAPTURE_DEVICE_INDEX 1 #define DEFAULT_FRAME_RATE 30 @@ -11,8 +15,6 @@ #define ROTATE_CAPTURED_FRAME 1 #define LOW_QUALITY 1 - - #import "video_capture_qtkit_objc.h" #include "video_capture_qtkit_utility.h" #include "trace.h" @@ -28,8 +30,6 @@ using namespace videocapturemodule; /// manually. /// ***** Potentially returns an instance of self -(id)init{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); self = [super init]; if(nil != self) { @@ -46,8 +46,6 @@ using namespace videocapturemodule; /// ***** Objective-C. Similar to C++ destructor /// ***** Returns nothing - (void)dealloc { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(_captureSession) { [_captureSession stopRunning]; @@ -64,7 +62,6 @@ using namespace videocapturemodule; /// sent /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)registerOwner:(VideoCaptureMacQTKit*)owner{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, "%s:%d", __FUNCTION__, __LINE__); if(!owner){ return [NSNumber numberWithInt:-1]; } @@ -77,8 +74,6 @@ using namespace videocapturemodule; /// occurred /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)setCaptureDeviceById:(char*)uniqueId{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d name=%s", __FUNCTION__, __LINE__, uniqueId); if(NO == _OSSupported) { WEBRTC_TRACE(kTraceInfo, kTraceVideoCapture, 0, @@ -183,9 +178,6 @@ using namespace videocapturemodule; /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)setCaptureHeight:(int)height AndWidth:(int)width AndFrameRate:(int)frameRate{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d height=%d width=%d frameRate=%d", __FUNCTION__, - __LINE__, height, width, frameRate); if(NO == _OSSupported) { return [NSNumber numberWithInt:0]; @@ -219,8 +211,6 @@ using namespace videocapturemodule; /// ***** Sets member variables _capturing /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)startCapture{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(NO == _OSSupported) { return [NSNumber numberWithInt:0]; @@ -252,8 +242,6 @@ using namespace videocapturemodule; /// ***** Sets member variables _capturing /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)stopCapture{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(NO == _OSSupported) { @@ -285,8 +273,6 @@ using namespace videocapturemodule; /// ***** Class member variables are initialized here /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)initializeVariables{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(NO == _OSSupported) { @@ -327,8 +313,6 @@ using namespace videocapturemodule; // versions of the OS. I.E. Backwards compaitibility // Returns nothing. Sets member variable - (void)checkOSSupported{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); Class osSupportedTest = NSClassFromString(@"QTCaptureSession"); _OSSupported = NO; @@ -342,8 +326,6 @@ using namespace videocapturemodule; /// ***** Stores them in an NSArray instance /// ***** Returns 0 on success, -1 otherwise. - (NSNumber*)getCaptureDevices{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(NO == _OSSupported) { @@ -371,8 +353,6 @@ using namespace videocapturemodule; // The image format and frequency are setup here // Returns 0 on success, -1 otherwise. - (NSNumber*)initializeVideoCapture{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); if(YES == _captureInitialized) { 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 f7d8f2e29d..f70923edae 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 @@ -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 @@ -42,8 +42,6 @@ VideoCaptureMacQuickTime::VideoCaptureMacQuickTime(WebRtc_Word32 iID) : _captureDeviceListTime(0), _captureCapabilityList() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); _captureCapability.width = START_CODEC_WIDTH; _captureCapability.height = START_CODEC_HEIGHT; memset(_captureDeviceDisplayName, 0, sizeof(_captureDeviceDisplayName)); @@ -52,8 +50,6 @@ VideoCaptureMacQuickTime::VideoCaptureMacQuickTime(WebRtc_Word32 iID) : VideoCaptureMacQuickTime::~VideoCaptureMacQuickTime() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); VideoCaptureTerminate(); @@ -71,8 +67,6 @@ VideoCaptureMacQuickTime::~VideoCaptureMacQuickTime() WebRtc_Word32 VideoCaptureMacQuickTime::Init( const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); const WebRtc_Word32 nameLength = (WebRtc_Word32) strlen((char*) deviceUniqueIdUTF8); @@ -133,9 +127,6 @@ WebRtc_Word32 VideoCaptureMacQuickTime::Init( if (version < 0x07000000) // QT v. 7.x or newer (QT 5.0.2 0x05020000) { _videoMacCritsect->Leave(); - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d QuickTime version too old. Need 7 or newer", - __FUNCTION__, __LINE__); return -1; } @@ -210,8 +201,6 @@ WebRtc_Word32 VideoCaptureMacQuickTime::CaptureSettings( int VideoCaptureMacQuickTime::VideoCaptureTerminate() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); VideoCaptureStop(); _videoMacCritsect->Enter(); @@ -289,8 +278,6 @@ int VideoCaptureMacQuickTime::UpdateCaptureSettings(int channel, webrtc::VideoCodec& inst, bool def) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d channel: %d", __FUNCTION__, __LINE__, channel); if (channel < 0) { @@ -368,9 +355,6 @@ int VideoCaptureMacQuickTime::CreateLocalGWorld(int width, int height) } if (width == 0 || height == 0) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d Invalid dimensions width:%d height:%d", - __FUNCTION__, __LINE__, width, height); return -1; } @@ -493,9 +477,6 @@ int VideoCaptureMacQuickTime::ConnectCaptureDevice() if (SGNewChannel(_captureGrabber, VideoMediaType, &_captureChannel) != noErr) // Takes time!!! { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d Could not create sequence grabber channel", - __FUNCTION__, __LINE__); return -1; } @@ -1200,9 +1181,6 @@ int VideoCaptureMacQuickTime::VideoCaptureSetCaptureDevice( const char* deviceName, int size) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d deviceName=%s, size=%d", __FUNCTION__, __LINE__, - deviceName, size); _videoMacCritsect->Enter(); bool wasCapturing = false; diff --git a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc index 0efe5c9234..4f3cc1a5c8 100644 --- a/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc +++ b/src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc @@ -30,28 +30,20 @@ VideoCaptureMacQuickTimeInfo::VideoCaptureMacQuickTimeInfo( DeviceInfoImpl(iID), _id(iID), _grabberCritsect(CriticalSectionWrapper::CreateCriticalSection()) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); } VideoCaptureMacQuickTimeInfo::~VideoCaptureMacQuickTimeInfo() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); } WebRtc_Word32 VideoCaptureMacQuickTimeInfo::Init() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); return 0; } WebRtc_UWord32 VideoCaptureMacQuickTimeInfo::NumberOfDevices() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d", __FUNCTION__, __LINE__); int numOfDevices = 0; // don't care about these variables... dummy vars to call GetCaptureDevices @@ -76,8 +68,6 @@ WebRtc_Word32 VideoCaptureMacQuickTimeInfo::GetDeviceName( WebRtc_UWord32 deviceUniqueIdUTF8Length, WebRtc_UWord8* productUniqueIdUTF8, WebRtc_UWord32 productUniqueIdUTF8Length) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "%s:%d deviceNumber=\%d", __FUNCTION__, __LINE__); int numOfDevices = 0; // not needed for this function return GetCaptureDevices(deviceNumber, deviceNameUTF8, @@ -89,8 +79,6 @@ WebRtc_Word32 VideoCaptureMacQuickTimeInfo::GetDeviceName( WebRtc_Word32 VideoCaptureMacQuickTimeInfo::NumberOfCapabilities( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id, "NumberOfCapabilities is not supported on the Mac platform."); return -1; @@ -101,8 +89,6 @@ WebRtc_Word32 VideoCaptureMacQuickTimeInfo::GetCapability( const WebRtc_UWord32 deviceCapabilityNumber, VideoCaptureCapability& capability) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id, "NumberOfCapabilities is not supported on the Mac platform."); return -1; @@ -122,16 +108,12 @@ WebRtc_Word32 VideoCaptureMacQuickTimeInfo::DisplayCaptureSettingsDialogBox( const WebRtc_UWord8* dialogTitleUTF8, void* parentWindow, WebRtc_UWord32 positionX, WebRtc_UWord32 positionY) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); return -1; } WebRtc_Word32 VideoCaptureMacQuickTimeInfo::CreateCapabilityMap( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s:%d", __FUNCTION__, __LINE__); WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, _id, "NumberOfCapabilities is not supported on the Mac platform."); return -1; @@ -144,9 +126,6 @@ int VideoCaptureMacQuickTimeInfo::GetCaptureDevices( WebRtc_UWord32 productUniqueIdUTF8Length, int& numberOfDevices) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, - "%s(wrapped):%d deviceNumber: %d", __FUNCTION__, __LINE__, - deviceNumber); numberOfDevices = 0; memset(deviceNameUTF8, 0, deviceNameUTF8Length); 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 d14aec4a4b..d329936729 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 @@ -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 @@ -115,8 +115,6 @@ bool CheckQTVersion() VideoCaptureModule* VideoCaptureImpl::Create( const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "Create %s", deviceUniqueIdUTF8); if (webrtc::videocapturemodule::CheckOSVersion() == false) { @@ -211,8 +209,6 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(const WebRtc_Word32 id) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "Create %d", id); if (webrtc::videocapturemodule::CheckOSVersion() == false) { diff --git a/src/modules/video_capture/main/source/Windows/device_info_windows.cc b/src/modules/video_capture/main/source/Windows/device_info_windows.cc index cf87b0eaa8..5adcc9635b 100644 --- a/src/modules/video_capture/main/source/Windows/device_info_windows.cc +++ b/src/modules/video_capture/main/source/Windows/device_info_windows.cc @@ -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 @@ -106,8 +106,6 @@ WebRtc_Word32 DeviceInfoWindows::Init() WebRtc_UWord32 DeviceInfoWindows::NumberOfDevices() { ReadLockScoped cs(_apiLock); - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "NumberOfDevices"); return GetDeviceInfo(0, 0, 0, 0, 0, 0, 0); } @@ -120,8 +118,6 @@ WebRtc_Word32 DeviceInfoWindows::GetDeviceName( WebRtc_UWord8* productUniqueIdUTF8, WebRtc_UWord32 productUniqueIdUTF8Length) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "GetDeviceName"); ReadLockScoped cs(_apiLock); const WebRtc_Word32 result = GetDeviceInfo(deviceNumber, deviceNameUTF8, deviceNameLength, diff --git a/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc b/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc index 9f056f325e..bfc7a30f13 100644 --- a/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc +++ b/src/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc @@ -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 @@ -20,13 +20,9 @@ VideoCaptureModule* VideoCaptureImpl::Create( const WebRtc_Word32 id, const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, "Create %s", - deviceUniqueIdUTF8); if (deviceUniqueIdUTF8 == NULL) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, id, - "Create Invalid deviceUniqueIdUTF8"); return NULL; } diff --git a/src/modules/video_capture/main/source/Windows/video_capture_windows.cc b/src/modules/video_capture/main/source/Windows/video_capture_windows.cc index 8f94d6a2bb..624241ad87 100644 --- a/src/modules/video_capture/main/source/Windows/video_capture_windows.cc +++ b/src/modules/video_capture/main/source/Windows/video_capture_windows.cc @@ -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 @@ -171,9 +171,6 @@ WebRtc_Word32 VideoCaptureDS::Init(const WebRtc_Word32 id, WebRtc_Word32 VideoCaptureDS::StartCapture( const VideoCaptureCapability& capability) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "StartCapture widht %d, height %d, frameRate %d", - capability.width, capability.height, capability.maxFPS); CriticalSectionScoped cs(_apiCs); if (capability != _requestedCapability) @@ -197,8 +194,6 @@ WebRtc_Word32 VideoCaptureDS::StartCapture( WebRtc_Word32 VideoCaptureDS::StopCapture() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "StopCapture"); CriticalSectionScoped cs(_apiCs); HRESULT hr = _mediaControl->Pause(); diff --git a/src/modules/video_capture/main/source/device_info_impl.cc b/src/modules/video_capture/main/source/device_info_impl.cc index 10312e9620..e41e0bb2a8 100644 --- a/src/modules/video_capture/main/source/device_info_impl.cc +++ b/src/modules/video_capture/main/source/device_info_impl.cc @@ -45,8 +45,6 @@ DeviceInfoImpl::~DeviceInfoImpl(void) WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities( const WebRtc_UWord8* deviceUniqueIdUTF8) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "NumberOfCapabilities, uniqueID %s", deviceUniqueIdUTF8); if (!deviceUniqueIdUTF8) return -1; @@ -83,8 +81,6 @@ WebRtc_Word32 DeviceInfoImpl::GetCapability(const WebRtc_UWord8* deviceUniqueIdU const WebRtc_UWord32 deviceCapabilityNumber, VideoCaptureCapability& capability) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "GetCapability capability number %d", deviceCapabilityNumber); if (!deviceUniqueIdUTF8) { @@ -153,8 +149,6 @@ WebRtc_Word32 DeviceInfoImpl::GetBestMatchedCapability( VideoCaptureCapability& resulting) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "GetBestMatchedCapability unique ID %s", deviceUniqueIdUTF8); if (!deviceUniqueIdUTF8) return -1; diff --git a/src/modules/video_capture/main/source/video_capture_impl.cc b/src/modules/video_capture/main/source/video_capture_impl.cc index 1d19fc7fae..6574d3ead7 100644 --- a/src/modules/video_capture/main/source/video_capture_impl.cc +++ b/src/modules/video_capture/main/source/video_capture_impl.cc @@ -165,8 +165,6 @@ VideoCaptureImpl::~VideoCaptureImpl() WebRtc_Word32 VideoCaptureImpl::RegisterCaptureDataCallback( VideoCaptureDataCallback& dataCallBack) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "RegisterCaptureDataCallback"); CriticalSectionScoped cs(_apiCs); CriticalSectionScoped cs2(_callBackCs); _dataCallBack = &dataCallBack; @@ -176,8 +174,6 @@ WebRtc_Word32 VideoCaptureImpl::RegisterCaptureDataCallback( WebRtc_Word32 VideoCaptureImpl::DeRegisterCaptureDataCallback() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "DeRegisterCaptureDataCallback"); CriticalSectionScoped cs(_apiCs); CriticalSectionScoped cs2(_callBackCs); _dataCallBack = NULL; @@ -185,7 +181,6 @@ WebRtc_Word32 VideoCaptureImpl::DeRegisterCaptureDataCallback() } WebRtc_Word32 VideoCaptureImpl::RegisterCaptureCallback(VideoCaptureFeedBack& callBack) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, "RegisterCaptureCallback %x"); CriticalSectionScoped cs(_apiCs); CriticalSectionScoped cs2(_callBackCs); @@ -194,7 +189,6 @@ WebRtc_Word32 VideoCaptureImpl::RegisterCaptureCallback(VideoCaptureFeedBack& ca } WebRtc_Word32 VideoCaptureImpl::DeRegisterCaptureCallback() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, "DeRegisterCaptureCallback"); CriticalSectionScoped cs(_apiCs); CriticalSectionScoped cs2(_callBackCs); @@ -204,16 +198,12 @@ WebRtc_Word32 VideoCaptureImpl::DeRegisterCaptureCallback() } WebRtc_Word32 VideoCaptureImpl::SetCaptureDelay(WebRtc_Word32 delayMS) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, "SetCaptureDelay %d", - (int) delayMS); CriticalSectionScoped cs(_apiCs); _captureDelay = delayMS; return 0; } WebRtc_Word32 VideoCaptureImpl::CaptureDelay() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, "CaptureDelay %d", - (int) _captureDelay); CriticalSectionScoped cs(_apiCs); return _setCaptureDelay; } @@ -417,8 +407,6 @@ WebRtc_Word32 VideoCaptureImpl::SetCaptureRotation(VideoCaptureRotation rotation WebRtc_Word32 VideoCaptureImpl::StartSendImage(const VideoFrame& videoFrame, WebRtc_Word32 frameRate) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, _id, - "StartSendImage, frameRate %d", (int) frameRate); CriticalSectionScoped cs(_apiCs); CriticalSectionScoped cs2(_callBackCs); if (frameRate < 1 || frameRate > kMaxFrameRate) diff --git a/src/modules/video_coding/main/source/video_coding_impl.cc b/src/modules/video_coding/main/source/video_coding_impl.cc index 3b5c25ca86..771f702705 100644 --- a/src/modules/video_coding/main/source/video_coding_impl.cc +++ b/src/modules/video_coding/main/source/video_coding_impl.cc @@ -116,20 +116,12 @@ VideoCodingModuleImpl::~VideoCodingModuleImpl() VideoCodingModule* VideoCodingModule::Create(const WebRtc_Word32 id) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(id), - "VideoCodingModule::Create()"); return new VideoCodingModuleImpl(id, new TickTimeBase(), true); } VideoCodingModule* VideoCodingModule::Create(const WebRtc_Word32 id, TickTimeBase* clock) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(id), - "VideoCodingModule::Create()"); assert(clock); return new VideoCodingModuleImpl(id, clock, false); } @@ -139,10 +131,6 @@ VideoCodingModule::Destroy(VideoCodingModule* module) { if (module != NULL) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - static_cast(module)->Id(), - "VideoCodingModule::Destroy()"); delete static_cast(module); } } @@ -232,10 +220,6 @@ VideoCodingModuleImpl::Process() WebRtc_Word32 VideoCodingModuleImpl::Id() const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "Id()"); CriticalSectionScoped receiveCs(_receiveCritSect); { CriticalSectionScoped sendCs(_sendCritSect); @@ -247,10 +231,6 @@ VideoCodingModuleImpl::Id() const WebRtc_Word32 VideoCodingModuleImpl::ChangeUniqueId(const WebRtc_Word32 id) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "ChangeUniqueId()"); CriticalSectionScoped receiveCs(_receiveCritSect); { CriticalSectionScoped sendCs(_sendCritSect); @@ -285,10 +265,6 @@ VideoCodingModuleImpl::TimeUntilNextProcess() WebRtc_UWord8 VideoCodingModule::NumberOfCodecs() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - -1, - "NumberOfCodecs()"); return VCMCodecDataBase::NumberOfCodecs(); } @@ -296,10 +272,6 @@ VideoCodingModule::NumberOfCodecs() WebRtc_Word32 VideoCodingModule::Codec(WebRtc_UWord8 listId, VideoCodec* codec) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - -1, - "Codec()"); if (codec == NULL) { return VCM_PARAMETER_ERROR; @@ -311,10 +283,6 @@ VideoCodingModule::Codec(WebRtc_UWord8 listId, VideoCodec* codec) WebRtc_Word32 VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - -1, - "Codec()"); if (codec == NULL) { return VCM_PARAMETER_ERROR; @@ -330,10 +298,6 @@ VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) WebRtc_Word32 VideoCodingModuleImpl::InitializeSender() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "InitializeSender()"); CriticalSectionScoped cs(_sendCritSect); _codecDataBase.ResetSender(); _encoder = NULL; @@ -350,10 +314,6 @@ VideoCodingModuleImpl::RegisterSendCodec(const VideoCodec* sendCodec, WebRtc_UWord32 numberOfCores, WebRtc_UWord32 maxPayloadSize) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterSendCodec()"); CriticalSectionScoped cs(_sendCritSect); if (sendCodec == NULL) { @@ -396,10 +356,6 @@ VideoCodingModuleImpl::RegisterSendCodec(const VideoCodec* sendCodec, WebRtc_Word32 VideoCodingModuleImpl::SendCodec(VideoCodec* currentSendCodec) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SendCodec()"); CriticalSectionScoped cs(_sendCritSect); if (currentSendCodec == NULL) @@ -413,10 +369,6 @@ VideoCodingModuleImpl::SendCodec(VideoCodec* currentSendCodec) const VideoCodecType VideoCodingModuleImpl::SendCodec() const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SendCodec()"); CriticalSectionScoped cs(_sendCritSect); return _codecDataBase.SendCodec(); @@ -429,10 +381,6 @@ VideoCodingModuleImpl::RegisterExternalEncoder(VideoEncoder* externalEncoder, WebRtc_UWord8 payloadType, bool internalSource /*= false*/) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterExternalEncoder()"); CriticalSectionScoped cs(_sendCritSect); if (externalEncoder == NULL) @@ -458,10 +406,6 @@ WebRtc_Word32 VideoCodingModuleImpl::CodecConfigParameters(WebRtc_UWord8* buffer, WebRtc_Word32 size) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "CodecConfigParameters()"); CriticalSectionScoped cs(_sendCritSect); if (_encoder != NULL) { @@ -473,10 +417,6 @@ VideoCodingModuleImpl::CodecConfigParameters(WebRtc_UWord8* buffer, // Get encode bitrate int VideoCodingModuleImpl::Bitrate(unsigned int* bitrate) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "Bitrate()"); CriticalSectionScoped cs(_sendCritSect); // return the bit rate which the encoder is set to if (!_encoder) { @@ -489,10 +429,6 @@ int VideoCodingModuleImpl::Bitrate(unsigned int* bitrate) const // Get encode frame rate int VideoCodingModuleImpl::FrameRate(unsigned int* framerate) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "FrameRate()"); CriticalSectionScoped cs(_sendCritSect); // input frame rate, not compensated if (!_encoder) { @@ -508,10 +444,6 @@ VideoCodingModuleImpl::SetChannelParameters(WebRtc_UWord32 availableBandWidth, WebRtc_UWord8 lossRate, WebRtc_UWord32 rtt) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SetChannelParameters()"); WebRtc_Word32 ret = 0; { CriticalSectionScoped sendCs(_sendCritSect); @@ -543,10 +475,6 @@ VideoCodingModuleImpl::SetChannelParameters(WebRtc_UWord32 availableBandWidth, WebRtc_Word32 VideoCodingModuleImpl::SetReceiveChannelParameters(WebRtc_UWord32 rtt) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SetReceiveChannelParameters()"); CriticalSectionScoped receiveCs(_receiveCritSect); _receiver.UpdateRtt(rtt); return 0; @@ -558,10 +486,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterTransportCallback( VCMPacketizationCallback* transport) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterTransportCallback()"); CriticalSectionScoped cs(_sendCritSect); _encodedFrameCallback.SetMediaOpt(&_mediaOpt); _encodedFrameCallback.SetTransportCallback(transport); @@ -575,10 +499,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterSendStatisticsCallback( VCMSendStatisticsCallback* sendStats) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterSendStatisticsCallback()"); CriticalSectionScoped cs(_sendCritSect); _sendStatsCallback = sendStats; return VCM_OK; @@ -601,10 +521,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterProtectionCallback( VCMProtectionCallback* protection) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterProtectionCallback()"); CriticalSectionScoped cs(_sendCritSect); _mediaOpt.RegisterProtectionCallback(protection); return VCM_OK; @@ -615,10 +531,6 @@ WebRtc_Word32 VideoCodingModuleImpl::SetVideoProtection(VCMVideoProtection videoProtection, bool enable) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SetVideoProtection()"); switch (videoProtection) { @@ -748,10 +660,6 @@ VideoCodingModuleImpl::AddVideoFrame(const VideoFrame& videoFrame, const VideoContentMetrics* contentMetrics, const CodecSpecificInfo* codecSpecificInfo) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "AddVideoFrame()"); CriticalSectionScoped cs(_sendCritSect); if (_encoder == NULL) @@ -808,10 +716,6 @@ VideoCodingModuleImpl::FrameTypeRequest(FrameType frameType, { assert(simulcastIdx < kMaxSimulcastStreams); - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "FrameTypeRequest()"); CriticalSectionScoped cs(_sendCritSect); _nextFrameType[simulcastIdx] = frameType; @@ -839,10 +743,6 @@ VideoCodingModuleImpl::EnableFrameDropper(bool enable) WebRtc_Word32 VideoCodingModuleImpl::SentFrameCount(VCMFrameCount &frameCount) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SentFrameCount()"); CriticalSectionScoped cs(_sendCritSect); return _mediaOpt.SentFrameCount(frameCount); } @@ -851,10 +751,6 @@ VideoCodingModuleImpl::SentFrameCount(VCMFrameCount &frameCount) const WebRtc_Word32 VideoCodingModuleImpl::InitializeReceiver() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "InitializeReceiver()"); CriticalSectionScoped cs(_receiveCritSect); WebRtc_Word32 ret = _receiver.Initialize(); if (ret < 0) @@ -889,10 +785,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterReceiveCallback( VCMReceiveCallback* receiveCallback) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterReceiveCallback()"); CriticalSectionScoped cs(_receiveCritSect); _decodedFrameCallback.SetUserReceiveCallback(receiveCallback); return VCM_OK; @@ -902,10 +794,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterReceiveStatisticsCallback( VCMReceiveStatisticsCallback* receiveStats) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterReceiveStatisticsCallback()"); CriticalSectionScoped cs(_receiveCritSect); _receiveStatsCallback = receiveStats; return VCM_OK; @@ -918,10 +806,6 @@ VideoCodingModuleImpl::RegisterExternalDecoder(VideoDecoder* externalDecoder, WebRtc_UWord8 payloadType, bool internalRenderTiming) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterExternalDecoder()"); CriticalSectionScoped cs(_receiveCritSect); if (externalDecoder == NULL) { @@ -942,10 +826,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterFrameTypeCallback( VCMFrameTypeCallback* frameTypeCallback) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterFrameTypeCallback()"); CriticalSectionScoped cs(_receiveCritSect); _frameTypeCallback = frameTypeCallback; return VCM_OK; @@ -955,10 +835,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterFrameStorageCallback( VCMFrameStorageCallback* frameStorageCallback) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterFrameStorageCallback()"); CriticalSectionScoped cs(_receiveCritSect); _frameStorageCallback = frameStorageCallback; return VCM_OK; @@ -968,10 +844,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RegisterPacketRequestCallback( VCMPacketRequestCallback* callback) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterPacketRequestCallback()"); CriticalSectionScoped cs(_receiveCritSect); _packetRequestCallback = callback; return VCM_OK; @@ -982,10 +854,6 @@ VideoCodingModuleImpl::RegisterPacketRequestCallback( WebRtc_Word32 VideoCodingModuleImpl::Decode(WebRtc_UWord16 maxWaitTimeMs) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "Decode()"); WebRtc_Word64 nextRenderTimeMs; { CriticalSectionScoped cs(_receiveCritSect); @@ -1075,10 +943,6 @@ WebRtc_Word32 VideoCodingModuleImpl::RequestSliceLossIndication( const WebRtc_UWord64 pictureID) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterSliceLossIndication()"); if (_frameTypeCallback != NULL) { const WebRtc_Word32 ret = @@ -1132,10 +996,6 @@ VideoCodingModuleImpl::RequestKeyFrame() WebRtc_Word32 VideoCodingModuleImpl::DecodeDualFrame(WebRtc_UWord16 maxWaitTimeMs) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "DecodeDualFrame()"); CriticalSectionScoped cs(_receiveCritSect); if (_dualReceiver.State() != kReceiving || _dualReceiver.NackMode() != kNackInfinite) @@ -1260,10 +1120,6 @@ WebRtc_Word32 VideoCodingModuleImpl::DecodeFromStorage( const EncodedVideoData& frameFromStorage) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "DecodeFromStorage()"); CriticalSectionScoped cs(_receiveCritSect); WebRtc_Word32 ret = _frameFromFile.ExtractFromStorage(frameFromStorage); if (ret < 0) @@ -1277,10 +1133,6 @@ VideoCodingModuleImpl::DecodeFromStorage( WebRtc_Word32 VideoCodingModuleImpl::ResetDecoder() { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "ResetDecoder()"); CriticalSectionScoped cs(_receiveCritSect); if (_decoder != NULL) { @@ -1307,10 +1159,6 @@ VideoCodingModuleImpl::RegisterReceiveCodec(const VideoCodec* receiveCodec, WebRtc_Word32 numberOfCores, bool requireKeyFrame) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "RegisterReceiveCodec()"); CriticalSectionScoped cs(_receiveCritSect); if (receiveCodec == NULL) { @@ -1324,10 +1172,6 @@ VideoCodingModuleImpl::RegisterReceiveCodec(const VideoCodec* receiveCodec, WebRtc_Word32 VideoCodingModuleImpl::ReceiveCodec(VideoCodec* currentReceiveCodec) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "ReceiveCodec()"); CriticalSectionScoped cs(_receiveCritSect); if (currentReceiveCodec == NULL) { @@ -1340,10 +1184,6 @@ VideoCodingModuleImpl::ReceiveCodec(VideoCodec* currentReceiveCodec) const VideoCodecType VideoCodingModuleImpl::ReceiveCodec() const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "ReceiveCodec()"); CriticalSectionScoped cs(_receiveCritSect); return _codecDataBase.ReceiveCodec(); } @@ -1354,10 +1194,6 @@ VideoCodingModuleImpl::IncomingPacket(const WebRtc_UWord8* incomingPayload, WebRtc_UWord32 payloadLength, const WebRtcRTPHeader& rtpInfo) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "IncomingPacket()"); const VCMPacket packet(incomingPayload, payloadLength, rtpInfo); WebRtc_Word32 ret; if (_dualReceiver.State() != kPassive) @@ -1389,10 +1225,6 @@ VideoCodingModuleImpl::IncomingPacket(const WebRtc_UWord8* incomingPayload, WebRtc_Word32 VideoCodingModuleImpl::SetMinimumPlayoutDelay(WebRtc_UWord32 minPlayoutDelayMs) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SetMininumPlayoutDelay(%u)", minPlayoutDelayMs); _timing.SetMinimumTotalDelay(minPlayoutDelayMs); return VCM_OK; } @@ -1402,10 +1234,6 @@ VideoCodingModuleImpl::SetMinimumPlayoutDelay(WebRtc_UWord32 minPlayoutDelayMs) WebRtc_Word32 VideoCodingModuleImpl::SetRenderDelay(WebRtc_UWord32 timeMS) { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "SetRenderDelay(%u)", timeMS); _timing.SetRenderDelay(timeMS); return VCM_OK; } @@ -1414,10 +1242,6 @@ VideoCodingModuleImpl::SetRenderDelay(WebRtc_UWord32 timeMS) WebRtc_Word32 VideoCodingModuleImpl::Delay() const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "Delay()"); return _timing.TargetVideoDelay(); } @@ -1470,18 +1294,10 @@ VideoCodingModuleImpl::NackList(WebRtc_UWord16* nackList, WebRtc_UWord16& size) WebRtc_Word32 VideoCodingModuleImpl::ReceivedFrameCount(VCMFrameCount& frameCount) const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "ReceivedFrameCount()"); return _receiver.ReceivedFrameCount(frameCount); } WebRtc_UWord32 VideoCodingModuleImpl::DiscardedPackets() const { - WEBRTC_TRACE(webrtc::kTraceModuleCall, - webrtc::kTraceVideoCoding, - VCMId(_id), - "DiscardedPackets()"); return _receiver.DiscardedPackets(); } diff --git a/src/modules/video_render/main/source/Android/video_render_android_impl.cc b/src/modules/video_render/main/source/Android/video_render_android_impl.cc index e1aa60041a..22fa659df9 100644 --- a/src/modules/video_render/main/source/Android/video_render_android_impl.cc +++ b/src/modules/video_render/main/source/Android/video_render_android_impl.cc @@ -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 @@ -96,8 +96,6 @@ VideoRenderAndroid::AddIncomingRenderStream(const WebRtc_UWord32 streamId, const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s", - __FUNCTION__); CriticalSectionScoped cs(_critSect); AndroidStream* renderStream = NULL; @@ -131,8 +129,6 @@ VideoRenderAndroid::AddIncomingRenderStream(const WebRtc_UWord32 streamId, WebRtc_Word32 VideoRenderAndroid::DeleteIncomingRenderStream( const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s", - __FUNCTION__); CriticalSectionScoped cs(_critSect); MapItem* item = _streamsMap.Find(streamId); @@ -158,12 +154,6 @@ WebRtc_Word32 VideoRenderAndroid::GetIncomingRenderStreamProperties( float& right, float& bottom) const { - WEBRTC_TRACE( - kTraceModuleCall, - kTraceVideoRenderer, - _id, - "%s: streamId - %d zOrder - %d left - %d top - %d right -%d and bottm - %d", - streamId, zOrder, left, top, right, bottom); return -1; } @@ -214,8 +204,6 @@ WebRtc_Word32 VideoRenderAndroid::StopRender() CriticalSectionScoped cs(_critSect); if (!_javaRenderThread) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, no renderer", __FUNCTION__); return -1; } _javaShutDownFlag = true; diff --git a/src/modules/video_render/main/source/mac/cocoa_full_screen_window.mm b/src/modules/video_render/main/source/mac/cocoa_full_screen_window.mm index be92d7b6b0..e86bab1413 100644 --- a/src/modules/video_render/main/source/mac/cocoa_full_screen_window.mm +++ b/src/modules/video_render/main/source/mac/cocoa_full_screen_window.mm @@ -1,6 +1,12 @@ -// -// CocoaFullScreenWindow.m -// +/* + * 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 + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ #import "cocoa_full_screen_window.h" #include "trace.h" @@ -9,10 +15,7 @@ using namespace webrtc; @implementation CocoaFullScreenWindow - - -(id)init{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); self = [super init]; if(!self){ @@ -26,7 +29,6 @@ using namespace webrtc; } -(void)grabFullScreen{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); #ifdef GRAB_ALL_SCREENS if(CGCaptureAllDisplays() != kCGErrorSuccess) @@ -57,7 +59,6 @@ using namespace webrtc; -(void)releaseFullScreen { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); [_window orderOut:self]; #ifdef GRAB_ALL_SCREENS @@ -77,7 +78,6 @@ using namespace webrtc; - (void) dealloc { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); [self releaseFullScreen]; [super dealloc]; } diff --git a/src/modules/video_render/main/source/mac/cocoa_render_view.mm b/src/modules/video_render/main/source/mac/cocoa_render_view.mm index 5d79904f23..567d171f11 100644 --- a/src/modules/video_render/main/source/mac/cocoa_render_view.mm +++ b/src/modules/video_render/main/source/mac/cocoa_render_view.mm @@ -1,6 +1,12 @@ -// -// CocoaRenderView.mm -// +/* + * 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 + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ #import #import @@ -11,9 +17,7 @@ using namespace webrtc; @implementation CocoaRenderView - -(void)initCocoaRenderView:(NSOpenGLPixelFormat*)fmt{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); self = [super initWithFrame:[self frame] pixelFormat:[fmt autorelease]]; if (self == nil){ @@ -22,18 +26,15 @@ using namespace webrtc; } - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d Created instance", __FUNCTION__, __LINE__); _nsOpenGLContext = [self openGLContext]; } - -(NSOpenGLContext*)nsOpenGLContext { return _nsOpenGLContext; } -(void)initCocoaRenderViewFullScreen:(NSOpenGLPixelFormat*)fmt{ - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); NSRect screenRect = [[NSScreen mainScreen]frame]; // [_windowRef setFrame:screenRect]; @@ -44,7 +45,6 @@ using namespace webrtc; WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, 0, "%s:%d Could not create instance", __FUNCTION__, __LINE__); } - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d Created instance", __FUNCTION__, __LINE__); _nsOpenGLContext = [self openGLContext]; } diff --git a/src/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc b/src/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc index 961a685884..88dc1e638c 100644 --- a/src/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc +++ b/src/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc @@ -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 @@ -126,7 +126,6 @@ VideoRenderMacCarbonImpl::ChangeWindow(void* window) } _ptrWindow = window; - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s:%d", __FUNCTION__, __LINE__); _ptrWindow = window; @@ -148,7 +147,6 @@ VideoRenderMacCarbonImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId, if(!_ptrWindow) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s, no window", __FUNCTION__); } if(!AGLChannel) diff --git a/src/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm b/src/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm index 0826539ddd..4698b6ec06 100644 --- a/src/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm +++ b/src/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm @@ -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 @@ -96,7 +96,6 @@ VideoRenderMacCocoaImpl::ChangeWindow(void* window) } _ptrWindow = window; - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s:%d", __FUNCTION__, __LINE__); _ptrWindow = window; _ptrCocoaRender->ChangeWindow((CocoaRenderView*)_ptrWindow); @@ -118,7 +117,6 @@ VideoRenderMacCocoaImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId, if(!_ptrWindow) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s, no window", __FUNCTION__); } if(!nsOpenGLChannel) diff --git a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm index 5663010eeb..4f1a6c5cf5 100644 --- a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm +++ b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm @@ -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 @@ -243,7 +243,6 @@ int VideoChannelNSOpenGL::DeliverFrame(unsigned char* buffer, int bufferSize, un [_nsglContext makeCurrentContext]; - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "bufferSize=%d _width=%d _height=%d", bufferSize, _width, _height); glBindTexture(GL_TEXTURE_RECTANGLE_EXT, _texture); // Make sure this texture is the active one GLenum glErr = glGetError(); @@ -557,7 +556,6 @@ int VideoRenderNSOpenGL::setRenderTargetWindow() { LockAGLCntx(); - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s:%d", __FUNCTION__, __LINE__); GLuint attribs[] = { @@ -588,7 +586,6 @@ int VideoRenderNSOpenGL::setRenderTargetWindow() glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "setRenderTargetWindow glClearColor 0.5"); DisplayBuffers(); @@ -600,7 +597,6 @@ int VideoRenderNSOpenGL::setRenderTargetFullScreen() { LockAGLCntx(); - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, "%s:%d", __FUNCTION__, __LINE__); GLuint attribs[] = { @@ -654,7 +650,6 @@ int VideoRenderNSOpenGL::setRenderTargetFullScreen() VideoRenderNSOpenGL::~VideoRenderNSOpenGL() { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, 0, "%s:%d", __FUNCTION__, __LINE__); if(_fullScreen) { diff --git a/src/modules/video_render/main/source/video_render_impl.cc b/src/modules/video_render/main/source/video_render_impl.cc index 390a69b87d..616d03beba 100644 --- a/src/modules/video_render/main/source/video_render_impl.cc +++ b/src/modules/video_render/main/source/video_render_impl.cc @@ -69,12 +69,6 @@ VideoRender::CreateVideoRender(const WebRtc_Word32 id, const bool fullscreen, const VideoRenderType videoRenderType/*=kRenderDefault*/) { - WEBRTC_TRACE( - kTraceModuleCall, - kTraceVideoRenderer, - id, - "CreateVideoRender(videoRenderType: %d, window: %x, fullscreen: %d)", - videoRenderType, window, fullscreen); VideoRenderType resultVideoRenderType = videoRenderType; if (videoRenderType == kRenderDefault) @@ -90,9 +84,6 @@ void VideoRender::DestroyVideoRender( { if (module) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - static_cast (module)->Id(), - "DestroyVideoRender"); delete module; } } @@ -330,8 +321,6 @@ ModuleVideoRenderImpl::~ModuleVideoRenderImpl() WebRtc_Word32 ModuleVideoRenderImpl::ChangeUniqueId(const WebRtc_Word32 id) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "ChangeUniqueId(new id:%d)", id); CriticalSectionScoped cs(_moduleCrit); @@ -367,8 +356,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window) { CriticalSectionScoped cs(_moduleCrit); - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); #ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER @@ -423,16 +410,12 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window) WebRtc_Word32 ModuleVideoRenderImpl::Id() { CriticalSectionScoped cs(_moduleCrit); - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); return _id; } WebRtc_UWord32 ModuleVideoRenderImpl::GetIncomingFrameRate( const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, stream: %u", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); MapItem* mapItem = _streamRenderMap.Find(streamId); @@ -463,8 +446,6 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId, const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, stream: %u", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -525,8 +506,6 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId, WebRtc_Word32 ModuleVideoRenderImpl::DeleteIncomingRenderStream( const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, stream: %u", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -558,9 +537,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::AddExternalRenderCallback( const WebRtc_UWord32 streamId, VideoRenderCallback* renderObject) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, stream: %u, callback: %x", __FUNCTION__, streamId, - renderObject); CriticalSectionScoped cs(_moduleCrit); MapItem* mapItem = _streamRenderMap.Find(streamId); @@ -589,8 +565,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetIncomingRenderStreamProperties( float& right, float& bottom) const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, stream: %u", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -607,8 +581,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetIncomingRenderStreamProperties( WebRtc_UWord32 ModuleVideoRenderImpl::GetNumIncomingRenderStreams() const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); return (WebRtc_UWord32) _streamRenderMap.Size(); @@ -617,8 +589,6 @@ WebRtc_UWord32 ModuleVideoRenderImpl::GetNumIncomingRenderStreams() const bool ModuleVideoRenderImpl::HasIncomingRenderStream( const WebRtc_UWord32 streamId) const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); bool hasStream = false; @@ -638,8 +608,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::RegisterRawFrameCallback( WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s(%u)", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -653,9 +621,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId) MapItem* item = _streamRenderMap.Find(streamId); if (item == NULL) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could find render stream %d", __FUNCTION__, - streamId); return -1; } @@ -663,17 +628,12 @@ WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId) static_cast (item->GetItem()); if (incomingStream->Start() == -1) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could not start stream %d", __FUNCTION__, - incomingStream->StreamId()); return -1; } // Start the HW renderer if (_ptrRenderer->StartRender() == -1) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could not start renderer", __FUNCTION__); return -1; } return 0; @@ -681,8 +641,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::StartRender(const WebRtc_UWord32 streamId) WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s(%u)", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -696,9 +654,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId) MapItem* item = _streamRenderMap.Find(streamId); if (item == NULL) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could find render stream %d", __FUNCTION__, - streamId); return -1; } @@ -706,9 +661,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId) static_cast (item->GetItem()); if (incomingStream->Stop() == -1) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could not start stream %d", __FUNCTION__, - incomingStream->StreamId()); return -1; } @@ -717,8 +669,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::StopRender(const WebRtc_UWord32 streamId) WebRtc_Word32 ModuleVideoRenderImpl::ResetRender() { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); WebRtc_Word32 error = 0; @@ -731,9 +681,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::ResetRender() static_cast (item->GetItem()); if (incomingStream->Reset() == -1) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s: Could not reset stream %d", __FUNCTION__, - incomingStream->StreamId()); error = -1; } item = _streamRenderMap.Next(item); @@ -743,8 +690,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::ResetRender() RawVideoType ModuleVideoRenderImpl::PreferredVideoType() const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (_ptrRenderer == NULL) @@ -757,8 +702,6 @@ RawVideoType ModuleVideoRenderImpl::PreferredVideoType() const bool ModuleVideoRenderImpl::IsFullScreen() { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -774,8 +717,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetScreenResolution( WebRtc_UWord32& screenWidth, WebRtc_UWord32& screenHeight) const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -790,8 +731,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetScreenResolution( WebRtc_UWord32 ModuleVideoRenderImpl::RenderFrameRate( const WebRtc_UWord32 streamId) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, streamId: %u", __FUNCTION__, streamId); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -810,9 +749,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetStreamCropping( const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, l: %1.1f, t: %1.1f, r: %1.1f, b: %1.1f", __FUNCTION__, - left, top, right, bottom); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -826,8 +762,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetStreamCropping( WebRtc_Word32 ModuleVideoRenderImpl::SetTransparentBackground(const bool enable) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, enable: %d", __FUNCTION__, enable); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -855,8 +789,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetText( const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -877,8 +809,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetBitmap(const void* bitMap, const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -895,8 +825,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::GetLastRenderedFrame( const WebRtc_UWord32 streamId, VideoFrame &frame) const { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -934,9 +862,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::ConfigureRenderer( const float right, const float bottom) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s, l: %1.1f, t: %1.1f, r: %1.1f, b: %1.1f", __FUNCTION__, - left, top, right, bottom); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -953,8 +878,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetStartImage( const WebRtc_UWord32 streamId, const VideoFrame& videoFrame) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -990,8 +913,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::SetTimeoutImage( const VideoFrame& videoFrame, const WebRtc_UWord32 timeout) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) @@ -1026,8 +947,6 @@ WebRtc_Word32 ModuleVideoRenderImpl::MirrorRenderStream(const int renderId, const bool mirrorXAxis, const bool mirrorYAxis) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, _id, - "%s", __FUNCTION__); CriticalSectionScoped cs(_moduleCrit); if (!_ptrRenderer) diff --git a/src/modules/video_render/main/source/windows/video_render_windows_impl.cc b/src/modules/video_render/main/source/windows/video_render_windows_impl.cc index a5231a020d..6f2237fd3f 100644 --- a/src/modules/video_render/main/source/windows/video_render_windows_impl.cc +++ b/src/modules/video_render/main/source/windows/video_render_windows_impl.cc @@ -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 @@ -109,8 +109,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::ChangeWindow(void* window) CriticalSectionScoped cs(_renderWindowsCritsect); if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); return -1; } else @@ -132,8 +130,6 @@ VideoRenderWindowsImpl::AddIncomingRenderStream(const WebRtc_UWord32 streamId, if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -151,8 +147,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::DeleteIncomingRenderStream( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -179,8 +173,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::GetIncomingRenderStreamProperties( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -196,8 +188,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::StartRender() WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -212,8 +202,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::StopRender() WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -238,8 +226,6 @@ bool VideoRenderWindowsImpl::FullScreen() bool fullscreen = false; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -291,8 +277,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetStreamCropping( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -314,8 +298,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::ConfigureRenderer( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -333,8 +315,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetTransparentBackground( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -358,8 +338,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetText( WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else { @@ -382,8 +360,6 @@ WebRtc_Word32 VideoRenderWindowsImpl::SetBitmap(const void* bitMap, WebRtc_Word32 error = -1; if (!_ptrRendererWin) { - WEBRTC_TRACE(kTraceModuleCall, kTraceVideoRenderer, - _id, "%s, no renderer", __FUNCTION__); } else {