From 8afaf28a09bc07ccb2b31cfc5db635c9d068600a Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 22 May 2013 09:27:09 -0500
Subject: [PATCH] FS-5379: --resolve fix skinny phone codec agreement issues
due to incorrect hardwired ptime, update field names for future coding to be
more descriptive
---
src/mod/endpoints/mod_skinny/skinny_protocol.c | 4 ++--
src/mod/endpoints/mod_skinny/skinny_protocol.h | 4 ++--
src/mod/endpoints/mod_skinny/skinny_server.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.c b/src/mod/endpoints/mod_skinny/skinny_protocol.c
index 9c103c6121..1dab0f1c60 100644
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.c
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.c
@@ -726,7 +726,7 @@ switch_status_t send_register_reject(listener_t *listener,
switch_status_t send_open_receive_channel(listener_t *listener,
uint32_t conference_id,
uint32_t pass_thru_party_id,
- uint32_t packets,
+ uint32_t ms_per_packet,
uint32_t payload_capacity,
uint32_t echo_cancel_type,
uint32_t g723_bitrate,
@@ -739,7 +739,7 @@ switch_status_t send_open_receive_channel(listener_t *listener,
message->length = 4 + sizeof(message->data.open_receive_channel);
message->data.open_receive_channel.conference_id = conference_id;
message->data.open_receive_channel.pass_thru_party_id = pass_thru_party_id;
- message->data.open_receive_channel.packets = packets;
+ message->data.open_receive_channel.ms_per_packet = ms_per_packet;
message->data.open_receive_channel.payload_capacity = payload_capacity;
message->data.open_receive_channel.echo_cancel_type = echo_cancel_type;
message->data.open_receive_channel.g723_bitrate = g723_bitrate;
diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.h b/src/mod/endpoints/mod_skinny/skinny_protocol.h
index a04f8bc236..da79df8b7e 100644
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.h
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.h
@@ -456,7 +456,7 @@ struct PACKED reset_message {
struct PACKED open_receive_channel_message {
uint32_t conference_id;
uint32_t pass_thru_party_id;
- uint32_t packets;
+ uint32_t ms_per_packet;
uint32_t payload_capacity;
uint32_t echo_cancel_type;
uint32_t g723_bitrate;
@@ -874,7 +874,7 @@ switch_status_t send_register_reject(listener_t *listener,
switch_status_t send_open_receive_channel(listener_t *listener,
uint32_t conference_id,
uint32_t pass_thru_party_id,
- uint32_t packets,
+ uint32_t ms_per_packet,
uint32_t payload_capacity,
uint32_t echo_cancel_type,
uint32_t g723_bitrate,
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index acce21bb71..1a9545b1b9 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -704,7 +704,7 @@ switch_status_t skinny_session_start_media(switch_core_session_t *session, liste
send_open_receive_channel(listener,
tech_pvt->call_id, /* uint32_t conference_id, */
tech_pvt->call_id, /* uint32_t pass_thru_party_id, */
- 20, /* uint32_t packets, */
+ 20, /* uint32_t ms_per_packet, */
SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
0, /* uint32_t echo_cancel_type, */
0, /* uint32_t g723_bitrate, */
@@ -1707,7 +1707,7 @@ switch_status_t skinny_handle_open_receive_channel_ack_message(listener_t *liste
/* Codec */
tech_pvt->iananame = "PCMU"; /* TODO */
- tech_pvt->codec_ms = 10; /* TODO */
+ tech_pvt->codec_ms = 20; /* TODO */
tech_pvt->rm_rate = 8000; /* TODO */
tech_pvt->rm_fmtp = NULL; /* TODO */
tech_pvt->agreed_pt = (switch_payload_t) 0; /* TODO */