kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build in dev-mode

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-07-21 17:01:05 +00:00
parent 7622f1ad2a
commit 6e31ca48b0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_skinny.c
View File

@@ -2660,7 +2660,7 @@ static void transmit_connect(struct skinny_device *d, struct skinny_subchannel *
req->data.openreceivechannel.echo = htolel(0); req->data.openreceivechannel.echo = htolel(0);
req->data.openreceivechannel.bitrate = htolel(0); req->data.openreceivechannel.bitrate = htolel(0);
SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting OPEN_RECEIVE_CHANNEL_MESSAGE to %s, confid %u, partyid %u, ms %d, fmt %d, echo %d, brate %d\n", SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting OPEN_RECEIVE_CHANNEL_MESSAGE to %s, confid %u, partyid %u, ms %u, fmt %d, echo %d, brate %d\n",
d->name, sub->callid, sub->callid, framing, codec_ast2skinny(tmpfmt), 0, 0); d->name, sub->callid, sub->callid, framing, codec_ast2skinny(tmpfmt), 0, 0);
ao2_ref(tmpfmt, -1); ao2_ref(tmpfmt, -1);
@@ -3058,7 +3058,7 @@ static void transmit_startmediatransmission(struct skinny_device *d, struct skin
req->data.startmedia_ip6.qualifier.bitRate = htolel(0); req->data.startmedia_ip6.qualifier.bitRate = htolel(0);
} }
SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting START_MEDIA_TRANSMISSION_MESSAGE to %s, callid %u, passthrupartyid %u, ip %s:%d, ms %d, fmt %d, prec 127\n", SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting START_MEDIA_TRANSMISSION_MESSAGE to %s, callid %u, passthrupartyid %u, ip %s:%d, ms %u, fmt %d, prec 127\n",
d->name, sub->callid, sub->callid, ast_inet_ntoa(dest.sin_addr), dest.sin_port, framing, codec_ast2skinny(format)); d->name, sub->callid, sub->callid, ast_inet_ntoa(dest.sin_addr), dest.sin_port, framing, codec_ast2skinny(format));
transmit_response(d, req); transmit_response(d, req);
} }
@@ -3667,7 +3667,7 @@ static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp_instance *r
tmpfmt = ast_format_cap_get_format(l->cap, 0); tmpfmt = ast_format_cap_get_format(l->cap, 0);
framing = ast_format_cap_get_format_framing(l->cap, tmpfmt); framing = ast_format_cap_get_format_framing(l->cap, tmpfmt);
SKINNY_DEBUG(DEBUG_AUDIO, 4, "Setting payloadType to '%s' (%d ms)\n", ast_format_get_name(tmpfmt), framing); SKINNY_DEBUG(DEBUG_AUDIO, 4, "Setting payloadType to '%s' (%u ms)\n", ast_format_get_name(tmpfmt), framing);
if (!(l->directmedia) || (l->nat)){ if (!(l->directmedia) || (l->nat)){
ast_rtp_instance_get_local_address(rtp, &us_tmp); ast_rtp_instance_get_local_address(rtp, &us_tmp);
@@ -6909,7 +6909,7 @@ static int handle_open_receive_channel_ack_message(struct skinny_req *req, struc
tmpfmt = ast_format_cap_get_format(l->cap, 0); tmpfmt = ast_format_cap_get_format(l->cap, 0);
framing = ast_format_cap_get_format_framing(l->cap, tmpfmt); framing = ast_format_cap_get_format_framing(l->cap, tmpfmt);
SKINNY_DEBUG(DEBUG_PACKET, 4, "Setting payloadType to '%s' (%d ms)\n", ast_format_get_name(tmpfmt), framing); SKINNY_DEBUG(DEBUG_PACKET, 4, "Setting payloadType to '%s' (%u ms)\n", ast_format_get_name(tmpfmt), framing);
transmit_startmediatransmission(d, sub, us, tmpfmt, framing); transmit_startmediatransmission(d, sub, us, tmpfmt, framing);

2
tests/test_core_format.c
View File

@@ -232,7 +232,7 @@ static void test_core_format_generate_sdp_fmtp(const struct ast_format *format,
return; return;
} }
ast_str_append(str, 0, "a=fmtp:%d one=%d;two=%d\r\n", payload, pvt->field_one, pvt->field_two); ast_str_append(str, 0, "a=fmtp:%u one=%d;two=%d\r\n", payload, pvt->field_one, pvt->field_two);
++test_callbacks_called.format_generate_sdp_fmtp; ++test_callbacks_called.format_generate_sdp_fmtp;
} }