From bd652e4607f59a71e3b3812e7bb7a1b87daca947 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 9 Sep 2016 14:41:02 +0800 Subject: [PATCH 1/2] fix build failed for stdc++ --- trunk/research/librtmp/srs_h264_raw_publish.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/research/librtmp/srs_h264_raw_publish.c b/trunk/research/librtmp/srs_h264_raw_publish.c index 3cbe61553..8f1ebdf2f 100644 --- a/trunk/research/librtmp/srs_h264_raw_publish.c +++ b/trunk/research/librtmp/srs_h264_raw_publish.c @@ -154,7 +154,8 @@ int main(int argc, char** argv) int pts = 0; // @remark, to decode the file. char* p = h264_raw; - for (int count = 0; p < h264_raw + file_size; count++) { + int count = 0; + for (; p < h264_raw + file_size;) { // @remark, read a frame from file buffer. char* data = NULL; int size = 0; @@ -188,7 +189,7 @@ int main(int argc, char** argv) (nut == 7? "SPS":(nut == 8? "PPS":(nut == 5? "I":(nut == 1? "P":(nut == 9? "AUD":(nut == 6? "SEI":"Unknown"))))))); // @remark, when use encode device, it not need to sleep. - if (count == 10) { + if (count++ == 9) { usleep(1000 * 1000 * count / fps); count = 0; } From 4e756bd0eb354a1d3bb747e42d15dfbbc05173b3 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 9 Sep 2016 14:52:35 +0800 Subject: [PATCH 2/2] refine readme --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c968acd06..4c180d863 100755 --- a/README.md +++ b/README.md @@ -202,7 +202,7 @@ Supported operating systems and hardware: 1. Stable [1.0release branch][branch1]. 1. Support publish h264 raw stream([CN][v2_CN_SrsLibrtmp2], [EN][v2_EN_SrsLibrtmp2]) by srs-librtmp. 1. Support [6k+ clients][bug #194], 3Gbps per process. -1. Suppport [English wiki][v1_EN_Home). +1. Suppport [English wiki][v1_EN_Home]. 1. Research and simplify st, [bug #182][bug #182]. 1. Support compile [srs-librtmp on windows][srs-librtmp], [bug #213][bug #213]. 1. Support [10k+ clients][bug #251], 4Gbps per process. @@ -977,6 +977,10 @@ Winlin [v1_EN_Edge]: https://github.com/ossrs/srs/wiki/v1_EN_Edge [v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost [v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost +[v1_CN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake +[v1_EN_RTMPHandshake]: https://github.com/ossrs/srs/wiki/v1_EN_RTMPHandshake +[v1_CN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPServer +[v1_EN_HTTPServer]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPServer [v1_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS [v1_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS [v1_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly