Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-07-13 22:09:01 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
be342178c0e118d94e65d0885cbaf3232d9ee931
be342178
1 parent
ef5ddd01
fix ingest flv tool, support non monotonically timestamp.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
2 行增加
和
1 行删除
trunk/research/librtmp/srs_ingest_flv.c
trunk/research/librtmp/srs_ingest_flv.c
查看文件 @
be34217
...
...
@@ -38,6 +38,7 @@ int proxy(srs_flv_t flv, srs_rtmp_t ortmp);
int
connect_oc
(
srs_rtmp_t
ortmp
);
#define RE_PULSE_MS 300
#define RE_PULSE_JITTER_MS 3000
int64_t
re_create
();
void
re_update
(
int64_t
re
,
int32_t
starttime
,
u_int32_t
time
);
void
re_cleanup
(
int64_t
re
,
int32_t
starttime
,
u_int32_t
time
);
...
...
@@ -256,7 +257,7 @@ void re_update(int64_t re, int32_t starttime, u_int32_t time)
// send by pulse algorithm.
int64_t
now
=
srs_utils_time_ms
();
int64_t
diff
=
time
-
starttime
-
(
now
-
re
);
if
(
diff
>
RE_PULSE_MS
)
{
if
(
diff
>
RE_PULSE_MS
&&
diff
<
RE_PULSE_JITTER_MS
)
{
usleep
((
useconds_t
)(
diff
*
1000
));
}
}
...
...
请
注册
或
登录
后发表评论