[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-common-cvs
Subject: [Common-cvs] include defslice.h,1.29,1.30
From: svaidhya () helixcommunity ! org
Date: 2010-03-17 6:31:42
Message-ID: 201003170632.o2H6WC4x020510 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20052
Modified Files:
defslice.h
Log Message:
Synopsis
========
Including license checking for Multirate Clips for MPEG2TS Segmentation .
Branch : SERVER_14_0_RN, HEAD
Suggested Reviewer: Chytanya
Description
==========
Modified StreamHandler to check for License for MR files and proceed only if present \
and stop if not licensed
Files Changed:
============
./server_rn/datatype/mpeg2ts/streamhandler.cpp
./common/include/defslice.h
Testing Performed
=================
Unit Tests:
- None
Integration Tests:
- Verified MR segmentation do not occur without license and error logs are written as \
expected.
- Verified SR segmentation still happens.
- Did not verify if MR happens with license because I don.t have one :P
Leak Tests:
- None.
Performance Tests:
- None
Build verified: win32-i386-vc7
Platform tested : win32-i386-vc7
Index: defslice.h
===================================================================
RCS file: /cvsroot/common/include/defslice.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- defslice.h 4 Mar 2010 18:19:44 -0000 1.29
+++ defslice.h 17 Mar 2010 06:31:39 -0000 1.30
@@ -113,6 +113,7 @@
const INT32 LICENSE_3GPP_REL6_ENABLED = 0;
const INT32 LICENSE_WINDOWSMEDIAASF_ENABLED = 0;
const INT32 LICENSE_MPEG2TS_ENABLED = 0;
+const INT32 LICENSE_MPEG2TS_MULTIRATE_ENABLED = 0;
const INT32 LICENSE_RTMP_LIVE_ENABLED = 0;
const INT32 LICENSE_FLV_ENABLED = 0;
const INT32 LICENSE_F4V_ENABLED = 0;
@@ -227,6 +228,7 @@
#define REGISTRY_HTTP_CONNECTIONS "license.Summary.General.HTTPConnections"
#define REGISTRY_HTTPS_ENABLED "license.Summary.General.HTTPS"
#define REGISTRY_MPEG2TS_ENABLED "license.Summary.General.MPEG2TSSupport"
+#define REGISTRY_MPEG2TS_MULTIRATE_ENABLED \
"license.Summary.General.MPEG2TSMRSupport" #define REGISTRY_RTMP_ENABLED \
"license.Summary.General.RTMP"
// Multicast Section
_______________________________________________
Common-cvs mailing list
Common-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/common-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic