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-03-14 20:07:56 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
320f45c6f4048c71703c95e2784bdf85068af1a4
320f45c6
1 parent
27cb62b7
fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
15 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_http_conn.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
320f45c
...
...
@@ -560,6 +560,7 @@ Supported operating systems and hardware:
### SRS 2.0 history
*
v2.0, 2015-03-14, fix
[
#324
](
https://github.com/winlinvip/simple-rtmp-server/issues/324
)
, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
*
v2.0, 2015-03-14, for
[
#324
](
https://github.com/winlinvip/simple-rtmp-server/issues/324
)
, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
*
v2.0, 2015-03-12, fix
[
#328
](
https://github.com/winlinvip/simple-rtmp-server/issues/328
)
, support adobe hds. 2.0.138.
*
v2.0, 2015-03-10, fix
[
#155
](
https://github.com/winlinvip/simple-rtmp-server/issues/155
)
, support osx(darwin) for mac pro. 2.0.137.
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
320f45c
...
...
@@ -1180,7 +1180,19 @@ int SrsHttpServer::hijack(SrsHttpMessage* request, ISrsHttpHandler** ph)
if
(
sflvs
.
find
(
sid
)
!=
sflvs
.
end
())
{
entry
=
sflvs
[
sid
];
*
ph
=
entry
->
stream
;
srs_trace
(
"hstrs sid=%s"
,
sid
.
c_str
());
}
}
// trigger edge to fetch from origin.
bool
vhost_is_edge
=
_srs_config
->
get_vhost_is_edge
(
r
->
vhost
);
srs_trace
(
"hstrs: source url=%s, is_edge=%d, source_id=%d[%d]"
,
r
->
get_stream_url
().
c_str
(),
vhost_is_edge
,
s
->
source_id
(),
s
->
source_id
());
if
(
vhost_is_edge
)
{
// notice edge to start for the first client.
if
((
ret
=
s
->
on_edge_start_play
())
!=
ERROR_SUCCESS
)
{
srs_error
(
"notice edge start play stream failed. ret=%d"
,
ret
);
return
ret
;
}
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
320f45c
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 1
39
#define VERSION_REVISION 1
40
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论