[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.23.2.2,
From:       stanb () helixcommunity ! org
Date:       2007-10-31 20:35:28
Message-ID: 200710312035.l9VKZl6m013331 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_3_1_0_atlas
	cencsrchdlr.cpp 
Log Message:
Not letting file transfer in invalid stream case 
(DIVX AVI with no DIVX support installed) (PR# 203817, 205233)


Index: cencsrchdlr.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/cencsrchdlr.cpp,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -d -r1.23.2.2 -r1.23.2.3
--- cencsrchdlr.cpp	28 Sep 2007 22:15:37 -0000	1.23.2.2
+++ cencsrchdlr.cpp	31 Oct 2007 20:35:26 -0000	1.23.2.3
@@ -2087,7 +2087,7 @@
 	    // Retrieve input file duration for Direct Input case.
 	    if (SUCCEEDED(retVal) && m_bEncodeFromURL)
 	    {
-		SetupDirectInput();
+		retVal = SetupDirectInput();
 	    }
 
             if (SUCCEEDED(retVal))
@@ -2835,7 +2835,7 @@
     return ulRet;
 }
 
-void CEncoderSourceHandler::SetupDirectInput()
+HX_RESULT CEncoderSourceHandler::SetupDirectInput()
 {
     IHXTInput* pInput = NULL;
     if(m_pJob)
@@ -2861,6 +2861,13 @@
 	pConfigurationAgent->GetUint(kPropInputWidth, &nInputWidth);
 	pConfigurationAgent->GetUint(kPropInputHeight, &nInputHeight);
 
+	const char* cszString = NULL;
+	pConfigurationAgent->GetString(kPropStatus, &cszString);
+	if(cszString && !strcmp(cszString, kValueInvalidStreamStatus))
+	{
+	    return HXR_FAILED;
+	}
+
 	IUnknown* pUnkDuration = NULL;
 	pConfigurationAgent->GetUnknown(kPropDuration, &pUnkDuration);
 
@@ -2907,4 +2914,6 @@
     {
 	m_pStreamState[0].m_bUseVideoResizePrefilter = TRUE;
     }
+
+    return HXR_OK;
 }


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