diff -r 06b8e2af4411 -r 6fbed849b4f4 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp --- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp Fri Jun 11 14:26:25 2010 +0300 +++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp Wed Jun 23 19:08:38 2010 +0300 @@ -136,8 +136,8 @@ } QStringList S60AudioCaptureSession::supportedAudioCodecs() const -{ - return m_audioCodeclist.keys(); +{ + return m_audioCodeclist.keys(); } QStringList S60AudioCaptureSession::supportedAudioContainers() const @@ -306,7 +306,7 @@ void S60AudioCaptureSession::MoscoStateChangeEvent(CBase* aObject, TInt aPreviousState, TInt aCurrentState, TInt aErrorCode) -{ +{ if (aErrorCode==KErrNone) { TRAPD(err, MoscoStateChangeEventL(aObject, aPreviousState, aCurrentState, NULL)); setError(err); @@ -480,12 +480,14 @@ 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 supportedDataTypes; CleanupClosePushL(supportedDataTypes); m_recorderUtility->GetSupportedDestinationDataTypesL(supportedDataTypes); @@ -514,7 +516,7 @@ 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; }