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
2017-01-11 09:25:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e3aa34ec5f5682add4d72df1d9ba4c26df1b9769
e3aa34ec
1 parent
087a596a
fix #736, recovery the hls dispose. 2.0.227
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
12 行增加
和
6 行删除
README.md
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
e3aa34e
...
...
@@ -345,6 +345,7 @@ Remark:
## History
*
v2.0, 2017-01-11, fix
[
#736
][
bug #736
]
, recovery the hls dispose. 2.0.227
*
v2.0, 2017-01-10, refine hls html5 video template.
*
v2.0, 2017-01-10, fix
[
#635
][
bug #635
]
, hls support NonIDR(open gop). 2.0.226
*
v2.0, 2017-01-06, for
[
#730
][
bug #730
]
, reset ack follow flash player rules. 2.0.225
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
e3aa34e
...
...
@@ -794,14 +794,9 @@ int SrsSource::cycle_all()
{
int
ret
=
ERROR_SUCCESS
;
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/713
// @see https://github.com/ossrs/srs/issues/714
#if 0
int
cid
=
_srs_context
->
get_id
();
ret
=
do_cycle_all
();
_srs_context
->
set_id
(
cid
);
#endif
return
ret
;
}
...
...
@@ -813,10 +808,17 @@ int SrsSource::do_cycle_all()
std
::
map
<
std
::
string
,
SrsSource
*>::
iterator
it
;
for
(
it
=
pool
.
begin
();
it
!=
pool
.
end
();)
{
SrsSource
*
source
=
it
->
second
;
// Do cycle source to cleanup components, such as hls dispose.
if
((
ret
=
source
->
cycle
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// TODO: FIXME: support source cleanup.
// @see https://github.com/ossrs/srs/issues/713
// @see https://github.com/ossrs/srs/issues/714
#if 0
// When source expired, remove it.
if (source->expired()) {
int cid = source->source_id();
if (cid == -1 && source->pre_source_id() > 0) {
...
...
@@ -832,6 +834,9 @@ int SrsSource::do_cycle_all()
} else {
++it;
}
#else
++
it
;
#endif
}
return
ret
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
e3aa34e
...
...
@@ -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 22
6
#define VERSION_REVISION 22
7
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
请
注册
或
登录
后发表评论