--- a/camerauis/cameraxui/cxengine/src/cxequalitypresetssymbian.cpp	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/cxequalitypresetssymbian.cpp	Wed Aug 18 09:37:18 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009, Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <e32std.h> // For Symbian types used in mmsenginedomaincrkeys.h
 #include <MmsEngineDomainCRKeys.h>
+#include <imagingconfigmanager.h>
 
 #include "cxutils.h"
 #include "cxenamespace.h"
@@ -64,6 +65,7 @@
     : mSettings(settings)
 {
     CX_DEBUG_ENTER_FUNCTION();
+    OstTrace0(camerax_performance, CXEQUALITYPRESETSSYMBIAN_1, "msg: e_CX_QUALITYPRESETS_NEW 1");
 
     TRAPD(err,  mIcm = CImagingConfigManager::NewL());
 
@@ -72,8 +74,8 @@
         mIcm = NULL;
     }
 
+    OstTrace0(camerax_performance, CXEQUALITYPRESETSSYMBIAN_2, "msg: e_CX_QUALITYPRESETS_NEW 0");
     CX_DEBUG_EXIT_FUNCTION();
-
 }
 
 /* !
@@ -221,7 +223,7 @@
 @ param set contains the ICM configuration data
 @ returns CxeImageQuality struct
 */
-CxeImageDetails CxeQualityPresetsSymbian::createImagePreset(TImageQualitySet set)
+CxeImageDetails CxeQualityPresetsSymbian::createImagePreset(const TImageQualitySet &set)
 {
     CxeImageDetails newPreset;
     // set setting values from quality set
@@ -243,7 +245,7 @@
 /*!
 * Creates a new video preset based on TVideoQualitySet values from ICM.
 */
-CxeVideoDetails CxeQualityPresetsSymbian::createVideoPreset(TVideoQualitySet set)
+CxeVideoDetails CxeQualityPresetsSymbian::createVideoPreset(const TVideoQualitySet &set)
 {
     CX_DEBUG_ENTER_FUNCTION();
     CxeVideoDetails newPreset;
@@ -311,10 +313,10 @@
     int delta16by9 = abs((width * ASPECT_RATIO_SIZE_16BY9.height()) - (height * ASPECT_RATIO_SIZE_16BY9.width()));
     int delta11by9 = abs((width * ASPECT_RATIO_SIZE_11BY9.height()) - (height * ASPECT_RATIO_SIZE_11BY9.width()));
     int delta4by3  = abs((width * ASPECT_RATIO_SIZE_4BY3.height()) - (height * ASPECT_RATIO_SIZE_4BY3.width()));
-    
+
     // get the closest aspect ratio
     int minValue = qMin(qMin(delta16by9, delta11by9), delta4by3);
-    
+
     if (minValue == delta16by9) {
         aspectRatio = Cxe::AspectRatio16to9;
     } else if (minValue == delta11by9) {
@@ -383,11 +385,10 @@
         scaler = VIDEO_AVG_BITRATE_SCALER;
     }
 
-    int muteSetting = 0; // audio enabled
-    mSettings.get(CxeSettingIds::VIDEO_MUTE_SETTING, muteSetting);
+    bool muteSetting = mSettings.get<bool>(CxeSettingIds::VIDEO_MUTE_SETTING, false); // false = audio enabled
 
     int avgVideoBitRate = (details.mVideoBitRate * scaler);
-    int avgAudioBitRate = (muteSetting == 1) ? 0 : details.mAudioBitRate;
+    int avgAudioBitRate = muteSetting ? 0 : details.mAudioBitRate;
 
     quint32 averageBitRate = (quint32)((avgVideoBitRate + avgAudioBitRate) * VIDEO_METADATA_COEFF);
     quint32 averageByteRate = averageBitRate / 8;
@@ -436,7 +437,7 @@
 * Helper method to enable debug prints.
 @ param  Video quality preset values are printed out for debugging
 */
-void CxeQualityPresetsSymbian::debugPrints(CxeVideoDetails preset)
+void CxeQualityPresetsSymbian::debugPrints(const CxeVideoDetails &preset)
 {
     CX_DEBUG(("Video quality details"));
     CX_DEBUG(("Video resolution (%d,%d)", preset.mWidth, preset.mHeight));
@@ -461,7 +462,7 @@
 * Helper method to enable debug prints.
 @ param  Image quality preset values are printed out for debugging
 */
-void CxeQualityPresetsSymbian::debugPrints(CxeImageDetails newPreset)
+void CxeQualityPresetsSymbian::debugPrints(const CxeImageDetails &newPreset)
 {
     CX_DEBUG(("Image quality details"));
     CX_DEBUG(("Image resolution (%d,%d)", newPreset.mWidth, newPreset.mHeight));