Bug 1144962 - Part 2: Remove some wrapper code in sipcc r=mt
authorByron Campen [:bwc] <docfaraday@gmail.com>
Wed, 18 Mar 2015 16:19:26 -0700
changeset 263916 c5c158a9728d82cfa868f9079410dfe108f1f29b
parent 263915 6deef776437b830a1a78561f7ca01a765a957dd5
child 263917 badfefdddfc97d6128a23f347322464e7cfbbfb3
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmt
bugs1144962
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1144962 - Part 2: Remove some wrapper code in sipcc r=mt
media/webrtc/moz.build
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
media/webrtc/signaling/src/sdp/sipcc/ccsdp.c
media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -62,17 +62,16 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
         'signaling/src/mediapipeline/SrtpFlow.cpp',
         'signaling/src/peerconnection/MediaPipelineFactory.cpp',
         'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',
         'signaling/src/peerconnection/PeerConnectionImpl.cpp',
         'signaling/src/peerconnection/PeerConnectionMedia.cpp',
         'signaling/src/peerconnection/WebrtcGlobalInformation.cpp',
-        'signaling/src/sdp/sipcc/ccsdp.c',
         'signaling/src/sdp/sipcc/cpr_string.c',
         'signaling/src/sdp/sipcc/sdp_access.c',
         'signaling/src/sdp/sipcc/sdp_attr.c',
         'signaling/src/sdp/sipcc/sdp_attr_access.c',
         'signaling/src/sdp/sipcc/sdp_base64.c',
         'signaling/src/sdp/sipcc/sdp_config.c',
         'signaling/src/sdp/sipcc/sdp_main.c',
         'signaling/src/sdp/sipcc/sdp_services_unix.c',
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -1,19 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CSFLog.h"
 #include "nspr.h"
 #include "plstr.h"
 
-// For rtcp-fb constants
-#include "ccsdp.h"
-
 #include "VideoConduit.h"
 #include "AudioConduit.h"
 #include "nsThreadUtils.h"
 #include "LoadManager.h"
 #include "YuvStamper.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
@@ -22,16 +19,23 @@
 #include "webrtc/common_video/interface/native_handle.h"
 #include "webrtc/video_engine/include/vie_errors.h"
 #include "browser_logging/WebRtcLog.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidJNIWrapper.h"
 #endif
 
