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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] i420/renderer i420vdfmt.cpp, 1.4.58.1,
From:       mbahl () helixcommunity ! org
Date:       2007-07-25 18:40:42
Message-ID: 200707251841.l6PIfKeA004688 () dommarcmx ! xen ! 10east ! com
[Download RAW message or body]

Update of /cvsroot/datatype/i420/renderer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8079

Modified Files:
      Tag: hxclient_2_0_3_cayenne
	i420vdfmt.cpp i420video.cpp 
Log Message:
change to use custom imageformat


Index: i420video.cpp
===================================================================
RCS file: /cvsroot/datatype/i420/renderer/i420video.cpp,v
retrieving revision 1.3
retrieving revision 1.3.58.1
diff -u -d -r1.3 -r1.3.58.1
--- i420video.cpp	28 May 2004 15:16:43 -0000	1.3
+++ i420video.cpp	25 Jul 2007 18:40:38 -0000	1.3.58.1
@@ -42,6 +42,7 @@
 #define I420_VIDEO_RENDERER_NAME	"I420VideoRenderer"
 // TODO migrate this into hxmime.h
 #define I420_VIDEO_MIME_TYPE             "video/X-HX-I420"
+#define RGB_VIDEO_MIME_TYPE              "video/X-HX-RGB"
 
 /****************************************************************************
  *  Includes
@@ -94,12 +95,13 @@
 /************************************************************************
  *  Constants
  */
-const char* const CI420VideoRenderer::zm_pDescription = "RealNetworks RealVideo Renderer Plugin";
+const char* const CI420VideoRenderer::zm_pDescription = "RealNetworks I420 Renderer Plugin";
 
 
 const char* const CI420VideoRenderer::zm_pStreamMimeTypes[] =
 {
     I420_VIDEO_MIME_TYPE,
+    RGB_VIDEO_MIME_TYPE,
     NULL
 };
 

Index: i420vdfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/i420/renderer/i420vdfmt.cpp,v
retrieving revision 1.4.58.1
retrieving revision 1.4.58.2
diff -u -d -r1.4.58.1 -r1.4.58.2
--- i420vdfmt.cpp	24 Jul 2007 01:33:45 -0000	1.4.58.1
+++ i420vdfmt.cpp	25 Jul 2007 18:40:38 -0000	1.4.58.2
@@ -185,7 +185,15 @@
     m_pCodecOutputBIH->biWidth  = m_sMediaSize.cx;
     m_pCodecOutputBIH->biHeight = m_sMediaSize.cy;
     m_pCodecOutputBIH->biPlanes = 1;
+
+    // Assume I420 as the default color format
     m_pCodecOutputBIH->biCompression = HX_I420;
+    // Do we have an "ImageFormat" property
+    UINT32 ulImageFormat = 0;
+    if (SUCCEEDED(m_pHeader->GetPropertyULONG32("ImageFormat", ulImageFormat)))
+    {
+        m_pCodecOutputBIH->biCompression = ulImageFormat;
+    }
  
     m_pCodecOutputBIH->biSizeImage =
 	m_pCodecOutputBIH->biWidth * m_pCodecOutputBIH->biBitCount * 
@@ -259,7 +267,8 @@
 	}
     }
 
-    m_pI420VideoRenderer->BltIfNeeded();
+    HX_RELEASE(pBuf);
+    m_pI420VideoRenderer->BltIfNeeded();   
 
     HX_RELEASE(pBuf);
     return pFramePacket;
@@ -331,6 +340,12 @@
 	m_pCodecOutputBIH->biSizeImage = (m_pCodecOutputBIH->biWidth * m_pCodecOutputBIH->biHeight *
 					 m_pCodecOutputBIH->biBitCount) / 8;
 	m_pCodecOutputBIH->biCompression = HX_I420;
+        // Do we have an "ImageFormat" property
+        UINT32 ulImageFormat = 0;
+        if (SUCCEEDED(m_pHeader->GetPropertyULONG32("ImageFormat", ulImageFormat)))
+        {
+            m_pCodecOutputBIH->biCompression = ulImageFormat;
+        }
 	bitmapInfoHeader = *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]