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

equal deleted inserted replaced

-:d9aefe59d544
+:fa6d9f75d6a6
 * Description:
 *
 */
+#include <algorithm>
 #include <exception>
 #include <fbs.h>
 #include <QPixmap>
 #include <coemain.h>
 #include <ECamOrientationCustomInterface2.h>
 #include "cxestillcapturecontrolsymbian.h"
 #include "cxeimagedataqueuesymbian.h"
 #include "cxefilenamegenerator.h"
 #include "cxefilesavethread.h"
 #include "cxutils.h"
-#include "cxesysutil.h"
 #include "cxecameradevicecontrol.h"
 #include "cxecameradevice.h"
 #include "cxesoundplayersymbian.h"
 #include "cxestillimagesymbian.h"
 #include "cxeviewfindercontrol.h"
 #include "cxeerrormappingsymbian.h"
 #include "cxeautofocuscontrol.h"
 #include "cxesensoreventhandler.h"
 #include "cxesensoreventhandler.h"
 #include "cxequalitypresetssymbian.h"
+#include "cxediskmonitor.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxestillcapturecontrolsymbianTraces.h"
 #endif
 /**
 * Constructor.
 */
 CxeStillCaptureControlSymbian::CxeStillCaptureControlSymbian(
 CxeCameraDevice &cameraDevice,
 CxeViewfinderControl &viewfinderControl,
 CxeCameraDeviceControl &cameraDeviceControl,
 CxeFilenameGenerator &nameGenerator,
 CxeSensorEventHandler &sensorEventHandler,
 CxeAutoFocusControl &autoFocusControl,
 CxeSettings &settings,
 CxeQualityPresets &qualityPresets,
-CxeFileSaveThread &fileSaveThread)
+CxeFileSaveThread &fileSaveThread,
-: CxeStateMachine("CxeStillCaptureControlSymbian"),
+CxeDiskMonitor &diskMonitor)
-mCameraDevice(cameraDevice),
+: CxeStateMachine("CxeStillCaptureControlSymbian"),
-mViewfinderControl(viewfinderControl),
+mCameraDevice(cameraDevice),
-mCameraDeviceControl(cameraDeviceControl),
+mViewfinderControl(viewfinderControl),
-mFilenameGenerator(nameGenerator),
+mCameraDeviceControl(cameraDeviceControl),
-mSensorEventHandler(sensorEventHandler),
+mFilenameGenerator(nameGenerator),
-mAutoFocusControl(autoFocusControl),
+mSensorEventHandler(sensorEventHandler),
-mSettings(settings),
+mAutoFocusControl(autoFocusControl),
-mQualityPresets(qualityPresets),
+mSettings(settings),
-mFileSaveThread(fileSaveThread),
+mQualityPresets(qualityPresets),
-mMode(SingleImageCapture),
+mFileSaveThread(fileSaveThread),
-mAfState(CxeAutoFocusControl::Unknown)
+mDiskMonitor(diskMonitor),
-{
+mMode(SingleImageCapture),
-CX_DEBUG_ENTER_FUNCTION();
+mAfState(CxeAutoFocusControl::Unknown)
+{
+CX_DEBUG_ENTER_FUNCTION();
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_IN, "msg: e_CX_STILLCAPTURECONTROL_NEW 1");
 qRegisterMetaType<CxeStillCaptureControl::State>();
 initializeStates();
 reset();
+// If camera is already allocated, call the slot ourselves.
+if (mCameraDevice.camera()) {
+handleCameraAllocated(CxeError::None);
+}
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_MID1, "msg: e_CX_ENGINE_CONNECT_SIGNALS 1");
 // connect signals from cameraDevice to recieve events when camera reference changes
 connect(&cameraDevice, SIGNAL(prepareForCameraDelete()),
 this, SLOT(prepareForCameraDelete()));
 connect(&cameraDevice, SIGNAL(prepareForRelease()),
 this, SLOT(prepareForRelease()));
 this, SLOT(handleImageData(MCameraBuffer*,int)));
 // Connect signals for ECam events
 connect(&mCameraDeviceControl, SIGNAL(cameraEvent(int,int)),
 this, SLOT(handleCameraEvent(int,int)));
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_MID2, "msg: e_CX_ENGINE_CONNECT_SIGNALS 0");
 mImageDataQueue = new CxeImageDataQueueSymbian();
 mAutoFocusSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::AutoFocus);
 mCaptureSoundPlayer = new CxeSoundPlayerSymbian(CxeSoundPlayerSymbian::StillCapture);
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_CREATE_OUT, "msg: e_CX_STILLCAPTURECONTROL_NEW 0");
 CX_DEBUG_EXIT_FUNCTION();
 }
 /**
 * Destructor.
 * Initialize the still image capture control.
 */
 void CxeStillCaptureControlSymbian::init()
 {
 CX_DEBUG_ENTER_FUNCTION();
-OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_INIT, "msg: e_CX_STILL_CAPCONT_INIT 1");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_INIT_IN, "msg: e_CX_STILL_CAPCONT_INIT 1");
 if (state() == Uninitialized) {
 prepare();
 // Initialize orientation sensor and other sensors
 mSensorEventHandler.init();
 }
