[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-03-30 20:29:52
Message-ID: 200903302131.n2ULVrSp007005 () 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-serv14163/mdfdevice/server
Modified Files:
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:
SUB ID: CR 1705
Date: 03/27/2009
Project: SymbianMmf_rel
Synopsis: CR: graphics surface support updates for Helix
Overview: There is a update on surface handling. There will not be any display \
related calls to controller. Hence AddDisplay, removeDisplay and UpdateDisplay APIs \
have been removed. Corresponding changes have been updated to helix as a part of this \
CR.
Files modified:
/clientapps/symbianMmf/hxmmfsitesupplier.cpp
/clientapps/symbianMmf/hxmmfsitesupplier.h
/clientapps/symbianMmf/hxmmfstatectrl.cpp
/clientapps/symbianMmf/hxmmfstatectrl.h
/clientapps/symbianMmf/hxmmfstatectrlobs.h
/clientapps/symbianMmf/common/hxmmfbasectrl.cpp
/clientapps/symbianMmf/common/hxmmfbasectrl.h
/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.h
/common/system/platform/symbian/symbianglobalvideoparameters.cpp
/common/system/pub/platform/symbian/symbianglobalvideoparameters.h
datatype/mdf/video/renderer/mdfvideoadapter.cpp
datatype/mdf/video/renderer/mdfdevice/client/CMDFDevVideoClient.cpp
datatype/mdf/video/renderer/mdfdevice/client/CMDFDevVideoClient.h
datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerCmds.h
datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp
datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.h
datatype/mdf/video/renderer/pub/mdfvideoadapter.h
/video/sitelib/platform/symbian/minisymbiansite.cpp
/video/sitelib/pub/platform/symbian/minisymbiansite.h
/video/sitelib/pub/platform/symbian/symbianvideographicsurface.h
build/umakepf/helix-client-s60-50-common.pfi
build/umakepf/helix-client-s60-52-common.pfi
Image Size and Heap Use impact: None
Module Release testing (STIF) : N/A
Test case(s) Added : None
Memory leak check performed : N/A
Platforms and Profiles Build Verified: helix-client-s60-52-mmf-mdf-dsp
Platforms and Profiles Functionality verified: armv5
Branch: Head, 210CayS
===========================
DIFF enclosed as text files
===========================
Index: CMDFDevVideoServerSession.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CMDFDevVideoServerSession.h 2 Mar 2009 17:44:49 -0000 1.9
+++ CMDFDevVideoServerSession.h 30 Mar 2009 20:29:50 -0000 1.10
@@ -176,10 +176,9 @@
#endif //HELIX_FEATURE_S60_TRICKPLAY
virtual void MmvpoUpdateVideoProperties(const TYuvFormat& aYuvFormat, const \
TSize& aPictureSize); #if defined(S60_HX_GRAPHICS_SURFACE) && \
defined(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
- virtual void MmvsoSurfaceCreated(TInt aDisplayId);
- virtual void MmvsoSurfaceParametersChanged(TInt aDisplayId);
- virtual void MmvsoDisplayUpdated(TInt aDisplayId);
- virtual void MmvsoReplaceSurfaces();
+ virtual void MmvsoSurfaceCreated();
+ virtual void MmvsoSurfaceParametersChanged();
+ virtual void MmvsoRemoveSurface();
#endif
// CActive methods
virtual void RunL();
Index: CMDFDevVideoServerSession.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CMDFDevVideoServerSession.cpp 26 Mar 2009 16:10:45 -0000 1.15
+++ CMDFDevVideoServerSession.cpp 30 Mar 2009 20:29:50 -0000 1.16
@@ -567,39 +567,26 @@
}
break;
}
- case MDF_AddDisplay:
- {
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_AddDisplay"), this) );
- TInt aDisplayID = mesg.Int0();
- if( m_pVideoSurfaceSupport )
- {
- m_pVideoSurfaceSupport->MmvssAddDisplayL(aDisplayID);
- }
- else
- {
- lRetval = KErrNotSupported;
- }
- break;
- }
+
case MDF_GetSurfaceParameters:
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_GetSurfaceParameters"), this) );
- TInt aDisplayID = mesg.Int0();
+
TSurfaceId aSurfaceId;
TRect aCropRect;
TVideoAspectRatio aPixelAspectRatio;
- HXSymbianSurfaceId* sVideosurfaceId = (HXSymbianSurfaceId*) mesg.Ptr1();
+ HXSymbianSurfaceId* sVideosurfaceId = (HXSymbianSurfaceId*) mesg.Ptr0();
- HXxRect* sCroprect = (HXxRect*) mesg.Ptr2();
+ HXxRect* sCroprect = (HXxRect*) mesg.Ptr1();
- HXSymbianVideoAspectRatio* sPixelAspectRatio =(HXSymbianVideoAspectRatio*) \
mesg.Ptr3(); + HXSymbianVideoAspectRatio* sPixelAspectRatio \
=(HXSymbianVideoAspectRatio*) mesg.Ptr2();
if( m_pVideoSurfaceSupport )
{
- m_pVideoSurfaceSupport->MmvssGetSurfaceParametersL(aDisplayID, \
aSurfaceId, aCropRect, aPixelAspectRatio); + \
m_pVideoSurfaceSupport->MmvssGetSurfaceParametersL(aSurfaceId, aCropRect, \
aPixelAspectRatio); sVideosurfaceId->id = aSurfaceId;
sCroprect->left = aCropRect.iTl.iX;
sCroprect->top = aCropRect.iTl.iY;
@@ -614,27 +601,15 @@
}
break;
}
- case MDF_UpdateDisplay:
- {
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_UpdateDisplay"), this) );
- TInt aDisplayID = mesg.Int0();
- if( m_pVideoSurfaceSupport )
- {
- m_pVideoSurfaceSupport->MmvssUpdateDisplayL(aDisplayID);
- }
- else
- {
- lRetval = KErrNotSupported;
- }
- break;
- }
- case MDF_RemoveDisplay:
+
+ case MDF_SurfaceRemoved:
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_RemoveDisplay"), this) );
- TInt aDisplayID = mesg.Int0();
+ TSurfaceId aSurfaceId;
+ HXSymbianSurfaceId* sVideosurfaceId = (HXSymbianSurfaceId*) \
mesg.Ptr0(); if( m_pVideoSurfaceSupport )
{
- m_pVideoSurfaceSupport->MmvssRemoveDisplayL(aDisplayID);
+ m_pVideoSurfaceSupport->MmvssSurfaceRemovedL(aSurfaceId);
}
else
{
@@ -658,21 +633,6 @@
break;
}
- case MDF_AsyncDisplayUpdated:
- {
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_AsyncDisplayUpdated"), this) );
- if(m_AsyncDisplayUpdated.IsNull())
- {
- m_AsyncDisplayUpdated = mesg;
- bCompleteMsg = EFalse;
- }
- else
- {
- lRetval = KErrAlreadyExists;
- }
- break;
-
- }
case MDF_AsyncSurfaceParamChanged:
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_AsyncSurfaceParamChanged"), this) ); @@ -687,7 +647,7 @@
}
break;
}
- case MDF_AsyncReplaceSurfaces:
+ case MDF_AsyncRemoveSurface:
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL cmd: \
MDF_AsyncReplaceSurfaces"), this) ); if(m_AsyncReplaceSurfaces.IsNull())
@@ -936,14 +896,14 @@
}
#endif
#if defined(HELIX_FEATURE_S60_VIDEO_CUSTOM_INTERFACE) && \
defined(S60_HX_GRAPHICS_SURFACE) && \
defined(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
- if (!pInitParams->m_bDisablePostProcessor)
- {
+if (!pInitParams->m_bDisablePostProcessor)
+ {
m_pVideoSurfaceSupport = (MMMFVideoSurfaceSupport *) \
m_pDevVideoPlay->CustomInterface(m_PostProcessorHwDeviceId, \
KUidMMFVideoSurfaceSupport ); if( m_pVideoSurfaceSupport )
{
m_pVideoSurfaceSupport->MmvssSetObserver(*this);
}
- }
+ }
#endif
User::LeaveIfError(lRetval);
@@ -1498,7 +1458,7 @@
}
#if defined(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES) && defined \
(S60_HX_GRAPHICS_SURFACE)
-void CMDFDevVideoServerSession::MmvsoSurfaceCreated(TInt /*aDisplayId*/)
+void CMDFDevVideoServerSession::MmvsoSurfaceCreated()
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoSurfaceCreated() "), this) );
if(!m_AsyncSurfaceCreated.IsNull() )
@@ -1508,7 +1468,7 @@
}
}
-void CMDFDevVideoServerSession::MmvsoSurfaceParametersChanged(TInt /*aDisplayId*/)
+void CMDFDevVideoServerSession::MmvsoSurfaceParametersChanged()
{
SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoSurfaceParametersChanged() "), \
this) ); if(!m_AsyncSurfaceParamChanged.IsNull() )
@@ -1517,22 +1477,13 @@
m_AsyncSurfaceParamChanged.Complete(KErrNone);
}
}
-void CMDFDevVideoServerSession::MmvsoDisplayUpdated(TInt /*aDisplayId*/)
-{
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoDisplayUpdated() "), this) );
- if(!m_AsyncDisplayUpdated.IsNull() )
- {
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoDisplayUpdated() Completing \
message"), this) );
- m_AsyncDisplayUpdated.Complete(KErrNone);
- }
-}
-void CMDFDevVideoServerSession::MmvsoReplaceSurfaces()
+void CMDFDevVideoServerSession::MmvsoRemoveSurface()
{
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoReplaceSurfaces()"), this) );
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoRemoveSurface()"), this) );
if(!m_AsyncReplaceSurfaces.IsNull() )
{
- SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MmvsoReplaceSurfaces() Completing \
message"), this) ); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MmvsoRemoveSurface() Completing message"), this) \
); m_AsyncReplaceSurfaces.Complete(KErrNone);
}
}
_______________________________________________
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