正在显示
4 个修改的文件
包含
12 行增加
和
4 行删除
| @@ -289,7 +289,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv | @@ -289,7 +289,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv | ||
| 289 | * nginx v1.5.0: 139524 lines <br/> | 289 | * nginx v1.5.0: 139524 lines <br/> |
| 290 | 290 | ||
| 291 | ### History | 291 | ### History |
| 292 | -* 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) | 292 | +* v1.0, 2014-01-19, add wiki [DeliveryHLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS) |
| 293 | +* 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) | ||
| 293 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. | 294 | * v1.0, 2014-01-11, fix jw/flower player pause bug, which send closeStream actually. |
| 294 | * 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) | 295 | * 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) |
| 295 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. | 296 | * v1.0, 2014-01-01, change listen(512), chunk-size(60000), to improve performance. |
| @@ -297,7 +297,13 @@ echo "link players to cherrypy static-dir" | @@ -297,7 +297,13 @@ echo "link players to cherrypy static-dir" | ||
| 297 | rm -f research/api-server/static-dir/players && | 297 | rm -f research/api-server/static-dir/players && |
| 298 | ln -sf `pwd`/research/players research/api-server/static-dir/players && | 298 | ln -sf `pwd`/research/players research/api-server/static-dir/players && |
| 299 | rm -f research/api-server/static-dir/crossdomain.xml && | 299 | rm -f research/api-server/static-dir/crossdomain.xml && |
| 300 | -ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml | 300 | +ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml && |
| 301 | +rm -f research/api-server/static-dir/live && | ||
| 302 | +mkdir -p `pwd`/${SRS_OBJS}/nginx/html/live && | ||
| 303 | +ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live && | ||
| 304 | +rm -f research/api-server/static-dir/forward && | ||
| 305 | +mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward && | ||
| 306 | +ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward | ||
| 301 | 307 | ||
| 302 | # only when the nginx is ok, | 308 | # only when the nginx is ok, |
| 303 | # if api-server not enalbed, use nginx as demo. | 309 | # if api-server not enalbed, use nginx as demo. |
| @@ -1281,11 +1281,11 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp) | @@ -1281,11 +1281,11 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp) | ||
| 1281 | // marker_bit 1bit | 1281 | // marker_bit 1bit |
| 1282 | temp = temp >> 1; | 1282 | temp = temp >> 1; |
| 1283 | // PTS [29..15] 15bits, 15zero, 29-15+1one | 1283 | // PTS [29..15] 15bits, 15zero, 29-15+1one |
| 1284 | - ret |= temp & 0x3fff8000; | 1284 | + ret |= temp & 0x3fff8000LL; |
| 1285 | // marker_bit 1bit | 1285 | // marker_bit 1bit |
| 1286 | temp = temp >> 1; | 1286 | temp = temp >> 1; |
| 1287 | // PTS [32..30] 3bits | 1287 | // PTS [32..30] 3bits |
| 1288 | - ret |= temp & 0x1c0000000; | 1288 | + ret |= temp & 0x1c0000000LL; |
| 1289 | 1289 | ||
| 1290 | temp = temp >> 33; | 1290 | temp = temp >> 33; |
| 1291 | 1291 |
-
请 注册 或 登录 后发表评论