Fixes crash due to r841.

Review URL: http://webrtc-codereview.appspot.com/256004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@853 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

@@ -474,6 +474,12 @@ WebRtc_Word32 AudioConferenceMixerImpl::SetMixabilityStatus(
     WEBRTC_TRACE(kTraceModuleCall, kTraceAudioMixerServer, _id,
                  "SetMixabilityStatus(participant,mixable:%s)",
                  mixable ? "true" : "false");
+    if (!mixable)
+    {
+        // Anonymous participants are in a separate list. Make sure that the
+        // participant is in the _participantList if it is being mixed.
+        SetAnonymousMixabilityStatus(participant, false);
+    }
     WebRtc_UWord32 amountOfMixableParticipants;
     {
         CriticalSectionScoped cs(*_cbCrit);

src/voice_engine/main/source/channel.cc

@@ -3437,6 +3437,7 @@ int Channel::StartPlayingFileLocally(const char* fileName,
         return -1;
     }
 
+    {
         CriticalSectionScoped cs(_fileCritSect);
 
         if (_outputFilePlayerPtr)
@@ -3476,8 +3477,17 @@ int Channel::StartPlayingFileLocally(const char* fileName,
             _outputFilePlayerPtr = NULL;
             return -1;
         }
+        _outputFilePlayerPtr->RegisterModuleFileCallback(this);
+        _outputFilePlaying = true;
+    }
+    // _fileCritSect cannot be taken while calling
+    // 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)
     {
+        CriticalSectionScoped cs(_fileCritSect);
+        _outputFilePlaying = false;
         _engineStatisticsPtr->SetLastError(
             VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
             "StartPlayingFile() failed to add participant as file to mixer");
@@ -3486,8 +3496,6 @@ int Channel::StartPlayingFileLocally(const char* fileName,
         _outputFilePlayerPtr = NULL;
         return -1;
     }
-    _outputFilePlayerPtr->RegisterModuleFileCallback(this);
-    _outputFilePlaying = true;
 
     return 0;
 }
@@ -3521,6 +3529,7 @@ int Channel::StartPlayingFileLocally(InStream* stream,
         return -1;
     }
 
+    {
       CriticalSectionScoped cs(_fileCritSect);
 
       // Destroy the old instance
@@ -3547,7 +3556,8 @@ int Channel::StartPlayingFileLocally(InStream* stream,
       const WebRtc_UWord32 notificationTime(0);
 
       if (_outputFilePlayerPtr->StartPlayingFile(*stream, startPosition,
-                                               volumeScaling, notificationTime,
+                                                 volumeScaling,
+                                                 notificationTime,
                                                  stopPosition, codecInst) != 0)
       {
           _engineStatisticsPtr->SetLastError(VE_BAD_FILE, kTraceError,
@@ -3558,8 +3568,16 @@ int Channel::StartPlayingFileLocally(InStream* stream,
           _outputFilePlayerPtr = NULL;
           return -1;
       }
+      _outputFilePlayerPtr->RegisterModuleFileCallback(this);
+      _outputFilePlaying = true;
+    }
+    // _fileCritSect cannot be taken while calling
+    // SetAnonymousMixibilityStatus. Refer to comments in
+    // StartPlayingFileLocally(const char* ...) for more details.
     if (_outputMixerPtr->SetAnonymousMixabilityStatus(*this, true) != 0)
     {
+        CriticalSectionScoped cs(_fileCritSect);
+        _outputFilePlaying = false;
         _engineStatisticsPtr->SetLastError(
             VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
             "StartPlayingFile() failed to add participant as file to mixer");
@@ -3569,9 +3587,6 @@ int Channel::StartPlayingFileLocally(InStream* stream,
         return -1;
     }
 
-    _outputFilePlayerPtr->RegisterModuleFileCallback(this);
-    _outputFilePlaying = true;
-
     return 0;
 }
 
@@ -3588,6 +3603,7 @@ int Channel::StopPlayingFileLocally()
         return 0;
     }
 
+    {
         CriticalSectionScoped cs(_fileCritSect);
 
         if (_outputFilePlayerPtr->StopPlayingFile() != 0)
@@ -3597,18 +3613,22 @@ int Channel::StopPlayingFileLocally()
                 "StopPlayingFile() could not stop playing");
             return -1;
         }
-    if (_outputMixerPtr->SetAnonymousMixabilityStatus(*this, false) != 0)
-    {
-        _engineStatisticsPtr->SetLastError(
-            VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
-            "StopPlayingFile() failed to stop participant from playing as file"
-            "in the mixer");
-        return -1;
-    }
         _outputFilePlayerPtr->RegisterModuleFileCallback(NULL);
         FilePlayer::DestroyFilePlayer(_outputFilePlayerPtr);
         _outputFilePlayerPtr = NULL;
         _outputFilePlaying = false;
+    }
+    // _fileCritSect cannot be taken while calling
+    // SetAnonymousMixibilityStatus. Refer to comments in
+    // StartPlayingFileLocally(const char* ...) for more details.
+    if (_outputMixerPtr->SetAnonymousMixabilityStatus(*this, false) != 0)
+    {
+        _engineStatisticsPtr->SetLastError(
+            VE_AUDIO_CONF_MIX_MODULE_ERROR, kTraceError,
+            "StopPlayingFile() failed to stop participant from playing as"
+            "file in the mixer");
+        return -1;
+    }
 
     return 0;
 }