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

Incorrect parameters being passed to trace function.

Browse Source 
And a small spelling error.
Review URL: http://webrtc-codereview.appspot.com/98001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@287 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
frkoenig@google.com 2011-08-01 23:14:32 +00:00
parent 679450f4a6
commit e91655f8e2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_engine/main/source/vie_frame_provider_base.cc
View File

@ -30,7 +30,11 @@ ViEFrameProviderBase::~ViEFrameProviderBase()
{ {
if(_frameCallbackMap.Size()>0) if(_frameCallbackMap.Size()>0)
{ {
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideo, ViEId(_engineId,_id), "FramCallbacks still exist when Provider deleted %d",_frameCallbackMap.Size()); WEBRTC_TRACE(webrtc::kTraceWarning,
webrtc::kTraceVideo,
ViEId(_engineId,_id),
"FrameCallbacks still exist when Provider deleted %d",
_frameCallbackMap.Size());
} }
for(MapItem* item=_frameCallbackMap.First();item!=NULL;item=_frameCallbackMap.Next(item)) for(MapItem* item=_frameCallbackMap.First();item!=NULL;item=_frameCallbackMap.Next(item))
{ {
@ -178,7 +182,7 @@ int ViEFrameProviderBase::RegisterFrameCallback(int observerId,ViEFrameCallback*
return -1; return -1;
} }
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id),
"%s(0x%p)", callbackObject); "%s(0x%p)", __FUNCTION__, callbackObject);
{ {
CriticalSectionScoped cs(_providerCritSect); CriticalSectionScoped cs(_providerCritSect);
@ -230,7 +234,7 @@ int ViEFrameProviderBase::DeregisterFrameCallback(const ViEFrameCallback* callba
return -1; return -1;
} }
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id),
"%s(0x%p)", callbackObject); "%s(0x%p)", __FUNCTION__, callbackObject);
{ {
@ -279,7 +283,7 @@ bool ViEFrameProviderBase::IsFrameCallbackRegistered(const ViEFrameCallback* cal
return false; return false;
} }
WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id), WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideo, ViEId(_engineId, _id),
"%s(0x%p)", callbackObject); "%s(0x%p)", __FUNCTION__, callbackObject);
for (MapItem* mapItem = _frameCallbackMap.First(); for (MapItem* mapItem = _frameCallbackMap.First();
mapItem != NULL; mapItem != NULL;