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

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/build/mserver config_mpeg2ts.html, 1.13.8.1, 1.13.8.2
From:       packard () helixcommunity ! org
Date:       2012-05-23 8:22:04
[Download RAW message or body]

Update of /cvsroot/server/admin/web/build/mserver
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv14228/admin/web/build/mserver


Modified Files:
      Tag: SERVER_14_3_VERIMETRIX_HLS_LR
	config_mpeg2ts.html 
Log Message:
Synopsis
========
DRM HLS LR implementation, version 3(fix serveral bugs)
Branches: SERVER_14_3_VERIMETRIX_HLS_LR 

reviewed by: Xiaocheng Li


Description
===========
1. add liscense support on admin page
2. fix the solaris compile problem, change IO from fstream to fopen
3. fix CMS API parser bug.


Files Affected
==============
server_rn/common/util/drmutil.cpp
server_rn/common/util/drmpathmap.cpp
server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm
server/admin/web/build/mserver/toc.js
server/admin/web/build/server/toc.js
/server/admin/web/src/srvprxy/toc~server.js.wasm
server/admin/web/build/mserver/config_mpeg2ts.html
server/admin/web/build/server/config_mpeg2ts.html

Testing Performed
=================
Test with Helix Server and iPhone

Index: config_mpeg2ts.html
===================================================================
RCS file: /cvsroot/server/admin/web/build/mserver/config_mpeg2ts.html,v
retrieving revision 1.13.8.1
retrieving revision 1.13.8.2
diff -u -d -r1.13.8.1 -r1.13.8.2
--- config_mpeg2ts.html	28 Apr 2012 20:45:12 -0000	1.13.8.1
+++ config_mpeg2ts.html	23 May 2012 08:22:01 -0000	1.13.8.2
@@ -38,7 +38,7 @@
 
 <SCRIPT SRC="propview_nolist.js"></SCRIPT>
 
-<SCRIPT SRC="servvar.get.html?mpeg2ts=config.MPEG2_Transport_Stream&fs=config.FSMount&vcaslist=config.Verimatrix_DRM.HLS_DRM"></SCRIPT>
 +<SCRIPT SRC="servvar.get.html?mpeg2ts=config.MPEG2_Transport_Stream&fs=config.FSMount&vcaslist=config.Verimatrix_DRM.HLS_DRM&lic=license.Summary"></SCRIPT>
  
 <SCRIPT language="JavaScript">
 var fsLocal = [];
@@ -147,17 +147,37 @@
 
 FSPropView.prototype = new NestedPropListView ;
 
-var propHLS_DRMSources =
+function isLiscensed( keyPath )
 
-[
+{
 
-	new PropObj( 'ResourceIDRange', "", false, true,  null, null, "hostname", "Resource \
ID Range" ), +	key = lic;
 
-	new PropObj( 'defaultKeyCount', "10", false, true,  null, null, "int", "default Key \
Count" ), +	a = keyPath.split( '.' );
 
-];
+	for ( var i = 0; i < a.length; i++ )
 
-propVCASListParams = new PropList( "VCAS Nodes", vcaslist, null, propHLS_DRMSources \
); +	{
+
+		if ( ! (key && key[ a[ i ] ]) )
+
+		{
+
+			key = null;
+
+			break;
+
+		}
+
+		key = key[ a[ i ] ];
+
+	}
+
+	return ( key == null ? 0 : (key != "0") );
+
+}
+
+propVCASListParams = new PropList( "VCAS Nodes", vcaslist, null, null );
 
 function VCASPropView ()
 
@@ -511,6 +531,16 @@
 
 	}
 
+	if ( !isLiscensed("DRM.VCASSupport") )
+
+	{
+
+		theForm["MPEG2-TS_Output.VCASNode"].disabled = true;
+
+		theForm["MPEG2-TS_Output.UseVCASEncryption"].disabled = true;
+
+	}
+
 }    // fillMountPointSelectList
 
 function ShowSelectedMP ()


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