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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] tools/dtdriver/decoder/video vdecoder.cpp, 1.32,
From:       stanb () helixcommunity ! org
Date:       2009-12-28 16:45:00
Message-ID: 200912281645.nBSGjAQe013090 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/tools/dtdriver/decoder/video
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv1455/decoder/video

Modified Files:
      Tag: hxclient_4_0_1_brizo
	vdecoder.cpp 
Log Message:
Recent changes in AVCQ.DLL made QT based h.264 decoder produce output 
in UYVY format which broke DTDR. This change fixes the video processing 
by setting a new MIME type on DTDR output video stream so it can be 
processed by the client accordingly.


Index: vdecoder.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/decoder/video/vdecoder.cpp,v
retrieving revision 1.32
retrieving revision 1.32.8.1
diff -u -d -r1.32 -r1.32.8.1
--- vdecoder.cpp	26 May 2009 01:34:46 -0000	1.32
+++ vdecoder.cpp	28 Dec 2009 16:44:58 -0000	1.32.8.1
@@ -766,12 +766,25 @@
         SetCStringPropertyCCF(rpValues, "ASMRuleBook", "Marker=0;Marker=1;", m_pContext);
 
         // Check the color type to determine the mime type
-	const char* pszMime = "video/X-HX-I420";
-        if (pHeader && (pHeader->biCompression == HX_RGB || pHeader->biCompression == HX_ARGB))
+        if (pHeader)
         {
-            pszMime = "video/X-HX-RGB";
+            if (pHeader->biCompression == HX_RGB || pHeader->biCompression == HX_ARGB)
+            {
+                SetCStringPropertyCCF(rpValues, "MimeType", "video/X-HX-RGB", m_pContext);
+            }
+            else if (pHeader->biCompression == HX_UYVY)
+            {
+                SetCStringPropertyCCF(rpValues, "MimeType", "video/X-HX-UYVY", m_pContext);
+            }
+            else
+            {
+                SetCStringPropertyCCF(rpValues, "MimeType", "video/X-HX-I420", m_pContext);
+            }
+        }
+        else
+        {
+            SetCStringPropertyCCF(rpValues, "MimeType", "video/X-HX-I420", m_pContext);
         }
-        SetCStringPropertyCCF(rpValues, "MimeType", pszMime, m_pContext);
 
 	UINT32 nWidth = 0;
 	UINT32 nHeight = 0;


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