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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] tools/dtdriver/engine cencsrchdlr.cpp, 1.32,
From:       stanb () helixcommunity ! org
Date:       2008-08-27 16:27:27
Message-ID: 200808271631.m7RGViJ9016801 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/tools/dtdriver/engine
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv30134/datatype/tools/dtdriver/engine

Modified Files:
	cencsrchdlr.cpp cmuxsrchandler.cpp 
Log Message:
Support for getting raw Audio/Video out of Producer SDK added by using
Null Audio/Video codecs.


Index: cencsrchdlr.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/cencsrchdlr.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cencsrchdlr.cpp	19 Jun 2008 15:58:51 -0000	1.32
+++ cencsrchdlr.cpp	27 Aug 2008 16:27:24 -0000	1.33
@@ -958,7 +958,7 @@
 
     if(status != HXR_OK)
     {
-	if(m_pJob)
+	if(m_pJob && m_bEncoderStarted)
 	{
 	    m_pJob->StopEncoding();
 	}
@@ -991,6 +991,11 @@
         }
     }
 
+    if(status != HXR_OK)
+    {
+	m_bEncoderStarted = FALSE;
+    }
+
     if (m_pSrcInputProxy)
     {
         // We need to clear m_pSrcInputProxy
@@ -2621,17 +2626,28 @@
                     // Get the plugin name
                     const char* pszPluginName = NULL;
 
-                    if (!strcmp(pszCodecName, "ralf"))
+                    if (!strcmp(pszCodecName, kValueCodecNameRALossless))
                     {
                         pszPluginName = kValuePluginNameCodecLossless;
                     }
-                    else 
+                    else if (!strcmp(pszCodecName, kValueCodecNameRAAC))
                     {
                         pszPluginName = kValuePluginNameCodecRealAudio;
                     }
+		    else if (!strcmp(pszCodecName, kValueCodecNameAudioNull))
+		    {
+			pszPluginName = kValuePluginNameCodecAudioNull;
+		    }
+		    else
+		    {
+			 retVal = HXR_FAIL;
+		    }
 
-		    // Set the plugin name
-		    retVal = pInitParams->SetString(kPropPluginName, pszPluginName);
+		    if (SUCCEEDED(retVal))
+		    {
+			// Set the plugin name
+			retVal = pInitParams->SetString(kPropPluginName, pszPluginName);
+		    }
 
 		    if (SUCCEEDED(retVal))
 		    {
@@ -2649,7 +2665,7 @@
 			    m_pOptions->GetPropertyULONG32(ENCODEAUDIORATEMAX_OPTION_NAME, ulAudioRateMax);
 			    
 			    // Set the encoding type
-			    if (strcmp(pszCodecName, "ralf"))
+			    if ( !strcmp(pszPluginName, kValuePluginNameCodecRealAudio) )
 			    {
 				retVal = SetEncodingType(pStreamConfig, ulAudioRate, ulAudioRateMax, FALSE);
 			    }
@@ -2660,7 +2676,7 @@
                                 retVal = pStreamConfig->SetString(kPropCodecName, pszCodecName);
                                 if (SUCCEEDED(retVal))
                                 {
-				    if (strcmp(pszCodecName, "ralf"))
+				    if ( !strcmp(pszPluginName, kValuePluginNameCodecRealAudio) )
 				    {
 					UINT32 ulEncodeRate = 0;
 					retVal = _GetAudioEncodeRate(pStreamState, ulEncodeRate);
@@ -2740,12 +2756,21 @@
                     {
                         pszPluginName = kValuePluginNameCodecMP4;
                     }
-                    else
+                    else if (!strcmp(pszCodecName, kValueCodecNameVideoNull))
+                    {
+			pszPluginName = kValuePluginNameCodecVideoNull;
+                    }
+		    else
                     {
                         retVal = HXR_FAIL;
                     }
-                    // Set the plugin name
-                    retVal = pInitParams->SetString(kPropPluginName, pszPluginName);
+
+		    if (SUCCEEDED(retVal))
+		    {
+			// Set the plugin name
+			retVal = pInitParams->SetString(kPropPluginName, pszPluginName);
+		    }
+
                     if (SUCCEEDED(retVal))
                     {
                         // Create a stream config

Index: cmuxsrchandler.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/cmuxsrchandler.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmuxsrchandler.cpp	4 Apr 2007 19:26:15 -0000	1.6
+++ cmuxsrchandler.cpp	27 Aug 2008 16:27:24 -0000	1.7
@@ -634,6 +634,7 @@
                     bRet = TRUE;
                 }
             }
+	    HX_RELEASE(pBuffer);
             m_pStreamStatus[ulStreamNumber].m_bFirstPacket = FALSE;
         }
     }


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