commit 5398d9583b713f83db843a15f8bcc2ef8df23bcc
author niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 26 08:11:25 2012 +0000
committer niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 26 08:11:25 2012 +0000
tree d0bd84a1f958add06ed1ea8312faced7ac6f32eb
parent 38f247d800c80f6d2a42180e0bee357e7d7ff495

Force commit of 449006'
Review URL: https://webrtc-codereview.appspot.com/455006

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

src/voice_engine/main/source/channel.cc

diff --git a/src/voice_engine/main/source/channel.cc b/src/voice_engine/main/source/channel.cc
index fb87b14..37ad145 100644
--- a/src/voice_engine/main/source/channel.cc
+++ b/src/voice_engine/main/source/channel.cc
@@ -918,20 +918,7 @@
 
         if (_outputFileRecording && _outputFileRecorderPtr)
         {
-            if(audioFrame._audioChannel == 2)
-            {
-                AudioFrame temp =  audioFrame;
-                AudioFrameOperations::StereoToMono (temp);
-                _outputFileRecorderPtr->RecordAudioToFile(temp);
-            }
-            else if(audioFrame._audioChannel == 1)
-            {
-                _outputFileRecorderPtr->RecordAudioToFile(audioFrame);
-            }
-            else
-            {
-                assert(false);
-            }
+            _outputFileRecorderPtr->RecordAudioToFile(audioFrame);
         }
     }
 
@@ -3902,7 +3889,8 @@
     const WebRtc_UWord32 notificationTime(0); // Not supported in VoE
     CodecInst dummyCodec={100,"L16",16000,320,1,320000};
 
-    if (codecInst != NULL && codecInst->channels != 1)
+    if (codecInst != NULL &&
+      (codecInst->channels < 1) || (codecInst->channels > 2))
     {
         _engineStatisticsPtr->SetLastError(
             VE_BAD_ARGUMENT, kTraceError,

src/voice_engine/main/source/output_mixer.cc

diff --git a/src/voice_engine/main/source/output_mixer.cc b/src/voice_engine/main/source/output_mixer.cc
index 2764f78..a2841b2 100644
--- a/src/voice_engine/main/source/output_mixer.cc
+++ b/src/voice_engine/main/source/output_mixer.cc
@@ -342,7 +342,8 @@
     const WebRtc_UWord32 notificationTime(0);
     CodecInst dummyCodec={100,"L16",16000,320,1,320000};
 
-    if (codecInst != NULL && codecInst->channels != 1)
+    if (codecInst != NULL &&
+      (codecInst->channels < 1) || (codecInst->channels > 2))
     {
         _engineStatisticsPtr->SetLastError(
             VE_BAD_ARGUMENT, kTraceError,
@@ -529,8 +530,6 @@
         CriticalSectionScoped cs(&_fileCritSect);
         if (_outputFileRecording)
         {
-            assert(audioFrame._audioChannel == 1);
-        
             if (_outputFileRecorderPtr)
             {
                 _outputFileRecorderPtr->RecordAudioToFile(audioFrame);

src/voice_engine/main/source/voe_file_impl.cc

diff --git a/src/voice_engine/main/source/voe_file_impl.cc b/src/voice_engine/main/source/voe_file_impl.cc
index cd3193f..637dce7 100644
--- a/src/voice_engine/main/source/voe_file_impl.cc
+++ b/src/voice_engine/main/source/voe_file_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
@@ -469,8 +469,8 @@
     }
     if (channel == -1)
     {
-        _outputMixerPtr->StartRecordingPlayout(fileNameUTF8, compression);
-        return 0;
+        return _outputMixerPtr->StartRecordingPlayout
+          (fileNameUTF8, compression);
     }
     else
     {