Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
9a7a33fb
提交
9a7a33fb
authored
3月 03, 2015
作者:
Anthony Minessale
提交者:
Michael Jerris
5月 28, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-7500: block in flag set for wait for video ready
上级
5b509a72
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
5 行增加
和
8 行删除
+5
-8
mod_av.c
src/mod/applications/mod_av/mod_av.c
+0
-1
mod_conference.c
src/mod/applications/mod_conference/mod_conference.c
+2
-0
mod_fsv.c
src/mod/applications/mod_fsv/mod_fsv.c
+0
-3
mod_vlc.c
src/mod/formats/mod_vlc/mod_vlc.c
+0
-2
switch_channel.c
src/switch_channel.c
+3
-0
switch_ivr_play_say.c
src/switch_ivr_play_say.c
+0
-2
没有找到文件。
src/mod/applications/mod_av/mod_av.c
浏览文件 @
9a7a33fb
...
@@ -1122,7 +1122,6 @@ SWITCH_STANDARD_APP(record_av_function)
...
@@ -1122,7 +1122,6 @@ SWITCH_STANDARD_APP(record_av_function)
}
}
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
switch_core_media_get_vid_params
(
session
,
&
vid_params
);
switch_core_media_get_vid_params
(
session
,
&
vid_params
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_ECHO
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_ECHO
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"video size: %dx%d
\n
"
,
vid_params
.
width
,
vid_params
.
height
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"video size: %dx%d
\n
"
,
vid_params
.
width
,
vid_params
.
height
);
...
...
src/mod/applications/mod_conference/mod_conference.c
浏览文件 @
9a7a33fb
...
@@ -3691,9 +3691,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
...
@@ -3691,9 +3691,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
if
(
switch_test_flag
(
conference
,
CFLAG_TRANSCODE_VIDEO
))
{
if
(
switch_test_flag
(
conference
,
CFLAG_TRANSCODE_VIDEO
))
{
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_core_media_gen_key_frame
(
member
->
session
);
}
}
if
((
var
=
switch_channel_get_variable_dup
(
member
->
channel
,
"video_mute_png"
,
SWITCH_FALSE
,
-
1
)))
{
if
((
var
=
switch_channel_get_variable_dup
(
member
->
channel
,
"video_mute_png"
,
SWITCH_FALSE
,
-
1
)))
{
member
->
video_mute_png
=
switch_core_strdup
(
member
->
pool
,
var
);
member
->
video_mute_png
=
switch_core_strdup
(
member
->
pool
,
var
);
}
}
...
...
src/mod/applications/mod_fsv/mod_fsv.c
浏览文件 @
9a7a33fb
...
@@ -537,9 +537,6 @@ SWITCH_STANDARD_APP(play_yuv_function)
...
@@ -537,9 +537,6 @@ SWITCH_STANDARD_APP(play_yuv_function)
}
}
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
width
=
width
?
width
:
352
;
width
=
width
?
width
:
352
;
height
=
height
?
height
:
288
;
height
=
height
?
height
:
288
;
size
=
width
*
height
*
3
/
2
;
size
=
width
*
height
*
3
/
2
;
...
...
src/mod/formats/mod_vlc/mod_vlc.c
浏览文件 @
9a7a33fb
...
@@ -1377,7 +1377,6 @@ SWITCH_STANDARD_APP(play_video_function)
...
@@ -1377,7 +1377,6 @@ SWITCH_STANDARD_APP(play_video_function)
libvlc_video_set_callbacks
(
context
->
mp
,
vlc_video_lock_callback
,
vlc_video_unlock_callback
,
vlc_video_display_callback
,
context
);
libvlc_video_set_callbacks
(
context
->
mp
,
vlc_video_lock_callback
,
vlc_video_unlock_callback
,
vlc_video_display_callback
,
context
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
// start play
// start play
if
(
-
1
==
libvlc_media_player_play
(
context
->
mp
))
{
if
(
-
1
==
libvlc_media_player_play
(
context
->
mp
))
{
...
@@ -1680,7 +1679,6 @@ SWITCH_STANDARD_APP(capture_video_function)
...
@@ -1680,7 +1679,6 @@ SWITCH_STANDARD_APP(capture_video_function)
switch_core_timer_init
(
&
context
->
timer
,
"soft"
,
1
,
1000
,
context
->
pool
);
switch_core_timer_init
(
&
context
->
timer
,
"soft"
,
1
,
1000
,
context
->
pool
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
switch_core_media_get_vid_params
(
session
,
&
vid_params
);
switch_core_media_get_vid_params
(
session
,
&
vid_params
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_ECHO
);
switch_channel_set_flag
(
channel
,
CF_VIDEO_ECHO
);
switch_core_session_raw_read
(
session
);
switch_core_session_raw_read
(
session
);
...
...
src/switch_channel.c
浏览文件 @
9a7a33fb
...
@@ -1830,6 +1830,9 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
...
@@ -1830,6 +1830,9 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
switch_channel_set_variable
(
channel
,
"recovered"
,
"true"
);
switch_channel_set_variable
(
channel
,
"recovered"
,
"true"
);
}
}
if
(
flag
==
CF_VIDEO_DECODED_READ
)
{
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
}
}
}
SWITCH_DECLARE
(
void
)
switch_channel_set_flag_recursive
(
switch_channel_t
*
channel
,
switch_channel_flag_t
flag
)
SWITCH_DECLARE
(
void
)
switch_channel_set_flag_recursive
(
switch_channel_t
*
channel
,
switch_channel_flag_t
flag
)
...
...
src/switch_ivr_play_say.c
浏览文件 @
9a7a33fb
...
@@ -526,7 +526,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
...
@@ -526,7 +526,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
if
(
switch_channel_test_flag
(
channel
,
CF_VIDEO
))
{
if
(
switch_channel_test_flag
(
channel
,
CF_VIDEO
))
{
file_flags
|=
SWITCH_FILE_FLAG_VIDEO
;
file_flags
|=
SWITCH_FILE_FLAG_VIDEO
;
switch_channel_set_flag_recursive
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag_recursive
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
}
}
if
(
switch_core_file_open
(
fh
,
file
,
fh
->
channels
,
read_impl
.
actual_samples_per_second
,
file_flags
,
NULL
)
!=
SWITCH_STATUS_SUCCESS
)
{
if
(
switch_core_file_open
(
fh
,
file
,
fh
->
channels
,
read_impl
.
actual_samples_per_second
,
file_flags
,
NULL
)
!=
SWITCH_STATUS_SUCCESS
)
{
...
@@ -1264,7 +1263,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
...
@@ -1264,7 +1263,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
if
(
switch_channel_test_flag
(
channel
,
CF_VIDEO
))
{
if
(
switch_channel_test_flag
(
channel
,
CF_VIDEO
))
{
flags
|=
SWITCH_FILE_FLAG_VIDEO
;
flags
|=
SWITCH_FILE_FLAG_VIDEO
;
switch_channel_set_flag_recursive
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_set_flag_recursive
(
channel
,
CF_VIDEO_DECODED_READ
);
switch_channel_wait_for_flag
(
channel
,
CF_VIDEO_READY
,
SWITCH_TRUE
,
10000
,
NULL
);
}
}
if
(
switch_core_file_open
(
fh
,
if
(
switch_core_file_open
(
fh
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论