[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mdf/video/renderer mdfvideoadapter.cpp, 1.3.2.96,
From: praveenkumar () helixcommunity ! org
Date: 2009-03-30 18:49:46
Message-ID: 200903301951.n2UJpoMn029254 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mdf/video/renderer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5792
Modified Files:
Tag: hxclient_2_1_0_cayennes
mdfvideoadapter.cpp
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: mdfvideoadapter.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
retrieving revision 1.3.2.96
retrieving revision 1.3.2.97
diff -u -d -r1.3.2.96 -r1.3.2.97
--- mdfvideoadapter.cpp 27 Jan 2009 18:17:02 -0000 1.3.2.96
+++ mdfvideoadapter.cpp 30 Mar 2009 18:49:44 -0000 1.3.2.97
@@ -565,28 +565,7 @@
if(m_bIsGrphicSurface)
{
retFlag = m_pDevVideoClient->UseSurfaces();
- if(retFlag == KErrNone)
- {
- TInt32 diplayIdArray[10]; //AddDisplay call will be removed soon
- TInt32 index;
- retFlagValue = (SymbianGlobalVideoParameters::Instance())->GetAddDisplayID(diplayIdArray,index); \
- if(retFlagValue == HXR_OK)
- {
- for(TInt i=0; i < index && retFlag == KErrNone; i++)
- {
- retFlag = m_pDevVideoClient->AddDisplay(diplayIdArray[i]);
- }
- if(retFlag != KErrNone)
- {
- retVal = CHXSymbianErrorMapper::MapToHXStatus(retFlag);
- }
- }
- else
- {
- retVal = HXR_FAIL;
- }
- }
- else
+ if(retFlag != KErrNone)
{
retVal = CHXSymbianErrorMapper::MapToHXStatus(retFlag);
}
@@ -1310,39 +1289,25 @@
TInt retFlag = m_pDevVideoClient->UseSurfaces();
return CHXSymbianErrorMapper::MapToHXStatus(retFlag);
}
-STDMETHODIMP
-CMdfVideoAdapter::AddDisplay(INT32 lValue)
-{
- MDFVIDEOLOG_ENTERFN2( "AddDisplay ++" );
- TInt retFlag = m_pDevVideoClient->AddDisplay(lValue);
- return CHXSymbianErrorMapper::MapToHXStatus(retFlag);
-}
STDMETHODIMP
-CMdfVideoAdapter::GetSurfaceParameters(INT32 lValue, HXSymbianSurfaceId& \
sVideosurfaceId, HXxRect& sCroprect, HXSymbianVideoAspectRatio& sPixelAspectRatio) \
+CMdfVideoAdapter::GetSurfaceParameters(HXSymbianSurfaceId& sVideosurfaceId, HXxRect& \
sCroprect, HXSymbianVideoAspectRatio& sPixelAspectRatio) {
TInt lRetval = KErrNone;
MDFVIDEOLOG_ENTERFN2( "GetSurfaceParameters ++" );
- lRetval = m_pDevVideoClient->GetSurfaceParameters(lValue, sVideosurfaceId, \
sCroprect, sPixelAspectRatio); + lRetval = \
m_pDevVideoClient->GetSurfaceParameters(sVideosurfaceId, sCroprect, \
sPixelAspectRatio); MDFVIDEOLOG_RETURNFN2( "GetSurfaceParameters -- ", lRetval );
return CHXSymbianErrorMapper::MapToHXStatus(lRetval);
}
STDMETHODIMP
-CMdfVideoAdapter::UpdateDisplay(INT32 lValue)
-{
- MDFVIDEOLOG_ENTERFN2( "UpdateDisplay ++" );
- TInt retFlag = m_pDevVideoClient->UpdateDisplay(lValue);
- return CHXSymbianErrorMapper::MapToHXStatus(retFlag);
-}
-
-STDMETHODIMP
-CMdfVideoAdapter::RemoveDisplay(INT32 lValue)
+CMdfVideoAdapter::SurfaceRemoved(const HXSymbianSurfaceId& sVideosurfaceId)
{
MDFVIDEOLOG_ENTERFN2( "RemoveDisplay ++" );
- TInt retFlag = m_pDevVideoClient->RemoveDisplay(lValue);
+ TInt retFlag = m_pDevVideoClient->SurfaceRemoved(sVideosurfaceId);
return CHXSymbianErrorMapper::MapToHXStatus(retFlag);
}
+
void CMdfVideoAdapter::MmvsoSurfaceCreated()
{
MDFVIDEOLOG_ENTERFN2( "MmvsoSurfaceCreated" );
@@ -1355,17 +1320,12 @@
m_pGraphcisSurfaceObs->SurfaceParametersChanged();
MDFVIDEOLOG_LEAVEFN2( "MmvsoSurfaceParametersChanged --" );
}
-void CMdfVideoAdapter::MmvsoDisplayUpdated()
-{
- MDFVIDEOLOG_ENTERFN2( "MmvsoDisplayUpdated ++" );
- m_pGraphcisSurfaceObs->DisplayUpdated();
- MDFVIDEOLOG_LEAVEFN2( "MmvsoDisplayUpdated --" );
-}
-void CMdfVideoAdapter::MmvsoReplaceSurfaces()
+
+void CMdfVideoAdapter::MmvsoRemoveSurface()
{
- MDFVIDEOLOG_ENTERFN( "MmvsoReplaceSurfaces++" );
- m_pGraphcisSurfaceObs->ReplaceSurfaces();
- MDFVIDEOLOG_LEAVEFN2( "MmvsoReplaceSurfaces--");
+ MDFVIDEOLOG_ENTERFN( "MmvsoRemoveSurface++" );
+ m_pGraphcisSurfaceObs->RemoveSurface();
+ MDFVIDEOLOG_LEAVEFN2( "MmvsoRemoveSurface--");
}
#endif //for HELIX_FEATURE_SYMBIAN_GRAPHICS_SURFACES
_______________________________________________
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