-OstTrace0(camerax_performance, DUP1_CXESTILLCAPTURECONTROLSYMBIAN_INIT, "msg: e_CX_STILL_CAPCONT_INIT 0");
+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, "msg: e_CX_STILL_CAPCONT_DEINIT 1" );
 if (state() == Uninitialized) {
 // nothing to do
 return;
 }
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_IN, "msg: e_CX_STILL_CAPCONT_DEINIT 1" );
+// Stop monitoring disk space.
+mDiskMonitor.stop();
+disconnect(&mDiskMonitor, SIGNAL(diskSpaceChanged()), this, SLOT(handleDiskSpaceChanged()));
 //stop viewfinder
 mViewfinderControl.stop();
 // disable sensor event handler.
 mSensorEventHandler.deinit();
 if (state() == Capturing) {
 mCameraDevice.camera()->CancelCaptureImage();
 }
 setState(Uninitialized);
-OstTrace0( camerax_performance, DUP1_CXESTILLCAPTURECONTROLSYMBIAN_DEINIT, "msg: e_CX_STILL_CAPCONT_DEINIT 0" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_DEINIT_OUT, "msg: e_CX_STILL_CAPCONT_DEINIT 0" );
 CX_DEBUG_EXIT_FUNCTION();
 }
 /**!
 if (state() != Uninitialized) {
 // wrong state and we return
 return;
 }
-OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_STILLCAPCONT_PREPARE 1" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_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, DUP2_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_IMAGE_CAPTURE 1");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_MID1, "msg: e_CX_PREPARE_IMAGE_CAPTURE 1");
 TRAP(err, mCameraDevice.camera()->PrepareImageCaptureL(imgFormat, ecamStillResolutionIndex));
-OstTrace0(camerax_performance, DUP3_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_PREPARE_IMAGE_CAPTURE 0");
+OstTrace0(camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_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
 } else {
 err = KErrNotFound;
 }
 if (!err) {
-MCameraFaceTracking *faceTracking = mCameraDevice.faceTracking();
-if (faceTracking) {
-// Enable AF reticule drawing by adaptation
-TRAP_IGNORE(faceTracking->EnableFaceIndicatorsL(ETrue));
-}
 // 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();
+// 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 interested parties that image mode has been prepared for capture
 emit imagePrepareComplete(CxeErrorHandlingSymbian::map(err));
-OstTrace0( camerax_performance, DUP1_CXESTILLCAPTURECONTROLSYMBIAN_PREPARE, "msg: e_CX_STILLCAPCONT_PREPARE 0" );
+OstTrace0( camerax_performance, CXESTILLCAPTURECONTROLSYMBIAN_PREPARE_OUT, "msg: e_CX_STILLCAPCONT_PREPARE 0" );
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxeStillCaptureControlSymbian::capture()
 {
 CX_DEBUG_ENTER_FUNCTION();
 CX_ASSERT_ALWAYS(mCameraDevice.camera());
-// Play the capture sound and start image capture
+// Start the image capture as fast as possible to minimize lag.
-mCaptureSoundPlayer->play();
+// Check e.g. space available *after* this.
-setState(Capturing);
 mCameraDevice.camera()->CaptureImage();
-//! @todo: NOTE: This call may not stay here. It can move depending on the implementation for burst capture.
+if (imagesLeft() > 0) {
-if (mMode == BurstCapture) {
+mCaptureSoundPlayer->play();
-// Start a new filename sequence
+setState(Capturing);
-mFilenameGenerator.startNewImageFilenameSequence();
+//! @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
+mFilenameGenerator.startNewImageFilenameSequence();
+}
+} else {
+// There's no space for the image.
+// Cancel started capturing.
+mCameraDevice.camera()->CancelCaptureImage();
+// Report error.
+// Ui notification has anyway some delays, hence handling VF after this.
+emit imageCaptured(CxeError::DiskFull, CxeStillImage::INVALID_ID);
+// Capturing stops viewfinder, so restart it now.
+mViewfinderControl.stop();
+mViewfinderControl.start();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 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" );
 CX_DEBUG_EXIT_FUNCTION();
 }
 /**
 * Gets QPixmap snapshot from ECAM buffer, if available.
 }
 /**
 * handleImageData: Image data received from ECam
 */
