From e42eef422f6e6bc67ca8843431b1c9fdd43b43c1 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 19 Apr 2014 11:40:46 +0800 Subject: [PATCH] add ssl and nossl for ingest flv/rtmp over srs-librtmp --- trunk/research/librtmp/Makefile | 42 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 7def39571..e097c191d 100644 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -5,17 +5,19 @@ GCC = gcc default: help help: - @echo "Usage: make |||||||" - @echo " help display this help" - @echo " clean cleanup build" - @echo " ssl srs_publish_ssl, srs_play_ssl" - @echo " nossl srs_publish_nossl, srs_play_nossl, srs_ingest_flv, srs_ingest_rtmp" - @echo " srs_publish_nossl publish program using srs-librtmp, without ssl(simple handshake)" - @echo " srs_play_nossl play program using srs-librtmp, without ssl(simple handshake)" - @echo " srs_publish_ssl publish program using srs-librtmp, with ssl(complex handshake)" - @echo " srs_play_ssl play program using srs-librtmp, with ssl(complex handshake)" - @echo " srs_ingest_flv ingest flv file and publish to RTMP server. (simple handshake)" - @echo " srs_ingest_rtmp ingest RTMP and publish to RTMP server. (simple handshake)" + @echo "Usage: make |||||||||" + @echo " help display this help" + @echo " clean cleanup build" + @echo " ssl srs_publish_ssl, srs_play_ssl, srs_ingest_flv, srs_ingest_rtmp" + @echo " nossl srs_publish_nossl, srs_play_nossl, srs_ingest_flv, srs_ingest_rtmp" + @echo " srs_publish_nossl publish program using srs-librtmp, without ssl(simple handshake)" + @echo " srs_play_nossl play program using srs-librtmp, without ssl(simple handshake)" + @echo " srs_publish_ssl publish program using srs-librtmp, with ssl(complex handshake)" + @echo " srs_play_ssl play program using srs-librtmp, with ssl(complex handshake)" + @echo " srs_ingest_flv_nossl ingest flv file and publish to RTMP server. (simple handshake)" + @echo " srs_ingest_rtmp_nossl ingest RTMP and publish to RTMP server. (simple handshake)" + @echo " srs_ingest_flv_ssl ingest flv file and publish to RTMP server. (complex handshake)" + @echo " srs_ingest_rtmp_ssl ingest RTMP and publish to RTMP server. (complex handshake)" @echo "Remark: about simple/complex handshake, see: http://blog.csdn.net/win_lin/article/details/13006803" @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" @@ -48,11 +50,11 @@ srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_play_nossl -srs_ingest_flv: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) - $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv +srs_ingest_flv_nossl: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) + $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv_nossl -srs_ingest_rtmp: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) - $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp +srs_ingest_rtmp_nossl: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) + $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp_nossl srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_publish_ssl @@ -60,6 +62,12 @@ srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_ srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_play_ssl +srs_ingest_flv_ssl: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) + $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv_ssl + +srs_ingest_rtmp_ssl: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) + $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp_ssl + # alias for publish/play with/without ssl -ssl: srs_publish_ssl srs_play_ssl -nossl: srs_publish_nossl srs_play_nossl srs_ingest_flv srs_ingest_rtmp +ssl: srs_publish_ssl srs_play_ssl srs_ingest_flv_ssl srs_ingest_rtmp_ssl +nossl: srs_publish_nossl srs_play_nossl srs_ingest_flv_nossl srs_ingest_rtmp_nossl