FCL/sf/app/camera: comparison camerauis/cameraxui/cxengine/src/cxestillcapturecontrolsymbian.cpp

equal deleted inserted replaced

-:3075d9b614e6
+:0e652f8f1fbd
 /*
-* 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 */
 #include <algorithm>
 #include <exception>
-#include <fbs.h>
 #include <QPixmap>
 #include <coemain.h>
 #include <ECamOrientationCustomInterface2.h>
-#include <ecam/camerasnapshot.h>
 #include <ecamfacetrackingcustomapi.h>
 #include "cxestillcapturecontrolsymbian.h"
 #include "cxeimagedataqueuesymbian.h"
 #include "cxefilenamegenerator.h"
 #include "cxutils.h"
 #include "cxecameradevicecontrol.h"
 #include "cxecameradevice.h"
 #include "cxesoundplayersymbian.h"
 #include "cxestillimagesymbian.h"
-#include "cxeviewfindercontrol.h"
 #include "cxeviewfindercontrolsymbian.h"
+#include "cxesnapshotcontrol.h"
 #include "cxesettingsmappersymbian.h"
 #include "cxestate.h"
 #include "cxesettings.h"
 #include "cxeerrormappingsymbian.h"
 #include "cxeautofocuscontrol.h"
 #include "cxestillcapturecontrolsymbianTraces.h"
 #endif
 // constants
-const int KMaintainAspectRatio = false;
+namespace
-const TInt64 KMinRequiredSpaceImage = 2000000;
+{
+const TInt64 KMinRequiredSpaceImage = 2000000;
+}
-/**
+/*!
 * Constructor.
 */
 CxeStillCaptureControlSymbian::CxeStillCaptureControlSymbian(
 CxeCameraDevice &cameraDevice,
 CxeViewfinderControl &viewfinderControl,
+CxeSnapshotControl &snapshotControl,
 CxeCameraDeviceControl &cameraDeviceControl,
 CxeFilenameGenerator &nameGenerator,
 CxeSensorEventHandler &sensorEventHandler,
 CxeAutoFocusControl &autoFocusControl,
 CxeSettings &settings,
 CxeFileSaveThread &fileSaveThread,
 CxeDiskMonitor &diskMonitor)
 : CxeStateMachine("CxeStillCaptureControlSymbian"),
 mCameraDevice(cameraDevice),
 mViewfinderControl(viewfinderControl),
+mSnapshotControl(snapshotControl),
 mCameraDeviceControl(cameraDeviceControl),
 mFilenameGenerator(nameGenerator),
 mSensorEventHandler(sensorEventHandler),
 mAutoFocusControl(autoFocusControl),
 mSettings(settings),
 this, SLOT(handleSettingValueChanged(const QString&,QVariant)));
 // Connect ECam image buffer ready event
 connect(&mCameraDeviceControl, SIGNAL(imageBufferReady(MCameraBuffer*,int)),
 this, SLOT(handleImageData(MCameraBuffer*,int)));
-// Connect signals for ECam events
+// connect snapshot ready signal
-connect(&mCameraDeviceControl, SIGNAL(cameraEvent(int,int)),
+connect(&mSnapshotControl, SIGNAL(snapshotReady(CxeError::Id, const QImage&)),
-this, SLOT(handleCameraEvent(int,int)));
+this, SLOT(handleSnapshotReady(CxeError::Id, const QImage&)));
 OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_MID2, "msg: e_CX_ENGINE_CONNECT_SIGNALS 0");
 mImageDataQueue = new CxeImageDataQueueSymbian();
-mAutoFocusSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::AutoFocus);
+mAutoFocusSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::AutoFocus, mSettings);
-mCaptureSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::StillCapture);
+mCaptureSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::StillCapture, mSettings);
 OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_OUT, "msg: e_CX_STILLCAPTURECONTROL_NEW 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Destructor.
 */
 CxeStillCaptureControlSymbian::~CxeStillCaptureControlSymbian()
 {
 CX_DEBUG_ENTER_FUNCTION();
 delete mAutoFocusSoundPlayer;
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Return the current state.
 */
 CxeStillCaptureControl::State CxeStillCaptureControlSymbian::state() const
 {
 return static_cast<CxeStillCaptureControl::State>( stateId() );
 }
-/**
+/*!
 * Handle state changed event. Normally just emits the signal
 * for observers to react appropriately.
 */
 void CxeStillCaptureControlSymbian::handleStateChanged( int newStateId, CxeError::Id error )
 {
 emit stateChanged( static_cast<State>( newStateId ), error );
 }
-/**
+/*!
 * Initialize the control states.
 */
 void CxeStillCaptureControlSymbian::initializeStates()
 {
 // addState( id, name, allowed next states )
 addState(new CxeState( Capturing , "Capturing", Uninitialized | Ready));
 setInitialState(Uninitialized);
 }
-/**
+/*!
 * Initialize the still image capture control.
 */
 void CxeStillCaptureControlSymbian::init()
 {
 CX_DEBUG_ENTER_FUNCTION();
 OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_INIT_OUT, "msg: e_CX_STILL_CAPCONT_INIT 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Un-initialize the image mode.
 */
 void CxeStillCaptureControlSymbian::deinit()
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (state() == Uninitialized) {
 // nothing to do
 return;
 }
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_IN, "msg: e_CX_STILL_CAPCONT_DEINIT 1" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_IN, "msg: e_CX_STILLCAPCONT_DEINIT 1" );
 // Stop monitoring disk space.
 mDiskMonitor.stop();
 disconnect(&mDiskMonitor, SIGNAL(diskSpaceChanged()), this, SLOT(handleDiskSpaceChanged()));
 //stop viewfinder
 mViewfinderControl.stop();
+if (state() == Capturing) {
+mCameraDevice.camera()->CancelCaptureImage();
+}
 // disable sensor event handler.
 mSensorEventHandler.deinit();
-if (mCameraDevice.cameraSnapshot()) {
+mSnapshotControl.stop();
-mCameraDevice.cameraSnapshot()->StopSnapshot();
-}
-if (state() == Capturing) {
-mCameraDevice.camera()->CancelCaptureImage();
-}
 setState(Uninitialized);
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_OUT, "msg: e_CX_STILL_CAPCONT_DEINIT 0" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_OUT, "msg: e_CX_STILLCAPCONT_DEINIT 0" );
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**!
+/*!
 * Prepare still capture mode.
 */
 void CxeStillCaptureControlSymbian::prepare()
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (state() != Uninitialized) {
 // wrong state and we return
 return;
 }
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_IN, "msg: e_CX_STILLCAPCONT_PREPARE 1" );
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_PREPARE_IN, "msg: e_CX_STILLCAPCONT_PREPARE 1");
 int err = KErrNone;
 CxeError::Id cxErr = getImageQualityDetails(mCurrentImageDetails);
 int ecamStillResolutionIndex = 0;
 ecamStillResolutionIndex = 0;
 }
 // Prepare Image capture
 CCamera::TFormat imgFormat = supportedStillFormat(mCameraDeviceControl.cameraIndex());
-OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_MID1, "msg: e_CX_PREPARE_IMAGE_CAPTURE 1");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_PREPARE_MID1, "msg: e_CX_PREPARE_IMAGE_CAPTURE 1");
 TRAP(err, mCameraDevice.camera()->PrepareImageCaptureL(imgFormat, ecamStillResolutionIndex));
-OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_MID2, "msg: e_CX_PREPARE_IMAGE_CAPTURE 0");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_PREPARE_MID2, "msg: e_CX_PREPARE_IMAGE_CAPTURE 0");
 CX_DEBUG(("PrepareImageCaptureL done, err=%d, resolution index = %d", err, ecamStillResolutionIndex));
 if (!err) {
 // still capture prepare went fine, try preparing snapshot
 }
 // Inform interested parties that image mode has been prepared for capture
 emit imagePrepareComplete(CxeErrorHandlingSymbian::map(err));
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_OUT, "msg: e_CX_STILLCAPCONT_PREPARE 0" );
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_GOTOSTILL, "msg: e_CX_GO_TO_STILL_MODE 0");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_PREPARE_OUT, "msg: e_CX_STILLCAPCONT_PREPARE 0");
-CX_DEBUG_EXIT_FUNCTION();
-}
+CX_DEBUG_EXIT_FUNCTION();
+}
-/**!
+/*!
 Prepare still snapshot
 Returns symbian error code.
 */
 int CxeStillCaptureControlSymbian::prepareStillSnapshot()
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_PREPARESNAP_1, "msg: e_CX_PREPARE_SNAPSHOT 1" );
-CCamera::CCameraSnapshot *cameraSnapshot = mCameraDevice.cameraSnapshot();
-CX_ASSERT_ALWAYS(cameraSnapshot);
+int status(KErrNone);
+try {
-int err = KErrNone;
+QSize snapshotSize = mSnapshotControl.calculateSnapshotSize(
-// Whether or not we have postcapture on, we need the snapshot for Thumbnail Manager.
+mViewfinderControl.deviceDisplayResolution(),
-if (cameraSnapshot) {
+mCurrentImageDetails.mAspectRatio);
-// Cancel active snapshot
+mSnapshotControl.start(snapshotSize);
-cameraSnapshot->StopSnapshot();
+} catch (...) {
+status = KErrGeneral;
-// Prepare snapshot
+}
-CCamera::TFormat snapFormat = CCamera::EFormatFbsBitmapColor16MU;
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_PREPARESNAP_2, "msg: e_CX_PREPARE_SNAPSHOT 0" );
-OstTrace0( camerax_performance, DUP4_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_SNAPSHOT 1" );
-TRAP(err, cameraSnapshot->PrepareSnapshotL(snapFormat,
+CX_DEBUG_EXIT_FUNCTION();
-getSnapshotSize(),
+return status;
-KMaintainAspectRatio));
+}
-OstTrace0( camerax_performance, DUP5_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_SNAPSHOT 0" );
-CX_DEBUG(("PrepareSnapshotL done, err=%d", err));
+/*!
-// Start snapshot if no errors encountered.
-if (err == KErrNone) {
-CX_DEBUG(("Start still snapshot"));
-cameraSnapshot->StartSnapshot();
-}
-} else {
-// No snapshot interface available. Report error.
-// Assert above takes care of this, but keeping this as an option.
-err = KErrNotReady;
-}
-CX_DEBUG_EXIT_FUNCTION();
-return err;
-}
-/**!
 imageInfo contains image qualities details
 Returns CxeError error code.
 */
 CxeError::Id CxeStillCaptureControlSymbian::getImageQualityDetails(CxeImageDetails &imageInfo)
 {
 CX_DEBUG_ENTER_FUNCTION();
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_GETQUALITYDETAILS_1, "msg: e_CX_GET_QUALITY_DETAILS 1" );
 int imageQuality = 0;
 CxeError::Id err = CxeError::None;
 if (mCameraDeviceControl.cameraIndex() == Cxe::PrimaryCameraIndex) {
 err = mSettings.get(CxeSettingIds::IMAGE_QUALITY, imageQuality);
 // we are in secondary camera
 // get secondary camera image quality details
 imageInfo = mIcmSupportedImageResolutions.at(imageQuality);
 }
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_GETQUALITYDETAILS_2, "msg: e_CX_GET_QUALITY_DETAILS 0" );
 CX_DEBUG_EXIT_FUNCTION();
 return err;
 }
