[datatype-dev] CR: MDF Virtual Window Support
Shy.Ward at nokia.com Shy.Ward at nokia.comSkipped content of type multipart/alternative-------------- next part --------------
Index: mdfclocksource.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfclocksource.cpp,v
retrieving revision 1.3.2.5
diff -w -u -b -r1.3.2.5 mdfclocksource.cpp
Index: mdfpluginpackage.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfpluginpackage.cpp,v
retrieving revision 1.1.2.2
diff -w -u -b -r1.1.2.2 mdfpluginpackage.cpp
Index: mdfvideoadapter.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
retrieving revision 1.3.2.40
diff -w -u -b -r1.3.2.40 mdfvideoadapter.cpp
--- mdfvideoadapter.cpp 12 Oct 2006 18:03:28 -0000 1.3.2.40
+++ mdfvideoadapter.cpp 3 Nov 2006 02:14:33 -0000
@@ -1284,10 +1284,21 @@
m_bIsDSAStarted = FALSE;
}
- if( m_ClipRegion.Count() )
+ retVal = HXR_FAIL;
+ MMdfVideoWindowControl* pVirtualDisplay =
+ (MMdfVideoWindowControl *) m_pDevVideoPlay->CustomInterface( m_PostProcessorHwDeviceId, KUidMdfVideoWindowControl );
+ MDFVIDEOLOG_INOUTFN2( "CustomInterface(Virtual Display) does not leave" );
+ if( pVirtualDisplay )
+ {
+ TRAPD( error, pVirtualDisplay->MmvwcSetLogicalVideoWindow( m_windowRect ) );
+ if ( error != KErrNone )
{
+ MDFVIDEOLOG_INOUTFN2( "MmvwcSetLogicalVideoWindow failed" );
retVal = HXR_FAIL;
- TRAPD(error, m_pDevVideoPlay->StartDirectScreenAccessL(m_windowRect, *m_pFbsScreenDevice, m_ClipRegion));
+ }
+ }
+
+ TRAPD(error, m_pDevVideoPlay->StartDirectScreenAccessL(m_clipRect, *m_pFbsScreenDevice, m_ClipRegion));
if (error == KErrNone)
{
retVal = HXR_OK;
@@ -1313,7 +1324,7 @@
//update last frame to window
m_pDevVideoPlay->Redraw();
}
- }
+
}
MDFVIDEOLOG_RETURNFN( "StartDSA", retVal );
Index: pub/mdfvideoadapter.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/pub/mdfvideoadapter.h,v
retrieving revision 1.3.2.16
diff -w -u -b -r1.3.2.16 mdfvideoadapter.h
--- pub/mdfvideoadapter.h 25 Sep 2006 21:30:13 -0000 1.3.2.16
+++ pub/mdfvideoadapter.h 3 Nov 2006 02:14:33 -0000
@@ -78,6 +78,7 @@
#include "hxsite3.h"
#include "hxprefs.h"
#include "hxprefutil.h"
+#include "videowindowcontrol.h"
class CMdfVideoAdapter : public IUnknown,
public IHXSurfaceControl,