Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
9e094835
提交
9e094835
authored
10月 07, 2011
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add manual_rtp_bug gen_one_gen_all to prevent rtp passthru to break the *S* word..
上级
f9fc86ef
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
31 行增加
和
3 行删除
+31
-3
switch_types.h
src/include/switch_types.h
+16
-1
mod_dptools.c
src/mod/applications/mod_dptools/mod_dptools.c
+2
-2
sofia_glue.c
src/mod/endpoints/mod_sofia/sofia_glue.c
+8
-0
switch_rtp.c
src/switch_rtp.c
+5
-0
没有找到文件。
src/include/switch_types.h
浏览文件 @
9e094835
...
@@ -685,7 +685,7 @@ typedef enum {
...
@@ -685,7 +685,7 @@ typedef enum {
*/
*/
RTP_BUG_ACCEPT_ANY_PACKETS
=
(
1
<<
7
)
RTP_BUG_ACCEPT_ANY_PACKETS
=
(
1
<<
7
)
,
/*
/*
Oracle's Contact Center Anywhere (CCA) likes to use a single RTP socket to send all its outbound audio.
Oracle's Contact Center Anywhere (CCA) likes to use a single RTP socket to send all its outbound audio.
...
@@ -694,6 +694,21 @@ typedef enum {
...
@@ -694,6 +694,21 @@ typedef enum {
*/
*/
RTP_BUG_GEN_ONE_GEN_ALL
=
(
1
<<
8
)
/*
Some RTP endpoints (and by some we mean *cough* _SONUS_!) do not like it when the timestamps jump forward or backwards in time.
So say you are generating a file that says "please wait for me to complete your call, or generating ringback"
Now you place and outbound call and you are bridging. Well, while you were playing the file, you were generating your own RTP timestamps.
But, now that you have a remote RTP stream, you'd rather send those timestamps as-is in case they will be fed to a remote jitter buffer......
Ok, so this causes the audio to completely fade out despite the fact that we send the mark bit which should give them heads up its happening.
Sigh, This flag will tell FreeSWITCH that if it ever generates even one RTP packet itself, to continue to generate all of them and ignore the
actual timestamps in the frames.
*/
}
switch_rtp_bug_flag_t
;
}
switch_rtp_bug_flag_t
;
#ifdef _MSC_VER
#ifdef _MSC_VER
...
...
src/mod/applications/mod_dptools/mod_dptools.c
浏览文件 @
9e094835
...
@@ -3730,8 +3730,8 @@ static int next_file(switch_file_handle_t *handle)
...
@@ -3730,8 +3730,8 @@ static int next_file(switch_file_handle_t *handle)
}
}
handle
->
samples
=
context
->
fh
.
samples
;
handle
->
samples
=
context
->
fh
.
samples
;
handle
->
samplerate
=
context
->
fh
.
samplerate
;
//
handle->samplerate = context->fh.samplerate;
handle
->
channels
=
context
->
fh
.
channels
;
//
handle->channels = context->fh.channels;
handle
->
format
=
context
->
fh
.
format
;
handle
->
format
=
context
->
fh
.
format
;
handle
->
sections
=
context
->
fh
.
sections
;
handle
->
sections
=
context
->
fh
.
sections
;
handle
->
seekable
=
context
->
fh
.
seekable
;
handle
->
seekable
=
context
->
fh
.
seekable
;
...
...
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @
9e094835
...
@@ -6577,6 +6577,14 @@ void sofia_glue_parse_rtp_bugs(switch_rtp_bug_flag_t *flag_pole, const char *str
...
@@ -6577,6 +6577,14 @@ void sofia_glue_parse_rtp_bugs(switch_rtp_bug_flag_t *flag_pole, const char *str
if
(
switch_stristr
(
"~ACCEPT_ANY_PACKETS"
,
str
))
{
if
(
switch_stristr
(
"~ACCEPT_ANY_PACKETS"
,
str
))
{
*
flag_pole
&=
~
RTP_BUG_ACCEPT_ANY_PACKETS
;
*
flag_pole
&=
~
RTP_BUG_ACCEPT_ANY_PACKETS
;
}
}
if
(
switch_stristr
(
"GEN_ONE_GEN_ALL"
,
str
))
{
*
flag_pole
|=
RTP_BUG_GEN_ONE_GEN_ALL
;
}
if
(
switch_stristr
(
"~GEN_ONE_GEN_ALL"
,
str
))
{
*
flag_pole
&=
~
RTP_BUG_GEN_ONE_GEN_ALL
;
}
}
}
char
*
sofia_glue_gen_contact_str
(
sofia_profile_t
*
profile
,
sip_t
const
*
sip
,
sofia_dispatch_event_t
*
de
,
sofia_nat_parse_t
*
np
)
char
*
sofia_glue_gen_contact_str
(
sofia_profile_t
*
profile
,
sip_t
const
*
sip
,
sofia_dispatch_event_t
*
de
,
sofia_nat_parse_t
*
np
)
...
...
src/switch_rtp.c
浏览文件 @
9e094835
...
@@ -4175,6 +4175,11 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
...
@@ -4175,6 +4175,11 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
fwd
=
(
switch_test_flag
(
rtp_session
,
SWITCH_RTP_FLAG_RAW_WRITE
)
&&
switch_test_flag
(
frame
,
SFF_RAW_RTP
))
?
1
:
0
;
fwd
=
(
switch_test_flag
(
rtp_session
,
SWITCH_RTP_FLAG_RAW_WRITE
)
&&
switch_test_flag
(
frame
,
SFF_RAW_RTP
))
?
1
:
0
;
if
(
!
fwd
&&
switch_test_flag
(
rtp_session
,
SWITCH_RTP_FLAG_RAW_WRITE
)
&&
(
rtp_session
->
rtp_bugs
&
RTP_BUG_GEN_ONE_GEN_ALL
))
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_WARNING
,
"Generating RTP locally but timestamp passthru is configured, disabling....
\n
"
);
switch_clear_flag
(
rtp_session
,
SWITCH_RTP_FLAG_RAW_WRITE
);
}
switch_assert
(
frame
!=
NULL
);
switch_assert
(
frame
!=
NULL
);
if
(
switch_test_flag
(
frame
,
SFF_CNG
))
{
if
(
switch_test_flag
(
frame
,
SFF_CNG
))
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论