[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-client-cvs
Subject: [Client-cvs] encodesvc/plugins/output/rbsbroadcast Umakefil, 1.5,
From: vtyagi () helixcommunity ! org
Date: 2010-03-31 10:11:06
Message-ID: 201003311011.o2VABNqK005482 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/client/encodesvc/plugins/output/rbsbroadcast
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10755
Modified Files:
Umakefil guids.cpp rbsactor.cpp rbsactor.h rbsfilter.cpp
rbsfilter.h
Log Message:
Changes to implement the during encoding messages SA 908 to SA 911
Index: rbsfilter.h
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/rbsfilter.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rbsfilter.h 10 Aug 2009 13:32:57 -0000 1.6
+++ rbsfilter.h 31 Mar 2010 10:11:03 -0000 1.7
@@ -196,6 +196,7 @@
BOOL m_bIsFilterInitialized;
BOOL* m_pbStreamDone;
CHAR* m_pszStreamName;
+ CHAR* m_pszOutputName;
CEventResend m_eventresend;
UINT32 m_ulLastKeyFrameTime;
Index: rbsactor.h
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/rbsactor.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rbsactor.h 23 Oct 2009 20:40:39 -0000 1.6
+++ rbsactor.h 31 Mar 2010 10:11:03 -0000 1.7
@@ -109,7 +109,7 @@
STDMETHOD(AuthDone)(THIS_ BOOL bAuthSucceeded);
// Method called by CRBSActor
- STDMETHOD(Initialize)( CRBSFilter * pRBSFilter,IHXTServiceBroker \
*pServiceBroker, IHXCommonClassFactory* pIFactory ,IHXBuffer* pISessionName, \
IHXValues* pIConfigValues, UINT32 eBroadCastType ,const char* pszServerName ); + \
STDMETHOD(Initialize)( CRBSFilter * pRBSFilter,IHXTServiceBroker *pServiceBroker, \
IHXCommonClassFactory* pIFactory ,IHXBuffer* pISessionName, IHXValues* \
pIConfigValues, UINT32 eBroadCastType ,const char* pszServerName, const char* \
pszOutputName); STDMETHOD(Start)();
STDMETHOD(Stop)();
STDMETHOD(SendPacket)(UINT32 ulStreamID, IHXPacket *pIPacket);
@@ -170,6 +170,7 @@
BOOL m_bStopThread;
bool m_bDebugMode;
char* m_pServerName;
+ char* m_pOutputName;
HXT_TIME m_LatencyStatsLogTime;
IHXTTimePtr m_spLatency;
Index: rbsfilter.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/rbsfilter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rbsfilter.cpp 1 Dec 2009 21:35:59 -0000 1.14
+++ rbsfilter.cpp 31 Mar 2010 10:11:03 -0000 1.15
@@ -531,6 +531,19 @@
res = HXR_POINTER;
}
}
+ // Set the output name
+ else if(strName == kPropOutputName)
+ {
+ m_pszOutputName = new char [ strlen(szValue) + 1];
+ if ( m_pszOutputName != NULL )
+ {
+ strcpy( m_pszOutputName, szValue);
+ }
+ else
+ {
+ res = HXR_POINTER;
+ }
+ }
// Handle push properties
else if(m_eBroadcastType == RBS_PUSH && (strName == kPropBroadcastAddress || \
strName == kPropBroadcastTransport || strName == kPropBroadcastSecurityType || \
strName == kPropBroadcastUsername || strName == kPropBroadcastPassword || strName == \
kPropBroadcastPath || @@ -2356,7 +2369,7 @@
{
HXTLOG_APPROVED( LC_APP_DIAG,BCAST,4021,"Setting server %s \
Properties:",szServerName); DumpValues( spIValues );
- res = m_pRBSActor->Initialize(this, m_spServiceBroker, m_spFactory, \
spISessionName, spIValues,(UINT32)m_eBroadcastType, szServerName ); + res = \
m_pRBSActor->Initialize(this, m_spServiceBroker, m_spFactory, spISessionName, \
spIValues,(UINT32)m_eBroadcastType, szServerName, m_pszOutputName); }
}
@@ -2642,7 +2655,7 @@
DumpValues( spIValues );
- m_pRBSActor->Initialize(this, m_spServiceBroker, m_spFactory, spISessionName, \
spIValues,(UINT32) m_eBroadcastType,szServerName ); + m_pRBSActor->Initialize(this, \
m_spServiceBroker, m_spFactory, spISessionName, spIValues,(UINT32) \
m_eBroadcastType,szServerName, m_pszOutputName); }
return res;
Index: guids.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/guids.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- guids.cpp 13 Sep 2007 16:40:15 -0000 1.2
+++ guids.cpp 31 Mar 2010 10:11:03 -0000 1.3
@@ -57,4 +57,4 @@
#include "hxpiids.h"
#include "hxtpluginguids.h"
#include "hxtcontextsink.h"
-
+#include "ihxtsettingsadvisor.h"
Index: rbsactor.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/rbsactor.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rbsactor.cpp 23 Oct 2009 20:40:39 -0000 1.8
+++ rbsactor.cpp 31 Mar 2010 10:11:03 -0000 1.9
@@ -59,7 +59,7 @@
#include "hxmsgs.h"
#include "hxtick.h"
#include "pckunpck.h"
-
+#include "hxsettingsadvisorutils.h"
#include "microsleep.h"
#if defined(_UNIX)
@@ -73,6 +73,8 @@
const UINT32 kLatencyStatsLogInterval = 60*1000; //60 secs
static const UINT32 kNumbeofMillisecsinSec = 1000;
+static const char kStringNotSpecified[] = "NotSpecified";
+
typedef IUnknown* (HXEXPORT_PTR FPCREATE_CONTEXT)();
typedef HX_RESULT (HXEXPORT_PTR FPCREATEINSTANCE)(IUnknown** /*OUT*/ ppIUnknown);
@@ -150,7 +152,7 @@
// Purpose
// This function sets up parameters recquired by CRBSActor.
///////////////////////////////////////////////////////////////////////////////////////////
-STDMETHODIMP CRBSActor::Initialize( CRBSFilter * pRBSFilter, IHXTServiceBroker \
*pServiceBroker, IHXCommonClassFactory* pIFactory, IHXBuffer* pISessionName, \
IHXValues* pIConfigValues, UINT32 eBroadCastType ,const char* pszServerName) \
+STDMETHODIMP CRBSActor::Initialize( CRBSFilter * pRBSFilter, IHXTServiceBroker \
*pServiceBroker, IHXCommonClassFactory* pIFactory, IHXBuffer* pISessionName, \
IHXValues* pIConfigValues, UINT32 eBroadCastType ,const char* pszServerName, const \
char* pszOutputName) {
HX_RESULT res = HXR_OK, res2 = HXR_OK;
@@ -226,6 +228,12 @@
strcpy(m_pServerName,pszServerName);
}
+ m_pOutputName = new char[ strlen(pszOutputName) + 1];
+ if( m_pOutputName )
+ {
+ strcpy(m_pOutputName,pszOutputName);
+ }
+
UINT32 ulPort=0;
UINT32 ulTCPReconnetTimeout=0;
if ( SUCCEEDED(m_spIConfigValues->GetPropertyULONG32("Authentication.HTTPPort",ulPort)) \
&& @@ -1083,7 +1091,19 @@
}
else if ( ulHXCode == HXR_TCP_RECONNECT )
{
- HXTLOG_APPROVED( LC_APP_ERROR, BCAST,4037,"Server %s disconnected. \
Reconnecting.",m_pServerName ); + HXTLOG_APPROVED( LC_APP_ERROR, \
BCAST,4037,"Server %s disconnected. Reconnecting.",m_pServerName ); + // \
Server disconnected with no reconnects remaining So Make a settings advisor call and \
throw message SA 911. + HXCallSettingsAdvisor(m_spActualContext,
+ 911,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 2,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pOutputName);
if ( m_spEventSink )
{
@@ -1098,11 +1118,35 @@
{
if ( m_bAuthReconnect == TRUE )
{
- HXTLOG_APPROVED( LC_APP_ERROR, BCAST,"Server %s disconnected. Connection \
closed.Attempting a reconnect.",m_pServerName ); + HXTLOG_APPROVED( \
LC_APP_ERROR, BCAST,"Server %s disconnected. Connection closed.Attempting a \
reconnect.",m_pServerName ); + // Server disconnected with no reconnects \
remaining So Make a settings advisor call and throw message SA 911. + \
HXCallSettingsAdvisor(m_spActualContext, + 911,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 2,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pOutputName);
}
else
{
- HXTLOG_APPROVED( LC_APP_ERROR, BCAST,4038,"Server %s disconnected. Connection \
closed.",m_pServerName ); + HXTLOG_APPROVED( LC_APP_ERROR, \
BCAST,4038,"Server %s disconnected. Connection closed.",m_pServerName ); + \
// Server disconnected with no reconnects remaining So Make a settings advisor call \
and throw message SA 910. + HXCallSettingsAdvisor(m_spActualContext,
+ 910,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 2,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pOutputName);
}
if(( m_eBroadcastType != RBS_PULL ) && (m_bAuthReconnect == FALSE) )
@@ -1157,7 +1201,19 @@
}
else
{
- HXTLOG_APPROVED( LC_APP_ERROR, BCAST,4041,"Failed to establish a TCP connection \
with server %s for authentication.",m_pServerName ); + HXTLOG_APPROVED( \
LC_APP_ERROR, BCAST,4041,"Failed to establish a TCP connection with server %s for \
authentication.",m_pServerName ); + // Unable to establish connection So \
Make a settings advisor call and throw message SA 909. + \
HXCallSettingsAdvisor(m_spActualContext, + 909,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 2,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pOutputName);
}
if(( m_eBroadcastType != RBS_PULL ) && (m_bAuthReconnect == FALSE) )
@@ -1203,10 +1259,40 @@
if ( m_bAuthReconnect == TRUE )
{
HXTLOG_APPROVED( LC_APP_ERROR, BCAST,"Authentication failed for server \
%s. Please check username and password.Attempting a reconnect.",m_pServerName ); + \
// Authentication failed So Make a settings advisor call and throw message SA 908. + \
HXCallSettingsAdvisor(m_spActualContext, + 908,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 3,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pServerName,
+ "RemoteResponse",
+ eTypeCString,
+ m_pOutputName);
}
else
{
- HXTLOG_APPROVED( LC_APP_ERROR, BCAST,4043,"Authentication failed for server %s. \
Please check username and password.",m_pServerName ); + HXTLOG_APPROVED( \
LC_APP_ERROR, BCAST,4043,"Authentication failed for server %s. Please check username \
and password.",m_pServerName ); + // Authentication failed So Make a \
settings advisor call and throw message SA 908. + \
HXCallSettingsAdvisor(m_spActualContext, + 908,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 3,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pServerName,
+ "RemoteResponse",
+ eTypeCString,
+ m_pOutputName);
}
if(( m_eBroadcastType != RBS_PULL ) && (m_bAuthReconnect == FALSE))
@@ -1225,6 +1311,22 @@
else if ( ulHXCode == HXR_AUTH_FAILURE )
{
HXTLOG_APPROVED( LC_APP_ERROR, BCAST,4043,"Authentication failed for server %s. \
Please check username and password.",m_pServerName ); + // Authentication \
failed So Make a settings advisor call and throw message SA 908. + \
HXCallSettingsAdvisor(m_spActualContext, + 908,
+ LC_APP_ERROR,
+ OUTPUTSERVER,
+ 3,
+ "Servername",
+ eTypeCString,
+ m_pServerName,
+ "OutputName",
+ eTypeCString,
+ m_pServerName,
+ "RemoteResponse",
+ eTypeCString,
+ m_pOutputName);
+
if( m_eBroadcastType != RBS_PULL )
{
m_spEventSink->HandleEvent( eEventOutputFilterError, &uStream,
Index: Umakefil
===================================================================
RCS file: /cvsroot/client/encodesvc/plugins/output/rbsbroadcast/Umakefil,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Umakefil 12 Mar 2009 23:39:49 -0000 1.5
+++ Umakefil 31 Mar 2010 10:11:03 -0000 1.6
@@ -91,6 +91,7 @@
'protocol/http[httplib]',
'client/encodesvc/common/util[produtillib]',
+ 'client/encodesvc/common/xmlparser[prodxmlparserlib]',
'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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic