Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
9c00466d
提交
9c00466d
authored
2月 26, 2013
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-5127 --resolve
上级
babeca40
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
28 行增加
和
8 行删除
+28
-8
switch_types.h
src/include/switch_types.h
+10
-8
switch_core_io.c
src/switch_core_io.c
+14
-0
switch_ivr_async.c
src/switch_ivr_async.c
+4
-0
没有找到文件。
src/include/switch_types.h
浏览文件 @
9c00466d
...
@@ -1480,7 +1480,8 @@ SMBF_WRITE_STREAM - Include the Write Stream
...
@@ -1480,7 +1480,8 @@ SMBF_WRITE_STREAM - Include the Write Stream
SMBF_WRITE_REPLACE - Replace the Write Stream
SMBF_WRITE_REPLACE - Replace the Write Stream
SMBF_READ_REPLACE - Replace the Read Stream
SMBF_READ_REPLACE - Replace the Read Stream
SMBF_STEREO - Record in stereo
SMBF_STEREO - Record in stereo
SMBF_ANSWER_RECORD_REQ - Don't record until the channel is answered
SMBF_ANSWER_REQ - Don't record until the channel is answered
SMBF_BRIDGE_REQ - Don't record until the channel is bridged
SMBF_THREAD_LOCK - Only let the same thread who created the bug remove it.
SMBF_THREAD_LOCK - Only let the same thread who created the bug remove it.
SMBF_PRUNE -
SMBF_PRUNE -
SMBF_NO_PAUSE -
SMBF_NO_PAUSE -
...
@@ -1496,13 +1497,14 @@ typedef enum {
...
@@ -1496,13 +1497,14 @@ typedef enum {
SMBF_READ_PING
=
(
1
<<
4
),
SMBF_READ_PING
=
(
1
<<
4
),
SMBF_STEREO
=
(
1
<<
5
),
SMBF_STEREO
=
(
1
<<
5
),
SMBF_ANSWER_REQ
=
(
1
<<
6
),
SMBF_ANSWER_REQ
=
(
1
<<
6
),
SMBF_THREAD_LOCK
=
(
1
<<
7
),
SMBF_BRIDGE_REQ
=
(
1
<<
7
),
SMBF_PRUNE
=
(
1
<<
8
),
SMBF_THREAD_LOCK
=
(
1
<<
8
),
SMBF_NO_PAUSE
=
(
1
<<
9
),
SMBF_PRUNE
=
(
1
<<
9
),
SMBF_STEREO_SWAP
=
(
1
<<
10
),
SMBF_NO_PAUSE
=
(
1
<<
10
),
SMBF_LOCK
=
(
1
<<
11
),
SMBF_STEREO_SWAP
=
(
1
<<
11
),
SMBF_TAP_NATIVE_READ
=
(
1
<<
12
),
SMBF_LOCK
=
(
1
<<
12
),
SMBF_TAP_NATIVE_WRITE
=
(
1
<<
13
)
SMBF_TAP_NATIVE_READ
=
(
1
<<
13
),
SMBF_TAP_NATIVE_WRITE
=
(
1
<<
14
)
}
switch_media_bug_flag_enum_t
;
}
switch_media_bug_flag_enum_t
;
typedef
uint32_t
switch_media_bug_flag_t
;
typedef
uint32_t
switch_media_bug_flag_t
;
...
...
src/switch_core_io.c
浏览文件 @
9c00466d
...
@@ -551,6 +551,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
...
@@ -551,6 +551,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_ANSWERED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_ANSWER_REQ
))
{
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_ANSWERED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_ANSWER_REQ
))
{
continue
;
continue
;
}
}
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_BRIDGED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_BRIDGE_REQ
))
{
continue
;
}
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
prune
++
;
prune
++
;
continue
;
continue
;
...
@@ -595,6 +600,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
...
@@ -595,6 +600,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_ANSWERED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_ANSWER_REQ
))
{
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_ANSWERED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_ANSWER_REQ
))
{
continue
;
continue
;
}
}
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_BRIDGED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_BRIDGE_REQ
))
{
continue
;
}
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
prune
++
;
prune
++
;
continue
;
continue
;
...
@@ -757,6 +767,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
...
@@ -757,6 +767,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
continue
;
continue
;
}
}
if
(
!
switch_channel_test_flag
(
session
->
channel
,
CF_BRIDGED
)
&&
switch_core_media_bug_test_flag
(
bp
,
SMBF_BRIDGE_REQ
))
{
continue
;
}
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
if
(
switch_test_flag
(
bp
,
SMBF_PRUNE
))
{
prune
++
;
prune
++
;
continue
;
continue
;
...
...
src/switch_ivr_async.c
浏览文件 @
9c00466d
...
@@ -1845,6 +1845,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t
...
@@ -1845,6 +1845,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t
flags
|=
SMBF_ANSWER_REQ
;
flags
|=
SMBF_ANSWER_REQ
;
}
}
if
((
p
=
switch_channel_get_variable
(
channel
,
"RECORD_BRIDGE_REQ"
))
&&
switch_true
(
p
))
{
flags
|=
SMBF_BRIDGE_REQ
;
}
if
((
p
=
switch_channel_get_variable
(
channel
,
"RECORD_APPEND"
))
&&
switch_true
(
p
))
{
if
((
p
=
switch_channel_get_variable
(
channel
,
"RECORD_APPEND"
))
&&
switch_true
(
p
))
{
file_flags
|=
SWITCH_FILE_WRITE_APPEND
;
file_flags
|=
SWITCH_FILE_WRITE_APPEND
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论