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

equal deleted inserted replaced

-:64817133cd1d
+:42ba2d16bf40
 #include <exception>
 #include <QPixmap>
 #include <coemain.h>
 #include <ECamOrientationCustomInterface2.h>
 #include <ecamfacetrackingcustomapi.h>
+#include <ecamusecasehintcustomapi.h>
 #include "cxestillcapturecontrolsymbian.h"
 #include "cxeimagedataqueuesymbian.h"
 #include "cxefilenamegenerator.h"
 #include "cxefilesavethread.h"
 #include "cxeautofocuscontrol.h"
 #include "cxesensoreventhandler.h"
 #include "cxesensoreventhandler.h"
 #include "cxequalitypresetssymbian.h"
 #include "cxediskmonitor.h"
+#include "cxeexception.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxestillcapturecontrolsymbianTraces.h"
 #endif
 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()));
 mSnapshotControl.stop();
 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();
 }
 /*!
 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 status(CxeError::None);
-CxeError::Id cxErr = getImageQualityDetails(mCurrentImageDetails);
-int ecamStillResolutionIndex = 0;
+try {
+// Update capture parameters
-if (cxErr == CxeError::None) {
+updateStillCaptureParameters();
-int imageWidth =  mCurrentImageDetails.mWidth;
-int imageHeight = mCurrentImageDetails.mHeight;
-CX_DEBUG(("CxeStillCaptureControlSymbian::prepare <> resolution = (%d, %d)", imageWidth, imageHeight));
-TSize imageSize;
-imageSize.SetSize(imageWidth, imageHeight);
-if (mECamSupportedImageResolutions.count() > 0) {
-ecamStillResolutionIndex = mECamSupportedImageResolutions.indexOf(imageSize);
-}
-if (ecamStillResolutionIndex < 0) {
-CX_DEBUG(("CxeStillCaptureControlSymbian::prepare - WARNING! resolution not supported, falling back to index 0"));
-ecamStillResolutionIndex = 0;
-}
 // Prepare Image capture
-CCamera::TFormat imgFormat = supportedStillFormat(mCameraDeviceControl.cameraIndex());
+CX_DEBUG(("Calling PrepareImageCaptureL, resolution index = %d", mSizeIndex));
-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));
+QT_TRAP_THROWING(mCameraDevice.camera()->PrepareImageCaptureL(mCaptureFormat, mSizeIndex));
-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
-err = prepareStillSnapshot();
-}
-} else {
-err = KErrNotFound;
-}
-if (!err) {
 // Start viewfinder before claiming to be ready,
 // as e.g. pending capture might be started by state change,
 // and viewfinder start might have problems with just started capturing.
 // If viewfinder is already running, this call does nothing.
 mViewfinderControl.start();
+// Prepare snapshot
+prepareSnapshot();
 // Start monitoring disk space.
 mDiskMonitor.start();
 connect(&mDiskMonitor, SIGNAL(diskSpaceChanged()), this, SLOT(handleDiskSpaceChanged()));
 // Enable AF reticule drawing by adaptation
 MCameraFaceTracking *faceTracking = mCameraDevice.faceTracking();
 if (faceTracking) {
 TRAP_IGNORE(faceTracking->EnableFaceIndicatorsL(ETrue));
 // Still capture and still snapshot are OK.
 // We can safely set state to READY.
 setState(Ready);
 // inform zoom control to prepare zoom
-emit prepareZoomForStill(ecamStillResolutionIndex);
+emit prepareZoomForStill(mSizeIndex);
-} else {
-CX_DEBUG(("Image Prepare FAILED! symbian error = %d", err));
+} catch (const std::exception &e) {
-// release resources
+// Exception encountered, free resources.
+CX_DEBUG(("Image Prepare FAILED! symbian error = %d", qt_symbian_exception2Error(e)));
+status = CxeErrorHandlingSymbian::map(qt_symbian_exception2Error(e));
 deinit();
 }
 // Inform interested parties that image mode has been prepared for capture
-emit imagePrepareComplete(CxeErrorHandlingSymbian::map(err));
+emit imagePrepareComplete(status);
-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();
 }
 /*!
 Prepare still snapshot
-Returns symbian error code.
+Throws exception on error.
 */