+// for ntohs
+#ifdef _MSC_VER
+#include "Winsock2.h"
+#else
+#include <netinet/in.h>
+#endif
+
 #include <algorithm>
 #include <math.h>
 
 #define DEFAULT_VIDEO_MAX_FRAMERATE 30
 
 namespace mozilla {
 
 static const char* logTag ="WebrtcVideoSessionConduit";
deleted file mode 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/ccsdp.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "sdp.h"
-#include "ccapi.h"
-
-int ccsdpAttrGetFmtpInst(void *sdp_ptr, uint16_t level, uint16_t payload_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-  if ( sdpp->dest_sdp == NULL ) {
-    return 0;
-  }
-  return sdp_find_fmtp_inst(sdpp->dest_sdp, level, payload_num);
-}
-
-const char* ccsdpAttrGetFmtpParamSets(void *sdp_ptr, uint16_t level,
-                                            uint8_t cap_num, uint16_t inst_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return NULL;
-  }
-  return sdp_attr_get_fmtp_param_sets(sdpp->dest_sdp, level, cap_num, inst_num);
-}
-
-sdp_result_e ccsdpAttrGetFmtpPackMode(void *sdp_ptr, uint16_t level,
-                         uint8_t cap_num, uint16_t inst_num, uint16_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_pack_mode(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-sdp_result_e ccsdpAttrGetFmtpLevelAsymmetryAllowed(void *sdp_ptr, uint16_t level,
-                         uint8_t cap_num, uint16_t inst_num, uint16_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_level_asymmetry_allowed(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-const char* ccsdpAttrGetFmtpProfileLevelId (void *sdp_ptr, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return NULL;
-  }
-  return sdp_attr_get_fmtp_profile_id(sdpp->dest_sdp, level, cap_num, inst_num);
-}
-
-
-
-sdp_result_e ccsdpAttrGetFmtpMaxMbps (void *sdp_ptr, uint16_t level,
-                                uint8_t cap_num, uint16_t inst_num, uint32_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_max_mbps(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-sdp_result_e ccsdpAttrGetFmtpMaxFs (void *sdp_ptr, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint32_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_max_fs(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-sdp_result_e ccsdpAttrGetFmtpMaxCpb (void *sdp_ptr, uint16_t level,
-                                 uint8_t cap_num, uint16_t inst_num, uint32_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_max_cpb(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-sdp_result_e ccsdpAttrGetFmtpMaxBr (void *sdp_ptr, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint32_t* val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_max_br(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-int ccsdpGetBandwidthValue (void *sdp_ptr, uint16_t level, uint16_t inst_num)
-
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_get_bw_value(sdpp->dest_sdp, level, inst_num);
-}
-
-sdp_result_e ccsdpAttrGetFmtpMaxDpb (void *sdp_ptr, uint16_t level,
-                               uint8_t cap_num, uint16_t inst_num, uint32_t *val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->dest_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_get_fmtp_max_dpb(sdpp->dest_sdp, level, cap_num, inst_num, val);
-}
-
-sdp_result_e ccsdpAddNewAttr (void *sdp_ptr, uint16_t level, uint8_t cap_num,
-                               sdp_attr_e attr_type, uint16_t *inst_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_add_new_attr(sdpp->src_sdp, level, cap_num, attr_type, inst_num);
-}
-
-sdp_result_e ccsdpAttrSetFmtpPayloadType (void *sdp_ptr, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint16_t payload_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_payload_type(sdpp->src_sdp, level, cap_num, inst_num, payload_num);
-}
-
-
-sdp_result_e ccsdpAttrSetFmtpPackMode (void *sdp_ptr, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num, uint16_t pack_mode)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_pack_mode(sdpp->src_sdp, level, cap_num, inst_num, pack_mode);
-}
-
-sdp_result_e ccsdpAttrSetFmtpLevelAsymmetryAllowed (void *sdp_ptr, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num, uint16_t asym_allowed)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_level_asymmetry_allowed(sdpp->src_sdp, level, cap_num, inst_num, asym_allowed);
-}
-
-
-sdp_result_e ccsdpAttrSetFmtpProfileLevelId (void *sdp_ptr, uint16_t level,
-                               uint8_t cap_num, uint16_t inst_num, const char *profile_level_id)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_profile_level_id(sdpp->src_sdp, level, cap_num, inst_num, profile_level_id);
-}
-
-
-sdp_result_e ccsdpAttrSetFmtpParameterSets (void *sdp_ptr, uint16_t level,
-                                     uint8_t cap_num, uint16_t inst_num, const char *parameter_sets)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_parameter_sets(sdpp->src_sdp, level, cap_num, inst_num, parameter_sets);
-}
-
-
-
-sdp_result_e ccsdpAttrSetFmtpMaxBr (void *sdp_ptr, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint32_t max_br)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_max_br(sdpp->src_sdp, level, cap_num, inst_num, max_br);
-}
-
-
-sdp_result_e ccsdpAttrSetFmtpMaxMbps (void *sdp_ptr, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint32_t max_mbps)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_max_mbps(sdpp->src_sdp, level, cap_num, inst_num, max_mbps);
-}
-
-sdp_result_e ccsdpAttrSetFmtpMaxFs (void *sdp_ptr, uint16_t level,
-                        uint8_t cap_num, uint16_t inst_num, uint32_t max_fs)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_max_fs(sdpp->src_sdp, level, cap_num, inst_num, max_fs);
-}
-
-sdp_result_e ccsdpAttrSetFmtpMaxCpb (void *sdp_ptr, uint16_t level,
-                            uint8_t cap_num, uint16_t inst_num, uint32_t max_cpb)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_max_cpb(sdpp->src_sdp, level, cap_num, inst_num, max_cpb);
-}
-
-sdp_result_e ccsdpAttrSetFmtpMaxDbp (void *sdp_ptr, uint16_t level,
-                                  uint8_t cap_num, uint16_t inst_num, uint32_t max_dpb)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_max_dpb(sdpp->src_sdp, level, cap_num, inst_num, max_dpb);
-}
-
-
-sdp_result_e ccsdpAttrSetFmtpQcif  (void *sdp_ptr, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint16_t qcif)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_qcif(sdpp->src_sdp, level, cap_num, inst_num, qcif);
-}
-
-sdp_result_e ccsdpAttrSetFmtpSqcif  (void *sdp_ptr, uint16_t level,
-                            uint8_t cap_num, uint16_t inst_num, uint16_t sqcif)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_attr_set_fmtp_sqcif(sdpp->src_sdp, level, cap_num, inst_num, sqcif);
-}
-
-sdp_result_e ccsdpAddNewBandwidthLine (void *sdp_ptr, uint16_t level, sdp_bw_modifier_e bw_modifier, uint16_t *inst_num)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_add_new_bw_line(sdpp->src_sdp, level, bw_modifier, inst_num);
-}
-
-
-sdp_result_e ccsdpSetBandwidth (void *sdp_ptr, uint16_t level, uint16_t inst_num,
-                         sdp_bw_modifier_e bw_modifier, uint32_t bw_val)
-{
-  cc_sdp_t *sdpp = sdp_ptr;
-
-  if ( sdpp->src_sdp == NULL ) {
-    return SDP_INVALID_PARAMETER;
-  }
-  return sdp_set_bw(sdpp->src_sdp, level, inst_num, bw_modifier, bw_val);
-}
-
-const char * ccsdpCodecName(rtp_ptype ptype)
-{
-  switch (ptype)
- {
-    case RTP_NONE:       return "NONE";
-    case RTP_PCMU:       return "PCMU";
-    case RTP_CELP:       return "CELP";
-    case RTP_G726:       return "G726";
-    case RTP_GSM:        return "GSM";
-    case RTP_G723:       return "G723";
-    case RTP_DVI4:       return "DVI4";
-    case RTP_DVI4_II:    return "DVI4_II";
-    case RTP_LPC:        return "LPC";
-    case RTP_PCMA:       return "PCMA";
-    case RTP_G722:       return "G722";
-    case RTP_G728:       return "G728";
-    case RTP_G729:       return "G729";
-    case RTP_JPEG:       return "JPEG";
-    case RTP_NV:         return "NV";
-    case RTP_H261:       return "H261";
-    case RTP_H264_P0:    return "H264_P0";
-    case RTP_H264_P1:    return "H264_P1";
-    case RTP_AVT:        return "AVT";
-    case RTP_L16:        return "L16";
-    case RTP_H263:       return "H263";
-    case RTP_ILBC:       return "iLBC";
-    case RTP_OPUS:       return "OPUS";
-    case RTP_VP8:        return "VP8";
-    case RTP_VP9:        return "VP9";
-    case RTP_I420:       return "I420";
-    /* case RTP_ISAC:       return "ISAC"; */
-  }
-  return "UNKNOWN";
-}
-
--- a/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/ccsdp.h
@@ -266,431 +266,9 @@ typedef enum {
     SDP_SETUP_ACTIVE = 0,
     SDP_SETUP_PASSIVE,
     SDP_SETUP_ACTPASS,
     SDP_SETUP_HOLDCONN,
     SDP_MAX_SETUP,
     SDP_SETUP_UNKNOWN
 } sdp_setup_type_e;
 
-/**
- * Returns the inst_num value for the specified FTMP attr
- *
- * @param[in]  sdp_handle     The SDP handle
- * @param[in]  level       The level to check for the attribute.
- *
- * @return     inst_num    The attribute instance number to check, or -1 for failure
- */
-
-int ccsdpAttrGetFmtpInst(void *sdp_handle, uint16_t level, uint16_t payload_num);
-
-/**
- * Gets the value of the fmtp attribute- parameter-sets parameter for H.264 codec
- *
- * @param[in]  sdp_handle     The SDP handle
- * @param[in]  level       The level to check for the attribute.
- * @param[in]  cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in]  inst_num    The attribute instance number to check.
- *
- * @return      parameter-sets value.
- */
-
-const char* ccsdpAttrGetFmtpParamSets(void *sdp_handle, uint16_t level,
-                                            uint8_t cap_num, uint16_t inst_num);
-
-/**
- * Gets the value of the fmtp attribute- packetization-mode parameter for H.264 codec
- *
- * @param[in]  sdp_handle     The SDP handle
- * @param[in]  level       The level to check for the attribute.
- * @param[in]  cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in]  inst_num    The attribute instance number to check.
- * @param[out] *val        packetization-mode value in the range 0 - 2.
- *
- * @return     sdp_result_e         SDP_SUCCESS = SUCCESS
- */
-sdp_result_e ccsdpAttrGetFmtpPackMode(void *sdp_handle, uint16_t level,
-                         uint8_t cap_num, uint16_t inst_num, uint16_t *val);
-/**
- * Gets the value of the fmtp attribute- level asymmetry allowed parameter for H.264 codec
- *
- * @param[in]  sdp_handle     The SDP handle
- * @param[in]  level       The level to check for the attribute.
- * @param[in]  cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in]  inst_num    The attribute instance number to check.
- * @param[out] *val        level-asymmetry-allowed param value in the range 0 - 1.
- *
- * @return     sdp_result_e         SDP_SUCCESS = SUCCESS
- */
-sdp_result_e ccsdpAttrGetFmtpLevelAsymmetryAllowed(void *sdp_handle, uint16_t level,
-                         uint8_t cap_num, uint16_t inst_num, uint16_t *val);
-
-
-/**
- * Gets the value of the fmtp attribute- profile-level-id parameter for H.264 codec
- *
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in]  level       The level to check for the attribute.
- * @param[in]  cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in]  inst_num    The attribute instance number to check.
- *
- * @return   char *      profile-level-id value.
- */
-const char* ccsdpAttrGetFmtpProfileLevelId (void *sdp_handle, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num);
-
-/**
- * Gets the value of the fmtp attribute- max-mbps parameter for H.264 codec
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the
- *                          attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[out] *val        max-mbps value.
- *
- * @return     sdp_result_e         SDP_SUCCESS
- */
-
-sdp_result_e ccsdpAttrGetFmtpMaxMbps (void *sdp_handle, uint16_t level,
-                                uint8_t cap_num, uint16_t inst_num, uint32_t *val);
-
-/**
- * Gets the value of the fmtp attribute- max-fs parameter for H.264 codec
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the
- *                          attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[out] *val        max-fs value.
- *
- * @return     sdp_result_e         SDP_SUCCESS
- */
-sdp_result_e ccsdpAttrGetFmtpMaxFs (void *sdp_handle, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint32_t *val);
-
-/**
- * Gets the value of the fmtp attribute- max-cpb parameter for H.264 codec
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param [out] *val      max-cpb value.
- *
- * @return     sdp_result_e         SDP_SUCCESS
- */
-sdp_result_e ccsdpAttrGetFmtpMaxCpb (void *sdp_handle, uint16_t level,
-                                 uint8_t cap_num, uint16_t inst_num, uint32_t *val);
-
-/**
- * Gets the value of the fmtp attribute- max-br parameter for H.264 codec
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param [out] *val      max-br value.
- *
- * @return     sdp_result_e         SDP_SUCCESS
- */
-sdp_result_e ccsdpAttrGetFmtpMaxBr (void *sdp_handle, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint32_t* val);
-
-/**
- * Returns the bandwidth value parameter from the b= line.
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level from which to get the bw value.
- * @param[in] inst_num    instance number of bw line at the level. The first
- *                          instance has a inst_num of 1 and so on.
- *
- * @return     A valid numerical bw value or SDP_INVALID_VALUE(-2).
- */
-int ccsdpGetBandwidthValue (void *sdp_handle, uint16_t level, uint16_t inst_num);
-
-/**
- * Add a new attribute of the specified type at the given level and capability
- * level or base attribute if cap_num is zero.
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] attr_type   The type of attribute to add.
- * @param[in] inst_num    Pointer to a uint16_t in which to return the instance number of the newly added attribute.
- *
- * @return     sdp_result_e
- *              SDP_SUCCESS            Attribute was added successfully.
- *              SDP_NO_RESOURCE        No memory avail for new attribute.
- *              SDP_INVALID_PARAMETER  Specified media line is not defined.
- */
-sdp_result_e ccsdpAddNewAttr (void *sdp_handle, uint16_t level, uint8_t cap_num,
-                               sdp_attr_e attr_type, uint16_t *inst_num);
-
-/**
- * Gets the value of the fmtp attribute- max-dpb parameter for H.264 codec
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[out] *val       max-dpb value.
- *
- * @return     sdp_result_e
- *              SDP_SUCCESS            Attribute was added successfully.
- */
-
-sdp_result_e ccsdpAttrGetFmtpMaxDpb (void *sdp_handle, uint16_t level,
-                               uint8_t cap_num, uint16_t inst_num, uint32_t *val);
-
-
-/**
- * Sets the value of the fmtp attribute payload type parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] payload_num New payload type value.
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpAttrSetFmtpPayloadType (void *sdp_handle, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint16_t payload_num);
-
-/**
- * Sets the value of the packetization mode attribute parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] pack_mode   Packetization mode value
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpPackMode (void *sdp_handle, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num, uint16_t pack_mode);
-/**
- * Sets the value of the level-asymmetry-allowed attribute parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] level_asymmetry_allowed   level asymmetry allowed value (0 or 1).
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpLevelAsymmetryAllowed (void *sdp_handle, uint16_t level,
-                                          uint8_t cap_num, uint16_t inst_num, uint16_t level_asymmetry_allowed);
-
-/**
- * Sets the value of the profile-level-id parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] profile_level_id profile_level_id to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpProfileLevelId (void *sdp_handle, uint16_t level,
-                               uint8_t cap_num, uint16_t inst_num, const char *profile_level_id);
-
-/**
- * Sets the value of the profile-level-id parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] parameter_sets parameter_sets to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpParameterSets (void *sdp_handle, uint16_t level,
-                                     uint8_t cap_num, uint16_t inst_num, const char *parameter_sets);
-
-/**
- * Sets the value of the max-br parameter for the given attribute.
- *
- * @param[in] sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] max_br    max_br value to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-
-sdp_result_e ccsdpAttrSetFmtpMaxBr (void *sdp_handle, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint32_t max_br);
-
-/**
- * Sets the value of the fmtp attribute- max-mbps parameter for H.264 codec
- *
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] max_mbps    value of max_mbps to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpMaxMbps (void *sdp_handle, uint16_t level,
-                              uint8_t cap_num, uint16_t inst_num, uint32_t max_mbps);
-
-/**
- * Sets the value of the fmtp attribute- max-fs parameter for H.264 codec
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] max_fs      max_fs value to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpAttrSetFmtpMaxFs (void *sdp_handle, uint16_t level,
-                        uint8_t cap_num, uint16_t inst_num, uint32_t max_fs);
-/**
- * Sets the value of the fmtp attribute- max-cbp parameter for H.264 codec
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] max_cpb      max_cbp value to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpMaxCpb (void *sdp_handle, uint16_t level,
-                            uint8_t cap_num, uint16_t inst_num, uint32_t max_cpb);
-/**
- * Sets the value of the fmtp attribute- max-dbp parameter for H.264 codec
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] max_dpb      max_dbp value to be set
- *
- * @return     SDP_SUCCESS            Attribute was added successfully.
- *             SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-
-sdp_result_e ccsdpAttrSetFmtpMaxDbp (void *sdp_handle, uint16_t level,
-                                  uint8_t cap_num, uint16_t inst_num, uint32_t max_dpb);
-
-
-/**
- * Sets the value of the fmtp attribute qcif parameter for the given attribute.
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] qcif        Sets the QCIF value for a video codec
- *
- * @return      SDP_SUCCESS       Attribute param was set successfully.
- *              SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpAttrSetFmtpQcif  (void *sdp_handle, uint16_t level,
-                             uint8_t cap_num, uint16_t inst_num, uint16_t qcif);
-
-/**
- * Sets the value of the fmtp attribute sqcif parameter for the given attribute.
- *
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in] level       The level to check for the attribute.
- * @param[in] cap_num     The capability number associated with the attribute if any.  If none, should be zero.
- * @param[in] inst_num    The attribute instance number to check.
- * @param[in] sqcif        Sets the SQCIF value for a video codec
- *
- * @return      SDP_SUCCESS       Attribute param was set successfully.
- *              SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpAttrSetFmtpSqcif  (void *sdp_handle, uint16_t level,
-                            uint8_t cap_num, uint16_t inst_num, uint16_t sqcif);
-
-/**
- *
- * To specify bandwidth parameters at any level, a bw line must first be
- * added at that level using this function. This function returns the instance
- * number of an existing bw_line that matches bw_modifier type, or of a newly
- * created bw_line of type bw_modifier. After this addition, you can set the
- * properties of the added bw line by using sdp_set_bw().
- *
- * Note carefully though, that since there can be multiple instances of bw
- * lines at any level, you must specify the instance number when setting
- * or getting the properties of a bw line at any level.
- *
- * This function returns the inst_num variable, the instance number
- * of the created bw_line at that level. The instance number is 1 based.
- * <pre>
- * For example:
- *             v=0                               :Session Level
- *             o=mhandley 2890844526 2890842807 IN IP4 126.16.64.4
- *             s=SDP Seminar
- *             c=IN IP4 10.1.0.2
- *             t=0 0
- *             b=AS:60                           : instance number 1
- *             b=TIAS:50780                      : instance number 2
- *             m=audio 1234 RTP/AVP 0 101 102    : 1st Media level
- *             b=AS:12                           : instance number 1
- *             b=TIAS:8480                       : instance number 2
- *             m=audio 1234 RTP/AVP 0 101 102    : 2nd Media level
- *             b=AS:20                           : instance number 1
- * </pre>
- * @param[in]  sdp_handle    The SDP handle returned by sdp_init_description.
- * @param[in]  level      The level to create the bw line.
- * @param[in]  bw_modifier The Type of bandwidth, CT, AS or TIAS.
- * @param[out]  inst_num   This memory is set with the instance number of the newly created bw line instance.
- *
- * @return      SDP_SUCCESS       Attribute param was set successfully.
- *              SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpAddNewBandwidthLine (void *sdp_handle, uint16_t level, sdp_bw_modifier_e bw_modifier, uint16_t *inst_num);
-
-
-/**
- * Once a bandwidth line is added under a level, this function can be used to
- * set the properties of that bandwidth line.
- *
- * @param[in]  sdp_handle     The SDP handle returned by sdp_init_description.
- * @param[in]  level       The level to at which the bw line resides.
- * @param[in]  inst_num    The instance number of the bw line that is to be set.
- * @param[in]  bw_modifier The Type of bandwidth, CT, AS or TIAS.
- * @param[in]  bw_val      Numerical bandwidth value.
- *
- * @note Before calling this function to set the bw line, the bw line must
- * be added using sdp_add_new_bw_line at the required level.
- *
- * @return      SDP_SUCCESS       Attribute param was set successfully.
- *              SDP_INVALID_PARAMETER  Specified attribute is not defined.
- */
-sdp_result_e ccsdpSetBandwidth (void *sdp_handle, uint16_t level, uint16_t inst_num,
-                         sdp_bw_modifier_e bw_modifier, uint32_t bw_val);
-
-/**
- * Returns a string representation of a codec's name.
- *
- * @param[in]  rtp_ptype      The value taken from the rtp_ptype enumeration
- *
- * @return     A string representing the name of the codec
- */
-const char * ccsdpCodecName(rtp_ptype ptype);
-
 #endif