Deprecated: Support for monitoring industry RTSP protocol.

.gitignore

@@ -17,10 +17,14 @@
 *.swp
 /trunk/Makefile
 /trunk/objs
+/trunk/src/build-qt-Desktop-Debug
 /trunk/research/librtmp/objs
 /trunk/3rdparty/ccache/ccache-3.1.9
 /trunk/3rdparty/gprof/graphviz-2.36.0
 /trunk/research/api-server/static-dir/crossdomain.xml
 /trunk/research/api-server/static-dir/forward
 /trunk/research/api-server/static-dir/live
 /trunk/research/api-server/static-dir/players
+
+# Apple-specific garbage files.
+.AppleDouble

AUTHORS.txt

@@ -1,13 +1,10 @@
 There are three types of people that have contributed to the SRS project:
-1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
-2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
-3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
-
-PRIMARY ordered by first contribution.
-* winlin<[email protected]> "Plan, arch, implement SRS1.0 and SRS2.0"
+1. AUTHORS: Contribute important features. Names of all PRIMARY response in NetConnection.connect and metadata.
+2. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
 
 AUTHORS ordered by first contribution.
-* wenjie.zhao<[email protected]> "The bandwidth test module"
+* winlin<[email protected]> "Plan, arch, implement SRS1.0 and SRS2.0"
+* wenjie.zhao<[email protected]> "The bandwidth test module, HDS and bug fixed."
 
 CONTRIBUTORS ordered by first contribution.
 * xiangcheng.liu<[email protected]> "Bug fixed"
@@ -21,4 +18,7 @@ CONTRIBUTORS ordered by first contribution.
 * StevenLiu<[email protected]> "Build SRS on Darwin OSX"
 * zhengfl<[email protected]> "Bug fixed"
 * tufang14<[email protected]> "Bug fixed"
+* allspace<[email protected]> "The srs-librtmp windows support"
+* niesongsong<[email protected]> "Configure support relative path"
+* rudeb0t<[email protected]> "Bug fixed"
 

DONATIONS.txt

@@ -1,5 +1,34 @@
 Donations ordered by first donation.
 
+===========================================================
+2015
+
+RMB 10000+
+* [2015-03-03 13:25] 郭强
+
+RMB 1000-9999
+* [2015-04-29 09:20] 王光辉
+* [2015-04-04 16:19] 蔡汉城
+
+RMB 500-999
+* [2015-04-11 12:48] 丁一
+
+RMB 100-499
+* [2015-05-06 22:04] 姜庆东
+* [2015-04-10 19:52] 阳成飞
+* [2015-03-30 13:34] 扶凯
+* [2015-03-29 11-07] 姚伟斌
+* [2015-03-14 20:21] 万伟
+* [2015-03-11 09:44] 叶发养
+* [2015-02-08 21:10] 韩友洪
+* [2015-01-09 16:08] 李理
+
+RMB 50-99
+* [2015-03-03 17:30] flybird
+
+RMB 0.01-49
+* [2015-xx-xx xx:xx] xxx
+
 ===========================================================
 2014
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2014 winlin
+Copyright (c) 2013-2015 SRS(simple-rtmp-server)
 
 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

trunk/3rdparty/patches/1.st.arm.patch

@@ -1,7 +1,5 @@
-Only in .: 1.st.arm.patch
-diff -r -c ./md.h ../st-1.9-patch-arm/md.h
-*** ./md.h	2009-10-02 02:46:43.000000000 +0800
---- ../st-1.9-patch-arm/md.h	2014-03-16 20:49:03.845344804 +0800
+*** md.h	Fri Oct  2 02:46:43 2009
+--- ../st-1.9-patch/md.h	Mon Mar 16 15:11:49 2015
 ***************
 *** 422,428 ****
   #define MD_STACK_GROWS_DOWN

trunk/3rdparty/patches/2.http.parser.patch

@@ -0,0 +1,16 @@
+*** Makefile	Wed Mar 27 06:35:20 2013
+--- ../http-parser-2.1-patch/Makefile	Mon Mar 16 15:25:59 2015
+***************
+*** 12,17 ****
+--- 12,22 ----
+  CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
+  CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
++ # patch by winlin
++ CPPFLAGS_FAST = $(CPPFLAGS_DEBUG)
++ CFLAGS_FAST = $(CFLAGS_DEBUG)
++ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
++ 
+  test: test_g test_fast
+  	./test_g
+  	./test_fast

trunk/3rdparty/patches/3.st.osx.kqueue.patch

