胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
e42eef42 1 parent e5fcf80b

add ssl and nossl for ingest flv/rtmp over srs-librtmp

内嵌 并排对比
正在显示 1 个修改的文件 包含 25 行增加 和 17 行删除
@@ -5,17 +5,19 @@ GCC = gcc @@ -5,17 +5,19 @@ GCC = gcc
5 default: help 5 default: help
6 6
7 help: 7 help:
8 - @echo "Usage: make <help>|<clean>|<srs_publish_nossl>|<srs_play_nossl>|<srs_publish_ssl>|<srs_play_ssl>|<srs_ingest_flv>|<srs_ingest_rtmp>"  
9 - @echo " help display this help"  
10 - @echo " clean cleanup build"  
11 - @echo " ssl srs_publish_ssl, srs_play_ssl"  
12 - @echo " nossl srs_publish_nossl, srs_play_nossl, srs_ingest_flv, srs_ingest_rtmp"  
13 - @echo " srs_publish_nossl publish program using srs-librtmp, without ssl(simple handshake)"  
14 - @echo " srs_play_nossl play program using srs-librtmp, without ssl(simple handshake)"  
15 - @echo " srs_publish_ssl publish program using srs-librtmp, with ssl(complex handshake)"  
16 - @echo " srs_play_ssl play program using srs-librtmp, with ssl(complex handshake)"  
17 - @echo " srs_ingest_flv ingest flv file and publish to RTMP server. (simple handshake)"  
18 - @echo " srs_ingest_rtmp ingest RTMP and publish to RTMP server. (simple handshake)" 8 + @echo "Usage: make <help>|<clean>|<srs_publish_nossl>|<srs_play_nossl>|<srs_ingest_flv_nossl>|<srs_ingest_rtmp_nossl>|<srs_publish_ssl>|<srs_play_ssl>|<srs_ingest_flv_ssl>|<srs_ingest_rtmp_ssl>"
  9 + @echo " help display this help"
  10 + @echo " clean cleanup build"
  11 + @echo " ssl srs_publish_ssl, srs_play_ssl, srs_ingest_flv, srs_ingest_rtmp"
  12 + @echo " nossl srs_publish_nossl, srs_play_nossl, srs_ingest_flv, srs_ingest_rtmp"
  13 + @echo " srs_publish_nossl publish program using srs-librtmp, without ssl(simple handshake)"
  14 + @echo " srs_play_nossl play program using srs-librtmp, without ssl(simple handshake)"
  15 + @echo " srs_publish_ssl publish program using srs-librtmp, with ssl(complex handshake)"
  16 + @echo " srs_play_ssl play program using srs-librtmp, with ssl(complex handshake)"
  17 + @echo " srs_ingest_flv_nossl ingest flv file and publish to RTMP server. (simple handshake)"
  18 + @echo " srs_ingest_rtmp_nossl ingest RTMP and publish to RTMP server. (simple handshake)"
  19 + @echo " srs_ingest_flv_ssl ingest flv file and publish to RTMP server. (complex handshake)"
  20 + @echo " srs_ingest_rtmp_ssl ingest RTMP and publish to RTMP server. (complex handshake)"
19 @echo "Remark: about simple/complex handshake, see: http://blog.csdn.net/win_lin/article/details/13006803" 21 @echo "Remark: about simple/complex handshake, see: http://blog.csdn.net/win_lin/article/details/13006803"
20 @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " 22 @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, "
21 @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" 23 @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) @@ -48,11 +50,11 @@ srs_publish_nossl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
48 srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) 50 srs_play_nossl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
49 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_play_nossl 51 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_play_nossl
50 52
51 -srs_ingest_flv: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)  
52 - $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv 53 +srs_ingest_flv_nossl: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
  54 + $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv_nossl
53 55
54 -srs_ingest_rtmp: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)  
55 - $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp 56 +srs_ingest_rtmp_nossl: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L)
  57 + $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp_nossl
56 58
57 srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) 59 srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
58 $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_publish_ssl 60 $(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_ @@ -60,6 +62,12 @@ srs_publish_ssl: srs_publish.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_
60 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) 62 srs_play_ssl: srs_play.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
61 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_play_ssl 63 $(GCC) srs_play.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_play_ssl
62 64
  65 +srs_ingest_flv_ssl: srs_ingest_flv.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
  66 + $(GCC) srs_ingest_flv.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_ingest_flv_ssl
  67 +
  68 +srs_ingest_rtmp_ssl: srs_ingest_rtmp.c Makefile $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L)
  69 + $(GCC) srs_ingest_rtmp.c $(SRS_LIBRTMP_L) $(SRS_LIBSSL_L) $(EXTRA_CXX_FLAG) -o srs_ingest_rtmp_ssl
  70 +
63 # alias for publish/play with/without ssl 71 # alias for publish/play with/without ssl
64 -ssl: srs_publish_ssl srs_play_ssl  
65 -nossl: srs_publish_nossl srs_play_nossl srs_ingest_flv srs_ingest_rtmp 72 +ssl: srs_publish_ssl srs_play_ssl srs_ingest_flv_ssl srs_ingest_rtmp_ssl
  73 +nossl: srs_publish_nossl srs_play_nossl srs_ingest_flv_nossl srs_ingest_rtmp_nossl