From 527abe2157fce5275ea196bf3f2804182b691886 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 19 Jan 2014 11:37:55 +0800 Subject: [PATCH] update readme --- README.md | 3 ++- trunk/auto/depends.sh | 8 +++++++- trunk/conf/srs.conf | 1 + trunk/research/hls/ts_info.cc | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ba46d69c8..68822d482 100755 --- a/README.md +++ b/README.md @@ -289,7 +289,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv * nginx v1.5.0: 139524 lines
### 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. diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 444613b0f..516ba23be 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -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. diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 6f9b043f4..3d2182161 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -748,6 +748,7 @@ vhost players { vprofile baseline; vpreset superfast; vparams { + g 100; } acodec libaacplus; abitrate 30; diff --git a/trunk/research/hls/ts_info.cc b/trunk/research/hls/ts_info.cc index ca25d5c44..c29a23e42 100644 --- a/trunk/research/hls/ts_info.cc +++ b/trunk/research/hls/ts_info.cc @@ -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;