+/*!
-/*!
-* Returns snapshot size. Snapshot size is calculated based on the
-* display resolution and current image aspect ratio.
-*/
-TSize CxeStillCaptureControlSymbian::getSnapshotSize() const
-{
-CX_DEBUG_ENTER_FUNCTION();
-TSize snapshotSize;
-QSize deviceResolution = mViewfinderControl.deviceDisplayResolution();
-QSize size = QSize(mCurrentImageDetails.mWidth, mCurrentImageDetails.mHeight);
-// scale according to aspect ratio.
-size.scale(deviceResolution.width(), deviceResolution.height(), Qt::KeepAspectRatio);
-CX_DEBUG(("Still Snapshot size, (%d,%d)", size.width(), size.height()));
-snapshotSize.SetSize(size.width(), deviceResolution.height());
-CX_DEBUG_EXIT_FUNCTION();
-return snapshotSize;
-}
-/**
 * Command to start image capture now.
+* @sa handleCameraEvent
 */
 void CxeStillCaptureControlSymbian::capture()
 {
 CX_DEBUG_ENTER_FUNCTION();
 CX_ASSERT_ALWAYS(mCameraDevice.camera());
 // Start the image capture as fast as possible to minimize lag.
 // Check e.g. space available *after* this.
+// Capture sound will be played when we receive "image capture event" from ECAM.
 mCameraDevice.camera()->CaptureImage();
 if (imagesLeft() > 0) {
-mCaptureSoundPlayer->play();
 setState(Capturing);
 //! @todo: NOTE: This call may not stay here. It can move depending on the implementation for burst capture.
 if (mMode == BurstCapture) {
 // Start a new filename sequence
 CX_DEBUG_EXIT_FUNCTION();
 }
-/* !
+/*!
 @Param cameraIndex indicates which camera we are in use, primary/secondary
 Returns the format we use for specific camera index.
 */
 CCamera::TFormat CxeStillCaptureControlSymbian::supportedStillFormat(Cxe::CameraIndex cameraIndex)
 {
 CX_DEBUG_EXIT_FUNCTION();
 return imgFormat;
 }
+/*!
-/**
-* Camera events. Only relevant one(s) are handled.
-*/
-void CxeStillCaptureControlSymbian::handleCameraEvent(int eventUid, int error)
-{
-CX_DEBUG_ENTER_FUNCTION();
-if (eventUid == KUidECamEventSnapshotUidValue &&
-mCameraDeviceControl.mode() == Cxe::ImageMode) {
-handleSnapshotEvent(CxeErrorHandlingSymbian::map(error));
-}
-CX_DEBUG_EXIT_FUNCTION();
-}
-/**
 * Snapshot ready notification. Ask the snapshot from snapshot interface.
 * NB: Typically snapshot arrives before image data but can be in reverse
 * order as well.
-*/
+*
-void CxeStillCaptureControlSymbian::handleSnapshotEvent(CxeError::Id error)
+* @param status Status of snapshot creation. CxeError::None if no error, otherwise contains the error code.
-{
+* @param snapshot Snapshot as QImage
-CX_DEBUG_ENTER_FUNCTION();
+*/
+void CxeStillCaptureControlSymbian::handleSnapshotReady(CxeError::Id status, const QImage &snapshot)
-if (state() == CxeStillCaptureControl::Uninitialized) {
+{
-// we ignore this event, when we are not active
+CX_DEBUG_ENTER_FUNCTION();
-return;
+if (mCameraDeviceControl.mode() == Cxe::ImageMode) {
-}
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_HANDLESNAPSHOT_1, "msg: e_CX_HANDLE_SNAPSHOT 1");
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_HANDLESNAPSHOTEVENT, "msg: e_CX_HANDLE_SNAPSHOT 1" );
+QPixmap ss = QPixmap::fromImage(snapshot);
 // Get image container for current snapshot index.
 // Remember to increment counter.
 CxeStillImageSymbian* stillImage = getImageForIndex(mNextSnapshotIndex++);
+if (status == CxeError::None) {
-if (error == CxeError::None) {
+stillImage->setSnapshot(ss);
-try {
+}
-stillImage->setSnapshot(extractSnapshot());
-} catch (const std::exception& ex) {
+// Emit snapshotReady signal in all cases (error or not)
-error = CxeError::General;
+emit snapshotReady(status, snapshot, stillImage->id());
-}
-}
+// When the snapshot ready event is handled, prepare new filename.
+if (stillImage->filename().isEmpty()) {
-// Emit snapshotReady signal in all cases (error or not)
+// Error ignored at this point, try again when image data arrives.
-emit snapshotReady(error, stillImage->snapshot(), stillImage->id());
+prepareFilename(stillImage);
+}
-// When the snapshot ready event is handled, prepare new filename.
-if (stillImage->filename().isEmpty()) {
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_HANDLESNAPSHOT_2, "msg: e_CX_HANDLE_SNAPSHOT 0");
-// Error ignored at this point, try again when image data arrives.
+}
-prepareFilename(stillImage);
-}
+CX_DEBUG_EXIT_FUNCTION();
+}
-OstTrace0( camerax_performance, DUP1_CXESTILLCAPTURECONTROLSYMBIAN_HANDLESNAPSHOTEVENT, "msg: e_CX_HANDLE_SNAPSHOT 0" );
-CX_DEBUG_EXIT_FUNCTION();
+/*!
-}
+* Handle ECAM events.
+* Needed only for capture sound synchronization.
-/**
+* @param eventUid ECAM event id.
-* Gets QPixmap snapshot from ECAM buffer, if available.
+* @param error Error code. KErrNone if operation has been successful.
-* @param buffer ECAM buffer containing the snapshot data. Will be released when this
+*/
-* method returns, even on exception.
+void CxeStillCaptureControlSymbian::handleCameraEvent(int eventUid, int error)
-*/
+{
-QPixmap CxeStillCaptureControlSymbian::extractSnapshot()
+if (eventUid == KUidECamEventImageCaptureEventUidValue && error == KErrNone) {
-{
+CX_DEBUG(("CxeStillCaptureControlSymbian::handleCameraEvent - image capture event"));
-CX_DEBUG_ENTER_FUNCTION();
+if (state() == CxeStillCaptureControl::Capturing) {
-QPixmap pixmap;
+mCaptureSoundPlayer->play();
+}
-if (mCameraDevice.cameraSnapshot()) {
+}
+}
-QT_TRAP_THROWING({
-RArray<TInt> frameIndex;
-CleanupClosePushL(frameIndex);
+/*!
-MCameraBuffer &buffer(mCameraDevice.cameraSnapshot()->SnapshotDataL(frameIndex));
-// Make sure buffer is released on leave / exception
-CxeCameraBufferCleanup cleaner(&buffer);
-TInt firstImageIndex(frameIndex.Find(0));
-CFbsBitmap &snapshot(buffer.BitmapL(firstImageIndex));
-CleanupStack::PopAndDestroy(); // frameIndex
-TSize size = snapshot.SizeInPixels();
-TInt sizeInWords = size.iHeight * CFbsBitmap::ScanLineLength(size.iWidth, EColor16MU) / sizeof(TUint32);
-CX_DEBUG(("size %d x %d, sizeInWords = %d", size.iWidth, size.iHeight, sizeInWords ));
-TUint32* pixelData = new (ELeave) TUint32[ sizeInWords ];
-// Convert to QImage
-snapshot.LockHeap();
-TUint32* dataPtr = snapshot.DataAddress();
-memcpy(pixelData, dataPtr, sizeof(TUint32)*sizeInWords);
-snapshot.UnlockHeap();
-CX_DEBUG(("Creating QImage"));
-QImage *snapImage = new QImage((uchar*)pixelData, size.iWidth, size.iHeight,
-CFbsBitmap::ScanLineLength(size.iWidth, EColor16MU),
-QImage::Format_RGB32);
-pixmap = QPixmap::fromImage(*snapImage);
-delete [] pixelData;
-delete snapImage;
-});
-}
-CX_DEBUG_EXIT_FUNCTION();
-return pixmap;
-}
-/**
 * handleImageData: Image data received from ECam
 */
 void CxeStillCaptureControlSymbian::handleImageData(MCameraBuffer* cameraBuffer, int error)
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (!symbErr) {
 //! @todo: this does a deep copy... we want to avoid this for performance/memory consumption reasons
 QByteArray byteArray( reinterpret_cast<const char*>( data->Ptr() ), data->Size() );
 data = NULL;
+// get geotagging setting value and check if we have to add location trail to image data.
+int value = Cxe::GeoTaggingOff;
+mSettings.get(CxeSettingIds::GEOTAGGING, value);
 // Save the image data
-CxeImageDataItemSymbian* dataItem = mImageDataQueue->startSave(byteArray, stillImage->filename(), stillImage->id());
+CxeImageDataItemSymbian* dataItem = mImageDataQueue->startSave(byteArray,
+stillImage->filename(),
+stillImage->id(),
+value == Cxe::GeoTaggingOn);
 stillImage->setDataItem(dataItem);
 mFileSaveThread.save(dataItem); // Saving thread takes ownership of dataItem.
 }
 // ECam Camera buffer should always be released
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Settings changed, needs updated
 */
 void CxeStillCaptureControlSymbian::handleSettingValueChanged(const QString& settingId, QVariant newValue)
 {
 CX_DEBUG_ENTER_FUNCTION();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * ECam reference changing, release resources
 */
 void CxeStillCaptureControlSymbian::prepareForCameraDelete()
 {
 CX_DEBUG_ENTER_FUNCTION();
 deinit();
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Camera being released. Cancel ongoing capture, if any.
 */
 void CxeStillCaptureControlSymbian::prepareForRelease()
 {
 CX_DEBUG_ENTER_FUNCTION();
 deinit();
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 *  New camera available,
 */
 void CxeStillCaptureControlSymbian::handleCameraAllocated(CxeError::Id error)
 {
 CX_DEBUG_ENTER_FUNCTION();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Return number of images captured (during current capture operation only).
 */
 int CxeStillCaptureControlSymbian::imageCount() const
 {
 return mImages.count();
 }
-/**
+/*!
 * Reset the image array.
 */
 void CxeStillCaptureControlSymbian::reset()
 {
 CX_DEBUG_ENTER_FUNCTION();
 mNextImageDataIndex = 0;
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * This should cancel any ongoing image captures.
 */
 void CxeStillCaptureControlSymbian::cancelAll()
 {
 mImageDataQueue->clear();
 reset();
 }
-/**
+/*!
 * Sets the current capture mode: SingleImageCapture / BurstCapture.
 */
 void CxeStillCaptureControlSymbian::setMode( CaptureMode mode )
 {
 mMode = mode;
 }
-/**
+/*!
 * Returns the current capture mode.
 */
 CxeStillCaptureControl::CaptureMode CxeStillCaptureControlSymbian::mode() const
 {
 return mMode;
 }
-/**
+/*!
 * Operator [] - returns the indexed image from capture array.
 */
 CxeStillImage &CxeStillCaptureControlSymbian::operator[]( int index )
 {
 return *mImages[ index ];
 }
-/**
+/*!
 * Getter for image data queue.
 */
 CxeImageDataQueue &CxeStillCaptureControlSymbian::imageDataQueue()
 {
 return *mImageDataQueue;
 }
-/**
+/*!
 * Generates a filename and sets it in the still image object.
 * Skips the process if filename already copied exists in the object. This
 * behaviour is required in rare cases where image data arrives before snapshot.
 */
 CxeError::Id
 CxeStillCaptureControlSymbian::prepareFilename(CxeStillImageSymbian *stillImage)
 {
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPAREFILENAME_1, "msg: e_CX_PREPARE_FILENAME 1" );
 CxeError::Id err = CxeError::None;
 if (stillImage->filename().isEmpty()) {
 QString path;
 QString fileExt = mCurrentImageDetails.mImageFileExtension;
 //! @todo: Error ID can be returned by this function.
 // Also error can be detected from empty filename string.
 CX_DEBUG(("ERROR in filename generation. err:%d", err));
 }
 }
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPAREFILENAME_2, "msg: e_CX_PREPARE_FILENAME 0" );
 return err;
 }
 /*!
 * Helper method to set orientation data from the orientation sensor
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**
+/*!
 * Get the image container at given index or create a new one if needed.
 */
 CxeStillImageSymbian* CxeStillCaptureControlSymbian::getImageForIndex(int index)
 {
 CxeStillImageSymbian* image(NULL);
 mAfState = newState;
 CxeAutoFocusControl::Mode mode = mAutoFocusControl.mode();
 // if focused and in correct mode, play sound
 if  (newState == CxeAutoFocusControl::Ready &&
-mode != CxeAutoFocusControl::Hyperfocal &&
+!mAutoFocusControl.isFixedFocusMode(mode) &&
-mode != CxeAutoFocusControl::Infinity &&
 mAutoFocusControl.isSoundEnabled()) {
 mAutoFocusSoundPlayer->play();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }

changeset 43	0e652f8f1fbd
parent 28	3075d9b614e6
child 45	24fd82631616