Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
1d1cb7e4
提交
1d1cb7e4
authored
4月 06, 2017
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-10097: [mod_conference] Add fgimg to conference video layouts
上级
9c6a027d
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
45 行增加
和
0 行删除
+45
-0
conference_api.c
src/mod/applications/mod_conference/conference_api.c
+44
-0
mod_conference.h
src/mod/applications/mod_conference/mod_conference.h
+1
-0
没有找到文件。
src/mod/applications/mod_conference/conference_api.c
浏览文件 @
1d1cb7e4
...
@@ -110,6 +110,7 @@ api_command_t conference_api_sub_commands[] = {
...
@@ -110,6 +110,7 @@ api_command_t conference_api_sub_commands[] = {
{
"vid-layout"
,
(
void_fn_t
)
&
conference_api_sub_vid_layout
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-layout"
,
"<layout name>|group <group name> [<canvas id>]"
},
{
"vid-layout"
,
(
void_fn_t
)
&
conference_api_sub_vid_layout
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-layout"
,
"<layout name>|group <group name> [<canvas id>]"
},
{
"vid-write-png"
,
(
void_fn_t
)
&
conference_api_sub_write_png
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-write-png"
,
"<path>"
},
{
"vid-write-png"
,
(
void_fn_t
)
&
conference_api_sub_write_png
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-write-png"
,
"<path>"
},
{
"vid-fps"
,
(
void_fn_t
)
&
conference_api_sub_vid_fps
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-fps"
,
"<fps>"
},
{
"vid-fps"
,
(
void_fn_t
)
&
conference_api_sub_vid_fps
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-fps"
,
"<fps>"
},
{
"vid-fgimg"
,
(
void_fn_t
)
&
conference_api_sub_canvas_fgimg
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-fgimg"
,
"<file> | clear [<canvas-id>]"
},
{
"vid-bgimg"
,
(
void_fn_t
)
&
conference_api_sub_canvas_bgimg
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-bgimg"
,
"<file> | clear [<canvas-id>]"
},
{
"vid-bgimg"
,
(
void_fn_t
)
&
conference_api_sub_canvas_bgimg
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-bgimg"
,
"<file> | clear [<canvas-id>]"
},
{
"vid-bandwidth"
,
(
void_fn_t
)
&
conference_api_sub_vid_bandwidth
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-bandwidth"
,
"<BW>"
},
{
"vid-bandwidth"
,
(
void_fn_t
)
&
conference_api_sub_vid_bandwidth
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-bandwidth"
,
"<BW>"
},
{
"vid-personal"
,
(
void_fn_t
)
&
conference_api_sub_vid_personal
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-personal"
,
"[on|off]"
}
{
"vid-personal"
,
(
void_fn_t
)
&
conference_api_sub_vid_personal
,
CONF_API_SUB_ARGS_SPLIT
,
"vid-personal"
,
"[on|off]"
}
...
@@ -1384,6 +1385,49 @@ switch_status_t conference_api_sub_canvas_bgimg(conference_obj_t *conference, sw
...
@@ -1384,6 +1385,49 @@ switch_status_t conference_api_sub_canvas_bgimg(conference_obj_t *conference, sw
return
SWITCH_STATUS_SUCCESS
;
return
SWITCH_STATUS_SUCCESS
;
}
}
switch_status_t
conference_api_sub_canvas_fgimg
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
)
{
mcu_canvas_t
*
canvas
=
NULL
;
int
idx
=
0
;
char
*
file
=
NULL
;
switch_status_t
status
=
SWITCH_STATUS_FALSE
;
if
(
!
argv
[
2
])
{
stream
->
write_function
(
stream
,
"Invalid input
\n
"
);
return
SWITCH_STATUS_SUCCESS
;
}
file
=
argv
[
2
];
if
(
argv
[
3
])
{
idx
=
atoi
(
argv
[
3
])
-
1
;
}
if
(
idx
<
0
||
idx
>
SUPER_CANVAS_ID
||
!
conference
->
canvases
[
idx
])
{
stream
->
write_function
(
stream
,
"Invalid canvas
\n
"
);
return
SWITCH_STATUS_SUCCESS
;
}
if
((
canvas
=
conference
->
canvases
[
idx
]))
{
switch_mutex_lock
(
canvas
->
mutex
);
if
(
!
strcasecmp
(
file
,
"clear"
))
{
conference_video_reset_image
(
canvas
->
img
,
&
canvas
->
bgcolor
);
}
else
{
status
=
conference_video_set_canvas_fgimg
(
canvas
,
file
);
}
switch_mutex_unlock
(
canvas
->
mutex
);
}
if
(
status
==
SWITCH_STATUS_SUCCESS
)
{
stream
->
write_function
(
stream
,
"Set FGimg %s
\n
"
,
file
);
}
else
{
stream
->
write_function
(
stream
,
"Error Setting FGimg %s
\n
"
,
file
);
}
return
SWITCH_STATUS_SUCCESS
;
}
switch_status_t
conference_api_sub_vid_fps
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
)
switch_status_t
conference_api_sub_vid_fps
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
)
{
{
float
fps
=
0
;
float
fps
=
0
;
...
...
src/mod/applications/mod_conference/mod_conference.h
浏览文件 @
1d1cb7e4
...
@@ -1200,6 +1200,7 @@ switch_status_t conference_api_sub_get(conference_obj_t *conference, switch_stre
...
@@ -1200,6 +1200,7 @@ switch_status_t conference_api_sub_get(conference_obj_t *conference, switch_stre
switch_status_t
conference_api_sub_vid_mute_img
(
conference_member_t
*
member
,
switch_stream_handle_t
*
stream
,
void
*
data
);
switch_status_t
conference_api_sub_vid_mute_img
(
conference_member_t
*
member
,
switch_stream_handle_t
*
stream
,
void
*
data
);
switch_status_t
conference_api_sub_vid_logo_img
(
conference_member_t
*
member
,
switch_stream_handle_t
*
stream
,
void
*
data
);
switch_status_t
conference_api_sub_vid_logo_img
(
conference_member_t
*
member
,
switch_stream_handle_t
*
stream
,
void
*
data
);
switch_status_t
conference_api_sub_vid_fps
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_vid_fps
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_canvas_fgimg
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_canvas_bgimg
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_canvas_bgimg
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_write_png
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_write_png
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_file_vol
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
switch_status_t
conference_api_sub_file_vol
(
conference_obj_t
*
conference
,
switch_stream_handle_t
*
stream
,
int
argc
,
char
**
argv
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论