Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
a126cc7f
提交
a126cc7f
authored
2月 25, 2011
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add param to jb to try to recapture latency (disabled by default)
上级
4ef6280a
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
36 行增加
和
11 行删除
+36
-11
stfu.c
libs/stfu/stfu.c
+35
-10
stfu.h
libs/stfu/stfu.h
+1
-1
没有找到文件。
libs/stfu/stfu.c
浏览文件 @
a126cc7f
...
@@ -102,7 +102,10 @@ struct stfu_instance {
...
@@ -102,7 +102,10 @@ struct stfu_instance {
int32_t
ts_offset
;
int32_t
ts_offset
;
int32_t
ts_drift
;
int32_t
ts_drift
;
int32_t
max_drift
;
uint32_t
drift_dropped_packets
;
uint32_t
drift_max_dropped
;
int32_t
ts_diff
;
int32_t
ts_diff
;
int32_t
last_ts_diff
;
int32_t
last_ts_diff
;
int32_t
same_ts
;
int32_t
same_ts
;
...
@@ -258,7 +261,7 @@ stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen)
...
@@ -258,7 +261,7 @@ stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen)
return
s
;
return
s
;
}
}
stfu_instance_t
*
stfu_n_init
(
uint32_t
qlen
,
uint32_t
max_qlen
,
uint32_t
samples_per_packet
,
uint32_t
samples_per_second
)
stfu_instance_t
*
stfu_n_init
(
uint32_t
qlen
,
uint32_t
max_qlen
,
uint32_t
samples_per_packet
,
uint32_t
samples_per_second
,
uint32_t
max_drift_ms
)
{
{
struct
stfu_instance
*
i
;
struct
stfu_instance
*
i
;
...
@@ -277,6 +280,12 @@ stfu_instance_t *stfu_n_init(uint32_t qlen, uint32_t max_qlen, uint32_t samples_
...
@@ -277,6 +280,12 @@ stfu_instance_t *stfu_n_init(uint32_t qlen, uint32_t max_qlen, uint32_t samples_
stfu_n_init_aqueue
(
&
i
->
b_queue
,
qlen
);
stfu_n_init_aqueue
(
&
i
->
b_queue
,
qlen
);
stfu_n_init_aqueue
(
&
i
->
c_queue
,
qlen
);
stfu_n_init_aqueue
(
&
i
->
c_queue
,
qlen
);
i
->
max_drift
=
(
int32_t
)(
max_drift_ms
*
(
samples_per_second
/
1000
)
*
-
1
);
if
(
max_drift_ms
&&
samples_per_packet
)
{
i
->
drift_max_dropped
=
(
samples_per_second
*
2
)
/
samples_per_packet
;
}
i
->
in_queue
=
&
i
->
a_queue
;
i
->
in_queue
=
&
i
->
a_queue
;
i
->
out_queue
=
&
i
->
b_queue
;
i
->
out_queue
=
&
i
->
b_queue
;
i
->
old_queue
=
&
i
->
c_queue
;
i
->
old_queue
=
&
i
->
c_queue
;
...
@@ -396,6 +405,9 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
...
@@ -396,6 +405,9 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
if
(
i
->
last_ts_diff
==
i
->
ts_diff
)
{
if
(
i
->
last_ts_diff
==
i
->
ts_diff
)
{
if
(
++
i
->
same_ts
==
5
)
{
if
(
++
i
->
same_ts
==
5
)
{
i
->
samples_per_packet
=
i
->
ts_diff
;
i
->
samples_per_packet
=
i
->
ts_diff
;
if
(
i
->
max_drift
&&
i
->
samples_per_packet
)
{
i
->
drift_max_dropped
=
(
i
->
samples_per_second
*
2
)
/
i
->
samples_per_packet
;
}
}
}
}
else
{
}
else
{
i
->
same_ts
=
0
;
i
->
same_ts
=
0
;
...
@@ -409,11 +421,24 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
...
@@ -409,11 +421,24 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
}
}
}
}
if
(
timer_ts
&&
ts
&&
!
i
->
ts_offset
)
{
if
(
timer_ts
)
{
i
->
ts_offset
=
timer_ts
-
ts
;
if
(
ts
&&
!
i
->
ts_offset
)
{
}
i
->
ts_offset
=
timer_ts
-
ts
;
}
i
->
ts_drift
=
ts
+
(
i
->
ts_offset
-
timer_ts
);
i
->
ts_drift
=
ts
+
(
i
->
ts_offset
-
timer_ts
);
if
(
i
->
max_drift
)
{
if
(
i
->
ts_drift
<
i
->
max_drift
)
{
if
(
++
i
->
drift_dropped_packets
<
i
->
drift_max_dropped
)
{
stfu_log
(
STFU_LOG_EMERG
,
"%s TOO LATE !!! %u
\n\n\n
"
,
i
->
name
,
ts
);
return
STFU_ITS_TOO_LATE
;
}
}
else
{
i
->
drift_dropped_packets
=
0
;
}
}
}
if
(
i
->
sync_in
)
{
if
(
i
->
sync_in
)
{
good_ts
=
1
;
good_ts
=
1
;
...
@@ -493,12 +518,12 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
...
@@ -493,12 +518,12 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
stfu_log
(
STFU_LOG_EMERG
,
"I: %s %u i=%u/%u - g:%u/%u c:%u/%u b:%u - %u:%u - %u %d %u %u %d %d %d
\n
"
,
i
->
name
,
stfu_log
(
STFU_LOG_EMERG
,
"I: %s %u i=%u/%u - g:%u/%u c:%u/%u b:%u - %u:%u - %u %d %u %u %d %d %d
/%d
\n
"
,
i
->
name
,
i
->
qlen
,
i
->
period_packet_in_count
,
i
->
period_time
,
i
->
consecutive_good_count
,
i
->
qlen
,
i
->
period_packet_in_count
,
i
->
period_time
,
i
->
consecutive_good_count
,
i
->
decrement_time
,
i
->
period_clean_count
,
i
->
decrement_time
,
i
->
consecutive_bad_count
,
i
->
decrement_time
,
i
->
period_clean_count
,
i
->
decrement_time
,
i
->
consecutive_bad_count
,
ts
,
ts
/
i
->
samples_per_packet
,
ts
,
ts
/
i
->
samples_per_packet
,
i
->
period_missing_count
,
i
->
period_need_range_avg
,
i
->
period_missing_count
,
i
->
period_need_range_avg
,
i
->
last_wr_ts
,
ts
,
i
->
diff
,
i
->
diff_total
/
least1
(
i
->
period_packet_in_count
),
i
->
ts_drift
);
i
->
last_wr_ts
,
ts
,
i
->
diff
,
i
->
diff_total
/
least1
(
i
->
period_packet_in_count
),
i
->
ts_drift
,
i
->
max_drift
);
}
}
if
(
last
||
i
->
in_queue
->
array_len
==
i
->
in_queue
->
array_size
)
{
if
(
last
||
i
->
in_queue
->
array_len
==
i
->
in_queue
->
array_size
)
{
...
@@ -597,7 +622,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
...
@@ -597,7 +622,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
if
(
!
i
->
ready
)
{
if
(
!
i
->
ready
)
{
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
stfu_log
(
STFU_LOG_EMERG
,
"%s
XXXSKIP
\n
"
,
i
->
name
);
stfu_log
(
STFU_LOG_EMERG
,
"%s
JITTERBUFFER NOT READY: IGNORING FRAME
\n
"
,
i
->
name
);
}
}
return
NULL
;
return
NULL
;
}
}
...
@@ -612,7 +637,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
...
@@ -612,7 +637,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
}
}
if
(
i
->
cur_ts
==
0
)
{
if
(
i
->
cur_ts
==
0
)
{
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
if
(
stfu_log
!=
null_logger
&&
i
->
debug
)
{
stfu_log
(
STFU_LOG_EMERG
,
"%s
XXXPUNT
\n
"
,
i
->
name
);
stfu_log
(
STFU_LOG_EMERG
,
"%s
JITTERBUFFER ERROR: PUNTING
\n
"
,
i
->
name
);
return
NULL
;
return
NULL
;
}
}
}
}
...
...
libs/stfu/stfu.h
浏览文件 @
a126cc7f
...
@@ -179,7 +179,7 @@ typedef void (*stfu_n_call_me_t)(stfu_instance_t *i, void *);
...
@@ -179,7 +179,7 @@ typedef void (*stfu_n_call_me_t)(stfu_instance_t *i, void *);
void
stfu_n_report
(
stfu_instance_t
*
i
,
stfu_report_t
*
r
);
void
stfu_n_report
(
stfu_instance_t
*
i
,
stfu_report_t
*
r
);
void
stfu_n_destroy
(
stfu_instance_t
**
i
);
void
stfu_n_destroy
(
stfu_instance_t
**
i
);
stfu_instance_t
*
stfu_n_init
(
uint32_t
qlen
,
uint32_t
max_qlen
,
uint32_t
samples_per_packet
,
uint32_t
samples_per_second
);
stfu_instance_t
*
stfu_n_init
(
uint32_t
qlen
,
uint32_t
max_qlen
,
uint32_t
samples_per_packet
,
uint32_t
samples_per_second
,
uint32_t
max_drift_ms
);
stfu_status_t
stfu_n_resize
(
stfu_instance_t
*
i
,
uint32_t
qlen
);
stfu_status_t
stfu_n_resize
(
stfu_instance_t
*
i
,
uint32_t
qlen
);
stfu_status_t
stfu_n_add_data
(
stfu_instance_t
*
i
,
uint32_t
ts
,
uint32_t
pt
,
void
*
data
,
size_t
datalen
,
uint32_t
timer_ts
,
int
last
);
stfu_status_t
stfu_n_add_data
(
stfu_instance_t
*
i
,
uint32_t
ts
,
uint32_t
pt
,
void
*
data
,
size_t
datalen
,
uint32_t
timer_ts
,
int
last
);
stfu_frame_t
*
stfu_n_read_a_frame
(
stfu_instance_t
*
i
);
stfu_frame_t
*
stfu_n_read_a_frame
(
stfu_instance_t
*
i
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论