Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
19e86216
提交
19e86216
authored
6月 26, 2017
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-10417: [freeswitch-core] Reduce flicker in screen sharing -- minor tweak
上级
e409af11
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
16 行增加
和
14 行删除
+16
-14
switch_jitterbuffer.c
src/switch_jitterbuffer.c
+9
-9
switch_rtp.c
src/switch_rtp.c
+7
-5
没有找到文件。
src/switch_jitterbuffer.c
浏览文件 @
19e86216
...
@@ -742,9 +742,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
...
@@ -742,9 +742,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
jb_debug
(
jb
,
2
,
"%s"
,
"DROPPED FRAME DETECTED RESYNCING
\n
"
);
jb_debug
(
jb
,
2
,
"%s"
,
"DROPPED FRAME DETECTED RESYNCING
\n
"
);
jb
->
target_seq
=
0
;
jb
->
target_seq
=
0
;
//
if (jb->session) {
if
(
jb
->
session
)
{
//
switch_core_session_request_video_refresh(jb->session);
switch_core_session_request_video_refresh
(
jb
->
session
);
//
}
}
}
}
}
}
...
@@ -772,9 +772,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
...
@@ -772,9 +772,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
jb_frame_inc
(
jb
,
1
);
jb_frame_inc
(
jb
,
1
);
}
}
//
if (jb->session) {
if
(
jb
->
session
)
{
//
switch_core_session_request_video_refresh(jb->session);
switch_core_session_request_video_refresh
(
jb
->
session
);
//
}
}
for
(
x
=
0
;
x
<
10
;
x
++
)
{
for
(
x
=
0
;
x
<
10
;
x
++
)
{
increment_seq
(
jb
);
increment_seq
(
jb
);
...
@@ -930,9 +930,9 @@ SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
...
@@ -930,9 +930,9 @@ SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
switch_core_inthash_init
(
&
jb
->
missing_seq_hash
);
switch_core_inthash_init
(
&
jb
->
missing_seq_hash
);
switch_mutex_unlock
(
jb
->
mutex
);
switch_mutex_unlock
(
jb
->
mutex
);
//
if (jb->session) {
if
(
jb
->
session
)
{
//
switch_core_session_request_video_refresh(jb->session);
switch_core_session_request_video_refresh
(
jb
->
session
);
//
}
}
}
}
jb_debug
(
jb
,
2
,
"%s"
,
"RESET BUFFER
\n
"
);
jb_debug
(
jb
,
2
,
"%s"
,
"RESET BUFFER
\n
"
);
...
...
src/switch_rtp.c
浏览文件 @
19e86216
...
@@ -1664,9 +1664,9 @@ static void check_jitter(switch_rtp_t *rtp_session)
...
@@ -1664,9 +1664,9 @@ static void check_jitter(switch_rtp_t *rtp_session)
(rtp_session->stats.inbound.last_processed_seq + 1), lost);
(rtp_session->stats.inbound.last_processed_seq + 1), lost);
rtp_session->stats.inbound.last_loss++;
rtp_session->stats.inbound.last_loss++;
//
if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
//
switch_core_session_request_video_refresh(rtp_session->session);
switch_core_session_request_video_refresh(rtp_session->session);
//
}
}
if (rtp_session->stats.inbound.last_loss > 0 && rtp_session->stats.inbound.last_loss < LOST_BURST_CAPTURE) {
if (rtp_session->stats.inbound.last_loss > 0 && rtp_session->stats.inbound.last_loss < LOST_BURST_CAPTURE) {
rtp_session->stats.inbound.loss[rtp_session->stats.inbound.last_loss] += lost;
rtp_session->stats.inbound.loss[rtp_session->stats.inbound.last_loss] += lost;
...
@@ -6187,7 +6187,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
...
@@ -6187,7 +6187,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
}
}
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
rtp_session
->
session
),
SWITCH_LOG_DEBUG1
,
"Got NACK [%u][0x%x] for seq %u
\n
"
,
nack
,
nack
,
ntohs
(
seq
));
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "%s Got NACK [%u][0x%x] for seq %u\n",
switch_core_session_get_name(rtp_session->session), nack, nack, ntohs(seq));
if (switch_jb_get_packet_by_seq(rtp_session->vbw, seq, (switch_rtp_packet_t *) send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
if (switch_jb_get_packet_by_seq(rtp_session->vbw, seq, (switch_rtp_packet_t *) send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
...
@@ -6211,7 +6212,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
...
@@ -6211,7 +6212,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
blp = ntohs(blp);
blp = ntohs(blp);
for (i = 0; i < 16; i++) {
for (i = 0; i < 16; i++) {
if (blp & (1 << i)) {
if (blp & (1 << i)) {
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
rtp_session
->
session
),
SWITCH_LOG_DEBUG1
,
"Also Got NACK for seq %u
\n
"
,
ntohs
(
seq
)
+
i
+
1
);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "%s Also Got NACK for seq %u\n",
switch_core_session_get_name(rtp_session->session), ntohs(seq) + i + 1);
/* If they are missing more than one, may as well gen a key frame for good measure */
/* If they are missing more than one, may as well gen a key frame for good measure */
//switch_core_media_gen_key_frame(rtp_session->session);
//switch_core_media_gen_key_frame(rtp_session->session);
if (switch_jb_get_packet_by_seq(rtp_session->vbw, htons(ntohs(seq) + i + 1), (switch_rtp_packet_t *) &send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
if (switch_jb_get_packet_by_seq(rtp_session->vbw, htons(ntohs(seq) + i + 1), (switch_rtp_packet_t *) &send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论