From a1b21cd777f7a8ec3cacefc19b6979015e1780d5 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Thu, 5 Dec 2013 21:28:34 +0000 Subject: [PATCH] Fix constants.[h|cc] to avoid static initializer in webrtcvideoengine.cc. R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5139004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5230 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/constants.cc | 44 ++++++++++++++++++------------------ talk/media/base/constants.h | 44 ++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/talk/media/base/constants.cc b/talk/media/base/constants.cc index bbe5eb759..9162ce4fd 100644 --- a/talk/media/base/constants.cc +++ b/talk/media/base/constants.cc @@ -39,30 +39,30 @@ const float kHighSystemCpuThreshold = 0.85f; const float kLowSystemCpuThreshold = 0.65f; const float kProcessCpuThreshold = 0.10f; -const char* kRtxCodecName = "rtx"; +const char kRtxCodecName[] = "rtx"; // RTP payload type is in the 0-127 range. Use 128 to indicate "all" payload // types. const int kWildcardPayloadType = -1; -const char* kCodecParamAssociatedPayloadType = "apt"; +const char kCodecParamAssociatedPayloadType[] = "apt"; -const char* kOpusCodecName = "opus"; +const char kOpusCodecName[] = "opus"; // draft-spittka-payload-rtp-opus-03.txt -const char* kCodecParamPTime = "ptime"; -const char* kCodecParamMaxPTime = "maxptime"; -const char* kCodecParamMinPTime = "minptime"; -const char* kCodecParamSPropStereo = "sprop-stereo"; -const char* kCodecParamStereo = "stereo"; -const char* kCodecParamUseInbandFec = "useinbandfec"; -const char* kCodecParamMaxAverageBitrate = "maxaveragebitrate"; +const char kCodecParamPTime[] = "ptime"; +const char kCodecParamMaxPTime[] = "maxptime"; +const char kCodecParamMinPTime[] = "minptime"; +const char kCodecParamSPropStereo[] = "sprop-stereo"; +const char kCodecParamStereo[] = "stereo"; +const char kCodecParamUseInbandFec[] = "useinbandfec"; +const char kCodecParamMaxAverageBitrate[] = "maxaveragebitrate"; -const char* kCodecParamSctpProtocol = "protocol"; -const char* kCodecParamSctpStreams = "streams"; +const char kCodecParamSctpProtocol[] = "protocol"; +const char kCodecParamSctpStreams[] = "streams"; -const char* kParamValueTrue = "1"; -const char* kParamValueEmpty = ""; +const char kParamValueTrue[] = "1"; +const char kParamValueEmpty[] = ""; const int kOpusDefaultMaxPTime = 120; const int kOpusDefaultPTime = 20; @@ -77,15 +77,15 @@ const int kPreferredSPropStereo = 0; const int kPreferredStereo = 0; const int kPreferredUseInbandFec = 0; -const char* kRtcpFbParamNack = "nack"; -const char* kRtcpFbParamRemb = "goog-remb"; +const char kRtcpFbParamNack[] = "nack"; +const char kRtcpFbParamRemb[] = "goog-remb"; -const char* kRtcpFbParamCcm = "ccm"; -const char* kRtcpFbCcmParamFir = "fir"; -const char* kCodecParamMaxBitrate = "x-google-max-bitrate"; -const char* kCodecParamMinBitrate = "x-google-min-bitrate"; -const char* kCodecParamMaxQuantization = "x-google-max-quantization"; -const char* kCodecParamPort = "x-google-port"; +const char kRtcpFbParamCcm[] = "ccm"; +const char kRtcpFbCcmParamFir[] = "fir"; +const char kCodecParamMaxBitrate[] = "x-google-max-bitrate"; +const char kCodecParamMinBitrate[] = "x-google-min-bitrate"; +const char kCodecParamMaxQuantization[] = "x-google-max-quantization"; +const char kCodecParamPort[] = "x-google-port"; const int kGoogleRtpDataCodecId = 101; const char kGoogleRtpDataCodecName[] = "google-data"; diff --git a/talk/media/base/constants.h b/talk/media/base/constants.h index 80af77ee2..b80c0fc10 100644 --- a/talk/media/base/constants.h +++ b/talk/media/base/constants.h @@ -43,30 +43,30 @@ extern const float kHighSystemCpuThreshold; extern const float kLowSystemCpuThreshold; extern const float kProcessCpuThreshold; -extern const char* kRtxCodecName; +extern const char kRtxCodecName[]; // Codec parameters extern const int kWildcardPayloadType; -extern const char* kCodecParamAssociatedPayloadType; +extern const char kCodecParamAssociatedPayloadType[]; -extern const char* kOpusCodecName; +extern const char kOpusCodecName[]; // Attribute parameters -extern const char* kCodecParamPTime; -extern const char* kCodecParamMaxPTime; +extern const char kCodecParamPTime[]; +extern const char kCodecParamMaxPTime[]; // fmtp parameters -extern const char* kCodecParamMinPTime; -extern const char* kCodecParamSPropStereo; -extern const char* kCodecParamStereo; -extern const char* kCodecParamUseInbandFec; -extern const char* kCodecParamMaxAverageBitrate; -extern const char* kCodecParamSctpProtocol; -extern const char* kCodecParamSctpStreams; +extern const char kCodecParamMinPTime[]; +extern const char kCodecParamSPropStereo[]; +extern const char kCodecParamStereo[]; +extern const char kCodecParamUseInbandFec[]; +extern const char kCodecParamMaxAverageBitrate[]; +extern const char kCodecParamSctpProtocol[]; +extern const char kCodecParamSctpStreams[]; -extern const char* kParamValueTrue; +extern const char kParamValueTrue[]; // Parameters are stored as parameter/value pairs. For parameters who do not // have a value, |kParamValueEmpty| should be used as value. -extern const char* kParamValueEmpty; +extern const char kParamValueEmpty[]; // opus parameters. // Default value for maxptime according to @@ -88,18 +88,18 @@ extern const int kPreferredStereo; extern const int kPreferredUseInbandFec; // rtcp-fb messages according to RFC 4585 -extern const char* kRtcpFbParamNack; +extern const char kRtcpFbParamNack[]; // rtcp-fb messages according to // http://tools.ietf.org/html/draft-alvestrand-rmcat-remb-00 -extern const char* kRtcpFbParamRemb; +extern const char kRtcpFbParamRemb[]; // ccm submessages according to RFC 5104 -extern const char* kRtcpFbParamCcm; -extern const char* kRtcpFbCcmParamFir; +extern const char kRtcpFbParamCcm[]; +extern const char kRtcpFbCcmParamFir[]; // Google specific parameters -extern const char* kCodecParamMaxBitrate; -extern const char* kCodecParamMinBitrate; -extern const char* kCodecParamMaxQuantization; -extern const char* kCodecParamPort; +extern const char kCodecParamMaxBitrate[]; +extern const char kCodecParamMinBitrate[]; +extern const char kCodecParamMaxQuantization[]; +extern const char kCodecParamPort[]; // We put the data codec names here so callers of // DataEngine::CreateChannel don't have to import rtpdataengine.h or