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-01-23 15:14:29 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4f5cc9c403aedd836fb1ef40220afff9bce03841
4f5cc9c4
1 parent
4449a8d7
for #151, use absolutely overflow to make jwplayer happy. 1.0.23
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
19 行增加
和
5 行删除
README.md
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.hpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
4f5cc9c
...
...
@@ -385,6 +385,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-01-23, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, use absolutely overflow to make jwplayer happy. 1.0.23
*
v1.0, 2015-01-17, hotfix
[
#290
](
https://github.com/winlinvip/simple-rtmp-server/issues/290
)
, use iformat only for rtmp input. 1.0.22
*
<strong>
v1.0, 2015-01-15,
[
1.0r1 release(1.0.21)
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1
)
released. 59472 lines.
</strong>
*
v1.0, 2015-01-08, hotfix
[
#281
](
https://github.com/winlinvip/simple-rtmp-server/issues/281
)
, fix hls bug ignore type-9 send aud. 1.0.20
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
4f5cc9c
...
...
@@ -655,10 +655,15 @@ int SrsHlsMuxer::on_sequence_header()
bool
SrsHlsMuxer
::
is_segment_overflow
()
{
srs_assert
(
current
);
return
current
->
duration
>=
hls_fragment
;
}
bool
SrsHlsMuxer
::
is_segment_absolutely_overflow
()
{
srs_assert
(
current
);
return
current
->
duration
>=
2
*
hls_fragment
;
}
int
SrsHlsMuxer
::
flush_audio
(
SrsMpegtsFrame
*
af
,
SrsBuffer
*
ab
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
@@ -1090,7 +1095,9 @@ int SrsHlsCache::write_audio(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t
// pure audio again for audio disabled.
// so we reap event when the audio incoming when segment overflow.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/151
if
(
muxer
->
is_segment_overflow
())
{
// we use absolutely overflow of segment to make jwplayer/ffplay happy
// @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-71155184
if
(
muxer
->
is_segment_absolutely_overflow
())
{
if
((
ret
=
reap_segment
(
"audio"
,
muxer
,
af
->
pts
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
trunk/src/app/srs_app_hls.hpp
查看文件 @
4f5cc9c
...
...
@@ -192,10 +192,16 @@ public:
virtual
int
segment_open
(
int64_t
segment_start_dts
);
virtual
int
on_sequence_header
();
/**
* whether video overflow,
* that is whether the current segment duration >= the segment in config
* whether segment overflow,
* that is whether the current segment duration>=(the segment in config)
*/
virtual
bool
is_segment_overflow
();
/**
* whether segment absolutely overflow, for pure audio to reap segment,
* that is whether the current segment duration>=2*(the segment in config)
* @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-71155184
*/
virtual
bool
is_segment_absolutely_overflow
();
virtual
int
flush_audio
(
SrsMpegtsFrame
*
af
,
SrsBuffer
*
ab
);
virtual
int
flush_video
(
SrsMpegtsFrame
*
af
,
SrsBuffer
*
ab
,
SrsMpegtsFrame
*
vf
,
SrsBuffer
*
vb
);
/**
...
...
trunk/src/core/srs_core.hpp
查看文件 @
4f5cc9c
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 2
2
#define VERSION_REVISION 2
3
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
请
注册
或
登录
后发表评论