update version, add build date

trunk/3rdparty/readme.txt

@@ -7,6 +7,9 @@ nginx-1.5.7.zip
 st-1.9.zip
     basic framework for srs.
 
+CherryPy-3.2.4.zip
+    sample api server for srs.
+
 ffmpeg-2.1.1.tar.gz
 yasm-1.2.0.tar.gz
 lame-3.99.5.tar.gz
@@ -38,4 +41,7 @@ links:
     yasm:
         http://yasm.tortall.net/
         http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
+    cherrypy:
+        http://www.cherrypy.org/
+        https://pypi.python.org/pypi/CherryPy/3.2.4
 

trunk/auto/depends.sh

@@ -78,6 +78,31 @@ else
     echo "#undef SRS_HLS" >> $SRS_AUTO_HEADERS_H
 fi
 
+#####################################################################################
+# cherrypy for http hooks callback, CherryPy-3.2.4
+#####################################################################################
+if [ $SRS_HTTP = YES ]; then
+    if [[ -f ${SRS_OBJS}/CherryPy-3.2.4/setup.py ]]; then
+        echo "CherryPy-3.2.4 is ok.";
+    else
+        echo "install CherryPy-3.2.4"; 
+        (
+            sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && 
+            unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 && 
+            sudo python setup.py install
+        )
+    fi
+    # check status
+    ret=$?; if [[ $ret -ne 0 ]]; then echo "build CherryPy-3.2.4 failed, ret=$ret"; exit $ret; fi
+    if [ ! -f ${SRS_OBJS}/nginx/sbin/nginx ]; then echo "build CherryPy-3.2.4 failed."; exit -1; fi
+fi
+
+if [ $SRS_HTTP = YES ]; then
+    echo "#define SRS_HTTP" >> $SRS_AUTO_HEADERS_H
+else
+    echo "#undef SRS_HTTP" >> $SRS_AUTO_HEADERS_H
+fi
+
 #####################################################################################
 # openssl, for rtmp complex handshake
 #####################################################################################

trunk/auto/options.sh

@@ -5,11 +5,13 @@ help=no
 SRS_HLS=RESERVED
 SRS_SSL=RESERVED
 SRS_FFMPEG=RESERVED
+SRS_HTTP=RESERVED
 
 # TODO: remove the default to yes.
 SRS_HLS=YES
 SRS_SSL=YES
 SRS_FFMPEG=YES
+SRS_HTTP=YES
 
 opt=
 
@@ -28,10 +30,12 @@ do
         --with-ssl)                     SRS_SSL=YES               ;;
         --with-hls)                     SRS_HLS=YES               ;;
         --with-ffmpeg)                  SRS_FFMPEG=YES            ;;
+        --with-http)                    SRS_HTTP=YES              ;;
         
         --without-ssl)                  SRS_SSL=NO                ;;
         --without-hls)                  SRS_HLS=NO                ;;
         --without-ffmpeg)               SRS_FFMPEG=NO             ;;
+        --without-http)                 SRS_HTTP=NO               ;;
 
         *)
             echo "$0: error: invalid option \"$option\""
@@ -50,10 +54,13 @@ cat << END
 
   --with-ssl               enable rtmp complex handshake, requires openssl-devel installed.
                            to delivery h264 video and aac audio to flash player.
+  --with-http              enable http hooks, build cherrypy as demo api server.
+                           srs will call the http hooks, such as: on_connect.
   --with-hls               enable hls streaming, build nginx as http server for hls.
 
   --without-ssl            disable rtmp complex handshake.
   --without-hls            disable hls, rtmp streaming only.
+  --without-http           disable http, http hooks callback.
 
 END
 
@@ -73,6 +80,10 @@ if [ $SRS_FFMPEG = RESERVED ]; then
     echo "you must specifies the ffmpeg, see: ./configure --help";
     __check_ok=NO
 fi
+if [ $SRS_HTTP = RESERVED ]; then
+    echo "you must specifies the http, see: ./configure --help";
+    __check_ok=NO
+fi
 if [ $__check_ok = NO ]; then
     exit 1;
 fi

trunk/conf/srs.conf

