Symbian: Fix for AMR recording returning -5 error in 3.1 platform.

Error ID: https://qtrequirements.troll.no/browse/MOBILITY-844

1 files changed, 6 insertions, 4 deletions

diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
index 52d5b7b9ac..273db142b0 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
@@ -480,12 +480,14 @@ void S60AudioCaptureSession::populateAudioCodecsDataL()
 
 void S60AudioCaptureSession::applyAudioSettingsL()
 {      
-    if (!m_recorderUtility)
-        return;
+    if (!m_recorderUtility || m_format.codec() == "AMR")
+        return;   
     
     TFourCC fourCC = m_audioCodeclist.value(m_format.codec()).fourCC;    
     
-    //set destination datatype
+    if (m_format.codec() == "PCM")         
+        fourCC = determinePCMFormat();    
+    
     RArray<TFourCC> supportedDataTypes;
     CleanupClosePushL(supportedDataTypes);
     m_recorderUtility->GetSupportedDestinationDataTypesL(supportedDataTypes);    
@@ -514,7 +516,7 @@ void S60AudioCaptureSession::applyAudioSettingsL()
     CleanupClosePushL(supportedChannels);
     m_recorderUtility->GetSupportedNumberOfChannelsL(supportedChannels);    
     for (TInt l = 0; l < supportedChannels.Count(); l++ ) {        
-        if (supportedChannels[l] == m_format.channels()) {
+        if (supportedChannels[l] == m_format.channels()) {            
             m_recorderUtility->SetDestinationNumberOfChannelsL(m_format.channels());
             break;
         }