external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

update readme

Browse source
This commit is contained in:
winlin 2014-01-19 11:37:55 +08:00
parent 1d3621dc23
commit 527abe2157
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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.

8
trunk/auto/depends.sh
View file

@ -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.

1
trunk/conf/srs.conf
View file

@ -748,6 +748,7 @@ vhost players {
vprofile baseline;
vpreset superfast;
vparams {
g 100;
}
acodec libaacplus;
abitrate 30;

4
trunk/research/hls/ts_info.cc
View file

@ -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 & 0x3fff8000LL;
// marker_bit 1bit
temp = temp >> 1;
// PTS [32..30] 3bits
ret |= temp & 0x1c0000000;
ret |= temp & 0x1c0000000LL;
temp = temp >> 33;