@@ -0,0 +1,19 @@
+*** io.c	Fri Oct  2 06:49:07 2009
+--- ../st-1.9-patch/io.c	Mon Mar 16 15:06:28 2015
+***************
+*** 89,94 ****
+--- 89,102 ----
+    if (fdlim > 0 && rlim.rlim_max > (rlim_t) fdlim) {
+      rlim.rlim_max = fdlim;
+    }
++ 
++   /* when rlimit max is negative, for example, osx, use cur directly. */
++   /* @see https://github.com/winlinvip/simple-rtmp-server/issues/336 */
++   if ((int)rlim.rlim_max < 0) {
++     _st_osfd_limit = (int)(fdlim > 0? fdlim : rlim.rlim_cur);
++     return 0;
++   }
++ 
+    rlim.rlim_cur = rlim.rlim_max;
+    if (setrlimit(RLIMIT_NOFILE, &rlim) < 0)
+      return -1;

trunk/3rdparty/patches/4.st.disable.examples.patch

@@ -0,0 +1,15 @@
+*** Makefile	Fri Oct  2 06:55:03 2009
+--- ../st-1.9-patch/Makefile	Mon Mar 16 15:30:35 2015
+***************
+*** 310,315 ****
+--- 310,319 ----
+  EXAMPLES    =
+  endif
+
++ # disable examples for ubuntu crossbuild failed.
++ # @see https://github.com/winlinvip/simple-rtmp-server/issues/308
++ EXAMPLES =
++ 
+  ifeq ($(OS), DARWIN)
+  LINKNAME    = libst.$(DSO_SUFFIX)
+  SONAME      = libst.$(MAJOR).$(DSO_SUFFIX)

trunk/3rdparty/patches/5.x264.osx.gcc.patch

@@ -0,0 +1,19 @@
+*** configure	Sat Nov 30 05:45:08 2013
+--- ../x264-snapshot-20131129-2245-stable-patch/configure	Tue Mar 17 21:42:24 2015
+***************
+*** 466,472 ****
+          ;;
+      darwin*)
+          SYS="MACOSX"
+!         CFLAGS="$CFLAGS -falign-loops=16"
+          libm="-lm"
+          if [ "$pic" = "no" ]; then
+              cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"
+--- 466,472 ----
+          ;;
+      darwin*)
+          SYS="MACOSX"
+!         CFLAGS="$CFLAGS"
+          libm="-lm"
+          if [ "$pic" = "no" ]; then
+              cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"

trunk/3rdparty/readme.txt

@@ -16,13 +16,14 @@ CherryPy-3.2.4.zip
 ffmpeg-2.1.1.tar.gz
 yasm-1.2.0.tar.gz
 lame-3.99.5.tar.gz
-libaacplus-2.0.2.tar.gz
-libaacplus-patch-26410-800.zip (26410-800.zip)
 speex-1.2rc1.zip
 x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
     for srs to support live stream transcoding.
     remark: we use *.zip for all linux plantform.
 
+fdk-aac-0.1.3.zip
+    https://github.com/mstorsjo/fdk-aac/releases
+
 tools/ccache-3.1.9.zip
     to fast build.
 
@@ -52,12 +53,6 @@ links:
     lame: 
         http://sourceforge.net/projects/lame/ 
         http://nchc.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
-    aacplus: 
-        http://217.20.164.161/~tipok/aacplus/ 
-        http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz
-    aacplus-patch: 
-        http://www.3gpp.org/DynaReport/26410.htm 
-        http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
     yasm:
         http://yasm.tortall.net/
         http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz

trunk/auto/apps.sh

@@ -1,7 +1,8 @@
 # generate the binary
 #
 # params:
-#     $SRS_OBJS the objs directory. ie. objs
+#     $SRS_OBJS the objs directory to store the Makefile. ie. ./objs
+#     $SRS_OBJS_DIR the objs directory for Makefile. ie. objs
 #     $SRS_MAKEFILE the makefile name. ie. Makefile
 #
 #     $MAIN_ENTRANCES array, disable all except the $APP_MAIN itself. ie. ["srs_main_server" "srs_main_bandcheck"]
@@ -14,7 +15,7 @@
 
 FILE=${SRS_OBJS}/${SRS_MAKEFILE}
 
-APP_TARGET="${SRS_OBJS}/${APP_NAME}"
+APP_TARGET="${SRS_OBJS_DIR}/${APP_NAME}"
 
 echo "generate app ${APP_NAME} depends...";
 
@@ -45,7 +46,7 @@ for item in ${MODULE_OBJS[*]}; do
         continue;
     fi
 
-    OBJ_FILE=${SRS_OBJS}/$item
+    OBJ_FILE=${SRS_OBJS_DIR}/$item
     OBJ_FILE="${OBJ_FILE%.*}.o"
     echo -n "${OBJ_FILE} " >> ${FILE}
 done
@@ -76,7 +77,7 @@ for item in ${MODULE_OBJS[*]}; do
         continue;
     fi
 
-    OBJ_FILE=${SRS_OBJS}/$item
+    OBJ_FILE=${SRS_OBJS_DIR}/$item
     OBJ_FILE="${OBJ_FILE%.*}.o"
     echo -n "${OBJ_FILE} " >> ${FILE}
 done