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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/video/renderer mp4vdfmt.cpp, 1.18.8.31.4.1,
From:       kliu () helixcommunity ! org
Date:       2011-03-31 8:33:48
Message-ID: 201103310833.p2V8Xf8G008373 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_3_6_5_atlas
	mp4vdfmt.cpp 
Log Message:
ported fix from 362 to 365


Index: mp4vdfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/mp4vdfmt.cpp,v
retrieving revision 1.18.8.31.4.1
retrieving revision 1.18.8.31.4.2
diff -u -d -r1.18.8.31.4.1 -r1.18.8.31.4.2
--- mp4vdfmt.cpp	28 Mar 2011 08:53:34 -0000	1.18.8.31.4.1
+++ mp4vdfmt.cpp	31 Mar 2011 08:33:45 -0000	1.18.8.31.4.2
@@ -64,6 +64,9 @@
 #define MAX_NONKEY_CODED_FRAME_FALLBEHIND -800
 
 #define H264_EPS_FRAMES_ALLOWED_TO_SKIP   10
+
+#define MAX_SUPPORTED_WIDTH 1280
+#define MAX_SUPPORTED_HEIGHT 720
 /****************************************************************************
  *  Includes
  */
@@ -238,6 +241,17 @@
             AddToAutoUpgradeCollection(pszAUStr, m_pMP4VideoRenderer->GetContext());
         }
         HX_VECTOR_DELETE(pszAUStr);
+
+#ifdef HELIX_PRODUCT_LENOVO_LEPHONE_TD
+        if (m_pHeader)
+        {
+            UINT32 ulFrameWidth  = 0;
+            UINT32 ulFrameHeight = 0;
+            m_pHeader->GetPropertyULONG32("FrameWidth", ulFrameWidth);
+            m_pHeader->GetPropertyULONG32("FrameHeight", ulFrameHeight);
+            CheckResolutionLimit(ulFrameWidth, MAX_SUPPORTED_WIDTH, ulFrameHeight, \
MAX_SUPPORTED_HEIGHT); +        }
+#endif
     }
 	if (SUCCEEDED(retVal))
 	{
@@ -406,14 +420,15 @@
 
 #ifdef HELIX_PRODUCT_LENOVO_LEPHONE_TD
     // Limited resolution 1280 * 720 only when we are using software decoders.
-    if(!m_bDecoderMemMgt)
+    if(!m_bDecoderMemMgt && m_pMP4VideoRenderer->HasClientEngine())
     {
-	if(pMofOutI->uiWidth > MAX_SUPPORTED_WIDTH || pMofOutI->uiHeight > \
                MAX_SUPPORTED_HEIGHT)
-	{
-		return HXR_UNSUPPORTED_VIDEO;
-	}
+        if(pMofOutI->uiWidth > MAX_SUPPORTED_WIDTH || pMofOutI->uiHeight > \
MAX_SUPPORTED_HEIGHT) +        {
+            CheckResolutionLimit(pMofOutI->uiWidth, MAX_SUPPORTED_WIDTH, \
pMofOutI->uiHeight, MAX_SUPPORTED_HEIGHT); +            return HXR_UNSUPPORTED_VIDEO;
+        }
     }
-#endif	
+#endif
 
     if (!m_pCodecOutputBIH)
     {


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