@@ -81,14 +81,14 @@ vhost __defaultVhost__ {
 vhost dev {
     enabled         on;
     gop_cache       on;
-    hls             on;
+    hls             off;
     hls_path        ./objs/nginx/html;
     hls_fragment    5;
     hls_window      30;
-    forward         127.0.0.1:19350;
+    #forward         127.0.0.1:19350;
     #forward         127.0.0.1:1936;
     transcode {
-        enabled     on;
+        enabled     off;
         ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
         engine dev {
             enabled         off;

trunk/configure

@@ -15,6 +15,15 @@ BLACK="\\e[0m"
 # parse user options.
 . auto/options.sh
 
+# if specifies http, requires sudo to install the CherryPy.
+if [ $SRS_HTTP = YES ]; then
+    sudo echo "" >/dev/null 2>&1
+    ret=$?; if [[ 0 -ne $ret ]]; then echo 
+        "--with-http requires sudoer, ret=$ret"; 
+        exit $ret; 
+    fi
+fi
+
 # clean the exists
 if [[ -f Makefile ]]; then
     make clean
@@ -22,6 +31,8 @@ fi
 
 # generate the audo headers file.
 echo "#define SRS_CONFIGURE \"${SRS_CONFIGURE}\"" > $SRS_AUTO_HEADERS_H
+echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
+echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
 
 # apply user options.
 . auto/depends.sh
@@ -143,6 +154,11 @@ if [ $SRS_FFMPEG = YES ]; then
 else
     echo -e "${YELLOW}warning: without live stream transcoding over FFMPEG support${BLACK}"
 fi
+if [ $SRS_HTTP = YES ]; then
+    echo -e "${GREEN}http hooks callback over CherryPy is enabled${BLACK}"
+else
+    echo -e "${YELLOW}warning: without http hooks callback over CherryPy support${BLACK}"
+fi
 
 # mkdir dirs
 mkdir -p ${SRS_OBJS}/logs

trunk/src/core/srs_core.hpp

@@ -1,105 +1,105 @@
-/*
+/*
-The MIT License (MIT)
+The MIT License (MIT)
-
+
-Copyright (c) 2013 winlin
+Copyright (c) 2013 winlin
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy of
+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
+this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
+the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+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,
+the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+subject to the following conditions:
-
+
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Software.
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+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
+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
+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.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+*/
-
+
-#ifndef SRS_CORE_HPP
+#ifndef SRS_CORE_HPP
-#define SRS_CORE_HPP
+#define SRS_CORE_HPP
-
+
-/*
+/*
-#include <srs_core.hpp>
+#include <srs_core.hpp>
-*/
+*/
-
+
-/**
+/**
-* the core provides the common defined macros, utilities,
+* the core provides the common defined macros, utilities,
-* user must include the srs_core.hpp before any header, or maybe 
+* user must include the srs_core.hpp before any header, or maybe 
-* build failed.
+* build failed.
-*/
+*/
-
+
-// for int64_t print using PRId64 format.
+// for int64_t print using PRId64 format.
-#ifndef __STDC_FORMAT_MACROS
+#ifndef __STDC_FORMAT_MACROS
-    #define __STDC_FORMAT_MACROS
+    #define __STDC_FORMAT_MACROS
-#endif
+#endif
-#include <inttypes.h>
+#include <inttypes.h>
-
+
-#include <assert.h>
+#include <assert.h>
-#define srs_assert(expression) assert(expression)
+#define srs_assert(expression) assert(expression)
-
+
-#include <stddef.h>
+#include <stddef.h>
-#include <sys/types.h>
+#include <sys/types.h>
-
+
-// generated by configure.
+// generated by configure.
-#include <srs_auto_headers.hpp>
+#include <srs_auto_headers.hpp>
-
+
-// free the p and set to NULL.
+// free the p and set to NULL.
-// p must be a T*.
+// p must be a T*.
-#define srs_freep(p) \
+#define srs_freep(p) \
-	if (p) { \
+	if (p) { \
-		delete p; \
+		delete p; \
-		p = NULL; \
+		p = NULL; \
-	} \
+	} \
-	(void)0
+	(void)0
-// free the p which represents a array
+// free the p which represents a array
-#define srs_freepa(p) \
+#define srs_freepa(p) \
-	if (p) { \
+	if (p) { \
-		delete[] p; \
+		delete[] p; \
-		p = NULL; \
+		p = NULL; \
-	} \
+	} \
-	(void)0
+	(void)0
-
+
-// current release version
+// current release version
-#define RTMP_SIG_SRS_VERSION "0.5.0"
+#define RTMP_SIG_SRS_VERSION "0.8.0"
-// server info.
+// server info.
-#define RTMP_SIG_SRS_KEY "srs"
+#define RTMP_SIG_SRS_KEY "srs"
-#define RTMP_SIG_SRS_ROLE "origin server"
+#define RTMP_SIG_SRS_ROLE "origin server"
-#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(simple rtmp server)"
+#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(simple rtmp server)"
-#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT
+#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT
-#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
+#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
-#define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin"
+#define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin"
-#define RTMP_SIG_SRS_EMAIL "winterserver@126.com"
+#define RTMP_SIG_SRS_EMAIL "winterserver@126.com"
-#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
+#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
-#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013 winlin"
+#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013 winlin"
-#define RTMP_SIG_SRS_CONTRIBUTOR "winlin"
+#define RTMP_SIG_SRS_CONTRIBUTOR "winlin"
-
+
-// compare
+// compare
-#define srs_min(a, b) (((a) < (b))? (a) : (b))
+#define srs_min(a, b) (((a) < (b))? (a) : (b))
-#define srs_max(a, b) (((a) < (b))? (b) : (a))
+#define srs_max(a, b) (((a) < (b))? (b) : (a))
-
+
-// get current system time in ms, use cache to avoid performance problem
+// get current system time in ms, use cache to avoid performance problem
-extern int64_t srs_get_system_time_ms();
+extern int64_t srs_get_system_time_ms();
-// the deamon st-thread will update it.
+// the deamon st-thread will update it.
-extern void srs_update_system_time_ms();
+extern void srs_update_system_time_ms();
-
+
-// signal defines.
+// signal defines.
-#define SIGNAL_RELOAD SIGHUP
+#define SIGNAL_RELOAD SIGHUP
-
+
-#include <string>
+#include <string>
-// replace utility
+// replace utility
-extern std::string srs_replace(std::string str, std::string old_str, std::string new_str);
+extern std::string srs_replace(std::string str, std::string old_str, std::string new_str);
-// dns resolve utility, return the resolved ip address.
+// dns resolve utility, return the resolved ip address.
-extern std::string srs_dns_resolve(std::string host);
+extern std::string srs_dns_resolve(std::string host);
-// resolve the vhost in query string
+// resolve the vhost in query string
-// @param app, may contains the vhost in query string format:
+// @param app, may contains the vhost in query string format:
-// 		app?vhost=request_vhost
+// 		app?vhost=request_vhost
-//		app...vhost...request_vhost
+//		app...vhost...request_vhost
-extern void srs_vhost_resolve(std::string& vhost, std::string& app);
+extern void srs_vhost_resolve(std::string& vhost, std::string& app);
-
+
 #endif