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:35:53 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
aaade0f04f43ee6680044c9324717f292b63b59e
aaade0f0
2 parents
c9d270fb
78885069
for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
5 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_ts.cpp
README.md
查看文件 @
aaade0f
...
...
@@ -521,6 +521,7 @@ Supported operating systems and hardware:
### SRS 2.0 history
*
v2.0, 2015-01-25, hotfix
[
#268
](
https://github.com/winlinvip/simple-rtmp-server/issues/268
)
, refine the pcr start at 0, dts/pts plus delay. 2.0.105
*
v2.0, 2015-01-25, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, refine pcr=dts-800ms and use dts/pts directly. 2.0.104
*
v2.0, 2015-01-23, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, use absolutely overflow to make jwplayer happy. 2.0.103
*
v2.0, 2015-01-22, for
[
#293
](
https://github.com/winlinvip/simple-rtmp-server/issues/293
)
, support http live ts stream. 2.0.101.
...
...
@@ -585,6 +586,7 @@ Supported operating systems and hardware:
### SRS 1.0 history
*
v1.0, 2015-01-25, hotfix
[
#268
](
https://github.com/winlinvip/simple-rtmp-server/issues/268
)
, refine the pcr start at 0, dts/pts plus delay. 1.0.25
*
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
...
...
trunk/src/core/srs_core.hpp
查看文件 @
aaade0f
...
...
@@ -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 10
4
#define VERSION_REVISION 10
5
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_ts.cpp
查看文件 @
aaade0f
...
...
@@ -198,7 +198,7 @@ public:
p
[
-
1
]
|=
0x20
;
// Both Adaption and Payload
*
p
++
=
7
;
// size
*
p
++
=
0x50
;
// random access + PCR
p
=
write_pcr
(
p
,
frame
->
dts
-
SRS_AUTO_HLS_DELAY
);
p
=
write_pcr
(
p
,
frame
->
dts
);
}
// PES header
...
...
@@ -330,10 +330,12 @@ private:
}
static
char
*
write_pcr
(
char
*
p
,
int64_t
pcr
)
{
// the pcr=dts-delay
// and the pcr maybe negative
// the pcr=dts-delay, where dts = frame->dts + delay
// and the pcr should never be negative
// @see https://github.com/winlinvip/simple-rtmp-server/issues/268
int64_t
v
=
srs_max
(
0
,
pcr
);
srs_assert
(
pcr
>=
0
);
int64_t
v
=
pcr
;
*
p
++
=
(
char
)
(
v
>>
25
);
*
p
++
=
(
char
)
(
v
>>
17
);
...
...
请
注册
或
登录
后发表评论