Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
f5c541a5
提交
f5c541a5
authored
10月 28, 2015
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix close file snafu
上级
ca49966f
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
42 行增加
和
1 行删除
+42
-1
conference_file.c
src/mod/applications/mod_conference/conference_file.c
+39
-0
conference_video.c
src/mod/applications/mod_conference/conference_video.c
+2
-0
mod_conference.h
src/mod/applications/mod_conference/mod_conference.h
+1
-1
没有找到文件。
src/mod/applications/mod_conference/conference_file.c
浏览文件 @
f5c541a5
...
...
@@ -410,6 +410,45 @@ switch_status_t conference_file_local_play(conference_obj_t *conference, switch_
return
status
;
}
switch_status_t
conference_close_open_files
(
conference_obj_t
*
conference
)
{
int
x
=
0
;
switch_mutex_lock
(
conference
->
mutex
);
/* Close Unused Handles */
if
(
conference
->
fnode
)
{
conference_file_node_t
*
fnode
,
*
cur
;
switch_memory_pool_t
*
pool
;
fnode
=
conference
->
fnode
;
while
(
fnode
)
{
cur
=
fnode
;
fnode
=
fnode
->
next
;
if
(
cur
->
type
!=
NODE_TYPE_SPEECH
)
{
conference_file_close
(
conference
,
cur
);
}
pool
=
cur
->
pool
;
switch_core_destroy_memory_pool
(
&
pool
);
x
++
;
}
conference
->
fnode
=
NULL
;
}
if
(
conference
->
async_fnode
)
{
switch_memory_pool_t
*
pool
;
conference_file_close
(
conference
,
conference
->
async_fnode
);
pool
=
conference
->
async_fnode
->
pool
;
conference
->
async_fnode
=
NULL
;
switch_core_destroy_memory_pool
(
&
pool
);
x
++
;
}
switch_mutex_unlock
(
conference
->
mutex
);
return
x
?
SWITCH_STATUS_SUCCESS
:
SWITCH_STATUS_FALSE
;
}
/* For Emacs:
* Local Variables:
* mode:c
...
...
src/mod/applications/mod_conference/conference_video.c
浏览文件 @
f5c541a5
...
...
@@ -2681,6 +2681,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
}
}
conference_close_open_files
(
conference
);
switch_core_timer_destroy
(
&
canvas
->
timer
);
conference_video_destroy_canvas
(
&
canvas
);
...
...
src/mod/applications/mod_conference/mod_conference.h
浏览文件 @
f5c541a5
...
...
@@ -860,7 +860,7 @@ void conference_member_add_file_data(conference_member_t *member, int16_t *data,
void
conference_send_notify
(
conference_obj_t
*
conference
,
const
char
*
status
,
const
char
*
call_id
,
switch_bool_t
final
);
switch_status_t
conference_file_close
(
conference_obj_t
*
conference
,
conference_file_node_t
*
node
);
void
*
SWITCH_THREAD_FUNC
conference_record_thread_run
(
switch_thread_t
*
thread
,
void
*
obj
);
switch_status_t
conference_close_open_files
(
conference_obj_t
*
conference
);
void
conference_al_gen_arc
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
);
void
conference_al_process
(
al_handle_t
*
al
,
void
*
data
,
switch_size_t
datalen
,
int
rate
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论