Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
054225b8
提交
054225b8
authored
9月 09, 2013
作者:
Seven Du
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor to use the new switch_core_session_refresh_video function
上级
9074a124
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
4 行增加
和
18 行删除
+4
-18
mod_conference.c
src/mod/applications/mod_conference/mod_conference.c
+2
-6
mod_fsv.c
src/mod/applications/mod_fsv/mod_fsv.c
+2
-12
没有找到文件。
src/mod/applications/mod_conference/mod_conference.c
浏览文件 @
054225b8
...
...
@@ -32,6 +32,7 @@
* David Weekly <david@weekly.org>
* Joao Mesquita <jmesquita@gmail.com>
* Raymond Chandler <intralanman@freeswitch.org>
* Seven Du <dujinfang@gmail.com>
*
* mod_conference.c -- Software Conference Bridge
*
...
...
@@ -1869,7 +1870,6 @@ static void *SWITCH_THREAD_FUNC conference_video_bridge_thread_run(switch_thread
switch_status_t
status
;
switch_frame_t
*
read_frame
;
conference_obj_t
*
conference
=
vh
->
member_a
->
conference
;
switch_core_session_message_t
msg
=
{
0
};
switch_thread_rwlock_rdlock
(
conference
->
rwlock
);
switch_thread_rwlock_rdlock
(
vh
->
member_a
->
rwlock
);
...
...
@@ -1882,16 +1882,12 @@ static void *SWITCH_THREAD_FUNC conference_video_bridge_thread_run(switch_thread
switch_core_session_read_lock
(
session_a
);
switch_core_session_read_lock
(
session_b
);
/* Tell the channel to request a fresh vid frame */
msg
.
from
=
__FILE__
;
msg
.
message_id
=
SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ
;
vh
->
up
=
1
;
while
(
vh
->
up
==
1
&&
switch_test_flag
(
vh
->
member_a
,
MFLAG_RUNNING
)
&&
switch_test_flag
(
vh
->
member_b
,
MFLAG_RUNNING
)
&&
switch_channel_ready
(
channel_a
)
&&
switch_channel_ready
(
channel_b
))
{
if
(
switch_channel_test_flag
(
channel_a
,
CF_VIDEO_REFRESH_REQ
))
{
switch_core_session_re
ceive_message
(
session_b
,
&
msg
);
switch_core_session_re
fresh_video
(
session_b
);
switch_channel_clear_flag
(
channel_a
,
CF_VIDEO_REFRESH_REQ
);
}
...
...
src/mod/applications/mod_fsv/mod_fsv.c
浏览文件 @
054225b8
...
...
@@ -114,17 +114,12 @@ SWITCH_STANDARD_APP(record_fsv_function)
switch_codec_implementation_t
read_impl
=
{
0
};
switch_dtmf_t
dtmf
=
{
0
};
int
count
=
0
,
sanity
=
30
;
switch_core_session_message_t
msg
=
{
0
};
switch_channel_set_flag
(
channel
,
CF_VIDEO_PASSIVE
);
/* Tell the channel to request a fresh vid frame */
msg
.
from
=
__FILE__
;
msg
.
message_id
=
SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ
;
switch_core_session_get_read_impl
(
session
,
&
read_impl
);
switch_channel_answer
(
channel
);
switch_core_session_re
ceive_message
(
session
,
&
msg
);
switch_core_session_re
fresh_video
(
session
);
switch_channel_set_variable
(
channel
,
SWITCH_PLAYBACK_TERMINATOR_USED
,
""
);
...
...
@@ -310,15 +305,10 @@ SWITCH_STANDARD_APP(play_fsv_function)
switch_dtmf_t
dtmf
=
{
0
};
switch_frame_t
*
read_frame
;
switch_codec_implementation_t
read_impl
=
{
0
};
switch_core_session_message_t
msg
=
{
0
};
switch_channel_set_flag
(
channel
,
CF_VIDEO_PASSIVE
);
/* Tell the channel to request a fresh vid frame */
msg
.
from
=
__FILE__
;
msg
.
message_id
=
SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ
;
switch_core_session_receive_message
(
session
,
&
msg
);
switch_core_session_refresh_video
(
session
);
switch_core_session_get_read_impl
(
session
,
&
read_impl
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论