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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/session clientsession.cpp,1.119,1.120
From:       jzeng () helixcommunity ! org
Date:       2008-11-06 23:15:28
Message-ID: 200811062322.mA6NMhqp000949 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/session
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4962/server/engine/session

Modified Files:
	clientsession.cpp 
Log Message:
synopsis
========
sspl related issues
Branches:  head, server_12_1
Suggested Reviewer: Shantha 

Description
===========
This checkin includes:

1. Add licnese handling for sspl.
2. Find in-band seeking.

Files Affected
==============

common/include/defslice.h,v
server/engine/inputsource/base_shim.cpp,v
server/engine/inputsource/ppmstaticshim.cpp,v
server/engine/inputsource/pub/base_shim.h,v
server/engine/session/clientsession.cpp,v
server/fs/sdpgenfsys/sdpgenfobj.cpp,v
server/protocol/rtsp/crtspbase.cpp,v
server-restricted/datatype/playlist/pl_processor.cpp,v
server-restricted/datatype/playlist/plmgr.cpp,v
server-restricted/protocol/http-ctrl/ssplgethandler.cpp,v
server-restricted/protocol/http-ctrl/ssplutil.cpp,v
server-restricted/protocol/http-ctrl/pub/ssplutil.h,v

Testing Performed
=================

Unit Tests:
Run the playlist manager unit testing.

Integration Tests:

Test 3gp and rm, live and on-demand.

Leak Tests:
None.

Performance Tests:
- None

Platforms Tested: linux-rhel4-i686
Build verified: linux-rhel4-i686





Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- clientsession.cpp	23 Oct 2008 01:20:22 -0000	1.119
+++ clientsession.cpp	6 Nov 2008 23:15:26 -0000	1.120
@@ -476,7 +476,6 @@
         // triggered at switch time. the last clip done event needs to
         // be triggered differently since it doesn't happen as a result
         // of a switch.
-        //Used by FCS (FinalSwitch) and SSPL (FinalClip) Logging
         pClipStats->SetEndFlag(TRUE);
         ClipDone(pClipStats);
     }
@@ -3076,7 +3075,7 @@
     if(m_bIsPlaylist)
     {
         bIsPlaylistOBSeekable = ssplRequestCheck.CheckRequestParams(pURL, HTTPMessage::T_GET) 
-                && ssplRequestCheck.VerifySSPLLicense();
+                && ssplRequestCheck.VerifySSPLSeekLicense();
     }
 
     if (m_bIsFCSURL || m_bIsPlaylist)
@@ -4146,6 +4145,9 @@
     pSourceURL = m_url;
     pSourceURL->AddRef();
     pRequest = m_pRequest;
+ #ifdef HELIX_FEATURE_SERVER_SSPL
+    SSPLUtil ssplUtil(m_pProc->pc->server_context);
+ #endif //HELIX_FEATURE_SERVER_SSPL
 
     if (!m_bDone)
     {
@@ -4180,7 +4182,7 @@
         case AllowanceSerializer::allow_playback:
  #ifdef HELIX_FEATURE_SERVER_SSPL
             pRequest->GetURL(pUrl);
-            if(SSPLUtil::IsSSPLURL(pUrl))
+            if(ssplUtil.IsSSPLURL(pUrl))
             {
             m_pPlaylistControl = new CPlaylistControl(this, m_pProc->pc->server_context);
             m_pPlaylistControl->AddRef();
@@ -5947,9 +5949,7 @@
     UINT32 ulFileDur = 0;
     IHXBuffer* pStartTime = GetStartTime();
 
-    //Used for both FCS (SwitchCount) and SSPL (ClipCount) Logging
     pClipStats->SetSwitchCount(m_ulSwitchCount);
-
     pClipStats->SetSession(m_pStats);
     pClipStats->SetStatus(200);
     pClipStats->SetNPTStartTime(m_ulEndTime);
@@ -7181,6 +7181,7 @@
 
 void ClientSession::ClipStreamDoneCalled()
 {
+    DPRINTF(D_ENTRY, ("ClientSession::ClipStreamDoneCalled() url\n"));
     if(m_pPlaylistControl)
     {
         m_pPlaylistControl->GetNextMediaClip();


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