FCL/sf/os/mm: comparison mmplugins/cameraplugins/source/webcamera/ecamwebcameraplugin.cpp

equal deleted inserted replaced

-:9ae0fe04e757
+:92a82bc706f7
 _LIT(KCameraDriverPddName, "webcamera.pdd");
 _LIT(KCameraDriverLddName, "ewebcamera.ldd");
-const TInt KCaptureWidth     = 160;					// Capture image width
+const TInt KCaptureWidth     = 640;					// Capture image width
-const TInt KCaptureHeight    = 120;					// Capture image height
+const TInt KCaptureHeight    = 480;					// Capture image height
 const TInt KCaptureLineBytes = KCaptureWidth * 3;	// bytes of one line
 //
 // CWebCamera class
 //
 CWebCamera::CWebCamera():
 	iCaptureBufPtr(NULL, 0)
 	{
 	iInfo.iHardwareVersion.iMajor = 0;
 	iInfo.iHardwareVersion.iMinor = 0;
 	iInfo.iHardwareVersion.iBuild = 0;
 	iInfo.iSoftwareVersion.iMajor = 0;
 	iInfo.iSoftwareVersion.iMinor = 0;
 	{
 	delete iCaptureBuf;
 	delete iAdvSettingsImpl;
 	delete iVfActive;
 	delete iActive;
+	delete iCaptureBitmap;
+	iChunk.Close();
 	iImageSizes.Close();
 	iDriver.Close();
 	}
 CWebCamera* CWebCamera::NewL()
 	return self;
 	}
 void CWebCamera::ConstructL()
 	{
-	RDebug::Print(_L("CWebCamera::ConstructL_S"));
 	// Open drivers.
 	TInt err;
 	err = User::LoadPhysicalDevice(KCameraDriverPddName);
-	RDebug::Print(_L("CWebCamera::ConstructL LoadPhysicalDevice[%d]"), err);
 	if (err != KErrNone && err != KErrAlreadyExists)
 		{
 		User::Leave(err);
 		}
 	err = User::LoadLogicalDevice(KCameraDriverLddName);
-	RDebug::Print(_L("CWebCamera::ConstructL LoadLogicalDevice[%d]"), err);
 	if (err != KErrNone && err != KErrAlreadyExists)
 		{
 		User::Leave(err);
 		}
-	RDebug::Print(_L("CWebCamera::ConstructL iDriver.Open()"));
 	iDriver.Open();
 	iActive = CWebCameraActive::NewL(this, iDriver);
 	iVfActive = CWebCameraVfActive::NewL(this, iDriver);
 	User::LeaveIfError(iImageSizes.Append(TSize(640, 480)));	// VGA
 	User::LeaveIfError(iImageSizes.Append(TSize(160, 120)));	// QQVGA
 	iInfo.iNumImageSizesSupported = iImageSizes.Count();
-	RDebug::Print(_L("CWebCamera::ConstructL_E"));
+	// Open chunk
+	err = iDriver.OpenSharedChunks(iChunk, iChunkInfo);
+	if (err != KErrNone)
+		{
+		User::Leave(err);
+		}
+	iChuckBase=iChunk.Base();
 	}
 /**
 from CCameraPlugin
 Duplicates the original camera object for use by, for example, multimedia systems.
 May leave with KErrNoMemory or KErrNotFound if aCameraHandle is not valid.
-@param  aObserver
+@param  aObserver 					Reference to an observer.
-Reference to an observer.
 @param  aCameraHandle Handle of an existing camera object.
 @return Duplicate of the original camera object.
 */
 void CWebCamera::Construct2DupL(MCameraObserver& aObserver,TInt aCameraHandle)
 	{
 	iObserver = &aObserver;
 Index from 0 to CamerasAvailable()-1 inclusive specifying the
 camera device to use.
 @param	aPriority
 Value from -100 to 100 indicating relative priority of client to
 use camera.
 @return Pointer to a fully constructed CCamera object. Ownership is passed
 to the caller.
 @leave  May leave with KErrNoMemory or KErrNotSupported if aCameraIndex is
 out of range.
 */
 void CWebCamera::Construct2L(MCameraObserver2& aObserver,TInt aCameraIndex,TInt aPriority)
 	{
 //
 // virtual functions
 //
 /**
-from CCamera
+from CCamera		Gets information about the camera device.
+@param  aInfo 		On return, information about the camera device. See TCameraInfo.
-Gets information about the camera device.
-@param  aInfo
-On return, information about the camera device. See TCameraInfo.
 */
 void CWebCamera::CameraInfo(TCameraInfo& aInfo) const
 	{
 	aInfo = iInfo;
 	}
 	iReserved = EFalse;
 	}
 /**
 from CCamera
 Asynchronous method to switch on camera power.
 User must have successfully called Reserve() prior to calling this function.
 Calls MCameraObserver::PowerOnComplete() when power on is complete.
 */
 void CWebCamera::PowerOn()
 	{
 	iActive->PowerOn();
 Sets the digital zoom factor.
 This must be in the range of 0 to TCameraInfo::iMaxDigitalZoom inclusive.
 May leave with KErrNotSupported if the zoom factor is out of range.
 @param  aDigitalZoomFactor
 The required digital zoom factor.
 */
 void CWebCamera::SetDigitalZoomFactorL(TInt /*aDigitalZoomFactor = 0*/)
 	{
 /**
 from CCamera
 Sets the flash mode.
 No effect if this is not supported, see TCameraInfo::iFlashModesSupported.
 May leave with KErrNotSupported if the specified flash mode is invalid.
 @param  aFlash
 The required flash mode.
 */
 void CWebCamera::SetFlashL(TFlash /*aFlash = EFlashNone*/)
 	{
 /**
 from CCamera
 Gets the currently set flash mode.
 @return  The currently set flash mode.
 @note	if CCamera::New2L() or CCamera::NewDuplicate2L() is not used to create CCamera object, it is assumed that
 application is not prepared to receive extra added enum values (unrecognised). So, any extra enum value(unrecognised)
 (set in the ECAM implementation because of sharing clients) should not be returned from the ECAM implementation.
 To receive extra added enum values, application should rather use CCamera::New2L() or CCamera::NewDuplicate2L()
 @see	CCamera::CCameraV2DirectViewFinder
 */
 void CWebCamera::StartViewFinderDirectL(RWsSession& aWs, CWsScreenDevice& aScreenDevice, RWindowBase& aWindow, TRect& aScreenRect)
 	{
-	RDebug::Print(_L("CWebCamera::StartViewFinderDirectL"));
 	TRect emptyRect;
 	StartViewFinderDirectL(aWs, aScreenDevice, aWindow, aScreenRect, emptyRect);
 	}
 /**
 @see	CCamera::CCameraClientViewFinder
 */
 void CWebCamera::StartViewFinderDirectL(RWsSession& aWs, CWsScreenDevice& aScreenDevice, RWindowBase& aWindow, TRect& aScreenRect, TRect& aClipRect)
 	{
-	RDebug::Print(_L("CWebCamera::StartViewFinderDirectL'"));
+	iVfActive->StartViewFinderDirectL(aWs, aScreenDevice, aWindow, aScreenRect, aClipRect, iChuckBase, iChunkRemSize);
-	iVfActive->StartViewFinderDirectL(aWs, aScreenDevice, aWindow, aScreenRect, aClipRect);
 	}
 /**
 from CCamera
 Queries whether the view finder is active.
 @return  ETrue if the view finder is active. EFalse if the view finder is not
 active.
 @note   This method is assumed to be meant for default display only. KECamDefaultViewFinderHandle should be used to
 		refer viewfinders started using CCamera methods.
 @see	CCamera::CCameraV2DirectViewFinder
 @see	CCamera::CCameraClientViewFinder
 */
 TBool CWebCamera::ViewFinderActive() const
 	{
 Used to switch between what the camera sees and what you would see if the
 device were a mirror.
 @param  aMirror
 ETrue to set mirroring on, EFalse to set mirroring off.
 @leave  KErrNotSupported.
 @note   This method is assumed to be meant for default display only. KECamDefaultViewFinderHandle should be used to
 		refer viewfinders started using CCamera methods.
 	iCaptureBuf = HBufC8::NewL(KMaxBufSize);
 	iCaptureBufPtr.Set(iCaptureBuf->Des());
 	iCaptureBufPtr.SetLength(0);
-	iActive->ImageCapture(iCaptureBufPtr);
+	iActive->ImageCapture(iChunkRemSize);
 	iImageCaptureActive = ETrue;
 	}
 /**
 from CCamera
 Gets the currently set jpeg quality value.
 Returns 0 if not supported.
 @return The currently set jpeg quality value.
 @see    CCamera::CCameraPreImageCaptureControl::GetImageMaxMemorySizeL(TUint& aMemorySize)
 */
 TInt CWebCamera::JpegQuality() const
 	{
 	return 0;
 Gets a custom interface. The client has to cast the returned pointer
 to the appropriate type.
 @param aInterface
 	   The Uid of the particular interface function required.
 @return Custom interface pointer. NULL if the requested interface is not supported.
 */
 TAny* CWebCamera::CustomInterface(TUid aInterface)
 	{
 	switch(aInterface.iUid)
 		}
 	}
 /**
 from MWebCameraActiveCallBack
 CallBack function of the Reserve
 */
 void CWebCamera::ReserveCallBack(TInt aError)
 	{
-	RDebug::Print(_L("CWebCamera::ReserveCallBack"));
 	if (iObserver)
 		{
 		iObserver->ReserveComplete(aError);
 		}
 		}
 	}
 /**
 from MWebCameraActiveCallBack
 CallBack function of the PowerOn
 */
 void CWebCamera::PowerOnCallBack(TInt aError)
 	{
-	RDebug::Print(_L("CWebCamera::PowerOnCallBack"));
 	if (iObserver)
 		{
 		iObserver->PowerOnComplete(aError);
 		}
 CallBack function of the ImageCapture
 */
 void CWebCamera::ImageCaptureCallBackL(TInt aError)
 	{
-	RDebug::Print(_L("CWebCamera::ImageCaptureCallBack_S"));
 	iImageCaptureActive = EFalse;
+	if (!iCaptureBitmap)
-	iCaptureBitmap = NULL;
+		{
-	CFbsBitmap* image = new (ELeave) CFbsBitmap();
+		CFbsBitmap* image = new (ELeave) CFbsBitmap();
-	CleanupStack::PushL(image);
+		CleanupStack::PushL(image);
-	User::LeaveIfError(image->Create(TSize(KCaptureWidth, KCaptureHeight), EColor16M));
+		User::LeaveIfError(image->Create(TSize(KCaptureWidth, KCaptureHeight), EColor16M));
-	CleanupStack::Pop(image);
+		CleanupStack::Pop(image);
-	iCaptureBitmap = image;
+		iCaptureBitmap = image;
+		}
+	iCaptureBufPtr.Copy(iChuckBase,iChunkRemSize);
 ////////////////////////////////////////////////////////////////////////////////////////
 // output receive data log
 //	RDebug::Print(_L("CWebCameraVfActive::ImageCaptureCallBack iCaptureBufPtr[%d]"), iCaptureBufPtr.Length());
 //	TBuf<256> hexBuf;
 //			}
 //		}
 //	RDebug::Print(hexBuf);
 ////////////////////////////////////////////////////////////////////////////////////////
-	RDebug::Print(_L("CWebCamera::ImageCaptureCallBack start setscanline_S"));
-	for (TInt height=0; height<KCaptureHeight; height++)
-		{
-		TInt pos = height * KCaptureLineBytes;
-		TPtrC8 posptr = iCaptureBuf->Mid(pos, KCaptureLineBytes);
-		TBuf8<KCaptureLineBytes>  buf;
-		buf.Copy(posptr);
-		iCaptureBitmap->SetScanLine(buf, ((KCaptureHeight-1)-height));
-		}
-	RDebug::Print(_L("CWebCamera::ImageCaptureCallBack start setscanline_E"));
 	if (iObserver)
 		{
+		TUint32 *wData = iCaptureBitmap->DataAddress();
+		Mem::Copy(wData, iCaptureBufPtr.Ptr(), (KCaptureHeight * KCaptureLineBytes));
 		iObserver->ImageReady(iCaptureBitmap, iCaptureBuf, aError);
+		delete iCaptureBitmap;
+		iCaptureBitmap = NULL;
 		}
 	else if (iObserver2)
 		{
 		iObserver2->ImageBufferReady(*iCaptureCameraBuf, aError);
 		}
-	RDebug::Print(_L("CWebCamera::ImageCaptureCallBack_E"));
 	}
 //from MWebCameraVfActiveCallBack
 void CWebCamera::ViewFinderCallBack(TInt /*aError*/)
 	{
-	RDebug::Print(_L("CWebCamera::ViewFinderCallBack"));
 	}
 //
 // CWebCameraInfo class

branch	RCL_3
changeset 64	92a82bc706f7
parent 9	9ae0fe04e757