[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] qos/core/pub qos_cfg_names.h,1.34,1.35
From: npatil () helixcommunity ! org
Date: 2007-05-30 5:48:05
Message-ID: 200705300548.l4U5mEVV030361 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/server/qos/core/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv21668
Modified Files:
qos_cfg_names.h
Log Message:
Synopsis
========
MDP Config Changes Work Statement 2 – Enabling/Disabling Media Delivery Pipeline
MDP Config Changes Work Statement 2 – Rename variables \
(X.*.Session.RateManager.BufferModel) MDP Config Changes Work Statement 2 – Link Char \
Rate Shifting
Quick link: None
Branch: SERVER_CURRENT_RN
Suggested Reviewer: Darrick
Description
===========
1: Presently this variable is used to enable or disable use of server-side rate \
adaptation. At present this value is an integer (Boolean) type where a value of “1” \
enables server-side rate adaptation and “0” disables server-side rate adaptation \
EXCEPT when the client advertises support for Helix-Adaptation or 3GPP-Adaptation.
The value of this variable shall henceforth be a string type with three possible \
values: “always”, “onadaptation”, and “never”. The values “always” and “onadaptation” \
shall correspond to the behaviors previously designated by values “1” and “0”, \
respectively. The value “never” shall cause the server to always disable server side \
rate adaptation (use of the MDP) regardless of client advertised support for \
Helix-Adaptation or 3GPP-Adaptation.
2: Rename the variables as specified in the work statement.
3: Presently the setting which enables Link-Char rate shifting resides in the global \
configuration. It shall be moved into the User-Agent Profiles and split into two \
variables as follows:
Variable Name
config.3GPPStreamAdaptation.EnableLinkCharRateShifting
New Name
X.*.RateAdaptation.ClientAdaptation.EnableLinkCharUpshift
X.*.RateAdaptation.ClientAdaptation.EnableLinkCharDownshift
Upshifting and downshifting based on Link-Char shall be enabled and disabled \
individually in the rate manager.
Files Affected
==============
server/engine/inputsource/uberstreammgr.cpp
server/engine/inputsource/srcfinder.cpp
server/engine/session/clientsession.cpp
server/engine/session/pub/clientsession.h
server/qos/core/pub/qos_cfg_names.h
server_rn/installer/proxy/proxyinst.cpp
server_rn/installer/server/retailservinst.cpp
server/engine/dataflow/static_pushpktflow.cpp
server_rn/qos/core/qos_clfact_rn.cpp
common/include/hxstreamadapt.h
server_rn/qos/session/pub/qos_sess_qosratemgr.h
server_rn/qos/session/qos_sess_qosratemgr.cpp
Testing Performed
=================
Unit Tests:
1. Installed the Helix Server and Proxy from the build and confirmed that the \
variable values are updated in the default config files. 2. Tested with all the three \
combinations of values the variable can have with hotrod player. Verified that these \
values behave as specified in the work statement. 3. Executed all (98) unit tests for \
MDP and confirmed all of them were success.
Note: In the code, the default behavior is kept as “onadaptation”. I.e. if a value is \
provided which is not equal to “always” or “never” then we are considering the value \
as “onadaptation”.
Integration Tests:
- None
Leak Tests:
- None
Performance Tests:
- None
Build verified: win32-i386-vc7, linux-rhel4-i686, and sunos-5.10-sparc-server
Platforms Tested: win32-i386-vc7
QA Hints
========
- Test with a player which does not support Helix-Adaptation or 3GPP-Adaptation with \
value as “always” and “onadaptation”.
- Test for Link Char enabled Upshift and Downshift.
Index: qos_cfg_names.h
===================================================================
RCS file: /cvsroot/server/qos/core/pub/qos_cfg_names.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- qos_cfg_names.h 22 May 2007 05:52:12 -0000 1.34
+++ qos_cfg_names.h 30 May 2007 05:48:03 -0000 1.35
@@ -38,21 +38,15 @@
#define _QOS_CFG_NAMES_H_
/* Flow */
-#define QOS_CFG_MDP "UseMediaDeliveryPipeline" /* bool */
+#define QOS_CFG_MDP "UseMediaDeliveryPipeline" /* string */
#define QOS_CFG_RTT_PROBE_FREQUENCY "RTTProbeFrequency" /* msec */
#define QOS_CFG_RDT_PKT_AGG_ENABLE "EnableRDTPacketAggregation"/* bool */
/* LinkChar support */
#define QOS_CFG_LINKCHAR_MULTIPLIER "RTSP.LinkCharMultiplier" /* e.g. 1000 to \
convert kbps -> bps */
-/* Session.RateManager: */
-#define QOS_CFG_RA_TYPE "RateAdaptation.RateManagerType" /* string */
-#define QOS_CFG_RM_BUFF_MOD "Session.RateManager.BufferModel" /* string */
-
-/* RateControl: */
-/* RTCP RR and RS rate/ratio (b=RR, b=RS) */
-#define QOS_CFG_RATECONTROL_RR_RATIO "RateControl.RTCPRRrate" /* x.x%, xxbps, xx */
-#define QOS_CFG_RATECONTROL_RS_RATIO "RateControl.RTCPRSrate" /* x.x%, xxbps, xx */
+/* ClientCapabilties: */
+#define QOS_CFG_CC_BUFF "ClientCapabilties.BufferInfoRatio" /* packets */
/* Stream bandwidth values (b=AS) */
/* BandwidthProtocol describes the transport protocol to be used for
@@ -60,10 +54,11 @@
#define QOS_CFG_CC_BW_PROT "ClientCapabilities.BandwidthProtocol" /* string */
#define QOS_CFG_CC_BW_MULT "ClientCapabilities.BandwidthMultiplier" /* % */
-/* Transport.RDT: */
-#define QOS_CFG_CC_BUFF "ClientCapabilties.BufferInfoRatio" /* packets */
-
/* RateControl: */
+/* RTCP RR and RS rate/ratio (b=RR, b=RS) */
+#define QOS_CFG_RATECONTROL_RR_RATIO "RateControl.RTCPRRrate" /* x.x%, xxbps, xx */
+#define QOS_CFG_RATECONTROL_RS_RATIO "RateControl.RTCPRSrate" /* x.x%, xxbps, xx */
+
#define QOS_CFG_RC_TYPE "RateControl.UDPCongestionControlType" /* string */
#define QOS_CFG_RC_MAX_BURST "RateControl.MaxBurst" /* packets */
#define QOS_CFG_RC_INIT_PKTSZ "RateControl.InitialPacketSize" /* Bytes */
@@ -80,7 +75,7 @@
/* RateControl.TCP: */
#define QOS_CFG_TCP_HONOR_MAX_SENDRATE "RateControl.TCP.HonorMaxSendRate" /* bool \
*/
-/* Transport.CongestionControl.TFRC: */
+/* RateControl.TFRC: */
#define QOS_CFG_TFRC_RTT_IIR_FILTER "RateControl.TFRC.EnableIIRForRTT" /* bool \
*/ #define QOS_CFG_TFRC_SS_SC "RateControl.TFRC.SlowStartScalar" /* % \
*/ #define QOS_CFG_TFRC_RTO_SC "RateControl.TFRC.TimeoutScalar" /* % \
*/ @@ -90,7 +85,7 @@
#define QOS_CFG_TFRC_USE_SS "RateControl.TFRC.EnableSlowStart" /* bool \
*/ #define QOS_CFG_TFRC_ACK_SZ "RateControl.TFRC.TCPPacketsPerACK" /* \
integer */
-/* Transport.CongestionControl.BCC: */
+/* RateControl.BCC: */
#define QOS_CFG_BCC_RTT_IIR_FILTER "RateControl.BCC.EnableIIRForRTT" /* bool \
*/ #define QOS_CFG_BCC_ZERO_TIMEO "RateControl.BCC.TimeoutTransmission" /* \
bool */ #define QOS_CFG_BCC_DEBUG_OUT "Transport.CongestionControl.BCC.Trace" \
/* bool */ @@ -103,10 +98,17 @@
#define QOS_CFG_BCC_LOW_LIM "RateControl.BCC.LowerLimit" /* \
integer;bps */ #define QOS_CFG_BCC_TGT_RIO "RateControl.BCC.TargetRatio" \
/* integer */
-/* InputSource */
-#define QOS_CFG_RA_DEFAULT_MEDIARATE "RateAdaptation.DefaultMediaRate" \
/* bps */
-#define QOS_CFG_RA_DISABLE_AUDIO_SW "RateAdaptation.EnableAudioRateSwitching" \
/* bool */
-#define QOS_CFG_RA_USE_REL6_RATE_SEL "RateAdaptation.UseRel6InitialRateSelection" \
// string +/* RateAdaptation */
+#define QOS_CFG_RA_DEFAULT_MEDIARATE "RateAdaptation.DefaultMediaRate" \
/* bps */ +#define QOS_CFG_RA_ENABLE_AUDIO_SW \
"RateAdaptation.EnableAudioRateSwitching" /* bool */ +#define \
QOS_CFG_RA_USE_REL6_RATE_SEL "RateAdaptation.UseRel6InitialRateSelection" /* string \
*/ +#define QOS_CFG_RA_TYPE "RateAdaptation.RateManagerType" \
/* string */ +#define QOS_CFG_RA_BUFF_MOD "RateAdaptation.BufferModel" \
/* string */ +
+/* RateAdaptation.ClientAdaptation */
+#define CONFIG_ENTRY_LINK_CHAR_UPSHIFTING \
"RateAdaptation.ClientAdaptation.EnableLinkCharUpshift" /* bool */ +#define \
CONFIG_ENTRY_LINK_CHAR_DOWNSHIFTING \
"RateAdaptation.ClientAdaptation.EnableLinkCharDownShift"/* bool */ +
#define QOS_CFG_INACTIVITY_TIMEOUT "InactivityTimeout"
/* sec */
_______________________________________________
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