-void CxeStillCaptureControlSymbian::handleImageData( MCameraBuffer* cameraBuffer, int error )
+void CxeStillCaptureControlSymbian::handleImageData(MCameraBuffer* cameraBuffer, int error)
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (state() == CxeStillCaptureControl::Uninitialized) {
 // we ignore this event, when we are not active
 if (settingId == CxeSettingIds::IMAGE_QUALITY) {
 // re-prepare for still
 if (state() == Ready) {
 deinit();
 init();
+}
+}
+CX_DEBUG_EXIT_FUNCTION();
+}
+/*!
+* Disk space changed.
+* Emit remaining images changed signal, if space change affects it.
+*/
+void CxeStillCaptureControlSymbian::handleDiskSpaceChanged()
+{
+CX_DEBUG_ENTER_FUNCTION();
+// Ignore updates on other states.
+if (state() == CxeStillCaptureControl::Ready) {
+int images = calculateRemainingImages(mCurrentImageDetails.mEstimatedSize);
+if (images != mCurrentImageDetails.mPossibleImages) {
+CX_DEBUG(("CxeStillCaptureControlSymbian - available images changed %d -> %d",
+mCurrentImageDetails.mPossibleImages, images));
+mCurrentImageDetails.mPossibleImages = images;
+emit availableImagesChanged();
 }
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Returns the number of images left for the current image quality setting
 */
 int CxeStillCaptureControlSymbian::imagesLeft()
 {
-return calculateRemainingImages(mCurrentImageDetails.mEstimatedSize);
+CX_DEBUG_ENTER_FUNCTION();
+if (mCurrentImageDetails.mPossibleImages == CxeImageDetails::UNKNOWN) {
+mCurrentImageDetails.mPossibleImages = calculateRemainingImages(mCurrentImageDetails.mEstimatedSize);
+}
+CX_DEBUG_EXIT_FUNCTION();
+return mCurrentImageDetails.mPossibleImages;
 }
 /*!
 int
 CxeStillCaptureControlSymbian::calculateRemainingImages(int estimatedImagesize)
 {
 CX_DEBUG_ENTER_FUNCTION();
-//Check the memory in-use setting
+qint64 space = mDiskMonitor.free() - KMinRequiredSpaceImage;
-qint64 memoryfree = CxeSysUtil::spaceAvailable(CCoeEnv::Static()->FsSession(), mSettings);
+int images = std::max(qint64(0), space / estimatedImagesize);
-memoryfree = memoryfree - KMinRequiredSpaceImage;
+CX_DEBUG_EXIT_FUNCTION();
-if (memoryfree < 0) {
+return images;
-memoryfree = 0; // exception, inform ui
-}
-qint64 images = memoryfree / estimatedImagesize;
-CX_DEBUG_EXIT_FUNCTION();
-return images;
 }
 // end of file

changeset 21	fa6d9f75d6a6
parent 19	d9aefe59d544
child 24	2094593137f5