From 6968aef66aca3295245e1d59aeb73694917bcff0 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 8 Nov 2014 20:06:31 +0800 Subject: [PATCH] update readme for srs-librtmp --- README.md | 14 +++++++++-- trunk/auto/generate-srs-librtmp-single.sh | 2 +- trunk/configure | 29 ++++++++++++----------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index fcb1b9c38..753dc45d7 100755 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ SRS is industrial-strength live streaming cluster, for the best conceptual integrity and the simplest implementation, which delivering rtmp/hls/http live on x86/x64/arm/mips linux, supports origin/edge/vhost and transcode/ingest and dvr/forward -and http-api/http-callback/reload, with wiki and the most -simple architecture. +and http-api/http-callback/reload and srs-librtmp, with wiki and +the most simple architecture. Download from github.io: [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.0.zip) @@ -47,6 +47,15 @@ client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) p [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer), [dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR). +[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp) +is a client library, only depends on c++ and socket, with +[examples](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples)(to play, +publish, ingest flv/rtmp, inject flv, +[publish h264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data)), +[exported as seperate project or single cpp file by configure](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#export-srs-librtmp). +SRS-librtmp provides api about RTMP, FLV, AMF0 and +[h.264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data). + WebSite: [http://ossrs.net](http://ossrs.net)
Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release)
Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
@@ -200,6 +209,7 @@ Supported operating systems and hardware: 1. Support system full utest on gtest. 1. [experiment] Support embeded [HTTP server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP) for hls(live/vod) 1. [experiment] Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FlvVodStream). +1. Support [publish h264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data) by srs-librtmp. 1. [dev] Suppport [English wiki](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_v1_ENHome). 1. [dev] Research and simplify st, [bug #182](https://github.com/winlinvip/simple-rtmp-server/issues/182). 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). diff --git a/trunk/auto/generate-srs-librtmp-single.sh b/trunk/auto/generate-srs-librtmp-single.sh index 39dbbc7de..0205c4267 100755 --- a/trunk/auto/generate-srs-librtmp-single.sh +++ b/trunk/auto/generate-srs-librtmp-single.sh @@ -98,7 +98,7 @@ cat << END >$FILE /** # Example to use srs-librtmp # see: https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp -${COMPILE} + ${COMPILE} */ #include #include "srs_librtmp.h" diff --git a/trunk/configure b/trunk/configure index 482f91b68..a380aba72 100755 --- a/trunk/configure +++ b/trunk/configure @@ -448,20 +448,6 @@ if [ $SRS_UTEST = YES ]; then LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh fi -# for srs-librtmp single file, -# package the whole project to srs_librtmp.h and srs_librtmp.cpp -if [ $SRS_EXPORT_LIBRTMP_SINGLE != NO ]; then - echo "package the whole project to srs_librtmp.h and srs_librtmp.cpp" - . $SRS_EXPORT_LIBRTMP_SINGLE/auto/generate-srs-librtmp-single.sh - echo -e "${GREEN}Please use the srs-librtmp files: ${BLACK}" - echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.h ${BLACK}" - echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.cpp ${BLACK}" - echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/example.c ${BLACK}" -elif [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then - echo -e "${GREEN}Please use the srs-librtmp project: ${BLACK}" - echo -e "${GREEN} cd $SRS_EXPORT_LIBRTMP_PROJECT && make ${BLACK}" -fi - echo 'configure ok! ' ##################################################################################### @@ -603,4 +589,19 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then echo "to build:" echo "\" make \" to build the srs(simple rtmp server)." echo "\" make help \" to get the usage of make" +else + # for srs-librtmp single file, + # package the whole project to srs_librtmp.h and srs_librtmp.cpp + if [ $SRS_EXPORT_LIBRTMP_SINGLE != NO ]; then + echo "package the whole project to srs_librtmp.h and srs_librtmp.cpp" + . $SRS_EXPORT_LIBRTMP_SINGLE/auto/generate-srs-librtmp-single.sh + echo -e "${GREEN}Please use the srs-librtmp files: ${BLACK}" + echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.h ${BLACK}" + echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.cpp ${BLACK}" + echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/example.c ${BLACK}" + # for srs-librtmp project. + else + echo -e "${GREEN}Please use the srs-librtmp project: ${BLACK}" + echo -e "${GREEN} cd $SRS_EXPORT_LIBRTMP_PROJECT && make ${BLACK}" + fi fi