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-25 13:04:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1835957a2b09b4dc7f393649f7e7b295c90e5b64
1835957a
1 parent
4f5cc9c4
for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
3 行删除
README.md
trunk/src/app/srs_app_hls.cpp
README.md
查看文件 @
1835957
...
...
@@ -385,6 +385,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-01-25, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, refine pcr=dts-800ms and use dts/pts directly. 1.0.24
*
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>
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
1835957
...
...
@@ -78,7 +78,9 @@ using namespace std;
// @see: NGX_RTMP_HLS_DELAY,
// 63000: 700ms, ts_tbn=90000
#define SRS_AUTO_HLS_DELAY 63000
// 72000: 800ms, ts_tbn=90000
// @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-71352511
#define SRS_AUTO_HLS_DELAY 72000
// the mpegts header specifed the video/audio pid.
#define TS_VIDEO_PID 256
...
...
@@ -237,6 +239,7 @@ public:
p
[
-
1
]
|=
0x20
;
// Both Adaption and Payload
*
p
++
=
7
;
// size
*
p
++
=
0x50
;
// random access + PCR
// about the pcr, read https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-71352511
p
=
write_pcr
(
p
,
frame
->
dts
-
SRS_AUTO_HLS_DELAY
);
}
...
...
@@ -293,11 +296,11 @@ public:
*
p
++
=
header_size
;
// pts; // 33bits
p
=
write_pts
(
p
,
flags
>>
6
,
frame
->
pts
+
SRS_AUTO_HLS_DELAY
);
p
=
write_pts
(
p
,
flags
>>
6
,
frame
->
pts
);
// dts; // 33bits
if
(
frame
->
dts
!=
frame
->
pts
)
{
p
=
write_pts
(
p
,
1
,
frame
->
dts
+
SRS_AUTO_HLS_DELAY
);
p
=
write_pts
(
p
,
1
,
frame
->
dts
);
}
}
...
...
请
注册
或
登录
后发表评论