Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
008bb494
提交
008bb494
authored
7月 27, 2012
作者:
root
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adding code for updating codec types
上级
ed5875b5
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
76 行增加
和
11 行删除
+76
-11
tdm.c
libs/freetdm/mod_freetdm/tdm.c
+3
-1
media_gateway_utils.c
src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
+1
-0
rtp.c
src/mod/endpoints/mod_sofia/rtp.c
+72
-10
没有找到文件。
libs/freetdm/mod_freetdm/tdm.c
浏览文件 @
008bb494
...
@@ -111,7 +111,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
...
@@ -111,7 +111,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
const
char
*
dname
;
const
char
*
dname
;
ftdm_codec_t
codec
;
ftdm_codec_t
codec
;
uint32_t
interval
;
uint32_t
interval
;
ftdm_status_t
fstatus
;
/*ftdm_status_t fstatus;*/
const
char
*
ftdm_start_only
=
switch_event_get_header
(
var_event
,
"ftdm_start_only"
);
const
char
*
ftdm_start_only
=
switch_event_get_header
(
var_event
,
"ftdm_start_only"
);
ctdm_private_t
*
tech_pvt
=
NULL
;
ctdm_private_t
*
tech_pvt
=
NULL
;
...
@@ -129,10 +129,12 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
...
@@ -129,10 +129,12 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
goto
fail
;
goto
fail
;
}
}
#if 0
if ((fstatus = ftdm_span_start(span)) != FTDM_SUCCESS && fstatus != FTDM_EINVAL) {
if ((fstatus = ftdm_span_start(span)) != FTDM_SUCCESS && fstatus != FTDM_EINVAL) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't start span %s.\n", span_name);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't start span %s.\n", span_name);
goto fail;
goto fail;
}
}
#endif
if
(
!
zstr
(
ftdm_start_only
)
&&
switch_true
(
ftdm_start_only
))
{
if
(
!
zstr
(
ftdm_start_only
)
&&
switch_true
(
ftdm_start_only
))
{
goto
fail
;
goto
fail
;
...
...
src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
浏览文件 @
008bb494
...
@@ -876,6 +876,7 @@ void mgco_handle_sdp_media_param(CmSdpMedPar *s, mg_termination_t* term, mgco_sd
...
@@ -876,6 +876,7 @@ void mgco_handle_sdp_media_param(CmSdpMedPar *s, mg_termination_t* term, mgco_sd
r
->
fmts
[
0
]
->
val
.
val
,
name
);
r
->
fmts
[
0
]
->
val
.
val
,
name
);
if
(
MG_TERM_RTP
==
term
->
type
){
if
(
MG_TERM_RTP
==
term
->
type
){
term
->
u
.
rtp
.
codec
=
name
;
term
->
u
.
rtp
.
codec
=
name
;
term
->
u
.
rtp
.
pt
=
r
->
fmts
[
0
]
->
val
.
val
;
}
}
}
else
{
}
else
{
/* ERROR */
/* ERROR */
...
...
src/mod/endpoints/mod_sofia/rtp.c
浏览文件 @
008bb494
...
@@ -421,6 +421,15 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
...
@@ -421,6 +421,15 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
const
char
*
command
=
switch_event_get_header
(
event
,
"command"
);
const
char
*
command
=
switch_event_get_header
(
event
,
"command"
);
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
crtp_private_t
*
tech_pvt
=
switch_core_session_get_private
(
session
);
crtp_private_t
*
tech_pvt
=
switch_core_session_get_private
(
session
);
char
*
codec
=
switch_event_get_header_nil
(
event
,
kCODEC
);
char
*
szptime
=
switch_event_get_header_nil
(
event
,
kPTIME
);
char
*
szrate
=
switch_event_get_header_nil
(
event
,
kRATE
);
char
*
szpt
=
switch_event_get_header_nil
(
event
,
kPT
);
int
ptime
=
!
zstr
(
szptime
)
?
atoi
(
szptime
)
:
0
,
rate
=
!
zstr
(
szrate
)
?
atoi
(
szrate
)
:
8000
,
pt
=
!
zstr
(
szpt
)
?
atoi
(
szpt
)
:
0
;
if
(
!
zstr
(
command
)
&&
!
strcasecmp
(
command
,
"media_modify"
))
{
if
(
!
zstr
(
command
)
&&
!
strcasecmp
(
command
,
"media_modify"
))
{
/* Compare parameters */
/* Compare parameters */
...
@@ -448,7 +457,44 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
...
@@ -448,7 +457,44 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
compare_var
(
event
,
channel
,
kPT
)
||
compare_var
(
event
,
channel
,
kPT
)
||
compare_var
(
event
,
channel
,
kRATE
))
{
compare_var
(
event
,
channel
,
kRATE
))
{
/* Reset codec */
/* Reset codec */
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_CRIT
,
"Switching codec not yet implemented
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_CRIT
,
"Switching codec updating
\n
"
);
if
(
switch_core_codec_init
(
&
tech_pvt
->
read_codec
,
codec
,
NULL
,
rate
,
ptime
,
1
,
/*SWITCH_CODEC_FLAG_ENCODE |*/
SWITCH_CODEC_FLAG_DECODE
,
NULL
,
switch_core_session_get_pool
(
tech_pvt
->
session
))
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't load codec?
\n
"
);
goto
fail
;
}
else
{
if
(
switch_core_codec_init
(
&
tech_pvt
->
write_codec
,
codec
,
NULL
,
rate
,
ptime
,
1
,
SWITCH_CODEC_FLAG_ENCODE
/*| SWITCH_CODEC_FLAG_DECODE*/
,
NULL
,
switch_core_session_get_pool
(
tech_pvt
->
session
))
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't load codec?
\n
"
);
goto
fail
;
}
}
if
(
switch_core_session_set_read_codec
(
session
,
&
tech_pvt
->
read_codec
)
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't set read codec?
\n
"
);
goto
fail
;
}
if
(
switch_core_session_set_write_codec
(
session
,
&
tech_pvt
->
write_codec
)
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't set write codec?
\n
"
);
goto
fail
;
}
switch_rtp_set_default_payload
(
tech_pvt
->
rtp_session
,
pt
);
switch_rtp_set_recv_pt
(
tech_pvt
->
rtp_session
,
pt
);
}
}
if
(
compare_var
(
event
,
channel
,
kRFC2833PT
))
{
if
(
compare_var
(
event
,
channel
,
kRFC2833PT
))
{
...
@@ -464,6 +510,22 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
...
@@ -464,6 +510,22 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
}
}
return
SWITCH_STATUS_SUCCESS
;
return
SWITCH_STATUS_SUCCESS
;
fail:
if
(
tech_pvt
)
{
if
(
tech_pvt
->
read_codec
.
implementation
)
{
switch_core_codec_destroy
(
&
tech_pvt
->
read_codec
);
}
if
(
tech_pvt
->
write_codec
.
implementation
)
{
switch_core_codec_destroy
(
&
tech_pvt
->
write_codec
);
}
}
if
(
session
)
{
switch_core_session_destroy
(
&
session
);
}
return
SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER
;
}
}
static
switch_status_t
channel_receive_message
(
switch_core_session_t
*
session
,
switch_core_session_message_t
*
msg
)
static
switch_status_t
channel_receive_message
(
switch_core_session_t
*
session
,
switch_core_session_message_t
*
msg
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论