Addressed review comments from http://webrtc-codereview.appspot.com/256004/
Review URL: http://webrtc-codereview.appspot.com/256007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@979 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
ced118636d
commit
31d30700d6
@ -3436,7 +3436,7 @@ int Channel::StartPlayingFileLocally(const char* fileName,
|
||||
{
|
||||
_engineStatisticsPtr->SetLastError(
|
||||
VE_INVALID_ARGUMENT, kTraceError,
|
||||
"StartPlayingFileLocally() filePlayer format isnot correct");
|
||||
"StartPlayingFileLocally() filePlayer format is not correct");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -3463,7 +3463,7 @@ int Channel::StartPlayingFileLocally(const char* fileName,
|
||||
_outputFilePlaying = true;
|
||||
}
|
||||
// _fileCritSect cannot be taken while calling
|
||||
// SetAnonymousMixabilityStatus since as soon as the participant is added
|
||||
// SetAnonymousMixabilityStatus() since as soon as the participant is added
|
||||
// frames can be pulled by the mixer. Since the frames are generated from
|
||||
// the file, _fileCritSect will be taken. This would result in a deadlock.
|
||||
if (_outputMixerPtr->SetAnonymousMixabilityStatus(*this, true) != 0)
|
||||
|
Loading…
Reference in New Issue
Block a user