From adfbbbfd681568b862c7a44ca2d3698e0113bcb1 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 7 Apr 2014 08:32:28 +0800 Subject: [PATCH] add ingest files --- trunk/configure | 2 +- trunk/src/app/srs_app_ingest.cpp | 28 +++++++++++++++++++++++++ trunk/src/app/srs_app_ingest.hpp | 35 ++++++++++++++++++++++++++++++++ trunk/src/srs/srs.upp | 2 ++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 trunk/src/app/srs_app_ingest.cpp create mode 100644 trunk/src/app/srs_app_ingest.hpp diff --git a/trunk/configure b/trunk/configure index 6623950be..f431f18b4 100755 --- a/trunk/configure +++ b/trunk/configure @@ -435,7 +435,7 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socke "srs_app_codec" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" - "srs_app_http_conn" "srs_app_http_hooks" "srs_app_json") + "srs_app_http_conn" "srs_app_http_hooks" "srs_app_json" "srs_app_ingest") APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh APP_OBJS="${MODULE_OBJS[@]}" # diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp new file mode 100644 index 000000000..ec6dbcbe0 --- /dev/null +++ b/trunk/src/app/srs_app_ingest.cpp @@ -0,0 +1,28 @@ +/* +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. +*/ + +#include + +#ifdef SRS_INGEST + +#endif diff --git a/trunk/src/app/srs_app_ingest.hpp b/trunk/src/app/srs_app_ingest.hpp new file mode 100644 index 000000000..285b05c18 --- /dev/null +++ b/trunk/src/app/srs_app_ingest.hpp @@ -0,0 +1,35 @@ +/* +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. +*/ + +#ifndef SRS_APP_INGEST_HPP +#define SRS_APP_INGEST_HPP + +/* +#include +*/ +#include + +#ifdef SRS_INGEST + +#endif +#endif diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index dcd388162..c758287df 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -61,6 +61,8 @@ file ..\app\srs_app_http_conn.cpp, ..\app\srs_app_http_hooks.hpp, ..\app\srs_app_http_hooks.cpp, + ..\app\srs_app_ingest.hpp, + ..\app\srs_app_ingest.cpp, ..\app\srs_app_json.hpp, ..\app\srs_app_json.cpp, ..\app\srs_app_log.hpp,