diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile old mode 100755 new mode 100644 index 1feadafd0..5f3b08ced --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -1,7 +1,12 @@ -.PHONY: clean +.PHONY: default clean -srs_publish: srs_publish.c Makefile ../../objs/include/srs_librtmp.h ../../objs/lib/srs_librtmp.a - gcc srs_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_publish +default: srs_publish srs_play clean: - @rm -f srs_publish + @rm -f srs_publish srs_play + +srs_publish: srs_publish.c Makefile ../../objs/include/srs_librtmp.h ../../objs/lib/srs_librtmp.a + gcc srs_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_publish + +srs_play: srs_play.c Makefile ../../objs/include/srs_librtmp.h ../../objs/lib/srs_librtmp.a + gcc srs_play.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_play diff --git a/trunk/research/librtmp/srs_play.c b/trunk/research/librtmp/srs_play.c new file mode 100644 index 000000000..b67e54ab1 --- /dev/null +++ b/trunk/research/librtmp/srs_play.c @@ -0,0 +1,37 @@ +/* +The MIT License (MIT) + +Copyright (c) 2013-2014 winlin + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ +/** +gcc srs_play.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_play +*/ + +#include +#include "../../objs/include/srs_librtmp.h" + +int main(int argc, char** argv) +{ + printf("suck rtmp stream like rtmpdump\n"); + printf("srs(simple-rtmp-server) client librtmp library.\n"); + printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); + + return 0; +} diff --git a/trunk/research/librtmp/srs_publish.c b/trunk/research/librtmp/srs_publish.c old mode 100755 new mode 100644 index 54e824ad3..e458e6a40 --- a/trunk/research/librtmp/srs_publish.c +++ b/trunk/research/librtmp/srs_publish.c @@ -29,6 +29,7 @@ gcc srs_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_publish int main(int argc, char** argv) { + printf("publish rtmp stream to server like FMLE/FFMPEG/Encoder\n"); printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp old mode 100755 new mode 100644 index 631dcf308..984cbb46d --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -1,80 +1,81 @@ -file - main readonly separator, - ..\main\srs_main_server.cpp, - ..\main\srs_main_bandcheck.cpp, - auto readonly separator, - ..\..\objs\srs_auto_headers.hpp, - libs readonly separator, - ..\libs\srs_librtmp.hpp, - ..\libs\srs_librtmp.cpp, - core readonly separator, - ..\core\srs_core.hpp, - ..\core\srs_core.cpp, - ..\core\srs_core_autofree.hpp, - ..\core\srs_core_autofree.cpp, - kernel readonly separator, - ..\kernel\srs_kernel_buffer.hpp, - ..\kernel\srs_kernel_buffer.cpp, - ..\kernel\srs_kernel_error.hpp, - ..\kernel\srs_kernel_error.cpp, - ..\kernel\srs_kernel_log.hpp, - ..\kernel\srs_kernel_log.cpp, - ..\kernel\srs_kernel_reload.hpp, - ..\kernel\srs_kernel_reload.cpp, - ..\kernel\srs_kernel_stream.hpp, - ..\kernel\srs_kernel_stream.cpp, - rtmp-protocol readonly separator, - ..\rtmp\srs_protocol_amf0.hpp, - ..\rtmp\srs_protocol_amf0.cpp, - ..\rtmp\srs_protocol_handshake.hpp, - ..\rtmp\srs_protocol_handshake.cpp, - ..\rtmp\srs_protocol_io.hpp, - ..\rtmp\srs_protocol_io.cpp, - ..\rtmp\srs_protocol_rtmp.hpp, - ..\rtmp\srs_protocol_rtmp.cpp, - ..\rtmp\srs_protocol_rtmp_stack.hpp, - ..\rtmp\srs_protocol_rtmp_stack.cpp, - ..\rtmp\srs_protocol_utility.hpp, - ..\rtmp\srs_protocol_utility.cpp, - app readonly separator, - ..\app\srs_core_bandwidth.hpp, - ..\app\srs_core_bandwidth.cpp, - ..\app\srs_core_client.hpp, - ..\app\srs_core_client.cpp, - ..\app\srs_core_codec.hpp, - ..\app\srs_core_codec.cpp, - ..\app\srs_core_conn.hpp, - ..\app\srs_core_conn.cpp, - ..\app\srs_core_config.hpp, - ..\app\srs_core_config.cpp, - ..\app\srs_core_encoder.hpp, - ..\app\srs_core_encoder.cpp, - ..\app\srs_core_forward.hpp, - ..\app\srs_core_forward.cpp, - ..\app\srs_core_hls.hpp, - ..\app\srs_core_hls.cpp, - ..\app\srs_core_http.hpp, - ..\app\srs_core_http.cpp, - ..\app\srs_core_log.hpp, - ..\app\srs_core_log.cpp, - ..\app\srs_core_refer.hpp, - ..\app\srs_core_refer.cpp, - ..\app\srs_core_pithy_print.hpp, - ..\app\srs_core_pithy_print.cpp, - ..\app\srs_core_thread.hpp, - ..\app\srs_core_thread.cpp, - ..\app\srs_core_server.hpp, - ..\app\srs_core_server.cpp, - ..\app\srs_core_st.hpp, - ..\app\srs_core_st.cpp, - ..\app\srs_core_socket.hpp, - ..\app\srs_core_socket.cpp, - ..\app\srs_core_source.hpp, - ..\app\srs_core_source.cpp, - research readonly separator, - ..\..\research\librtmp\srs_publish.c, - ..\..\research\hls\ts_info.cc; - -mainconfig - "" = "MAIN"; - +file + main readonly separator, + ..\main\srs_main_server.cpp, + ..\main\srs_main_bandcheck.cpp, + auto readonly separator, + ..\..\objs\srs_auto_headers.hpp, + libs readonly separator, + ..\libs\srs_librtmp.hpp, + ..\libs\srs_librtmp.cpp, + core readonly separator, + ..\core\srs_core.hpp, + ..\core\srs_core.cpp, + ..\core\srs_core_autofree.hpp, + ..\core\srs_core_autofree.cpp, + kernel readonly separator, + ..\kernel\srs_kernel_buffer.hpp, + ..\kernel\srs_kernel_buffer.cpp, + ..\kernel\srs_kernel_error.hpp, + ..\kernel\srs_kernel_error.cpp, + ..\kernel\srs_kernel_log.hpp, + ..\kernel\srs_kernel_log.cpp, + ..\kernel\srs_kernel_reload.hpp, + ..\kernel\srs_kernel_reload.cpp, + ..\kernel\srs_kernel_stream.hpp, + ..\kernel\srs_kernel_stream.cpp, + rtmp-protocol readonly separator, + ..\rtmp\srs_protocol_amf0.hpp, + ..\rtmp\srs_protocol_amf0.cpp, + ..\rtmp\srs_protocol_handshake.hpp, + ..\rtmp\srs_protocol_handshake.cpp, + ..\rtmp\srs_protocol_io.hpp, + ..\rtmp\srs_protocol_io.cpp, + ..\rtmp\srs_protocol_rtmp.hpp, + ..\rtmp\srs_protocol_rtmp.cpp, + ..\rtmp\srs_protocol_rtmp_stack.hpp, + ..\rtmp\srs_protocol_rtmp_stack.cpp, + ..\rtmp\srs_protocol_utility.hpp, + ..\rtmp\srs_protocol_utility.cpp, + app readonly separator, + ..\app\srs_core_bandwidth.hpp, + ..\app\srs_core_bandwidth.cpp, + ..\app\srs_core_client.hpp, + ..\app\srs_core_client.cpp, + ..\app\srs_core_codec.hpp, + ..\app\srs_core_codec.cpp, + ..\app\srs_core_conn.hpp, + ..\app\srs_core_conn.cpp, + ..\app\srs_core_config.hpp, + ..\app\srs_core_config.cpp, + ..\app\srs_core_encoder.hpp, + ..\app\srs_core_encoder.cpp, + ..\app\srs_core_forward.hpp, + ..\app\srs_core_forward.cpp, + ..\app\srs_core_hls.hpp, + ..\app\srs_core_hls.cpp, + ..\app\srs_core_http.hpp, + ..\app\srs_core_http.cpp, + ..\app\srs_core_log.hpp, + ..\app\srs_core_log.cpp, + ..\app\srs_core_refer.hpp, + ..\app\srs_core_refer.cpp, + ..\app\srs_core_pithy_print.hpp, + ..\app\srs_core_pithy_print.cpp, + ..\app\srs_core_thread.hpp, + ..\app\srs_core_thread.cpp, + ..\app\srs_core_server.hpp, + ..\app\srs_core_server.cpp, + ..\app\srs_core_st.hpp, + ..\app\srs_core_st.cpp, + ..\app\srs_core_socket.hpp, + ..\app\srs_core_socket.cpp, + ..\app\srs_core_source.hpp, + ..\app\srs_core_source.cpp, + research readonly separator, + ..\..\research\librtmp\srs_play.c, + ..\..\research\librtmp\srs_publish.c, + ..\..\research\hls\ts_info.cc; + +mainconfig + "" = "MAIN"; +