[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] admin/web/src/srvprxy preseg_result.html.wasm, 1.1, 1.2 config_mpeg2ts.html.wasm, 1.23,
From: mingda () helixcommunity ! org
Date: 2013-09-18 7:52:15
[Download RAW message or body]
Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2977/src/srvprxy
Modified Files:
config_mpeg2ts.html.wasm
Added Files:
preseg_result.html.wasm
Log Message:
Committed to: SERVER_15_1_0_RN, HEAD
Reviewed by: Xiaocheng Li
Synopsis:
=========
PreSegment Plugin
Branch: SERVER_15_1_0_RN, HEAD
Suggested Reviewers: Anyone
Description:
============
PreSegment Plugin
Files Modified:
===============
server/include/server_piids.h
server/engine/core/Umakefil
server/engine/core/ server_context.cpp
server_rn/datatype/mpeg2ts/mpeg2tsplin.cpp
server_rn/datatype/mpeg2ts/pub/streamsmap.h
server_rn/datatype/mpeg2ts/ streamsmap.cpp
server_rn/datatype/mpeg2ts/streamhandler.cpp
server_rn/datatype/mpeg2ts/pub/streamhandler.h
server_rn/common/util/pub/mpeg2ts_config_names.h
server_rn/common/util/librarypruner.cpp
server_rn/common/util/pub/librarypruner.h
server_rn/common/util/vhostapi.cpp
server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm
server/admin/web/server.opt
server-restricted/installer/server/retailservinst.cpp
build/BIF/SERVER_15_1_0-internal.bif
server-restricted/installer/server/make_tempdir
Files Added:
===============
Server_rn/appext/presegment/pub/directorymanager.h
Server_rn/appext/presegment/pub/presegment.h
Server_rn/appext/presegment/pub/virtualclientdispatcher.h
Server_rn/appext/presegment/directorymanager.cpp
Server_rn/appext/presegment/guids.cpp
Server_rn/appext/presegment/presegment.cpp
Server_rn/appext/presegment/ virtualclientdispatcher.cpp \
Server_rn/appext/presegment/win32.pcf \
server/admin/web/src/srvprxy/preseg_result.html.wasm server/include/hxpresegment.h
server/engine/core/hlsvirtualclient.cpp
server/engine/core/pub/hlsvirtualclient.h
Testing Performed:
================
Unit Tests:
None
Integration Tests:
Leak Tests: None
Performance Tests: N/A
Platforms Tested: CentOs64
Builds Verified: CentOs64
QA Hints
========
None.
Index: config_mpeg2ts.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- config_mpeg2ts.html.wasm 13 Aug 2013 11:06:37 -0000 1.23
+++ config_mpeg2ts.html.wasm 18 Sep 2013 07:51:58 -0000 1.24
@@ -60,8 +60,7 @@
new PropObj( 'MountPoint', "", true, true, null, null, "mountpoint", "Content \
MountPoint" ),
new PropObj('MPEG2-TS_Output.SegmentDuration', "10", false, false, "1", null, \
null, "int", "Segment Duration"),
new PropObj('MPEG2-TS_Output.PlaylistSegments', "3", false, false, "3", null, \
null, "int", "Playlist Segments"),
- new PropObj('MPEG2-TS_Output.MaxPlaylistSegments', "10", false, false, "0", \
null, null, "int", "Max Playlist Segments"),
-
+
new PropObj('MPEG2-TS_Output.SegmentPurgeSize', "5120", false, false, "0", null, \
null, "int", "Segment Purge Size"),
new PropObj('MPEG2-TS_Output.Encryption', "0", false, false, null, null, \
"ShortName", "Encryption"),
new PropObj('MPEG2-TS_Output.KeyFileInterval', "0", false, false, null, null, \
"", "KeyFile Interval"), @@ -120,6 +119,7 @@
var propSetSources =
[
new PropObj( 'Enable', "1", false, false, null, null, "int", "Enable \
SourcePath" ), + new PropObj( 'EnablePreSegment', "0", false, false, null, null, \
"int", "Enable Pre-Segment" ),
new PropObj( 'TargetMountPoint', "", false, true, null, null, "mountpoint", \
"Destination MountPoint" ),
new PropObj( 'PurgeSegmentsOnServerStart', "0", false, false, null, null, \
"int", "Purge Segments On Server Start" ), ];
@@ -129,6 +129,7 @@
new PropObj( 'GlobalEnable', "0", false, false, null, null, "int", "Enable \
Segmentation" ),
new PropObj( 'ForceHTTPSPlaylistDelivery', "0", false, false, null, null, \
"int", "Force Secure Playlists" ),
new PropObj( 'UseHTTPSKeyfileDelivery', "1", false, false, null, null, "int", \
"Secure KeyFiles" ), + new PropObj( 'DirectoryScanInterval', "720", false, false, \
"3", null, null, "int", "Directory Scan Interval"), ];
var propList = new PropList( "MPEG2_Transport_Stream", mpeg2ts, propSetMain, \
propSetSources); @@ -408,6 +409,12 @@
} // onLoad
+function SegmentNow ()
+{
+ var Url = '/admin/servvar.set.html?respage=preseg_result.html&Server.HLSDirectoryScan=1';
+ window.open(Url, 'Segment \
Now','scrollbars=1,width=600,height=400,left=100,top=100'); +} // SegmentNow
+
</SCRIPT>
</HEAD>
<@= bodyTag( "onLoad" ) @>
@@ -439,6 +446,15 @@
<@= formTableTag @>
<@= formElemSelectYesNo( "Enable Segmentation", name => "GlobalEnable"); @>
<@= formElemText( "Server Hostname", name => "Hostname" ); @>
+ <@= formElemText( "Pre-Segment Scan Interval (min)", name => \
"DirectoryScanInterval" ); @> + <tr>
+ <TD class="input" valign="top" align="RIGHT" width="44%">
+ </td>
+ <TD class="input" valign="top" align="LEFT" width="56%">
+ <input CLASS="input" MAXLENGTH="5" TYPE="button" onClick="SegmentNow();" \
value="Segment Now" style="width:44%"> + </td>
+ </tr>
+
<@
FORM_STYLE( "WRAP");
@>
@@ -471,6 +487,8 @@
<@= formElemText( "Edit Source Path" , name => "theEdit" ); @>
<@= formElemSelectYesNo( "Enable Source Path", name => "Enable" ); @>
<BR>
+ <@= formElemSelectYesNo( "Enable Pre-Segment", name => "EnablePreSegment" ); \
@> + <BR>
<@= formElemSelectYesNo( "Purge Segments On Server Start", name => \
"PurgeSegmentsOnServerStart" ); @> <BR>
<@= formElemSelect( "Destination MountPoint",
@@ -495,8 +513,6 @@
<@= formElemText( "Segment Duration" , name => \
"MPEG2-TS_Output.SegmentDuration", class => "input", units=> "seconds", size=>16, \
maxlength=>16 ); @> <BR>
<@= formElemText( "Minimum Playlist Segments" , name => \
"MPEG2-TS_Output.PlaylistSegments", class => "input", size=>16, \
maxlength=>16); @>
- <BR>
- <@= formElemText( "Maximum Playlist Segments" , name => \
"MPEG2-TS_Output.MaxPlaylistSegments", class => "input", size=>16, maxlength=>16); @> \
<BR><BR>
<@= formElemSelect( "Segment Encryption",
@@ -533,6 +549,8 @@
</TD>
</TR>
+<@= spacerRow @>
+
<@= submitResetBtns @>
<@= endHTMLTag @>
--- NEW FILE: preseg_result.html.wasm ---
#include "header.wasm"
<@
use configLib ;
use dialogLib ;
use dbgLib ;
TABLE_WIDTH( "520" );
@>
<HTML>
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=utf-8">
<@ if( $DEFS::DEBUG ) { @><SCRIPT language="javascript">
var cvsHeader = "$Header: \
/cvsroot/server/admin/web/src/srvprxy/preseg_result.html.wasm,v 1.2 2013/09/18 \
07:51:58 mingda Exp $" ;
</SCRIPT><@ } @>
<@= commonInc @>
<@= dlgTitleTag( TEXT("Administrator") . " - Command Succeeds!" ) @> <!--! SET DIALOG \
TITLE HERE -->
<STYLE>
.failed
{
font-weight: 600;
}
/*! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
failed text - return results page
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
.red
{
font-weight: 600;
color: red;
}
</STYLE>
</HEAD>
<BODY
CLASS="popup"
onload="_onLoadDefault();"
onunload="_onUnLoadDefault();"
>
#include "dbgpanel.wasm"
<@= popupHeader @>
<CENTER>
<@= popupTitle( "Command Succeeds!" ); @>
<FORM
name="theForm"
method="POST"
action="javascript:doSubmit();"
onsubmit="validate();"
onreset="window.close();"
>
<TABLE border="0" cellpadding="1" cellspacing="0" width="<@= TABLE_WIDTH() @>">
<TR>
<TD align="right" valign="middle">
<BR>
<script LANGUAGE="javascript">
document.write( '<a href="javascript://" onclick="window.close();"><img \
src="images/close.gif", border=0 alt="Close"></A>' );
</script>
</TD>
</TR>
</TABLE>
</FORM>
</CENTER>
<@= dynFormDivTag @>
</BODY>
</HTML>
_______________________________________________
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