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-05-23 07:46:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0bb90145badbe6a44b4dec54e2acc2da6cfb54a2
0bb90145
1 parent
6bfb743a
fix #391, copy request for async call.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
7 行增加
和
3 行删除
README.md
trunk/src/app/srs_app_dvr.cpp
trunk/src/app/srs_app_hls.cpp
README.md
查看文件 @
0bb9014
...
...
@@ -562,6 +562,7 @@ Supported operating systems and hardware:
### SRS 2.0 history
*
v2.0, 2015-05-23, fix
[
#391
](
https://github.com/simple-rtmp-server/srs/issues/391
)
copy request for async call.
*
v2.0, 2015-05-22, fix
[
#397
](
https://github.com/simple-rtmp-server/srs/issues/397
)
the USER_HZ maybe not 100. 2.0.165
*
v2.0, 2015-05-22, for
[
#400
](
https://github.com/simple-rtmp-server/srs/issues/400
)
, parse when got entire http header, by feilong. 2.0.164.
*
v2.0, 2015-05-19, merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.
...
...
trunk/src/app/srs_app_dvr.cpp
查看文件 @
0bb9014
...
...
@@ -498,12 +498,13 @@ int SrsFlvSegment::on_reload_vhost_dvr(std::string /*vhost*/)
SrsDvrAsyncCallOnDvr
::
SrsDvrAsyncCallOnDvr
(
SrsRequest
*
r
,
string
p
)
{
req
=
r
;
req
=
r
->
copy
()
;
path
=
p
;
}
SrsDvrAsyncCallOnDvr
::~
SrsDvrAsyncCallOnDvr
()
{
srs_freep
(
req
);
}
int
SrsDvrAsyncCallOnDvr
::
call
()
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
0bb9014
...
...
@@ -172,7 +172,7 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts)
SrsDvrAsyncCallOnHls
::
SrsDvrAsyncCallOnHls
(
SrsRequest
*
r
,
string
p
,
string
t
,
string
m
,
string
mu
,
int
s
,
double
d
)
{
req
=
r
;
req
=
r
->
copy
()
;
path
=
p
;
ts_url
=
t
;
m3u8
=
m
;
...
...
@@ -183,6 +183,7 @@ SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, string t, st
SrsDvrAsyncCallOnHls
::~
SrsDvrAsyncCallOnHls
()
{
srs_freep
(
req
);
}
int
SrsDvrAsyncCallOnHls
::
call
()
...
...
@@ -221,12 +222,13 @@ string SrsDvrAsyncCallOnHls::to_string()
SrsDvrAsyncCallOnHlsNotify
::
SrsDvrAsyncCallOnHlsNotify
(
SrsRequest
*
r
,
string
u
)
{
req
=
r
;
req
=
r
->
copy
()
;
ts_url
=
u
;
}
SrsDvrAsyncCallOnHlsNotify
::~
SrsDvrAsyncCallOnHlsNotify
()
{
srs_freep
(
req
);
}
int
SrsDvrAsyncCallOnHlsNotify
::
call
()
...
...
请
注册
或
登录
后发表评论