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

equal deleted inserted replaced

-:2922f70fca82
+:67457b2ffb33
 namespace
 {
 const TInt64 KMinRequiredSpaceImage = 2000000;
 }
-/**
+/*!
 * Constructor.
 */
 CxeStillCaptureControlSymbian::CxeStillCaptureControlSymbian(
 CxeCameraDevice &cameraDevice,
 CxeViewfinderControl &viewfinderControl,
 // Connect ECam image buffer ready event
 connect(&mCameraDeviceControl, SIGNAL(imageBufferReady(MCameraBuffer*,int)),
 this, SLOT(handleImageData(MCameraBuffer*,int)));
 // connect snapshot ready signal
-connect(&mSnapshotControl, SIGNAL(snapshotReady(CxeError::Id, const QPixmap&)),
+connect(&mSnapshotControl, SIGNAL(snapshotReady(CxeError::Id, const QImage&)),
-this, SLOT(handleSnapshotReady(CxeError::Id, const QPixmap&)));
+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();
 OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_OUT, "msg: e_CX_STILL_CAPCONT_DEINIT 0" );
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**!
+/*!
 * Prepare still capture mode.
 */
 void CxeStillCaptureControlSymbian::prepare()
 {
 CX_DEBUG_ENTER_FUNCTION();
 CX_DEBUG_EXIT_FUNCTION();
 }
-/**!
+/*!
 Prepare still snapshot
 Returns symbian error code.
 */
 int CxeStillCaptureControlSymbian::prepareStillSnapshot()
 {
 int status(KErrNone);
 try {
 QSize snapshotSize = mSnapshotControl.calculateSnapshotSize(
 mViewfinderControl.deviceDisplayResolution(),
-QSize(mCurrentImageDetails.mWidth, mCurrentImageDetails.mHeight));
+mCurrentImageDetails.mAspectRatio);
 mSnapshotControl.start(snapshotSize);
 } catch (...) {
 status = KErrGeneral;
 }
 OstTrace0( camerax_performance, DUP5_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_SNAPSHOT 0" );
 CX_DEBUG_EXIT_FUNCTION();
 return status;
 }
-/**!
+/*!
 imageInfo contains image qualities details
 Returns CxeError error code.
 */
 CxeError::Id CxeStillCaptureControlSymbian::getImageQualityDetails(CxeImageDetails &imageInfo)
 {
 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;
 }
-/**
+/*!
 * 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::handleSnapshotReady(CxeError::Id status, const QPixmap& snapshot)
+* @param status Status of snapshot creation. CxeError::None if no error, otherwise contains the error code.
+* @param snapshot Snapshot as QImage
+*/
+void CxeStillCaptureControlSymbian::handleSnapshotReady(CxeError::Id status, const QImage &snapshot)
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (mCameraDeviceControl.mode() == Cxe::ImageMode) {
 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) {
-stillImage->setSnapshot(snapshot);
+stillImage->setSnapshot(ss);
 }
 // Emit snapshotReady signal in all cases (error or not)
 emit snapshotReady(status, snapshot, stillImage->id());
 }
 }
 }
-/**
+/*!
 * 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
 }
 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);

changeset 41	67457b2ffb33
parent 40	2922f70fca82
child 42	feebad15db8c