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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/dataflow fsmanager.cpp,1.5.36.2,1.5.36.3
From:       vijendrakumara () helixcommunity ! org
Date:       2007-06-28 14:03:06
Message-ID: 200706281403.l5SE3FOF029407 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
      Tag: SERVER_11_1
	fsmanager.cpp 
Log Message:
Hello,

This CR contains the changes according to updated spec.

Note : SERVER_11_1_RN : doesn’t have any changes plgnhand.h (that’s a part
of AMP).


Synopsis

========


Record-Blocking Feature Development for server

Branches: SERVER_CURRENT_RN, SERVER_11_1_RN

Suggested Reviewer: Jamie Gordon, Chytanya Karusala


Description

===========

Contain changes according to updated spec.
1. Change the datatype of variable from bool to int
2. Change the string from EnableContentRecording to ContentMarker
3. Change the condition 1: Record blocking 0:Record enable anything
else:Record enable

Added Licensing check
Fix Bug 197983: Server Do Not Record broken with Alternate Mount Points

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

common/include/hxfiles.h
datatype-restrcited/rm/fileformat/rmffplin.cpp
datatype-restrcited/rm/fileformat/rmffplin.h
server/common/util/plgnhand.cpp
server/common/util/pub/plgnhand.h
server/engine/dataflow/fsmanager.cpp
server/engine/dataflow/pub/fsmanager.h
server/engine/inputsource/srcfinder.cpp
server/engine/session/source_finder.cpp
server-restricted/broadcast/transport/bcng/recv/breceiver.cpp
server-restricted/broadcast/transport/bcng/recv/strmsess.cpp
server-restricted/broadcast/transport/bcng/recv/pub/breceiver.h
server-restricted/broadcast/transport/bcng/recv/pub/strmsess.h


Testing Performed

=================

Functional Tests:
-----------------

Testing perform for various kinds of request using RealPlayer 11.
Tested on SERVER_CURRENT_RN , SERVER_11_1_RN

1. Testing for simple mount points – License is enabled
-  Send a request for mount point where Contentmarker is 1
   e.g rtsp://127.0.0.1/realvideo10.rm ; output: player shows
   recording button disabled.
-  Send a request for mount points where ContentMarker is 0
   e.g rtsp://127.0.0.1/tst/realvideo10.rm ; output: player
   shows recording button enabled.

2. Testing for simple mount points – Licensing is disabled
-  Send a request for mount point where Contentmarker is 1
   e.g rtsp://127.0.0.1/realvideo10.rm ; output: player shows
   recording button enabled.
-  Send a request for mount points where Contentmarker is 0
   e.g rtsp://127.0.0.1/tst/realvideo10.rm ; output: player
   shows recording button enabled.

3.Testing for Live Broadcast – License is enabled
- Send a request for push split e.g
  Setup: encoder-receiver1-transmitter1-receiver2-player
  rtsp://127.0.0.1/broadcast/source-name/broadcast/live.rm

  Note: Receiver2 has entry as ContentMarker=1
  Output: player shows recording button disabled.
- Send a request for push split e.g
  Setup: encoder-receiver1-transmitter1-receiver2-player
  rtsp://127.0.0.1/broadcast/source-name/broadcast/live.rm

  Note: Receiver2 has entry as ContentMarker=0
  Output: player shows recording button enabled.

4.Testing for Live Broadcast – License is disabled
- Send a request for push split e.g
  Setup: encoder-receiver1-transmitter1-receiver2-player
  rtsp://127.0.0.1/broadcast/source-name/broadcast/live.rm

  Note: Receiver2 has entry as ContentMarker=1
  Output: player shows recording button enabled.
- Send a request for push split e.g
  Setup: encoder-receiver1-transmitter1-receiver2-player
  rtsp://127.0.0.1/broadcast/source-name/broadcast/live.rm

  Note: Receiver2 has entry as ContentMarker=0
  Output: player shows recording button enabled.

Integration Tests:

n/a

Leak Tests:

n/a


Performance Tests:

n/a


Platforms Tested: win32-i386-vc7

Build verified: linux-rhel4-i686, win32-i386-vc7, sunos-5.10-sparc-server

QA Hints

========

None

Thanks and Regards
Vijendra


Index: fsmanager.cpp
===================================================================
RCS file: /cvsroot/server/engine/dataflow/fsmanager.cpp,v
retrieving revision 1.5.36.2
retrieving revision 1.5.36.3
diff -u -d -r1.5.36.2 -r1.5.36.3
--- fsmanager.cpp	2 Dec 2006 23:12:12 -0000	1.5.36.2
+++ fsmanager.cpp	28 Jun 2007 14:03:04 -0000	1.5.36.3
@@ -1114,8 +1114,8 @@
 
     // (m_bIsCDistEligible can only be false on the first entry
     // to this routine.)
-
-    if (!m_bIsCDistEligible)    // initialized false
+    
+	if (!m_bIsCDistEligible)    // initialized false
     {
         if (m_first_options)
         {
@@ -1300,3 +1300,9 @@
     HX_RELEASE(pValues);
     HX_RELEASE(pBuffer);
 }
+
+void
+FSManager::GetLastPlugin(PluginHandler::FileSystem::PluginInfo* & pPlugin)
+{
+    pPlugin = m_last_plugin;
+}


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