[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] engine/inputsource base_shim.cpp, 1.18,
From: jzeng () helixcommunity ! org
Date: 2008-08-21 0:11:55
Message-ID: 200808210015.m7L0FhlP023646 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/server/engine/inputsource
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24295/server/engine/inputsource
Modified Files:
base_shim.cpp mdpshim.cpp ppmstaticshim.cpp
Log Message:
Synopsis
========
SSPL -- initial playback
Branches: head, server_12_1
Suggested Reviewer: Srinivas, Jamie
Description
===========
This is the changes needed for initial playback. Including:
1. add a member variable to BaseShim to identify sspl.
2. Change the header "IsFCSSession" to "OpenDuration" to fit both fcs and sspl.
3. In crtspbase.cpp, add checking for sspl.
4. In clientsession, add code for sspl processing.
Because of of time restriction that I need to wrap this up last week, I didn't do a \
lot of testing. I will come back to this in a week and do more testing.
Files Affected
==============
server/engine/inputsource/base_shim.cpp,v
server/engine/inputsource/mdpshim.cpp,v
server/engine/inputsource/ppmstaticshim.cpp,v
server/engine/inputsource/pub/base_shim.h,v
server/engine/inputsource/pub/mdpshim.h,v
server/engine/inputsource/pub/ppmstaticshim.h,v
server/engine/session/clientsession.cpp,v
server/engine/session/pub/clientsession.h,v
server/fs/sdpgenfsys/sdpgenfobj.cpp,v
server/protocol/rtsp/Umakefil,v
server/protocol/rtsp/crtspbase.cpp,v
server-restricted/datatype/playlist/playlist_control.cpp,v
server-restricted/datatype/playlist/pub/playlist_control.h,v
server-restricted/protocol/http-ctrl/ssplutil.cpp,v
server-restricted/protocol/http-ctrl/pub/ssplutil.h,v
protocol/sdp/sdpmdgen.cpp,v
Testing Performed
=================
Unit Tests:
None.
Integration Tests:
Test rm and 3gp static clips.
Leak Tests:
None.
Performance Tests:
- None
Platforms Tested: win32
Build verified: win32
Index: ppmstaticshim.cpp
===================================================================
RCS file: /cvsroot/server/engine/inputsource/ppmstaticshim.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ppmstaticshim.cpp 8 Jul 2008 23:52:55 -0000 1.32
+++ ppmstaticshim.cpp 21 Aug 2008 00:11:53 -0000 1.33
@@ -68,8 +68,9 @@
IHXCommonClassFactory* pCCF,
ClientSession::StreamInfo** ppStrmInfo,
BOOL bIsRealDatatype,
- UINT16 num_streams)
- :BasePacketShim(pReg, pResp,pCCF,ppStrmInfo, bIsRealDatatype, num_streams)
+ UINT16 num_streams,
+ BOOL bIsPlaylist)
+ :BasePacketShim(pReg, pResp,pCCF,ppStrmInfo, bIsRealDatatype, num_streams, \
bIsPlaylist) ,m_pPacketSource(pSourcePackets)
,m_pPacketSink(NULL)
,m_pSwitchPacketSource(NULL)
Index: base_shim.cpp
===================================================================
RCS file: /cvsroot/server/engine/inputsource/base_shim.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- base_shim.cpp 9 Jul 2008 18:26:30 -0000 1.18
+++ base_shim.cpp 21 Aug 2008 00:11:53 -0000 1.19
@@ -73,7 +73,8 @@
IHXCommonClassFactory* pCCF,
ClientSession::StreamInfo** \
ppStrmInfo, BOOL bIsRealDatatype,
- UINT16 num_streams)
+ UINT16 num_streams,
+ BOOL bIsPlaylist)
{
BasePacketShim* baseShim = NULL;
if(bMDP)
@@ -81,7 +82,7 @@
IHXServerPacketSource* pServerPacketSource = NULL;
pSource->QueryInterface(IID_IHXServerPacketSource, \
(void**)&pServerPacketSource);
- baseShim = new CMDPShim(pReg, pResp, pCCF, ppStrmInfo, bIsRealDatatype, \
num_streams); + baseShim = new CMDPShim(pReg, pResp, pCCF, ppStrmInfo, \
bIsRealDatatype, num_streams, bIsPlaylist);
((CMDPShim*)baseShim)->SetSource(pServerPacketSource);
HX_RELEASE(pServerPacketSource);
@@ -91,7 +92,7 @@
IHXPSourcePackets* pSourcePackets = NULL;
pSource->QueryInterface(IID_IHXPSourcePackets, (void**)&pSourcePackets);
- baseShim = new CPPMStaticShim(pReg, pSourcePackets, pResp, pCCF, ppStrmInfo, \
bIsRealDatatype, num_streams); + baseShim = new CPPMStaticShim(pReg, \
pSourcePackets, pResp, pCCF, ppStrmInfo, bIsRealDatatype, num_streams, bIsPlaylist); \
HX_RELEASE(pSourcePackets); }
return baseShim;
@@ -102,7 +103,8 @@
IHXCommonClassFactory* pCCF,
ClientSession::StreamInfo** ppStrmInfo,
BOOL bIsRealDatatype,
- UINT16 num_streams)
+ UINT16 num_streams,
+ BOOL bIsPlaylist)
:m_ulRefCount(0)
,m_pSwitchResponse(pResp)
,m_bSwitchPending(FALSE)
@@ -120,6 +122,7 @@
,m_bWirePayload(FALSE)
,m_pLiveSourceWrapper(NULL)
,m_bDone(FALSE)
+ ,m_bIsPlaylist(bIsPlaylist)
{
if (pCCF)
{
@@ -476,7 +479,9 @@
//m_ulStartingTS, which means offset all subsequent packets' timestamp
//to the first packets.
- if(m_ulRVStream == 0xFFFFFFFF || m_ulDeliveryTimeOffset != 0)
+ //XXXJJ 8/15/08 For server side playlist we always want to start from 0.
+
+ if(m_bIsPlaylist || m_ulRVStream == 0xFFFFFFFF || m_ulDeliveryTimeOffset != 0)
{
m_ulStartingTS = pPacketData->ulTS;
}
Index: mdpshim.cpp
===================================================================
RCS file: /cvsroot/server/engine/inputsource/mdpshim.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mdpshim.cpp 8 Jul 2008 23:52:55 -0000 1.12
+++ mdpshim.cpp 21 Aug 2008 00:11:53 -0000 1.13
@@ -68,8 +68,9 @@
IHXCommonClassFactory* pCCF,
ClientSession::StreamInfo** ppStrmInfo,
BOOL bIsRealDatatype,
- UINT16 num_streams)
- :BasePacketShim(pReg, pResp,pCCF,ppStrmInfo, bIsRealDatatype, \
num_streams) + UINT16 num_streams,
+ BOOL bIsPlaylist)
+ :BasePacketShim(pReg, pResp,pCCF,ppStrmInfo, bIsRealDatatype, \
num_streams, bIsPlaylist) ,m_pPacketSource(NULL)
,m_pPacketSink(NULL)
,m_pSwitchPacketSource(NULL)
_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic