mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-12 12:37:05 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@321 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
e0c290de99
commit
a7cb1e7eea
5 files changed
+69
-9
No files matched your search
@@ -227,6 +227,7 @@ extern void iax_pref_codec_del(struct iax_session *session, unsigned int format)
|
||||
extern int iax_pref_codec_get(struct iax_session *session, unsigned int *array, int len);
|
||||
extern char *iax_get_peer_ip(struct iax_session *session);
|
||||
extern char *iax_event_get_apparent_ip(struct iax_event *event);
|
||||
extern void iax_set_samplerate(struct iax_session *session, unsigned short samplemask);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
||||
@@ -253,6 +253,7 @@ struct iax_session {
|
||||
#endif
|
||||
struct iax_netstat remote_netstats;
|
||||
|
||||
unsigned short samplemask;
|
||||
/* For linking if there are multiple connections */
|
||||
struct iax_session *next;
|
||||
};
|
||||
@@ -1880,6 +1881,12 @@ int iax_pref_codec_get(struct iax_session *session, unsigned int *array, int len
|
||||
return x;
|
||||
}
|
||||
|
||||
void iax_set_samplerate(struct iax_session *session, unsigned short samplemask)
|
||||
{
|
||||
session->samplemask = samplemask;
|
||||
}
|
||||
|
||||
|
||||
int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich, char *lang, int wait, int formats, int capabilities)
|
||||
{
|
||||
char tmp[256]="";
|
||||
@@ -1898,7 +1905,11 @@ int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich
|
||||
}
|
||||
memset(&ied, 0, sizeof(ied));
|
||||
strncpy(tmp, ich, sizeof(tmp) - 1);
|
||||
|
||||
iax_ie_append_short(&ied, IAX_IE_VERSION, IAX_PROTO_VERSION);
|
||||
if (session->samplemask) {
|
||||
iax_ie_append_short(&ied, IAX_IE_SAMPLINGRATE, session->samplemask);
|
||||
}
|
||||
if (cidnum)
|
||||
iax_ie_append_str(&ied, IAX_IE_CALLING_NUMBER, (unsigned char *) cidnum);
|
||||
if (cidname)
|
||||
|
||||
@@ -143,6 +143,8 @@ static void dump_samprate(char *output, int maxlen, void *value, int len)
|
||||
strcat(tmp, ",11.025khz");
|
||||
if (sr & IAX_RATE_16KHZ)
|
||||
strcat(tmp, ",16khz");
|
||||
if (sr & IAX_RATE_32KHZ)
|
||||
strcat(tmp, ",32khz");
|
||||
if (sr & IAX_RATE_22KHZ)
|
||||
strcat(tmp, ",22.05khz");
|
||||
if (sr & IAX_RATE_44KHZ)
|
||||
|
||||
@@ -143,6 +143,7 @@
|
||||
#define IAX_RATE_22KHZ (1 << 3) /* 22.05khz sampling */
|
||||
#define IAX_RATE_44KHZ (1 << 4) /* 44.1khz sampling */
|
||||
#define IAX_RATE_48KHZ (1 << 5) /* 48khz sampling */
|
||||
#define IAX_RATE_32KHZ (1 << 6) /* 32khz sampling */
|
||||
|
||||
#define IAX_DPSTATUS_EXISTS (1 << 0)
|
||||
#define IAX_DPSTATUS_CANEXIST (1 << 1)
|
||||
|
||||
Reference in new issue
Block a user