[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mdf/video/renderer/mdfdevice/client
From: praveenkumar () helixcommunity ! org
Date: 2009-03-30 18:49:47
Message-ID: 200903301951.n2UJpotq029255 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mdf/video/renderer/mdfdevice/client
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5792/mdfdevice/client
Modified Files:
Tag: hxclient_2_1_0_cayennes
CMDFDevVideoClient.cpp CMDFDevVideoClient.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: CMDFDevVideoClient.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/client/CMDFDevVideoClient.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- CMDFDevVideoClient.cpp 27 Jan 2009 18:17:03 -0000 1.1.2.5
+++ CMDFDevVideoClient.cpp 30 Mar 2009 18:49:44 -0000 1.1.2.6
@@ -575,38 +575,15 @@
return lRetval;
}
-TInt CMDFDevVideoClient::AddDisplay(TInt aValue)
-{
- HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::AddDisplay() ++");
- TInt lRetval = KErrNone;
- TIpcArgs args;
- args.Set(0, aValue);
- lRetval = SendAddoutstandingRequest(MDF_AsyncSurfaceCreated);
- if(lRetval == KErrNone)
- {
- lRetval = SendSyncCmd(MDF_AddDisplay, args);
- }
-
- if(lRetval != KErrNone)
- {
- HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::AddDisplay() Error:%d", lRetval);
- }
- return lRetval;
-
- //return KErrNone;
-}
-
-TInt CMDFDevVideoClient::GetSurfaceParameters(TInt aDisplayId, HXSymbianSurfaceId& \
sVideosurfaceId, +TInt CMDFDevVideoClient::GetSurfaceParameters(HXSymbianSurfaceId& \
sVideosurfaceId,
HXxRect& sCroprect, HXSymbianVideoAspectRatio& sPixelAspectRatio)
{
HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::GetSurfaceParameters() ++");
- TInt lRetval = KErrNone;
- TIpcArgs args;
-
- args.Set(0, aDisplayId);
- args.Set(1, (TAny*) &sVideosurfaceId);
- args.Set(2, (TAny*) &sCroprect);
- args.Set(3, (TAny*) &sPixelAspectRatio);
+ TInt lRetval = KErrNone;
+ TIpcArgs args;
+ args.Set(0, (TAny*) &sVideosurfaceId);
+ args.Set(1, (TAny*) &sCroprect);
+ args.Set(2, (TAny*) &sPixelAspectRatio);
lRetval = SendSyncCmd(MDF_GetSurfaceParameters, args);
if(lRetval != KErrNone)
{
@@ -615,33 +592,15 @@
return lRetval;
}
-TInt CMDFDevVideoClient::UpdateDisplay(TInt aValue)
-{
- HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::UpdateDisplay() ++");
- TInt lRetval = KErrNone;
- TIpcArgs args;
- args.Set(0, aValue);
- lRetval = SendAddoutstandingRequest(MDF_AsyncDisplayUpdated);
- if(lRetval == KErrNone)
- {
- lRetval = SendSyncCmd(MDF_UpdateDisplay, args);
- }
-
- if(lRetval != KErrNone)
- {
- HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::UpdateDisplay() Error:%d", \
lRetval);
- }
- return lRetval;
-}
-TInt CMDFDevVideoClient::RemoveDisplay(TInt aValue)
+TInt CMDFDevVideoClient::SurfaceRemoved(const HXSymbianSurfaceId& sVideosurfaceId)
{
HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::RemoveDisplay() ++");
TInt lRetval = KErrNone;
TIpcArgs args;
- args.Set(0, aValue);
+ args.Set(0, (TAny*) &sVideosurfaceId);
if(lRetval == KErrNone)
{
- lRetval = SendSyncCmd(MDF_RemoveDisplay, args);
+ lRetval = SendSyncCmd(MDF_SurfaceRemoved, args);
}
if(lRetval != KErrNone)
{
@@ -667,15 +626,6 @@
}
break;
}
- case MDF_AsyncDisplayUpdated:
- {
- if(!m_pDisplayUpdatedActiveObj->IsActive())
- {
- m_pDisplayUpdatedActiveObj->Activate();
- SendReceive(MDF_AsyncDisplayUpdated, \
m_pDisplayUpdatedActiveObj->Status());
- }
- break;
- }
case MDF_AsyncSurfaceParamChanged:
{
if(!m_pSurfaceParamChangedActiveObj->IsActive())
@@ -685,12 +635,12 @@
}
break;
}
- case MDF_AsyncReplaceSurfaces:
+ case MDF_AsyncRemoveSurface:
{
if(!m_pReplaceSurfacesActiveObj->IsActive())
{
m_pReplaceSurfacesActiveObj->Activate();
- SendReceive(MDF_AsyncReplaceSurfaces, TIpcArgs(), \
m_pReplaceSurfacesActiveObj->Status()); + \
SendReceive(MDF_AsyncRemoveSurface, TIpcArgs(), \
m_pReplaceSurfacesActiveObj->Status()); }
break;
}
@@ -766,12 +716,6 @@
TInt err = SendAddoutstandingRequest(MDF_AsyncSurfaceCreated);
m_pClResponse->MmvsoSurfaceCreated();
}
- else if(pData == (TAny*) m_pDisplayUpdatedActiveObj)
- {
- TInt err = SendAddoutstandingRequest(MDF_AsyncDisplayUpdated);
- m_pClResponse->MmvsoDisplayUpdated();
- HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::ProcessRunL \
m_pDisplayUpdatedActiveObj");
- }
else if(pData == (TAny*) m_pSurfaceParamChangedActiveObj)
{
HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::ProcessRunL \
m_pSurfaceParamChangedActiveObj"); @@ -781,8 +725,8 @@
else if(pData == (TAny*) m_pReplaceSurfacesActiveObj)
{
HXLOGL2(HXLOG_VIDE, "CMDFDevVideoClient::ProcessRunL \
m_pReplaceSurfacesActiveObj");
- TInt err = SendAddoutstandingRequest(MDF_AsyncReplaceSurfaces);
- m_pClResponse->MmvsoReplaceSurfaces();
+ TInt err = SendAddoutstandingRequest(MDF_AsyncRemoveSurface);
+ m_pClResponse->MmvsoRemoveSurface();
}
#endif // for HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
@@ -827,9 +771,8 @@
{
User::LeaveIfError(RegisterObserver(m_pSurfaceCreatedActiveObj, \
MDF_AsyncSurfaceCreated));
- User::LeaveIfError(RegisterObserver(m_pDisplayUpdatedActiveObj, \
MDF_AsyncDisplayUpdated));
User::LeaveIfError(RegisterObserver(m_pSurfaceParamChangedActiveObj, \
MDF_AsyncSurfaceParamChanged));
- User::LeaveIfError(RegisterObserver(m_pReplaceSurfacesActiveObj, \
MDF_AsyncReplaceSurfaces)); + \
User::LeaveIfError(RegisterObserver(m_pReplaceSurfacesActiveObj, \
MDF_AsyncRemoveSurface)); }
#endif
Index: CMDFDevVideoClient.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/client/CMDFDevVideoClient.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- CMDFDevVideoClient.h 27 Jan 2009 18:17:03 -0000 1.1.2.5
+++ CMDFDevVideoClient.h 30 Mar 2009 18:49:44 -0000 1.1.2.6
@@ -99,8 +99,7 @@
#if defined(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
virtual void MmvsoSurfaceCreated()=0;
virtual void MmvsoSurfaceParametersChanged()=0;
- virtual void MmvsoDisplayUpdated()=0;
- virtual void MmvsoReplaceSurfaces()=0;
+ virtual void MmvsoRemoveSurface()=0;
#endif //(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
};
@@ -161,11 +160,9 @@
#if defined(HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES)
TInt UseSurfaces();
- TInt AddDisplay(TInt aValue);
- TInt GetSurfaceParameters(TInt aDisplayId, HXSymbianSurfaceId& sVideosurfaceId,
+ TInt GetSurfaceParameters(HXSymbianSurfaceId& sVideosurfaceId,
HXxRect& sCroprect, HXSymbianVideoAspectRatio& sPixelAspectRatio);
- TInt UpdateDisplay(TInt aValue);
- TInt RemoveDisplay(TInt aValue);
+ TInt SurfaceRemoved(const HXSymbianSurfaceId& sVideosurfaceId);
#endif//HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
//
// CActiveCallBackHandler methods
_______________________________________________
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