[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs]
From:       yuryrp () helixcommunity ! org
Date:       2008-02-18 21:29:45
Message-ID: 200802182130.m1ILU3po018677 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mdf/video/renderer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv655

Modified Files:
      Tag: hxclient_2_2_1_cayennes
	mdfvideoadapter.cpp 
Log Message:
Modified by:  yury.ramanovich@nokia.com
 
Reviewed by: ashish.as.gupta@nokia.com, ehyche@real.com
 
Date: 02/12/2008
 
Project: SymbianMmf_wm
 
ErrorId: ECTN-7BEKZT
 
Synopsis: General system error occurred when play any unsupported wmv clips

Overview: when attempting to play unsupported wmv video 'Invalid clip' message should \
be displayed to user. CMDFDevVideoClient::CreateAndInit() returns KErrNotSupported in \
this case but currently it results in CMdfVideoAdapter::Init() returning default \
HXR_FAIL. 

Solution: 
1) Rename CDevVideoInitParams::m_lHlxErrorCode to m_lHlxDrmErrorCode because it is \
intended to be used only for drm clips. Set its default value to HXR_NOT_SUPPORTED.  \
                2) If CMDFDevVideoClient::CreateAndInit() unsuccessful, then in case \
                of
	- drm video CMdfVideoAdapter::InitL returns pInitParam->m_lHlxDrmErrorCode; 
	- plain video CMdfVideoAdapter::InitL returns appropriate helix error code.
	A simple utility that maps symbian error codes to helix error codes is introduced.
3) Also made sure that CMdfVideoAdapter::Init() returns correct helix error code \
value in case CMdfVideoAdapter::InitL() doesn’t leave.

Files modified:
/common/system/symbian.pcf,v                                               
/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v                         
/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerCmds.h,v   
/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp


Files added:
/common/system/platform/symbian/symbian_error_mapper.cpp
/common/system/pub/platform/symbian/symbian_error_mapper.h


Image Size and Heap Use impact: minor.

Module Release testing (STIF) : Yes, Passed

Test case(s) Added  : No
  
Memory leak check performed : Yes. No new memory leaks introduced.
  
Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-arm

Platforms and Profiles Functionality verified: armv5, winscw 
  
Branch: Head & 210CayS


Index: mdfvideoadapter.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v
retrieving revision 1.3.2.78.2.1
retrieving revision 1.3.2.78.2.2
diff -u -d -r1.3.2.78.2.1 -r1.3.2.78.2.2
--- mdfvideoadapter.cpp	11 Feb 2008 18:32:15 -0000	1.3.2.78.2.1
+++ mdfvideoadapter.cpp	18 Feb 2008 21:29:43 -0000	1.3.2.78.2.2
@@ -62,6 +62,7 @@
 #include "CHXSymbianServerDebug.h"
 #include "CMDFDevVideoClient.h"
 #include "CMDFDevVideoServerCmds.h"
+#include "symbian_error_mapper.h"
 
 #ifdef _WIN32
 #define DFLT_PRESENT_PRIORITY          THREAD_PRIORITY_ABOVE_NORMAL
@@ -369,7 +370,7 @@
             m_DevVidInitialized = EInitializedFailed;
             MDFVIDEOLOG_WRITE_FORMAT( "Error in Init is %d", error );
 
-            if( error == KErrNotSupported )
+            if( error == KErrNotSupported || retVal == HXR_UNSUPPORTED_VIDEO )
             {
                 retVal = HXR_UNSUPPORTED_VIDEO;
             }
@@ -476,9 +477,16 @@
     }
     else
     {
-        retVal = pInitParam->m_lHlxErrorCode;
+        if(pInitParam->m_bCopyRestricted)
+        {
+            retVal = pInitParam->m_lHlxDrmErrorCode;
+        }
+        else 
+        {
+            retVal = CHXSymbianErrorMapper::MapToHXStatus(lRetval);        
+        }    
     }
-
+    
     HX_DELETE(pInitParam);
     CleanupStack::PopAndDestroy(pServerName);
 


_______________________________________________
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]