-int CxeStillCaptureControlSymbian::prepareStillSnapshot()
+void CxeStillCaptureControlSymbian::prepareSnapshot()
 {
 CX_DEBUG_ENTER_FUNCTION();
-OstTrace0( camerax_performance, DUP4_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_SNAPSHOT 1" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_PREPARESNAP_1, "msg: e_CX_PREPARE_SNAPSHOT 1" );
-int status(KErrNone);
+QSize snapshotSize = mSnapshotControl.calculateSnapshotSize(
-try {
+mViewfinderControl.deviceDisplayResolution(),
-QSize snapshotSize = mSnapshotControl.calculateSnapshotSize(
+mCurrentImageDetails.mAspectRatio);
-mViewfinderControl.deviceDisplayResolution(),
+mSnapshotControl.start(snapshotSize);
-mCurrentImageDetails.mAspectRatio);
-mSnapshotControl.start(snapshotSize);
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_PREPARESNAP_2, "msg: e_CX_PREPARE_SNAPSHOT 0" );
-} catch (...) {
+CX_DEBUG_EXIT_FUNCTION();
-status = KErrGeneral;
+}
-}
-OstTrace0( camerax_performance, DUP5_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_SNAPSHOT 0" );
+/*!
-CX_DEBUG_EXIT_FUNCTION();
+Update image capture parameters. mCurrentImageDetails, mCaptureFormat and
-return status;
+mSizeIndex are updated based on the current settings.
-}
+*/
+void CxeStillCaptureControlSymbian::updateStillCaptureParameters()
+{
-/*!
+CX_DEBUG_ENTER_FUNCTION();
-imageInfo contains image qualities details
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_UPDATESTILLCAPTUREPARAMETERS_1, "msg: e_CX_UPDATE_STILL_CAPTURE_PARAMETERS 1" );
-Returns CxeError error code.
-*/
-CxeError::Id CxeStillCaptureControlSymbian::getImageQualityDetails(CxeImageDetails &imageInfo)
-{
-CX_DEBUG_ENTER_FUNCTION();
 int imageQuality = 0;
 CxeError::Id err = CxeError::None;
 if (mCameraDeviceControl.cameraIndex() == Cxe::PrimaryCameraIndex) {
-err = mSettings.get(CxeSettingIds::IMAGE_QUALITY, imageQuality);
+try {
+imageQuality = mSettings.get<int>(CxeSettingIds::IMAGE_QUALITY);
-bool validQuality = (imageQuality >= 0 && imageQuality < mIcmSupportedImageResolutions.count());
+bool validQuality = (imageQuality >= 0 &&
-if (err == CxeError::None && validQuality ) {
+imageQuality < mIcmSupportedImageResolutions.count());
-// get image quality details
-imageInfo = mIcmSupportedImageResolutions.at(imageQuality);
+if (validQuality ) {
-} else {
+// get image quality details
-err = CxeError::NotFound;
+mCurrentImageDetails = mIcmSupportedImageResolutions.at(imageQuality);
-CX_DEBUG(("Invalid ImageQuality = %d", imageQuality));
+} else {
+err = CxeError::NotFound;
+CX_DEBUG(("Invalid ImageQuality = %d", imageQuality));
+}
+} catch (CxeException &e) {
+err = (CxeError::Id) e.error();
 }
 } else {
 // we are in secondary camera
 // get secondary camera image quality details
-imageInfo = mIcmSupportedImageResolutions.at(imageQuality);
+mCurrentImageDetails = mIcmSupportedImageResolutions.at(imageQuality);
 }
-CX_DEBUG_EXIT_FUNCTION();
+mSizeIndex = 0;
-return err;
+if (err == CxeError::None) {
+int imageWidth = mCurrentImageDetails.mWidth;
+int imageHeight = mCurrentImageDetails.mHeight;
+CX_DEBUG(("CxeStillCaptureControlSymbian::updateStillCaptureParameters <> resolution = (%d, %d)", imageWidth, imageHeight));
+TSize imageSize;
+imageSize.SetSize(imageWidth, imageHeight);
+if (mECamSupportedImageResolutions.count() > 0) {
+mSizeIndex = mECamSupportedImageResolutions.indexOf(imageSize);
+}
+if (mSizeIndex < 0) {
+CX_DEBUG(("CxeStillCaptureControlSymbian::updateStillCaptureParameters - WARNING! resolution not supported, falling back to index 0"));
+mSizeIndex = 0;
+}
+mCaptureFormat = supportedStillFormat(mCameraDeviceControl.cameraIndex());
+}
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROL_UPDATESTILLCAPTUREPARAMETERS_2, "msg: e_CX_UPDATE_STILL_CAPTURE_PARAMETERS 0" );
+CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Command to start image capture now.
 * @sa handleCameraEvent
 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" );
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_HANDLESNAPSHOT_1, "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 (stillImage->filename().isEmpty()) {
 // Error ignored at this point, try again when image data arrives.
 prepareFilename(stillImage);
 }
-OstTrace0( camerax_performance, DUP1_CXESTILLCAPTURECONTROLSYMBIAN_HANDLESNAPSHOTEVENT, "msg: e_CX_HANDLE_SNAPSHOT 0" );
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROL_HANDLESNAPSHOT_2, "msg: e_CX_HANDLE_SNAPSHOT 0");
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 //! @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;
+Cxe::GeoTagging value = mSettings.get<Cxe::GeoTagging>(CxeSettingIds::GEOTAGGING, Cxe::GeoTaggingOff);
-mSettings.get(CxeSettingIds::GEOTAGGING, value);
 // Save the image data
 CxeImageDataItemSymbian* dataItem = mImageDataQueue->startSave(byteArray,
 stillImage->filename(),
 stillImage->id(),
 * 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();
 }
 /*!
+Use ECam Use Case Hint Custom API to inform ECam of our intended use case
+before calling Reserve().
+*/
+void CxeStillCaptureControlSymbian::hintUseCase()
+{
+CX_DEBUG_ENTER_FUNCTION();
+// Make sure ECam knows we're doing still image capture so it can prepare
+// for the correct use case.
+if (mCameraDeviceControl.mode() == Cxe::ImageMode) {
+MCameraUseCaseHint *useCaseHintApi = mCameraDevice.useCaseHintApi();
+if (useCaseHintApi) {
+updateStillCaptureParameters();
+TRAP_IGNORE(useCaseHintApi->HintStillCaptureL(mCaptureFormat,
+mSizeIndex));
+}
+}
+CX_DEBUG_EXIT_FUNCTION();
+}
+/*!
 * Returns supported image qualities based on the camera index
 * (primary/secondary).
 */
 QList<CxeImageDetails> CxeStillCaptureControlSymbian::supportedImageQualities()
 {

changeset 48	42ba2d16bf40
parent 37	64817133cd1d
child 60	a289dde0a1d6