[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mdf/video/renderer/mdfdevice/server
From: praveenkumar () helixcommunity ! org
Date: 2009-02-26 19:38:26
Message-ID: 200902261955.n1QJtLWC002859 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mdf/video/renderer/mdfdevice/server
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27267
Modified Files:
Tag: hxclient_2_1_0_cayennes
CMDFDevVideoServerSession.cpp CMDFDevVideoServerSession.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
RealNetworks, and I am authorized to contribute this code under said agreement."
Modified by: praveen.thimmashetty@nokia.com
Reviewed by:
Date: 2/25/2009
Project: SymbianMmf
ErrorId:
Synopsis: CR: Changes to disable creation of CFbsScreenDevice & co for NGA case
Since NGA(New Graphic Architecture) manages screen device creation, helix has to stay \
away from creating CFbsScreenDevice and realted objects for NGA case.
Files Modified:
datatype\mdf\video\renderer\mdfdevice\server\CMDFDevVideoServerSession.cpp
datatype\mdf\video\renderer\mdfdevice\server\CMDFDevVideoServerSession.h
Files Added: None
Image Size and Heap Use impact: None
Module Release testing (STIF) : done.
Test case(s) Added : N/A
Memory leak check performed : yes.
Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-arm
Platforms and Profiles Functionality verified: armv5, winscw
Branch: Head & 210CayS
Index: CMDFDevVideoServerSession.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- CMDFDevVideoServerSession.h 23 Feb 2009 17:52:16 -0000 1.1.2.6
+++ CMDFDevVideoServerSession.h 26 Feb 2009 19:38:22 -0000 1.1.2.7
@@ -206,15 +206,16 @@
private:
CHXSymbianServer* m_pServer;
+ CMMFDevVideoPlay* m_pDevVideoPlay;
+ TVideoPictureHeader* m_pPictureHeader;
- CMMFDevVideoPlay* m_pDevVideoPlay;
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
CFbsScreenDevice* m_pFbsScreenDevice;
CFbsBitGc* m_pFbsBitGc;
- TVideoPictureHeader* m_pPictureHeader;
-
RWsSession m_WsSession;
TDisplayMode m_DisplayMode;
TBool m_bWSConnected;
+#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
THwDeviceId m_DecoderHwDeviceId;
THwDeviceId m_PostProcessorHwDeviceId;
Index: CMDFDevVideoServerSession.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- CMDFDevVideoServerSession.cpp 27 Jan 2009 18:17:03 -0000 1.1.2.12
+++ CMDFDevVideoServerSession.cpp 26 Feb 2009 19:38:22 -0000 1.1.2.13
@@ -84,11 +84,13 @@
:CActive(EPriorityStandard)
,m_pServer(pServer)
,m_pDevVideoPlay(NULL)
+,m_pPictureHeader(NULL)
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
,m_pFbsScreenDevice(NULL)
,m_pFbsBitGc(NULL)
-,m_pPictureHeader(NULL)
,m_DisplayMode(CFbsDevice::DisplayMode16M())
,m_bWSConnected(EFalse)
+#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
,m_pPayloadFormatPluginDevice(NULL)
,m_pMDFEncodedFrameQ(NULL)
,m_DevVideoState(EDevVideoError)
@@ -100,7 +102,9 @@
,m_pVideoSurfaceSupport(NULL)
#endif // defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES) && defined \
(S60_HX_GRAPHICS_SURFACE) {
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
m_WsSession.SetHandle(0);
+#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
CActiveScheduler::Add(this);
}
@@ -114,14 +118,15 @@
{
m_pServer->SessionClosed(this);
}
-
+
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
HX_DELETE(m_pFbsScreenDevice);
HX_DELETE(m_pFbsBitGc);
if(m_WsSession.Handle() != 0)
{
m_WsSession.Close();
}
-
+#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
ResetPictureArray();
HX_DELETE(m_pDevVideoPlay);
#if defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES) && \
defined(S60_HX_GRAPHICS_SURFACE) @@ -295,6 +300,8 @@
lRetval = KErrNone;
break;
}
+//DSA events are ignored for NGA case.
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
case MDF_SyncStartDSA:
{
TRect* pRect = (TRect*) mesg.Ptr0();
@@ -308,6 +315,20 @@
lRetval = KErrNone;
break;
}
+ case MDF_SyncSwitchToScreenNumber:
+ {
+ CFbsScreenDevice* pNewScreenDevice = NULL;
+ TInt lScreenNumber = mesg.Int0();
+ TRAP( lRetval, pNewScreenDevice = CFbsScreenDevice::NewL( \
lScreenNumber, m_DisplayMode ) ); + if( lRetval != KErrNone )
+ {
+ m_pFbsBitGc->Activate( ( CFbsDevice* ) pNewScreenDevice );
+ HX_DELETE(m_pFbsScreenDevice);
+ m_pFbsScreenDevice = pNewScreenDevice;
+ }
+ break;
+ }
+#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
case MDF_SyncSetScalingAndCommit:
{
TSize* pSize = (TSize*) mesg.Ptr0();
@@ -434,19 +455,6 @@
#endif
break;
}
- case MDF_SyncSwitchToScreenNumber:
- {
- CFbsScreenDevice* pNewScreenDevice = NULL;
- TInt lScreenNumber = mesg.Int0();
- TRAP( lRetval, pNewScreenDevice = CFbsScreenDevice::NewL( \
lScreenNumber, m_DisplayMode ) );
- if( lRetval != KErrNone )
- {
- m_pFbsBitGc->Activate( ( CFbsDevice* ) pNewScreenDevice );
- HX_DELETE(m_pFbsScreenDevice);
- m_pFbsScreenDevice = pNewScreenDevice;
- }
- break;
- }
#if defined(HELIX_FEATURE_S60_TRICKPLAY) && defined(S60_HX_TRICK_PLAY)
case MDF_SyncQueryDirectionCapabilities:
{
@@ -746,6 +754,7 @@
}
#endif // End of #ifdef HELIX_FEATURE_LOGLEVEL_NONE
+#if !defined (HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
// Connect to window session
lRetval = m_WsSession.Connect();
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Window Session \
Connect ::%d"), this, lRetval) ); @@ -799,7 +808,7 @@
}
m_pFbsBitGc->Activate( ( CFbsDevice* ) m_pFbsScreenDevice );
}
-
+#endif // HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
m_bReturnPictures = pInitParams->m_bReturnPictures;
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL \
IsDecodeOnlyMode:: %d"), this, m_bReturnPictures) );
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic