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
2014-01-19 11:37:55 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
527abe2157fce5275ea196bf3f2804182b691886
527abe21
1 parent
1d3621dc
update readme
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
12 行增加
和
4 行删除
README.md
trunk/auto/depends.sh
trunk/conf/srs.conf
trunk/research/hls/ts_info.cc
README.md
查看文件 @
527abe2
...
...
@@ -289,7 +289,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
*
nginx v1.5.0: 139524 lines
<br/>
### History
*
v1.0, 2014-01-11, add wiki
[
HowToAskQuestion
](
https://github.com/winlinvip/simple-rtmp-server/wiki/HowToAskQuestion
)
,
[
RtmpUrlVhost
](
https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost
)
*
v1.0, 2014-01-19, add wiki
[
DeliveryHLS
](
https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS
)
*
v1.0, 2014-01-12, add wiki
[
HowToAskQuestion
](
https://github.com/winlinvip/simple-rtmp-server/wiki/HowToAskQuestion
)
,
[
RtmpUrlVhost
](
https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost
)
*
v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually.
*
v1.0, 2014-01-05, add wiki
[
Build
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Build
)
,
[
Performance
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Performance
)
,
[
Cluster
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Cluster
)
*
v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance.
...
...
trunk/auto/depends.sh
查看文件 @
527abe2
...
...
@@ -297,7 +297,13 @@ echo "link players to cherrypy static-dir"
rm -f research/api-server/static-dir/players
&&
ln -sf
`
pwd
`
/research/players research/api-server/static-dir/players
&&
rm -f research/api-server/static-dir/crossdomain.xml
&&
ln -sf
`
pwd
`
/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml
ln -sf
`
pwd
`
/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml
&&
rm -f research/api-server/static-dir/live
&&
mkdir -p
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/live
&&
ln -sf
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/live research/api-server/static-dir/live
&&
rm -f research/api-server/static-dir/forward
&&
mkdir -p
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/forward
&&
ln -sf
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/forward research/api-server/static-dir/forward
# only when the nginx is ok,
# if api-server not enalbed, use nginx as demo.
...
...
trunk/conf/srs.conf
查看文件 @
527abe2
...
...
@@ -748,6 +748,7 @@ vhost players {
vprofile
baseline
;
vpreset
superfast
;
vparams
{
g
100
;
}
acodec
libaacplus
;
abitrate
30
;
...
...
trunk/research/hls/ts_info.cc
查看文件 @
527abe2
...
...
@@ -1281,11 +1281,11 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp)
// marker_bit 1bit
temp
=
temp
>>
1
;
// PTS [29..15] 15bits, 15zero, 29-15+1one
ret
|=
temp
&
0x3fff8000
;
ret
|=
temp
&
0x3fff8000
LL
;
// marker_bit 1bit
temp
=
temp
>>
1
;
// PTS [32..30] 3bits
ret
|=
temp
&
0x1c0000000
;
ret
|=
temp
&
0x1c0000000
LL
;
temp
=
temp
>>
33
;
...
...
请
注册
或
登录
后发表评论