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

List:       helix-client-cvs
Subject:    [Client-cvs]
From:       ebala () helixcommunity ! org
Date:       2009-07-30 5:14:11
Message-ID: 200907300623.n6U6NKXN022257 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/client/encodesvc/plugins/output/rtpbroadcast
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv14854

Modified Files:
      Tag: PRODUCER_13_0_RN
	Umakefil rtpfilter.cpp 
Log Message:
Using common code to convert IHXMediaSample to IHXPacket

Index: rtpfilter.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rtpbroadcast/Attic/rtpfilter.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- rtpfilter.cpp	29 Jul 2009 07:12:37 -0000	1.1.2.1
+++ rtpfilter.cpp	30 Jul 2009 05:14:08 -0000	1.1.2.2
@@ -62,6 +62,7 @@
 
 #include "hxtpacketcallback.h"
 #include "hxtlist.h"
+#include "hxtconvert.h"
 
 #ifdef _UNIX
 #include <netdb.h>
@@ -1113,66 +1114,7 @@
     IHXPacket**	ppIInSample)
 {
     HX_RESULT res = HXR_OK;
-
-    SPIHXPacket spIPacket;
-    res = m_spFactory->CreateInstance(IID_IHXPacket, spIPacket.AdoptVoid());
-    if(SUCCEEDED(res))
-    {
-	SPIHXBuffer spIData;
-	res = m_spFactory->CreateInstance(IID_IHXBuffer, spIData.AdoptVoid());
-	if(SUCCEEDED(res))
-	{
-	    UINT32 ulSize = pIInSample->GetDataSize();
-	    spIData->SetSize(ulSize);
-	    memcpy(spIData->GetBuffer(), pIInSample->GetDataStartForReading(), ulSize );
-
-	    // XXXLY - Assume time is in milliseconds
-	    HXT_TIME tStartTime = 0;
-	    HXT_TIME tEndTime = 0;
-	    res = pIInSample->GetTime(&tStartTime, &tEndTime);
-	    UINT32 ulTime =(UINT32)tStartTime;
-
-	    UINT32 ulAsmRuleNum	= 0;
-	    if(SUCCEEDED(res))
-	    {
-		res = pIInSample->GetSampleField( HXT_FIELD_ASM_RULE, &ulAsmRuleNum );
-	    }
-
-	    UINT32 ulAsmFlags = 0;
-	    if (SUCCEEDED(res))
-	    {
-		res = pIInSample->GetSampleField( HXT_FIELD_ASM_FLAGS, &ulAsmFlags );
-	    }
-
-	    UINT32 ulStreamId = 0;
-	    if(SUCCEEDED(res))	    //HXT_FIELD_LOGICAL_STREAM_ID
-	    {
-		res = pIInSample->GetSampleField( HXT_FIELD_LOGICAL_STREAM_ID, &ulStreamId );
-	    }
-
-	   
-
-	    if(SUCCEEDED(res))
-	    {
-		res = spIPacket->Set(spIData, ulTime, (UINT16)ulStreamId, (UINT8)ulAsmFlags, (UINT16)ulAsmRuleNum);
-	    }
-	}
-    }
-    else
-    {
-	res = HXR_OUTOFMEMORY;
-    }
-
-    if(SUCCEEDED(res))
-    {
-	*ppIInSample = spIPacket;
-	(*ppIInSample)->AddRef();
-    }
-    else
-    {
-	*ppIInSample = NULL;
-    }
-
+    res = convertIHXTMediaSampleToIHXPacket(pIInSample, ppIInSample, m_spFactory);
     return res;
 }
 

Index: Umakefil
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rtpbroadcast/Attic/Umakefil,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Umakefil	29 Jul 2009 07:12:37 -0000	1.1.2.1
+++ Umakefil	30 Jul 2009 05:14:08 -0000	1.1.2.2
@@ -95,6 +95,7 @@
 	'protocol/http[httplib]',
 
 	'client/encodesvc/common/util[produtillib]', 
+	'client/encodesvc/common/container[prodcontlib]', 
 	'common/log/logutil[logutillib]',
 	'client/encodesvc/common/system[prodsyslib]',
 	'client/encodesvc/plugins/util[pluginutillib]'


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs
[prev in list] [next in list] [prev in thread] [next in thread]