[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] rtsp/fileformat/pub rtspfformat.h,1.5,1.5.40.1
From: yijil () helixcommunity ! org
Date: 2013-11-14 9:51:26
[Download RAW message or body]
Update of /cvsroot/datatype/rtsp/fileformat/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16097/pub
Modified Files:
Tag: SERVER_15_1_0
rtspfformat.h
Log Message:
Committed to: HEAD, SERVER_15_1_0_RN
Reviewed by: Richard
Synopsis:
=========
RTSP Ingest Feature
Branch: HEAD, SERVER_15_1_0_RN
Suggested Reviewers: anyone
Description:
============
I. Intro
==========================================
Some cameras or Multimedia server can support RTSP request. HUS need support RTSP \
protocol as a client to fetch streams. Then treat these streams as simple live \
stream.
RTSP ingest simply opens a RTSP session with camera or Multimedia server, then create \
data connection with then, and fetch media data. When initialize RTSP session, it \
need support none/basic/digest authentication mode according to camera or Multimedia \
server.
Now it can only support single rate.
II. What feature have been implemented in the version
1. Implement basic/digest authentication
2. Add new admin page and license support
3. Add statistics information for RTSP ingest live stream
4. the configuration information
<List Name="FSMount">
<!-- RTSP ingest live -->
<List Name="RTSP Ingest Live">
<Var ShortName="pn-rtspingest"/>
<Var MountPoint="/rtspingest/"/>
</List>
</List>
<List Name="RTSP_Ingest">
<Var GlobalEnable="1"/>
<Var InitialTimeout="10"/>
<Var SourceScanInterval="60"/>
<Var StreamTimeout="5"/>
<Var DebugLevel="0"/>
<List Name="Source1">
<Var StreamURL="rtsp://IPAddress:Port/[streamname]"/>
<Var UserName=username/>
<Var Password=password/>
<Var Enable="1"/>
<Var StreamName="test.mp4"/>
</List>
</List>
IV.
Files affected:
===============
build/BIF/helixinternal.bif
build/BIF/SERVER_15_1_0-internal.bif
build/umakepf/helix-server-all-defines.pf
server/admin/web/server.opt
server/admin/web/build/mserver/config_broad_mpeg2ts_ingress.html
server/admin/web/build/mserver/config_broad_push2cdn.html
server/admin/web/build/mserver/config_broad_rtmp_send.html
server/admin/web/build/mserver/config_mpeg2ts.html
server/admin/web/build/mserver/config_pending.nc.html
server/admin/web/build/mserver/license.html
server/admin/web/build/mserver/toc.js
server/admin/web/build/server/config_broad_mpeg2ts_ingress.html
server/config_broad_push2cdn.html
server/config_broad_rtmp_send.html
server/admin/web/build/server/config_mpeg2ts.html
server/admin/web/build/server/config_pending.nc.html
server/admin/web/build/server/license.html
server/admin/web/src/srvprxy/license.html.wasm
server/admin/web/src/srvprxy/pageData.pm
server/admin/web/src/srvprxy/toc~server.js.wasm
client/auth/basicauth/clbascauth.cpp
client/audiosvc/hxaudply.cpp
client/audiosvc/hxaudses.cpp
server-restricted/installer/server/make_tempdir
server-restricted/installer/server/retailservinst.cpp
server/engine/context/hxclfact.cpp
server/engine/core/_main.cpp
server/engine/core/server_info.cpp
server/engine/core/pub/server_info.h
server/common/util/make_lib
server/common/util/pub/bcast_defs.h
common/auth/rn5auth/Umakefil
common/auth/rn5auth/digestauth.cpp
common/auth/rn5auth/digestauth.h
common/auth/rn5auth/rn5auth.cpp
protocol/rtsp/Umakefil
protocol/rtsp/dlliids.cpp
protocol/rtsp/rtspclnt.cpp
common/include/defslice.h
client/core/Umakefil
client/core/hxcleng.cpp
client/core/hxconnbwinfo.cpp
client/core/hxntsrc.cpp
client/core/hxsrc.cpp
client/core/hxplay.cpp
client/core/latency_mode_hlpr.cpp
client/core/perscmgr.h
client/core/recordctl.cpp
client/core/rtspprotocol.cpp
client/core/rtspprotocol.h
client/core/sinkctl.cpp
client/core/srcinfo.cpp
client/core/velproxy.cpp
client/core/pub/chxeven.h
client/core/pub/hxplay.h
common/include/hxwin.h
datatype/smil/renderer/smil2/smldoc.cpp
datatype/smil/renderer/smil2/pub/smldoc.h
protocol-restricted/pna/Umakefil
VII. New Files added:
=================
client/core/svrclntcorelib_unix.pcf
client/core/svrclntcorelib
datatype/rtsp/fileformat/pub/rtspffclocksource.h
datatype/rtsp/fileformat/pub/rtspfformat.h
datatype/rtsp/fileformat/pub/rtspffpacketqueue.h
datatype/rtsp/fileformat/rtspffclocksource.cpp
datatype/rtsp/fileformat/rtspfformat.cpp
datatype/rtsp/fileformat/rtspffpacketqueue.cpp
datatype/rtsp/fileformat/rtspfformatdll.cpp
datatype/rtsp/fileformat/Umakefil
datatype/rtsp/fileformat/win32.pcf
server_rn/broadcast/transport/rtsp/recv/pub/clientcontext.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingest_config.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingestfileowner.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingesthandler.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingestmap.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingestpln.h
server_rn/broadcast/transport/rtsp/recv/pub/rtspingestworkercb.h
server_rn/broadcast/transport/rtsp/recv/clientcontext.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingest_config.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingestfileowner.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingesthandler.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingestmap.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingestpln.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingestworkercb.cpp
server_rn/broadcast/transport/rtsp/recv/win32.pcf
server_rn/broadcast/transport/rtsp/recv/guids.cpp
server_rn/broadcast/transport/rtsp/recv/Umakefil
server/admin/web/src/srvprxy/config_broadcast_rtsp_ingest.html.wasm
server/admin/web/build/server/config_broadcast _rtsp_ingest.html \
server/admin/web/build/mserver/config_broadcast _rtsp_ingest.html
Testing Performed:
================
Unit Tests:
None
Integration Tests:
1. Add configuration like given upstairs
2. Set camera using none/basic/digest authentication mode
3. using VLS/RealPlayer to play the stream from "/rtspingest/" mountpoint
4. Enable segmentation for "/rtspingest/", using IPad to play the stream
Leak Tests: None
Performance Tests: N/A
Platforms Tested: Windows
Builds Verified: Windows
QA Hints
========
None.
Index: rtspfformat.h
===================================================================
RCS file: /cvsroot/datatype/rtsp/fileformat/pub/rtspfformat.h,v
retrieving revision 1.5
retrieving revision 1.5.40.1
diff -u -d -r1.5 -r1.5.40.1
--- rtspfformat.h 3 Mar 2011 20:55:43 -0000 1.5
+++ rtspfformat.h 14 Nov 2013 09:51:24 -0000 1.5.40.1
@@ -284,31 +284,31 @@
inline HXBOOL IsReadyForGetPacket(RTSPFileFormatState eState)
{
- return ((eState >= RTSPFF_Streaming) &&
- (eState <= RTSPFF_UserPaused));
+ return ((eState >= RTSPFF_Streaming) &&
+ (eState <= RTSPFF_UserPaused));
}
inline HXBOOL IsReadyForSeekOrPause(RTSPFileFormatState eState)
{
- return ((eState >= RTSPFF_Initialized) &&
- (eState <= RTSPFF_SeekingToStreamingPending));
+ return ((eState >= RTSPFF_Initialized) &&
+ (eState <= RTSPFF_SeekingToStreamingPending));
}
inline HXBOOL IsRTSPPlayerPaused(RTSPFileFormatState eState)
{
- return ((eState >= RTSPFF_QueuePausedToStreamingPending) &&
- (eState <= RTSPFF_UserPausedSeekingToUserPausedPending));
+ return ((eState >= RTSPFF_QueuePausedToStreamingPending) &&
+ (eState <= RTSPFF_UserPausedSeekingToUserPausedPending));
}
inline HXBOOL IsRTSPPlayerPausedByUser(RTSPFileFormatState eState)
{
- return ((eState >= RTSPFF_UserPaused) &&
- (eState <= RTSPFF_UserPausedSeekingToUserPausedPending));
+ return ((eState >= RTSPFF_UserPaused) &&
+ (eState <= RTSPFF_UserPausedSeekingToUserPausedPending));
}
inline HXBOOL IsNeedingActiveRTSPPlayer(RTSPFileFormatState eState)
{
- return (eState >= RTSPFF_Initialized);
+ return (eState >= RTSPFF_Initialized);
}
HX_RESULT InitiateConnection(void);
@@ -316,7 +316,7 @@
inline void Dispatch(void);
HX_RESULT DispatchPacket(UINT16 unStreamNumber,
- HXBOOL bSinglePacketPrevalidated);
+ HXBOOL bSinglePacketPrevalidated);
void DispatchAllPendingPackets(void);
static const char* StateToString(RTSPFileFormatState eState);
@@ -324,6 +324,7 @@
IUnknown* m_pContext;
IHXCommonClassFactory* m_pClassFactory;
IHXFormatResponse* m_pFFResponse;
+ IHXErrorMessages* m_pFFErrorResponse;
IHXScheduler* m_pScheduler;
IHXErrorMessages* m_pErrorMessages;
IHXRequest* m_pRequest;
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic