Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1091242 - Part 5.3: Use modern integral types in sipcc code. r=ehugg

Browse Source
This commit is contained in:
Byron Campen [:bwc] 2014-11-14 17:38:00 -08:00
parent 3a2e44d3e2
commit 43300ec021
10 changed files with 1796 additions and 1803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
media/webrtc/signaling/src/sdp/sipcc/ccsdp.c
View File

@ -5,7 +5,7 @@
#include "sdp.h"
#include "ccapi.h"
int ccsdpAttrGetFmtpInst(void *sdp_ptr, u16 level, u16 payload_num)
int ccsdpAttrGetFmtpInst(void *sdp_ptr, uint16_t level, uint16_t payload_num)
{
cc_sdp_t *sdpp = sdp_ptr;
if ( sdpp->dest_sdp == NULL ) {
@ -14,8 +14,8 @@ int ccsdpAttrGetFmtpInst(void *sdp_ptr, u16 level, u16 payload_num)
return sdp_find_fmtp_inst(sdpp->dest_sdp, level, payload_num);
}
const char* ccsdpAttrGetFmtpParamSets(void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num)
const char* ccsdpAttrGetFmtpParamSets(void *sdp_ptr, uint16_t level,
uint8_t cap_num, uint16_t inst_num)
{
cc_sdp_t *sdpp = sdp_ptr;
@ -25,8 +25,8 @@ const char* ccsdpAttrGetFmtpParamSets(void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_param_sets(sdpp->dest_sdp, level, cap_num, inst_num);
}
sdp_result_e ccsdpAttrGetFmtpPackMode(void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 *val)
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;
@ -36,8 +36,8 @@ sdp_result_e ccsdpAttrGetFmtpPackMode(void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_pack_mode(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
sdp_result_e ccsdpAttrGetFmtpLevelAsymmetryAllowed(void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 *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;
@ -47,8 +47,8 @@ sdp_result_e ccsdpAttrGetFmtpLevelAsymmetryAllowed(void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_level_asymmetry_allowed(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
const char* ccsdpAttrGetFmtpProfileLevelId (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num)
const char* ccsdpAttrGetFmtpProfileLevelId (void *sdp_ptr, uint16_t level,
uint8_t cap_num, uint16_t inst_num)
{
cc_sdp_t *sdpp = sdp_ptr;
@ -60,8 +60,8 @@ const char* ccsdpAttrGetFmtpProfileLevelId (void *sdp_ptr, u16 level,
sdp_result_e ccsdpAttrGetFmtpMaxMbps (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 *val)
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;
@ -71,8 +71,8 @@ sdp_result_e ccsdpAttrGetFmtpMaxMbps (void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_max_mbps(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
sdp_result_e ccsdpAttrGetFmtpMaxFs (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 *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;
@ -82,8 +82,8 @@ sdp_result_e ccsdpAttrGetFmtpMaxFs (void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_max_fs(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
sdp_result_e ccsdpAttrGetFmtpMaxCpb (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 *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;
@ -93,8 +93,8 @@ sdp_result_e ccsdpAttrGetFmtpMaxCpb (void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_max_cpb(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
sdp_result_e ccsdpAttrGetFmtpMaxBr (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32* 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;
@ -104,7 +104,7 @@ sdp_result_e ccsdpAttrGetFmtpMaxBr (void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_max_br(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
int ccsdpGetBandwidthValue (void *sdp_ptr, u16 level, u16 inst_num)
int ccsdpGetBandwidthValue (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
cc_sdp_t *sdpp = sdp_ptr;
@ -115,8 +115,8 @@ int ccsdpGetBandwidthValue (void *sdp_ptr, u16 level, u16 inst_num)
return sdp_get_bw_value(sdpp->dest_sdp, level, inst_num);
}
sdp_result_e ccsdpAttrGetFmtpMaxDpb (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 *val)
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;
@ -126,8 +126,8 @@ sdp_result_e ccsdpAttrGetFmtpMaxDpb (void *sdp_ptr, u16 level,
return sdp_attr_get_fmtp_max_dpb(sdpp->dest_sdp, level, cap_num, inst_num, val);
}
sdp_result_e ccsdpAddNewAttr (void *sdp_ptr, u16 level, u8 cap_num,
sdp_attr_e attr_type, u16 *inst_num)
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;
@ -137,8 +137,8 @@ sdp_result_e ccsdpAddNewAttr (void *sdp_ptr, u16 level, u8 cap_num,
return sdp_add_new_attr(sdpp->src_sdp, level, cap_num, attr_type, inst_num);
}
sdp_result_e ccsdpAttrSetFmtpPayloadType (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 payload_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;
@ -149,8 +149,8 @@ sdp_result_e ccsdpAttrSetFmtpPayloadType (void *sdp_ptr, u16 level,
}
sdp_result_e ccsdpAttrSetFmtpPackMode (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 pack_mode)
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;
@ -160,8 +160,8 @@ sdp_result_e ccsdpAttrSetFmtpPackMode (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_pack_mode(sdpp->src_sdp, level, cap_num, inst_num, pack_mode);
}
sdp_result_e ccsdpAttrSetFmtpLevelAsymmetryAllowed (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 asym_allowed)
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;
@ -172,8 +172,8 @@ sdp_result_e ccsdpAttrSetFmtpLevelAsymmetryAllowed (void *sdp_ptr, u16 level,
}
sdp_result_e ccsdpAttrSetFmtpProfileLevelId (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, const char *profile_level_id)
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;
@ -184,8 +184,8 @@ sdp_result_e ccsdpAttrSetFmtpProfileLevelId (void *sdp_ptr, u16 level,
}
sdp_result_e ccsdpAttrSetFmtpParameterSets (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, const char *parameter_sets)
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;
@ -197,8 +197,8 @@ sdp_result_e ccsdpAttrSetFmtpParameterSets (void *sdp_ptr, u16 level,
sdp_result_e ccsdpAttrSetFmtpMaxBr (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 max_br)
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;
@ -209,8 +209,8 @@ sdp_result_e ccsdpAttrSetFmtpMaxBr (void *sdp_ptr, u16 level,
}
sdp_result_e ccsdpAttrSetFmtpMaxMbps (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 max_mbps)
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;
@ -220,8 +220,8 @@ sdp_result_e ccsdpAttrSetFmtpMaxMbps (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_max_mbps(sdpp->src_sdp, level, cap_num, inst_num, max_mbps);
}
sdp_result_e ccsdpAttrSetFmtpMaxFs (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 max_fs)
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;
@ -231,8 +231,8 @@ sdp_result_e ccsdpAttrSetFmtpMaxFs (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_max_fs(sdpp->src_sdp, level, cap_num, inst_num, max_fs);
}
sdp_result_e ccsdpAttrSetFmtpMaxCpb (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 max_cpb)
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;
@ -242,8 +242,8 @@ sdp_result_e ccsdpAttrSetFmtpMaxCpb (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_max_cpb(sdpp->src_sdp, level, cap_num, inst_num, max_cpb);
}
sdp_result_e ccsdpAttrSetFmtpMaxDbp (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u32 max_dpb)
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;
@ -254,8 +254,8 @@ sdp_result_e ccsdpAttrSetFmtpMaxDbp (void *sdp_ptr, u16 level,
}
sdp_result_e ccsdpAttrSetFmtpQcif (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 qcif)
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;
@ -265,8 +265,8 @@ sdp_result_e ccsdpAttrSetFmtpQcif (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_qcif(sdpp->src_sdp, level, cap_num, inst_num, qcif);
}
sdp_result_e ccsdpAttrSetFmtpSqcif (void *sdp_ptr, u16 level,
u8 cap_num, u16 inst_num, u16 sqcif)
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;
@ -276,7 +276,7 @@ sdp_result_e ccsdpAttrSetFmtpSqcif (void *sdp_ptr, u16 level,
return sdp_attr_set_fmtp_sqcif(sdpp->src_sdp, level, cap_num, inst_num, sqcif);
}
sdp_result_e ccsdpAddNewBandwidthLine (void *sdp_ptr, u16 level, sdp_bw_modifier_e bw_modifier, u16 *inst_num)
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;
@ -287,8 +287,8 @@ sdp_result_e ccsdpAddNewBandwidthLine (void *sdp_ptr, u16 level, sdp_bw_modifier
}
sdp_result_e ccsdpSetBandwidth (void *sdp_ptr, u16 level, u16 inst_num,
sdp_bw_modifier_e bw_modifier, u32 bw_val)
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;

1624
media/webrtc/signaling/src/sdp/sipcc/sdp.h
View File

File diff suppressed because it is too large Load Diff

160
media/webrtc/signaling/src/sdp/sipcc/sdp_access.c
View File

@ -38,7 +38,7 @@ static const char* logTag = "sdp_access";
* level The media level to find.
* Returns: Pointer to the media level or NULL if not found.
*/
sdp_mca_t *sdp_find_media_level (sdp_t *sdp_p, u16 level)
sdp_mca_t *sdp_find_media_level (sdp_t *sdp_p, uint16_t level)
{
int i;
sdp_mca_t *mca_p = NULL;
@ -83,7 +83,7 @@ tinybool sdp_version_valid (void *sdp_ptr)
* Parameters: sdp_ptr The SDP handle returned by sdp_init_description.
* Returns: Version value.
*/
int32 sdp_get_version (void *sdp_ptr)
int32_t sdp_get_version (void *sdp_ptr)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -101,7 +101,7 @@ int32 sdp_get_version (void *sdp_ptr)
* version Version to set.
* Returns: SDP_SUCCESS
*/
sdp_result_e sdp_set_version (void *sdp_ptr, int32 version)
sdp_result_e sdp_set_version (void *sdp_ptr, int32_t version)
{
sdp_t *sdp_p = (sdp_t*)sdp_ptr;
@ -571,7 +571,7 @@ sdp_result_e sdp_set_time_stop (void *sdp_ptr, const char *stop_time)
* media line level.
* Returns: TRUE or FALSE.
*/
tinybool sdp_encryption_valid (void *sdp_ptr, u16 level)
tinybool sdp_encryption_valid (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_encryptspec_t *encrypt_p;
@ -610,7 +610,7 @@ tinybool sdp_encryption_valid (void *sdp_ptr, u16 level)
* media line level.
* Returns: Encryption method or SDP_ENCRYPT_INVALID.
*/
sdp_encrypt_type_e sdp_get_encryption_method (void *sdp_ptr, u16 level)
sdp_encrypt_type_e sdp_get_encryption_method (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_encryptspec_t *encrypt_p;
@ -643,7 +643,7 @@ sdp_encrypt_type_e sdp_get_encryption_method (void *sdp_ptr, u16 level)
* media line level.
* Returns: Ptr to encryption key or NULL.
*/
const char *sdp_get_encryption_key (void *sdp_ptr, u16 level)
const char *sdp_get_encryption_key (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_encryptspec_t *encrypt_p;
@ -676,7 +676,7 @@ const char *sdp_get_encryption_key (void *sdp_ptr, u16 level)
* type The encryption type.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_encryption_method (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_encryption_method (void *sdp_ptr, uint16_t level,
sdp_encrypt_type_e type)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -714,7 +714,7 @@ sdp_result_e sdp_set_encryption_method (void *sdp_ptr, u16 level,
* key Ptr to the encryption key string.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_encryption_key (void *sdp_ptr, u16 level, const char *key)
sdp_result_e sdp_set_encryption_key (void *sdp_ptr, uint16_t level, const char *key)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_encryptspec_t *encrypt_p;
@ -748,7 +748,7 @@ sdp_result_e sdp_set_encryption_key (void *sdp_ptr, u16 level, const char *key)
* media line level.
* Returns: TRUE or FALSE.
*/
tinybool sdp_connection_valid (void *sdp_ptr, u16 level)
tinybool sdp_connection_valid (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -796,7 +796,7 @@ tinybool sdp_connection_valid (void *sdp_ptr, u16 level)
* instance has a inst_num of 1 and so on.
* Returns: TRUE or FALSE.
*/
tinybool sdp_bandwidth_valid (void *sdp_ptr, u16 level, u16 inst_num)
tinybool sdp_bandwidth_valid (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_data_t *bw_data_p;
@ -831,7 +831,7 @@ tinybool sdp_bandwidth_valid (void *sdp_ptr, u16 level, u16 inst_num)
* instance has a inst_num of 1 and so on.
* Returns: TRUE or FALSE
*/
tinybool sdp_bw_line_exists (void *sdp_ptr, u16 level, u16 inst_num)
tinybool sdp_bw_line_exists (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_data_t *bw_data_p;
@ -858,7 +858,7 @@ tinybool sdp_bw_line_exists (void *sdp_ptr, u16 level, u16 inst_num)
* media line level.
* Returns: Network type or SDP_NT_INVALID.
*/
sdp_nettype_e sdp_get_conn_nettype (void *sdp_ptr, u16 level)
sdp_nettype_e sdp_get_conn_nettype (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -891,7 +891,7 @@ sdp_nettype_e sdp_get_conn_nettype (void *sdp_ptr, u16 level)
* media line level.
* Returns: Address type or SDP_AT_INVALID.
*/
sdp_addrtype_e sdp_get_conn_addrtype (void *sdp_ptr, u16 level)
sdp_addrtype_e sdp_get_conn_addrtype (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -924,7 +924,7 @@ sdp_addrtype_e sdp_get_conn_addrtype (void *sdp_ptr, u16 level)
* media line level.
* Returns: Ptr to address or NULL.
*/
const char *sdp_get_conn_address (void *sdp_ptr, u16 level)
const char *sdp_get_conn_address (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -957,7 +957,7 @@ const char *sdp_get_conn_address (void *sdp_ptr, u16 level)
* Returns: TRUE if the addr is multicast, FALSE if not.
*/
tinybool sdp_is_mcast_addr (void *sdp_ptr, u16 level)
tinybool sdp_is_mcast_addr (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -995,12 +995,12 @@ tinybool sdp_is_mcast_addr (void *sdp_ptr, u16 level)
* Returns: Multicast address - Time to live (ttl) value
*/
int32 sdp_get_mcast_ttl (void *sdp_ptr, u16 level)
int32_t sdp_get_mcast_ttl (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
sdp_mca_t *mca_p;
u16 ttl=0;
uint16_t ttl=0;
if (sdp_verify_sdp_ptr(sdp_p) != FALSE) {
if (level == SDP_SESSION_LEVEL) {
@ -1033,12 +1033,12 @@ int32 sdp_get_mcast_ttl (void *sdp_ptr, u16 level)
* Returns: Multicast address - number of addresses value
*/
int32 sdp_get_mcast_num_of_addresses (void *sdp_ptr, u16 level)
int32_t sdp_get_mcast_num_of_addresses (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
sdp_mca_t *mca_p;
u16 num_addr = 0;
uint16_t num_addr = 0;
if (sdp_verify_sdp_ptr(sdp_p) == FALSE) {
return (SDP_INVALID_VALUE);
@ -1070,7 +1070,7 @@ int32 sdp_get_mcast_num_of_addresses (void *sdp_ptr, u16 level)
* media line level.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_conn_nettype (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_conn_nettype (void *sdp_ptr, uint16_t level,
sdp_nettype_e nettype)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1106,7 +1106,7 @@ sdp_result_e sdp_set_conn_nettype (void *sdp_ptr, u16 level,
* media line level.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_conn_addrtype (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_conn_addrtype (void *sdp_ptr, uint16_t level,
sdp_addrtype_e addrtype)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1144,7 +1144,7 @@ sdp_result_e sdp_set_conn_addrtype (void *sdp_ptr, u16 level,
* address Ptr to the address string.
* Returns: SDP_SUCCESS
*/
sdp_result_e sdp_set_conn_address (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_conn_address (void *sdp_ptr, uint16_t level,
const char *address)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1182,8 +1182,8 @@ sdp_result_e sdp_set_conn_address (void *sdp_ptr, u16 level,
.
* Returns: SDP_SUCCESS
*/
sdp_result_e sdp_set_mcast_addr_fields(void *sdp_ptr, u16 level,
u16 ttl, u16 num_of_addresses)
sdp_result_e sdp_set_mcast_addr_fields(void *sdp_ptr, uint16_t level,
uint16_t ttl, uint16_t num_of_addresses)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_conn_t *conn_p;
@ -1227,7 +1227,7 @@ sdp_result_e sdp_set_mcast_addr_fields(void *sdp_ptr, u16 level,
* 1-n specifying a media line level.
* Returns: TRUE or FALSE.
*/
tinybool sdp_media_line_valid (void *sdp_ptr, u16 level)
tinybool sdp_media_line_valid (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1257,7 +1257,7 @@ tinybool sdp_media_line_valid (void *sdp_ptr, u16 level)
* Parameters: sdp_ptr The SDP handle returned by sdp_init_description.
* Returns: Number of media lines.
*/
u16 sdp_get_num_media_lines (void *sdp_ptr)
uint16_t sdp_get_num_media_lines (void *sdp_ptr)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1276,7 +1276,7 @@ u16 sdp_get_num_media_lines (void *sdp_ptr)
* level The level to of the m= media line. Will be 1-n.
* Returns: Media type or SDP_MEDIA_INVALID.
*/
sdp_media_e sdp_get_media_type (void *sdp_ptr, u16 level)
sdp_media_e sdp_get_media_type (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1301,7 +1301,7 @@ sdp_media_e sdp_get_media_type (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: Line number (0 if not found or if locally built)
*/
u32 sdp_get_media_line_number (void *sdp_ptr, u16 level)
uint32_t sdp_get_media_line_number (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1326,7 +1326,7 @@ u32 sdp_get_media_line_number (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: Port format type or SDP_PORT_FORMAT_INVALID.
*/
sdp_port_format_e sdp_get_media_port_format (void *sdp_ptr, u16 level)
sdp_port_format_e sdp_get_media_port_format (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1351,7 +1351,7 @@ sdp_port_format_e sdp_get_media_port_format (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: Port number or SDP_INVALID_VALUE.
*/
int32 sdp_get_media_portnum (void *sdp_ptr, u16 level)
int32_t sdp_get_media_portnum (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1389,7 +1389,7 @@ int32 sdp_get_media_portnum (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: Port count or SDP_INVALID_VALUE.
*/
int32 sdp_get_media_portcount (void *sdp_ptr, u16 level)
int32_t sdp_get_media_portcount (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1424,7 +1424,7 @@ int32 sdp_get_media_portcount (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: VPI or SDP_INVALID_VALUE.
*/
int32 sdp_get_media_vpi (void *sdp_ptr, u16 level)
int32_t sdp_get_media_vpi (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1461,7 +1461,7 @@ int32 sdp_get_media_vpi (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: VCI or zero.
*/
u32 sdp_get_media_vci (void *sdp_ptr, u16 level)
uint32_t sdp_get_media_vci (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1498,7 +1498,7 @@ u32 sdp_get_media_vci (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: VCCI or SDP_INVALID_VALUE.
*/
int32 sdp_get_media_vcci (void *sdp_ptr, u16 level)
int32_t sdp_get_media_vcci (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1534,7 +1534,7 @@ int32 sdp_get_media_vcci (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: CID or SDP_INVALID_VALUE.
*/
int32 sdp_get_media_cid (void *sdp_ptr, u16 level)
int32_t sdp_get_media_cid (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1573,7 +1573,7 @@ int32 sdp_get_media_cid (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: CID or SDP_TRANSPORT_INVALID.
*/
sdp_transport_e sdp_get_media_transport (void *sdp_ptr, u16 level)
sdp_transport_e sdp_get_media_transport (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1603,7 +1603,7 @@ sdp_transport_e sdp_get_media_transport (void *sdp_ptr, u16 level)
* level The level to of the m= media line. Will be 1-n.
* Returns: Number of profiles or zero.
*/
u16 sdp_get_media_num_profiles (void *sdp_ptr, u16 level)
uint16_t sdp_get_media_num_profiles (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1635,8 +1635,8 @@ u16 sdp_get_media_num_profiles (void *sdp_ptr, u16 level)
* profile_num The specific profile type number to be retrieved.
* Returns: The profile type or SDP_TRANSPORT_INVALID.
*/
sdp_transport_e sdp_get_media_profile (void *sdp_ptr, u16 level,
u16 profile_num)
sdp_transport_e sdp_get_media_profile (void *sdp_ptr, uint16_t level,
uint16_t profile_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1667,7 +1667,7 @@ sdp_transport_e sdp_get_media_profile (void *sdp_ptr, u16 level,
* level The level to of the m= media line. Will be 1-n.
* Returns: Number of payload types or zero.
*/
u16 sdp_get_media_num_payload_types (void *sdp_ptr, u16 level)
uint16_t sdp_get_media_num_payload_types (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1695,8 +1695,8 @@ u16 sdp_get_media_num_payload_types (void *sdp_ptr, u16 level)
* profile_num The specific profile number. Will be 1-n.
* Returns: Number of payload types or zero.
*/
u16 sdp_get_media_profile_num_payload_types (void *sdp_ptr, u16 level,
u16 profile_num)
uint16_t sdp_get_media_profile_num_payload_types (void *sdp_ptr, uint16_t level,
uint16_t profile_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1719,8 +1719,8 @@ u16 sdp_get_media_profile_num_payload_types (void *sdp_ptr, u16 level,
}
rtp_ptype sdp_get_known_payload_type(void *sdp_ptr,
u16 level,
u16 payload_type_raw) {
uint16_t level,
uint16_t payload_type_raw) {
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_attr_t *attr_p;
sdp_transport_map_t *rtpmap;
@ -1818,7 +1818,7 @@ rtp_ptype sdp_get_known_payload_type(void *sdp_ptr,
* NUMERIC or ENUM.
* Returns: Payload type or zero.
*/
u32 sdp_get_media_payload_type (void *sdp_ptr, u16 level, u16 payload_num,
uint32_t sdp_get_media_payload_type (void *sdp_ptr, uint16_t level, uint16_t payload_num,
sdp_payload_ind_e *indicator)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1865,8 +1865,8 @@ u32 sdp_get_media_payload_type (void *sdp_ptr, u16 level, u16 payload_num,
* NUMERIC or ENUM.
* Returns: Payload type or zero.
*/
u32 sdp_get_media_profile_payload_type (void *sdp_ptr, u16 level, u16 prof_num,
u16 payload_num,
uint32_t sdp_get_media_profile_payload_type (void *sdp_ptr, uint16_t level, uint16_t prof_num,
uint16_t payload_num,
sdp_payload_ind_e *indicator)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -1904,7 +1904,7 @@ u32 sdp_get_media_profile_payload_type (void *sdp_ptr, u16 level, u16 prof_num,
* level The new media level to insert. Will be 1-n.
* Returns: SDP_SUCCESS, SDP_NO_RESOURCE, or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_insert_media_line (void *sdp_ptr, u16 level)
sdp_result_e sdp_insert_media_line (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1938,7 +1938,7 @@ sdp_result_e sdp_insert_media_line (void *sdp_ptr, u16 level)
/* Find the pointer to the media stream just prior to where
* we want to insert the new stream.
*/
mca_p = sdp_find_media_level(sdp_p, (u16)(level-1));
mca_p = sdp_find_media_level(sdp_p, (uint16_t)(level-1));
if (mca_p == NULL) {
SDP_FREE(new_mca_p);
sdp_p->conf_p->num_invalid_param++;
@ -1960,7 +1960,7 @@ sdp_result_e sdp_insert_media_line (void *sdp_ptr, u16 level)
* level The media level to delete. Will be 1-n.
* Returns: SDP_SUCCESS, SDP_NO_RESOURCE, or SDP_INVALID_PARAMETER
*/
void sdp_delete_media_line (void *sdp_ptr, u16 level)
void sdp_delete_media_line (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -1979,7 +1979,7 @@ void sdp_delete_media_line (void *sdp_ptr, u16 level)
if (level == 1) {
mca_p = sdp_find_media_level(sdp_p, level);
} else {
prev_mca_p = sdp_find_media_level(sdp_p, (u16)(level-1));
prev_mca_p = sdp_find_media_level(sdp_p, (uint16_t)(level-1));
if (prev_mca_p == NULL) {
sdp_p->conf_p->num_invalid_param++;
return;
@ -2026,7 +2026,7 @@ void sdp_delete_media_line (void *sdp_ptr, u16 level)
* media Media type for the media line.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_type (void *sdp_ptr, u16 level, sdp_media_e media)
sdp_result_e sdp_set_media_type (void *sdp_ptr, uint16_t level, sdp_media_e media)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2056,7 +2056,7 @@ sdp_result_e sdp_set_media_type (void *sdp_ptr, u16 level, sdp_media_e media)
* port_format Media type for the media line.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_port_format (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_media_port_format (void *sdp_ptr, uint16_t level,
sdp_port_format_e port_format)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -2087,7 +2087,7 @@ sdp_result_e sdp_set_media_port_format (void *sdp_ptr, u16 level,
* sctpport sctp port for application m= line
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_portnum (void *sdp_ptr, u16 level, int32 portnum, int32 sctp_port)
sdp_result_e sdp_set_media_portnum (void *sdp_ptr, uint16_t level, int32_t portnum, int32_t sctp_port)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2114,7 +2114,7 @@ sdp_result_e sdp_set_media_portnum (void *sdp_ptr, u16 level, int32 portnum, int
* level The media level to set the param. Will be 1-n.
* Returns: sctp_port or -1 on failure
*/
int32 sdp_get_media_sctp_port(void *sdp_ptr, u16 level)
int32_t sdp_get_media_sctp_port(void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2142,8 +2142,8 @@ int32 sdp_get_media_sctp_port(void *sdp_ptr, u16 level)
* num_ports Port count to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_portcount (void *sdp_ptr, u16 level,
int32 num_ports)
sdp_result_e sdp_set_media_portcount (void *sdp_ptr, uint16_t level,
int32_t num_ports)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2172,7 +2172,7 @@ sdp_result_e sdp_set_media_portcount (void *sdp_ptr, u16 level,
* vpi The VPI value to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_vpi (void *sdp_ptr, u16 level, int32 vpi)
sdp_result_e sdp_set_media_vpi (void *sdp_ptr, uint16_t level, int32_t vpi)
{
sdp_t *sdp_p = (sdp_t*)sdp_ptr;
sdp_mca_t *mca_p;
@ -2201,7 +2201,7 @@ sdp_result_e sdp_set_media_vpi (void *sdp_ptr, u16 level, int32 vpi)
* vci The VCI value to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_vci (void *sdp_ptr, u16 level, u32 vci)
sdp_result_e sdp_set_media_vci (void *sdp_ptr, uint16_t level, uint32_t vci)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2230,7 +2230,7 @@ sdp_result_e sdp_set_media_vci (void *sdp_ptr, u16 level, u32 vci)
* vcci The VCCI value to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_vcci (void *sdp_ptr, u16 level, int32 vcci)
sdp_result_e sdp_set_media_vcci (void *sdp_ptr, uint16_t level, int32_t vcci)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2259,7 +2259,7 @@ sdp_result_e sdp_set_media_vcci (void *sdp_ptr, u16 level, int32 vcci)
* cid The CID value to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_cid (void *sdp_ptr, u16 level, int32 cid)
sdp_result_e sdp_set_media_cid (void *sdp_ptr, uint16_t level, int32_t cid)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2286,7 +2286,7 @@ sdp_result_e sdp_set_media_cid (void *sdp_ptr, u16 level, int32 cid)
* transport The transport type to set.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_media_transport (void *sdp_ptr, u16 level,
sdp_result_e sdp_set_media_transport (void *sdp_ptr, uint16_t level,
sdp_transport_e transport)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -2316,10 +2316,10 @@ sdp_result_e sdp_set_media_transport (void *sdp_ptr, u16 level,
* profile The profile type to add.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_add_media_profile (void *sdp_ptr, u16 level,
sdp_result_e sdp_add_media_profile (void *sdp_ptr, uint16_t level,
sdp_transport_e profile)
{
u16 prof_num;
uint16_t prof_num;
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2372,8 +2372,8 @@ sdp_result_e sdp_add_media_profile (void *sdp_ptr, u16 level,
* NUMERIC or ENUM.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_add_media_payload_type (void *sdp_ptr, u16 level,
u16 payload_type,
sdp_result_e sdp_add_media_payload_type (void *sdp_ptr, uint16_t level,
uint16_t payload_type,
sdp_payload_ind_e indicator)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
@ -2415,11 +2415,11 @@ sdp_result_e sdp_add_media_payload_type (void *sdp_ptr, u16 level,
* NUMERIC or ENUM.
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_add_media_profile_payload_type (void *sdp_ptr, u16 level,
u16 prof_num, u16 payload_type,
sdp_result_e sdp_add_media_profile_payload_type (void *sdp_ptr, uint16_t level,
uint16_t prof_num, uint16_t payload_type,
sdp_payload_ind_e indicator)
{
u16 num_payloads;
uint16_t num_payloads;
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2472,7 +2472,7 @@ sdp_result_e sdp_add_media_profile_payload_type (void *sdp_ptr, u16 level,
*
* Returns: Pointer to the sdp_bw_data_t instance, or NULL.
*/
sdp_bw_data_t* sdp_find_bw_line (void *sdp_ptr, u16 level, u16 inst_num)
sdp_bw_data_t* sdp_find_bw_line (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_t *bw_p;
@ -2522,7 +2522,7 @@ sdp_bw_data_t* sdp_find_bw_line (void *sdp_ptr, u16 level, u16 inst_num)
* Returns: SDP_SUCCESS Attributes were successfully copied.
*/
sdp_result_e sdp_copy_all_bw_lines (void *src_sdp_ptr, void *dst_sdp_ptr,
u16 src_level, u16 dst_level)
uint16_t src_level, uint16_t dst_level)
{
sdp_t *src_sdp_p = (sdp_t *)src_sdp_ptr;
sdp_t *dst_sdp_p = (sdp_t *)dst_sdp_ptr;
@ -2617,7 +2617,7 @@ sdp_result_e sdp_copy_all_bw_lines (void *src_sdp_ptr, void *dst_sdp_ptr,
* instance has a inst_num of 1 and so on.
* Returns: Valid modifer value or SDP_BW_MODIFIER_UNSUPPORTED.
*/
sdp_bw_modifier_e sdp_get_bw_modifier (void *sdp_ptr, u16 level, u16 inst_num)
sdp_bw_modifier_e sdp_get_bw_modifier (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_data_t *bw_data_p;
@ -2644,7 +2644,7 @@ sdp_bw_modifier_e sdp_get_bw_modifier (void *sdp_ptr, u16 level, u16 inst_num)
* instance has a inst_num of 1 and so on.
* Returns: A valid numerical bw value or SDP_INVALID_VALUE.
*/
int32 sdp_get_bw_value (void *sdp_ptr, u16 level, u16 inst_num)
int32_t sdp_get_bw_value (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_data_t *bw_data_p;
@ -2672,7 +2672,7 @@ int32 sdp_get_bw_value (void *sdp_ptr, u16 level, u16 inst_num)
*
* Returns: A valid count or SDP_INVALID_VALUE
*/
int32 sdp_get_num_bw_lines (void *sdp_ptr, u16 level)
int32_t sdp_get_num_bw_lines (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_t *bw_p;
@ -2730,7 +2730,7 @@ int32 sdp_get_num_bw_lines (void *sdp_ptr, u16 level)
* *inst_num This memory is set with the instance number of the newly
* created bw line instance.
*/
sdp_result_e sdp_add_new_bw_line (void *sdp_ptr, u16 level, sdp_bw_modifier_e bw_modifier, u16 *inst_num)
sdp_result_e sdp_add_new_bw_line (void *sdp_ptr, uint16_t level, sdp_bw_modifier_e bw_modifier, uint16_t *inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_t *bw_p;
@ -2807,7 +2807,7 @@ sdp_result_e sdp_add_new_bw_line (void *sdp_ptr, u16 level, sdp_bw_modifier_e bw
* level The level to delete the bw line.
* inst_num The instance of the bw line to delete.
*/
sdp_result_e sdp_delete_bw_line (void *sdp_ptr, u16 level, u16 inst_num)
sdp_result_e sdp_delete_bw_line (void *sdp_ptr, uint16_t level, uint16_t inst_num)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_t *bw_p;
@ -2878,8 +2878,8 @@ sdp_result_e sdp_delete_bw_line (void *sdp_ptr, u16 level, u16 inst_num)
* 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.
*/
sdp_result_e sdp_set_bw (void *sdp_ptr, u16 level, u16 inst_num,
sdp_bw_modifier_e bw_modifier, u32 bw_val)
sdp_result_e sdp_set_bw (void *sdp_ptr, uint16_t level, uint16_t inst_num,
sdp_bw_modifier_e bw_modifier, uint32_t bw_val)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_bw_data_t *bw_data_p;
@ -2919,7 +2919,7 @@ sdp_result_e sdp_set_bw (void *sdp_ptr, u16 level, u16 inst_num,
* level SDP_MEDIA_LEVEL
* Returns: mid value.
*/
int32 sdp_get_mid_value (void *sdp_ptr, u16 level)
int32_t sdp_get_mid_value (void *sdp_ptr, uint16_t level)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;
@ -2944,7 +2944,7 @@ int32 sdp_get_mid_value (void *sdp_ptr, u16 level)
* mid_val mid value .
* Returns: SDP_SUCCESS or SDP_INVALID_PARAMETER
*/
sdp_result_e sdp_set_mid_value (void *sdp_ptr, u16 level, u32 mid_val)
sdp_result_e sdp_set_mid_value (void *sdp_ptr, uint16_t level, uint32_t mid_val)
{
sdp_t *sdp_p = (sdp_t *)sdp_ptr;
sdp_mca_t *mca_p;

162
media/webrtc/signaling/src/sdp/sipcc/sdp_attr.c
View File

@ -87,10 +87,10 @@ static void sdp_append_name_and_unsigned(flex_string *fs,
* level The level to check for the attribute.
* ptr Pointer to the attribute string to parse.
*/
sdp_result_e sdp_parse_attribute (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_attribute (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int i;
u8 xcpar_flag = FALSE;
uint8_t xcpar_flag = FALSE;
sdp_result_e result;
sdp_mca_t *mca_p=NULL;
sdp_attr_t *attr_p;
@ -200,7 +200,7 @@ sdp_result_e sdp_parse_attribute (sdp_t *sdp_p, u16 level, const char *ptr)
}
/* Build all of the attributes defined for the specified level. */
sdp_result_e sdp_build_attribute (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_attribute (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
sdp_attr_t *attr_p;
sdp_mca_t *mca_p=NULL;
@ -444,11 +444,11 @@ static void sdp_attr_fmtp_invalid_value(sdp_t *sdp, char *param_name,
sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
const char *ptr)
{
u16 i;
u32 mapword;
u32 bmap;
u8 low_val;
u8 high_val;
uint16_t i;
uint32_t mapword;
uint32_t bmap;
uint8_t low_val;
uint8_t high_val;
const char *ptr2;
const char *fmtp_ptr;
sdp_result_e result1 = SDP_SUCCESS;
@ -461,13 +461,13 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
char *temp_ptr = NULL;
char *tok=NULL;
char *temp=NULL;
u16 custom_x=0;
u16 custom_y=0;
u16 custom_mpi=0;
u16 par_height=0;
u16 par_width=0;
u16 cpcf=0;
u16 iter=0;
uint16_t custom_x=0;
uint16_t custom_y=0;
uint16_t custom_mpi=0;
uint16_t par_height=0;
uint16_t par_width=0;
uint16_t cpcf=0;
uint16_t iter=0;
ulong l_val = 0;
char* strtok_state;
@ -475,7 +475,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
char* strtoul_end;
/* Find the payload type number. */
attr_p->attr.fmtp.payload_num = (u16)sdp_getnextnumtok(ptr, &ptr,
attr_p->attr.fmtp.payload_num = (uint16_t)sdp_getnextnumtok(ptr, &ptr,
" \t", &result1);
if (result1 != SDP_SUCCESS) {
sdp_attr_fmtp_no_value(sdp_p, "payload type");
@ -590,7 +590,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->bitrate = (u32) strtoul_result;
fmtp_p->bitrate = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[41].name,
@ -617,7 +617,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_MODE;
fmtp_p->mode = (u32) strtoul_result;
fmtp_p->mode = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[3].name,
@ -645,7 +645,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->qcif = (u16) strtoul_result;
fmtp_p->qcif = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[4].name,
sdp_fmtp_codec_param[4].strlen) == 0) {
@ -672,7 +672,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->cif = (u16) strtoul_result;
fmtp_p->cif = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[5].name,
sdp_fmtp_codec_param[5].strlen) == 0) {
@ -699,7 +699,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->maxbr = (u16) strtoul_result;
fmtp_p->maxbr = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[6].name,
sdp_fmtp_codec_param[6].strlen) == 0) {
@ -726,7 +726,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->sqcif = (u16) strtoul_result;
fmtp_p->sqcif = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[7].name,
sdp_fmtp_codec_param[7].strlen) == 0) {
@ -753,7 +753,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->cif4 = (u16) strtoul_result;
fmtp_p->cif4 = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[8].name,
sdp_fmtp_codec_param[8].strlen) == 0) {
@ -780,7 +780,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->cif16 = (u16) strtoul_result;
fmtp_p->cif16 = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[9].name,
sdp_fmtp_codec_param[9].strlen) == 0) {
@ -808,11 +808,11 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
if (iter == 1)
custom_x = (u16) strtoul_result;
custom_x = (uint16_t) strtoul_result;
if (iter == 2)
custom_y = (u16) strtoul_result;
custom_y = (uint16_t) strtoul_result;
if (iter == 3)
custom_mpi = (u16) strtoul_result;
custom_mpi = (uint16_t) strtoul_result;
temp=PL_strtok_r(NULL, ",", &strtok_state);
iter++;
@ -856,9 +856,9 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
if (iter == 1)
par_width = (u16) strtoul_result;
par_width = (uint16_t) strtoul_result;
else
par_height = (u16) strtoul_result;
par_height = (uint16_t) strtoul_result;
temp=PL_strtok_r(NULL, ",", &strtok_state);
iter++;
@ -893,7 +893,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
if (errno || temp == strtoul_end || strtoul_result > USHRT_MAX) {
cpcf = 0;
} else {
cpcf = (u16) strtoul_result;
cpcf = (uint16_t) strtoul_result;
}
}
@ -929,7 +929,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->bpp = (u16) strtoul_result;
fmtp_p->bpp = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[13].name,
sdp_fmtp_codec_param[13].strlen) == 0) {
@ -955,7 +955,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->hrd = (u16) strtoul_result;
fmtp_p->hrd = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[14].name,
sdp_fmtp_codec_param[14].strlen) == 0) {
@ -1073,7 +1073,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->packetization_mode = (int16) strtoul_result;
fmtp_p->packetization_mode = (int16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[20].name,
sdp_fmtp_codec_param[20].strlen) == 0) {
@ -1099,7 +1099,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->interleaving_depth = (u16) strtoul_result;
fmtp_p->interleaving_depth = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[21].name,
sdp_fmtp_codec_param[21].strlen) == 0) {
@ -1116,7 +1116,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
tok++;
if (sdp_checkrange(sdp_p, tok, &l_val) == TRUE) {
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->deint_buf_req = (u32) l_val;
fmtp_p->deint_buf_req = (uint32_t) l_val;
fmtp_p->flag |= SDP_DEINT_BUF_REQ_FLAG;
codec_info_found = TRUE;
} else {
@ -1148,7 +1148,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_don_diff = (u32) strtoul_result;
fmtp_p->max_don_diff = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[23].name,
sdp_fmtp_codec_param[23].strlen) == 0) {
@ -1165,7 +1165,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
tok++;
if (sdp_checkrange(sdp_p, tok, &l_val) == TRUE) {
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->init_buf_time = (u32) l_val;
fmtp_p->init_buf_time = (uint32_t) l_val;
fmtp_p->flag |= SDP_INIT_BUF_TIME_FLAG;
codec_info_found = TRUE;
} else {
@ -1197,7 +1197,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_mbps = (u32) strtoul_result;
fmtp_p->max_mbps = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[25].name,
sdp_fmtp_codec_param[25].strlen) == 0) {
@ -1222,7 +1222,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_fs = (u32) strtoul_result;
fmtp_p->max_fs = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[26].name,
sdp_fmtp_codec_param[26].strlen) == 0) {
@ -1247,7 +1247,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_cpb = (u32) strtoul_result;
fmtp_p->max_cpb = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[27].name,
sdp_fmtp_codec_param[27].strlen) == 0) {
@ -1272,7 +1272,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_dpb = (u32) strtoul_result;
fmtp_p->max_dpb = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[28].name,
sdp_fmtp_codec_param[28].strlen) == 0) {
@ -1297,7 +1297,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_br = (u32) strtoul_result;
fmtp_p->max_br = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[29].name,
sdp_fmtp_codec_param[29].strlen) == 0) {
@ -1338,7 +1338,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
tok++;
if (sdp_checkrange(sdp_p, tok, &l_val) == TRUE) {
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->deint_buf_cap = (u32) l_val;
fmtp_p->deint_buf_cap = (uint32_t) l_val;
fmtp_p->flag |= SDP_DEINT_BUF_CAP_FLAG;
codec_info_found = TRUE;
} else {
@ -1361,7 +1361,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
tok++;
if (sdp_checkrange(sdp_p, tok, &l_val) == TRUE) {
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_rcmd_nalu_size = (u32) l_val;
fmtp_p->max_rcmd_nalu_size = (uint32_t) l_val;
fmtp_p->flag |= SDP_MAX_RCMD_NALU_SIZE_FLAG;
codec_info_found = TRUE;
} else {
@ -1391,7 +1391,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->parameter_add = (u16) strtoul_result;
fmtp_p->parameter_add = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[33].name,
sdp_fmtp_codec_param[33].strlen) == 0) {
@ -1441,7 +1441,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->annex_k_val = (u16) strtoul_result;
fmtp_p->annex_k_val = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[39].name,
sdp_fmtp_codec_param[39].strlen) == 0) {
@ -1466,7 +1466,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->annex_n_val = (u16) strtoul_result;
fmtp_p->annex_n_val = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[40].name,
sdp_fmtp_codec_param[40].strlen) == 0) {
@ -1494,9 +1494,9 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
if (iter == 1)
fmtp_p->annex_p_val_picture_resize = (u16) strtoul_result;
fmtp_p->annex_p_val_picture_resize = (uint16_t) strtoul_result;
else if (iter == 2)
fmtp_p->annex_p_val_warp = (u16) strtoul_result;
fmtp_p->annex_p_val_warp = (uint16_t) strtoul_result;
temp=PL_strtok_r(NULL, ",", &strtok_state);
iter++;
@ -1552,7 +1552,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->maxaveragebitrate = (u32) strtoul_result;
fmtp_p->maxaveragebitrate = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[44].name,
@ -1577,7 +1577,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->usedtx = (u16) strtoul_result;
fmtp_p->usedtx = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[45].name,
@ -1603,7 +1603,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->stereo = (u16) strtoul_result;
fmtp_p->stereo = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[46].name,
@ -1629,7 +1629,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->useinbandfec = (u16) strtoul_result;
fmtp_p->useinbandfec = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[47].name,
@ -1673,7 +1673,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->cbr = (u16) strtoul_result;
fmtp_p->cbr = (uint16_t) strtoul_result;
codec_info_found = TRUE;
} else if (cpr_strncasecmp(tmp,sdp_fmtp_codec_param[49].name,
sdp_fmtp_codec_param[49].strlen) == 0) {
@ -1699,7 +1699,7 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return SDP_INVALID_PARAMETER;
}
fmtp_p->fmtp_format = SDP_FMTP_CODEC_INFO;
fmtp_p->max_fr = (u32) strtoul_result;
fmtp_p->max_fr = (uint32_t) strtoul_result;
codec_info_found = TRUE;
} else if (fmtp_ptr != NULL && *fmtp_ptr == '\n') {
temp=PL_strtok_r(tmp, ";", &strtok_state);
@ -1843,10 +1843,10 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
}
/* Now look for '-' separated range */
ptr2 = tmp;
low_val = (u8)sdp_getnextnumtok(ptr2, (const char **)&ptr2,
low_val = (uint8_t)sdp_getnextnumtok(ptr2, (const char **)&ptr2,
"- \t", &result1);
if (*ptr2 == '-') {
high_val = (u8)sdp_getnextnumtok(ptr2, (const char **)&ptr2,
high_val = (uint8_t)sdp_getnextnumtok(ptr2, (const char **)&ptr2,
"- \t", &result2);
} else {
high_val = low_val;
@ -1892,11 +1892,11 @@ sdp_result_e sdp_parse_attr_fmtp (sdp_t *sdp_p, sdp_attr_t *attr_p,
sdp_result_e
sdp_build_attr_fmtp_params (sdp_t *sdp_p, sdp_fmtp_t *fmtp_p, flex_string *fs)
{
u16 event_id;
u32 mask;
u32 mapword;
u8 min = 0;
u8 max = 0;
uint16_t event_id;
uint32_t mask;
uint32_t mapword;
uint8_t min = 0;
uint8_t max = 0;
tinybool range_start = FALSE;
tinybool range_end = FALSE;
tinybool semicolon = FALSE;
@ -2079,9 +2079,9 @@ sdp_build_attr_fmtp_params (sdp_t *sdp_p, sdp_fmtp_t *fmtp_p, flex_string *fs)
if (fmtp_p->bmap[mapword] & mask) {
if (!range_start) {
range_start = TRUE;
min = max = (u8)event_id;
min = max = (uint8_t)event_id;
} else {
max = (u8)event_id;
max = (uint8_t)event_id;
}
range_end = (max == fmtp_p->maxval);
} else {
@ -2135,10 +2135,10 @@ sdp_result_e sdp_parse_attr_sctpmap(sdp_t *sdp_p, sdp_attr_t *attr_p,
{
sdp_result_e result = SDP_SUCCESS;
char tmp[SDP_MAX_STRING_LEN];
u32 streams;
uint32_t streams;
/* Find the payload type number. */
attr_p->attr.sctpmap.port = (u16)sdp_getnextnumtok(ptr, &ptr,
attr_p->attr.sctpmap.port = (uint16_t)sdp_getnextnumtok(ptr, &ptr,
" \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,
@ -2627,7 +2627,7 @@ sdp_result_e sdp_parse_attr_transport_map (sdp_t *sdp_p, sdp_attr_t *attr_p,
/* Find the payload type number. */
attr_p->attr.transport_map.payload_num =
(u16)sdp_getnextnumtok(ptr, &ptr, " \t", &result);
(uint16_t)sdp_getnextnumtok(ptr, &ptr, " \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,
"%s Warning: Invalid payload type specified for %s attribute.",
@ -2662,7 +2662,7 @@ sdp_result_e sdp_parse_attr_transport_map (sdp_t *sdp_p, sdp_attr_t *attr_p,
if (*ptr == '/') {
/* If a '/' exists, expect something valid beyond it. */
attr_p->attr.transport_map.num_chan =
(u16)sdp_getnextnumtok(ptr, &ptr, "/ \t", &result);
(uint16_t)sdp_getnextnumtok(ptr, &ptr, "/ \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,
"%s Warning: Invalid number of channels parameter"
@ -2934,7 +2934,7 @@ sdp_result_e sdp_build_attr_t38_udpec (sdp_t *sdp_p, sdp_attr_t *attr_p,
sdp_result_e sdp_parse_attr_pc_codec (sdp_t *sdp_p, sdp_attr_t *attr_p,
const char *ptr)
{
u16 i;
uint16_t i;
sdp_result_e result;
for (i=0; i < SDP_MAX_PAYLOAD_TYPES; i++) {
@ -2986,7 +2986,7 @@ sdp_result_e sdp_build_attr_pc_codec (sdp_t *sdp_p, sdp_attr_t *attr_p,
sdp_result_e sdp_parse_attr_cap (sdp_t *sdp_p, sdp_attr_t *attr_p,
const char *ptr)
{
u16 i;
uint16_t i;
sdp_result_e result;
sdp_mca_t *cap_p;
char tmp[SDP_MAX_STRING_LEN];
@ -3123,7 +3123,7 @@ sdp_result_e sdp_parse_attr_cap (sdp_t *sdp_p, sdp_attr_t *attr_p,
sdp_result_e sdp_build_attr_cap (sdp_t *sdp_p, sdp_attr_t *attr_p,
flex_string *fs)
{
u16 i, j;
uint16_t i, j;
sdp_mca_t *cap_p;
sdp_media_profiles_t *profile_p;
@ -3202,7 +3202,7 @@ sdp_result_e sdp_build_attr_cap (sdp_t *sdp_p, sdp_attr_t *attr_p,
sdp_result_e sdp_parse_attr_cpar (sdp_t *sdp_p, sdp_attr_t *attr_p,
const char *ptr)
{
u16 i;
uint16_t i;
sdp_result_e result;
sdp_mca_t *cap_p;
sdp_attr_t *cap_attr_p = NULL;
@ -3625,10 +3625,10 @@ sdp_result_e sdp_parse_attr_silencesupp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return (SDP_INVALID_PARAMETER);
}
/* Find silenceTimer -- u16 or "-" */
/* Find silenceTimer -- uint16_t or "-" */
attr_p->attr.silencesupp.timer =
(u16)sdp_getnextnumtok_or_null(ptr, &ptr, " \t",
(uint16_t)sdp_getnextnumtok_or_null(ptr, &ptr, " \t",
&attr_p->attr.silencesupp.timer_null,
&result);
if (result != SDP_SUCCESS) {
@ -3687,9 +3687,9 @@ sdp_result_e sdp_parse_attr_silencesupp (sdp_t *sdp_p, sdp_attr_t *attr_p,
return (SDP_INVALID_PARAMETER);
}
/* Find fxnslevel -- u8 or "-" */
/* Find fxnslevel -- uint8_t or "-" */
attr_p->attr.silencesupp.fxnslevel =
(u8)sdp_getnextnumtok_or_null(ptr, &ptr, " \t",
(uint8_t)sdp_getnextnumtok_or_null(ptr, &ptr, " \t",
&attr_p->attr.silencesupp.fxnslevel_null,
&result);
@ -3843,7 +3843,7 @@ sdp_result_e sdp_parse_attr_mptime (
sdp_attr_t *attr_p,
const char *ptr)
{
u16 i; /* loop counter for parameters */
uint16_t i; /* loop counter for parameters */
sdp_result_e result; /* value returned by this function */
tinybool null_ind; /* true if a parameter is "-" */
@ -4298,7 +4298,7 @@ sdp_result_e sdp_parse_attr_rtcp_unicast (sdp_t *sdp_p, sdp_attr_t *attr_p,
const char *ptr)
{
sdp_result_e result;
u32 i;
uint32_t i;
char tmp[SDP_MAX_STRING_LEN];
attr_p->attr.u32_val = SDP_RTCP_UNICAST_MODE_NOT_PRESENT;
@ -4365,7 +4365,7 @@ store_sdescriptions_mki_or_lifetime (char *buf, sdp_attr_t *attr_p)
{
tinybool result;
u16 mkiLen;
uint16_t mkiLen;
char mkiValue[SDP_SRTP_MAX_MKI_SIZE_BYTES];
/* MKI has a colon */
@ -4929,7 +4929,7 @@ sdp_result_e sdp_parse_attr_rtcp_fb (sdp_t *sdp_p,
ptr++;
} else {
/* If the pt is not '*', parse it out as an integer */
rtcp_fb_p->payload_num = (u16)sdp_getnextnumtok(ptr, &ptr,
rtcp_fb_p->payload_num = (uint16_t)sdp_getnextnumtok(ptr, &ptr,
" \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,
@ -5197,7 +5197,7 @@ sdp_result_e sdp_parse_attr_extmap(sdp_t *sdp_p,
/* Find the payload type number. */
attr_p->attr.extmap.id =
(u16)sdp_getnextnumtok(ptr, &ptr, "/ \t", &result);
(uint16_t)sdp_getnextnumtok(ptr, &ptr, "/ \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,
"%s Warning: Invalid extmap id specified for %s attribute.",

1362
media/webrtc/signaling/src/sdp/sipcc/sdp_attr_access.c
View File

File diff suppressed because it is too large Load Diff

10
media/webrtc/signaling/src/sdp/sipcc/sdp_main.c
View File

@ -920,7 +920,7 @@ void sdp_set_string_debug (sdp_t *sdp_p, const char *debug_str)
sdp_result_e sdp_validate_sdp (sdp_t *sdp_p)
{
int i;
u16 num_media_levels;
uint16_t num_media_levels;
/* Need to validate c= info is specified at session level or
* at all m= levels.
@ -978,8 +978,8 @@ sdp_result_e sdp_validate_sdp (sdp_t *sdp_p)
*/
sdp_result_e sdp_parse (sdp_t *sdp_p, const char *buf, size_t len)
{
u8 i;
u16 cur_level = SDP_SESSION_LEVEL;
uint8_t i;
uint16_t cur_level = SDP_SESSION_LEVEL;
const char *ptr;
const char *next_ptr = NULL;
char *line_end;
@ -1221,7 +1221,7 @@ sdp_result_e sdp_build (sdp_t *sdp_p, flex_string *fs)
if (result == SDP_SUCCESS) {
for (i=1; ((i <= sdp_p->mca_count) &&
(result == SDP_SUCCESS)); i++) {
result = sdp_token[SDP_TOKEN_M].build_func(sdp_p, (u16)i, fs);
result = sdp_token[SDP_TOKEN_M].build_func(sdp_p, (uint16_t)i, fs);
/* ok not to check buffer space (yet) as the for() checks it */
for (j=SDP_TOKEN_I;
@ -1233,7 +1233,7 @@ sdp_result_e sdp_build (sdp_t *sdp_p, flex_string *fs)
/* These tokens not valid at media level. */
continue;
}
result = sdp_token[j].build_func(sdp_p, (u16)i, fs);
result = sdp_token[j].build_func(sdp_p, (uint16_t)i, fs);
/* ok not to check buffer space (yet) as the for() checks it */
}
}

7
media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
View File

@ -18,13 +18,6 @@
#define SDP_FREE free
typedef uint8_t tinybool;
typedef uint8_t u8;
typedef uint16_t u16;
typedef uint16_t uint16;
typedef uint32_t u32;
typedef uint32_t uint32;
typedef int32_t int32;
typedef int16_t int16;
typedef unsigned short ushort;
typedef unsigned long ulong;
#ifndef __GNUC_STDC_INLINE__

82
media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
View File

@ -45,14 +45,14 @@ extern const sdp_srtp_crypto_suite_list sdp_srtp_crypto_suite_array[];
/* Function Prototypes */
/* sdp_access.c */
extern sdp_mca_t *sdp_find_media_level(sdp_t *sdp_p, u16 level);
extern sdp_bw_data_t* sdp_find_bw_line (void *sdp_ptr, u16 level, u16 inst_num);
extern sdp_mca_t *sdp_find_media_level(sdp_t *sdp_p, uint16_t level);
extern sdp_bw_data_t* sdp_find_bw_line (void *sdp_ptr, uint16_t level, uint16_t inst_num);
/* sdp_attr.c */
extern sdp_result_e
sdp_build_attr_fmtp_params (sdp_t *sdp_p, sdp_fmtp_t *attr_p, flex_string *fs);
extern sdp_result_e sdp_parse_attribute(sdp_t *sdp_p, u16 level,
extern sdp_result_e sdp_parse_attribute(sdp_t *sdp_p, uint16_t level,
const char *ptr);
extern sdp_result_e sdp_parse_attr_simple_string(sdp_t *sdp_p,
sdp_attr_t *attr_p, const char *ptr);
@ -229,11 +229,11 @@ extern sdp_result_e sdp_parse_attr_complete_line (
/* sdp_attr_access.c */
extern void sdp_free_attr(sdp_attr_t *attr_p);
extern sdp_result_e sdp_find_attr_list(sdp_t *sdp_p, u16 level, u8 cap_num,
extern sdp_result_e sdp_find_attr_list(sdp_t *sdp_p, uint16_t level, uint8_t cap_num,
sdp_attr_t **attr_p, char *fname);
extern sdp_attr_t *sdp_find_attr(sdp_t *sdp_p, u16 level, u8 cap_num,
sdp_attr_e attr_type, u16 inst_num);
extern sdp_attr_t *sdp_find_capability(sdp_t *sdp_p, u16 level, u8 cap_num);
extern sdp_attr_t *sdp_find_attr(sdp_t *sdp_p, uint16_t level, uint8_t cap_num,
sdp_attr_e attr_type, uint16_t inst_num);
extern sdp_attr_t *sdp_find_capability(sdp_t *sdp_p, uint16_t level, uint8_t cap_num);
/* sdp_config.c */
extern tinybool sdp_verify_conf_ptr(sdp_conf_options_t *conf_p);
@ -267,48 +267,48 @@ extern tinybool sdp_verify_sdp_ptr(sdp_t *sdp_p);
/* sdp_tokens.c */
extern sdp_result_e sdp_parse_version(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_parse_version(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_version(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_owner(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_version(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_owner(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_owner(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_sessname(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_owner(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_sessname(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_sessname(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_sessinfo(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_sessname(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_sessinfo(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_sessinfo(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_uri(sdp_t *sdp_p, u16 token, const char *ptr);
extern sdp_result_e sdp_build_uri(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_email(sdp_t *sdp_p, u16 token, const char *ptr);
extern sdp_result_e sdp_build_email(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_phonenum(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_sessinfo(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_uri(sdp_t *sdp_p, uint16_t token, const char *ptr);
extern sdp_result_e sdp_build_uri(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_email(sdp_t *sdp_p, uint16_t token, const char *ptr);
extern sdp_result_e sdp_build_email(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_phonenum(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_phonenum(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_connection(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_phonenum(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_connection(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_connection(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_bandwidth(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_connection(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_bandwidth(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_bandwidth(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_timespec(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_bandwidth(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_timespec(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_timespec(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_repeat_time(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_timespec(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_repeat_time(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_repeat_time(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_timezone_adj(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_repeat_time(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_timezone_adj(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_timezone_adj(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_encryption(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_timezone_adj(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_encryption(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_encryption(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_media(sdp_t *sdp_p, u16 token, const char *ptr);
extern sdp_result_e sdp_build_media(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_parse_attribute(sdp_t *sdp_p, u16 token,
extern sdp_result_e sdp_build_encryption(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_media(sdp_t *sdp_p, uint16_t token, const char *ptr);
extern sdp_result_e sdp_build_media(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern sdp_result_e sdp_parse_attribute(sdp_t *sdp_p, uint16_t token,
const char *ptr);
extern sdp_result_e sdp_build_attribute(sdp_t *sdp_p, u16 token, flex_string *fs);
extern sdp_result_e sdp_build_attribute(sdp_t *sdp_p, uint16_t token, flex_string *fs);
extern void sdp_parse_payload_types(sdp_t *sdp_p, sdp_mca_t *mca_p,
const char *ptr);
@ -325,21 +325,21 @@ sdp_build_attr_sdescriptions(sdp_t *sdp_p, sdp_attr_t *attr_p,
/* sdp_utils.c */
extern sdp_mca_t *sdp_alloc_mca(u32 line);
extern sdp_mca_t *sdp_alloc_mca(uint32_t line);
extern tinybool sdp_validate_maxprate(const char *string_parm);
extern char *sdp_findchar(const char *ptr, char *char_list);
extern const char *sdp_getnextstrtok(const char *str, char *tokenstr, unsigned tokenstr_len,
const char *delim, sdp_result_e *result);
extern u32 sdp_getnextnumtok(const char *str, const char **str_end,
extern uint32_t sdp_getnextnumtok(const char *str, const char **str_end,
const char *delim, sdp_result_e *result);
extern u32 sdp_getnextnumtok_or_null(const char *str, const char **str_end,
extern uint32_t sdp_getnextnumtok_or_null(const char *str, const char **str_end,
const char *delim, tinybool *null_ind,
sdp_result_e *result);
extern tinybool sdp_getchoosetok(const char *str, const char **str_end,
const char *delim, sdp_result_e *result);
extern
tinybool verify_sdescriptions_mki(char *buf, char *mkiVal, u16 *mkiLen);
tinybool verify_sdescriptions_mki(char *buf, char *mkiVal, uint16_t *mkiLen);
extern
tinybool verify_sdescriptions_lifetime(char *buf);

80
media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
View File

@ -16,11 +16,11 @@ static const char *logTag = "sdp_token";
#define MCAST_STRING_LEN 4
sdp_result_e sdp_parse_version (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_version (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
sdp_result_e result = SDP_FAILURE;
sdp_p->version = (u16)sdp_getnextnumtok(ptr, &ptr, " \t", &result);
sdp_p->version = (uint16_t)sdp_getnextnumtok(ptr, &ptr, " \t", &result);
if ((result != SDP_SUCCESS) || (sdp_p->version != SDP_CURRENT_VERSION)) {
sdp_parse_error(sdp_p,
"%s Invalid version (%u) found, parse failed.",
@ -36,7 +36,7 @@ sdp_result_e sdp_parse_version (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_version (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_version (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
if (sdp_p->version == SDP_INVALID_VALUE) {
if (sdp_p->conf_p->version_reqd == TRUE) {
@ -77,7 +77,7 @@ static sdp_result_e sdp_verify_unsigned(const char *ptr, uint64_t max_value)
return SDP_SUCCESS;
}
sdp_result_e sdp_parse_owner (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_owner (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int i;
sdp_result_e result;
@ -220,7 +220,7 @@ sdp_result_e sdp_parse_owner (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_owner (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_owner (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
if ((sdp_p->owner_name[0] == '\0') ||
(sdp_p->owner_network_type >= SDP_MAX_NETWORK_TYPES) ||
@ -259,7 +259,7 @@ sdp_result_e sdp_build_owner (sdp_t *sdp_p, u16 level, flex_string *fs)
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_sessname (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_sessname (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int str_len;
char *endptr;
@ -287,7 +287,7 @@ sdp_result_e sdp_parse_sessname (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_sessname (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_sessname (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
if (sdp_p->sessname[0] == '\0') {
if (sdp_p->conf_p->session_name_reqd == TRUE) {
@ -313,7 +313,7 @@ sdp_result_e sdp_build_sessname (sdp_t *sdp_p, u16 level, flex_string *fs)
* that at most one i= line exists at each level and if the line exists
* there should be a parameter.
*/
sdp_result_e sdp_parse_sessinfo (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_sessinfo (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
sdp_mca_t *mca_p;
@ -353,13 +353,13 @@ sdp_result_e sdp_parse_sessinfo (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_sessinfo (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_sessinfo (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build session info line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_uri (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_uri (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
@ -383,13 +383,13 @@ sdp_result_e sdp_parse_uri (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_uri (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_uri (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build URI line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_email (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_email (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
@ -405,13 +405,13 @@ sdp_result_e sdp_parse_email (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_email (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_email (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build email line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_phonenum (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_phonenum (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
@ -428,13 +428,13 @@ sdp_result_e sdp_parse_phonenum (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_phonenum (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_phonenum (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build phone number line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_connection (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_connection (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int i;
const char *slash_ptr;
@ -643,7 +643,7 @@ sdp_result_e sdp_parse_connection (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_connection (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_connection (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
sdp_mca_t *mca_p;
sdp_conn_t *conn_p;
@ -714,7 +714,7 @@ sdp_result_e sdp_build_connection (sdp_t *sdp_p, u16 level, flex_string *fs)
*
* It currently supports three types of valid bwtypes - AS, CT and TIAS
*/
sdp_result_e sdp_parse_bandwidth (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_bandwidth (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int i;
sdp_mca_t *mca_p;
@ -824,7 +824,7 @@ sdp_result_e sdp_parse_bandwidth (sdp_t *sdp_p, u16 level, const char *ptr)
*
* Builds *all* the bandwith lines for the specified level.
*/
sdp_result_e sdp_build_bandwidth (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_bandwidth (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
sdp_bw_t *bw_p;
sdp_bw_data_t *bw_data_p;
@ -858,7 +858,7 @@ sdp_result_e sdp_build_bandwidth (sdp_t *sdp_p, u16 level, flex_string *fs)
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_timespec (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_timespec (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *tmpptr;
sdp_result_e result;
@ -923,7 +923,7 @@ sdp_result_e sdp_parse_timespec (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_timespec (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_timespec (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
if ((sdp_p->timespec_p == NULL) ||
(sdp_p->timespec_p->start_time == '\0') ||
@ -949,7 +949,7 @@ sdp_result_e sdp_build_timespec (sdp_t *sdp_p, u16 level, flex_string *fs)
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_repeat_time (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_repeat_time (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
@ -966,13 +966,13 @@ sdp_result_e sdp_parse_repeat_time (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_repeat_time (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_repeat_time (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build repeat time line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_timezone_adj (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_timezone_adj (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
char *endptr;
@ -989,13 +989,13 @@ sdp_result_e sdp_parse_timezone_adj (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_timezone_adj (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_timezone_adj (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
/* Build timezone adjustment line not supported. */
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_encryption (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_encryption (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
int i;
sdp_result_e result;
@ -1067,7 +1067,7 @@ sdp_result_e sdp_parse_encryption (sdp_t *sdp_p, u16 level, const char *ptr)
}
/* If the encryption info is valid, we build it. Else skip it. */
sdp_result_e sdp_build_encryption (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_encryption (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
sdp_encryptspec_t *encrypt_p;
sdp_mca_t *mca_p;
@ -1105,11 +1105,11 @@ sdp_result_e sdp_build_encryption (sdp_t *sdp_p, u16 level, flex_string *fs)
return (SDP_SUCCESS);
}
sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
{
u16 i;
u16 num_port_params=0;
int32 num[SDP_MAX_PORT_PARAMS];
uint16_t i;
uint16_t num_port_params=0;
int32_t num[SDP_MAX_PORT_PARAMS];
tinybool valid_param = FALSE;
sdp_result_e result;
sdp_mca_t *mca_p;
@ -1117,7 +1117,7 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
char tmp[SDP_MAX_STRING_LEN];
char port[SDP_MAX_STRING_LEN];
const char *port_ptr;
int32 sctp_port;
int32_t sctp_port;
/* Allocate resource for new media stream. */
mca_p = sdp_alloc_mca(sdp_p->parse_line);
@ -1483,7 +1483,7 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
return (SDP_SUCCESS);
}
sdp_result_e sdp_build_media (sdp_t *sdp_p, u16 level, flex_string *fs)
sdp_result_e sdp_build_media (sdp_t *sdp_p, uint16_t level, flex_string *fs)
{
int i, j;
sdp_mca_t *mca_p;
@ -1613,8 +1613,8 @@ sdp_result_e sdp_build_media (sdp_t *sdp_p, u16 level, flex_string *fs)
*/
void sdp_parse_payload_types (sdp_t *sdp_p, sdp_mca_t *mca_p, const char *ptr)
{
u16 i;
u16 num_payloads;
uint16_t i;
uint16_t num_payloads;
sdp_result_e result;
tinybool valid_payload;
char tmp[SDP_MAX_STRING_LEN];
@ -1626,7 +1626,7 @@ void sdp_parse_payload_types (sdp_t *sdp_p, sdp_mca_t *mca_p, const char *ptr)
/* If there are no more payload types, we're finished */
break;
}
mca_p->payload_type[num_payloads] = (u16)sdp_getnextnumtok(tmp,
mca_p->payload_type[num_payloads] = (uint16_t)sdp_getnextnumtok(tmp,
(const char **)&tmp2,
" \t", &result);
if (result == SDP_SUCCESS) {
@ -1714,9 +1714,9 @@ sdp_result_e sdp_parse_multiple_profile_payload_types (sdp_t *sdp_p,
sdp_mca_t *mca_p,
const char *ptr)
{
u16 i;
u16 prof;
u16 payload;
uint16_t i;
uint16_t prof;
uint16_t payload;
sdp_result_e result;
sdp_media_profiles_t *profile_p;
char tmp[SDP_MAX_STRING_LEN];
@ -1784,7 +1784,7 @@ sdp_result_e sdp_parse_multiple_profile_payload_types (sdp_t *sdp_p,
/* See if the payload type is numeric. */
if (prof < SDP_MAX_PROFILES && payload < SDP_MAX_PAYLOAD_TYPES) {
profile_p->payload_type[prof][payload] = (u16)sdp_getnextnumtok(tmp,
profile_p->payload_type[prof][payload] = (uint16_t)sdp_getnextnumtok(tmp,
(const char **)&tmp2,
" \t", &result);
if (result == SDP_SUCCESS) {

14
media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c
View File

@ -15,7 +15,7 @@
static const char* logTag = "sdp_utils";
sdp_mca_t *sdp_alloc_mca (u32 line) {
sdp_mca_t *sdp_alloc_mca (uint32_t line) {
sdp_mca_t *mca_p;
/* Allocate resource for new media stream. */
@ -139,7 +139,7 @@ static sdp_result_e next_token(const char **string_of_tokens, char *token, unsig
*/
tinybool
verify_sdescriptions_mki (char *buf, char *mkiVal, u16 *mkiLen)
verify_sdescriptions_mki (char *buf, char *mkiVal, uint16_t *mkiLen)
{
char *ptr,
@ -200,7 +200,7 @@ verify_sdescriptions_mki (char *buf, char *mkiVal, u16 *mkiLen)
return FALSE;
}
*mkiLen = (u16) strtoul_result;
*mkiLen = (uint16_t) strtoul_result;
sstrncpy(mkiVal, mkiValBuf, MKI_BUF_LEN);
return TRUE;
@ -341,7 +341,7 @@ const char *sdp_getnextstrtok (const char *str, char *tokenstr, unsigned tokenst
* a new line char or the end of the string. Skip any delimiters before
* the token.
*/
u32 sdp_getnextnumtok_or_null (const char *str, const char **str_end,
uint32_t sdp_getnextnumtok_or_null (const char *str, const char **str_end,
const char *delim, tinybool *null_ind,
sdp_result_e *result)
{
@ -383,7 +383,7 @@ u32 sdp_getnextnumtok_or_null (const char *str, const char **str_end,
*result = SDP_SUCCESS;
*str_end = token_list;
return (u32) numval;
return (uint32_t) numval;
}
@ -391,7 +391,7 @@ u32 sdp_getnextnumtok_or_null (const char *str, const char **str_end,
* passed in as a param. The token also will not go past a new line char
* or the end of the string. Skip any delimiters before the token.
*/
u32 sdp_getnextnumtok (const char *str, const char **str_end,
uint32_t sdp_getnextnumtok (const char *str, const char **str_end,
const char *delim, sdp_result_e *result)
{
const char *token_list = str;
@ -422,7 +422,7 @@ u32 sdp_getnextnumtok (const char *str, const char **str_end,
*result = SDP_SUCCESS;
*str_end = token_list;
return (u32) numval;
return (uint32_t) numval;
}