正在显示
4 个修改的文件
包含
66 行增加
和
1 行删除
| @@ -435,7 +435,7 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socke | @@ -435,7 +435,7 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socke | ||
| 435 | "srs_app_codec" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" | 435 | "srs_app_codec" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" |
| 436 | "srs_app_http" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" | 436 | "srs_app_http" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" |
| 437 | "srs_app_config" "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" | 437 | "srs_app_config" "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" |
| 438 | - "srs_app_http_conn" "srs_app_http_hooks" "srs_app_json") | 438 | + "srs_app_http_conn" "srs_app_http_hooks" "srs_app_json" "srs_app_ingest") |
| 439 | APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh | 439 | APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh |
| 440 | APP_OBJS="${MODULE_OBJS[@]}" | 440 | APP_OBJS="${MODULE_OBJS[@]}" |
| 441 | # | 441 | # |
trunk/src/app/srs_app_ingest.cpp
0 → 100644
| 1 | +/* | ||
| 2 | +The MIT License (MIT) | ||
| 3 | + | ||
| 4 | +Copyright (c) 2013-2014 winlin | ||
| 5 | + | ||
| 6 | +Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| 7 | +this software and associated documentation files (the "Software"), to deal in | ||
| 8 | +the Software without restriction, including without limitation the rights to | ||
| 9 | +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| 10 | +the Software, and to permit persons to whom the Software is furnished to do so, | ||
| 11 | +subject to the following conditions: | ||
| 12 | + | ||
| 13 | +The above copyright notice and this permission notice shall be included in all | ||
| 14 | +copies or substantial portions of the Software. | ||
| 15 | + | ||
| 16 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 17 | +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| 18 | +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| 19 | +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| 20 | +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 22 | +*/ | ||
| 23 | + | ||
| 24 | +#include <srs_app_ingest.hpp> | ||
| 25 | + | ||
| 26 | +#ifdef SRS_INGEST | ||
| 27 | + | ||
| 28 | +#endif |
trunk/src/app/srs_app_ingest.hpp
0 → 100644
| 1 | +/* | ||
| 2 | +The MIT License (MIT) | ||
| 3 | + | ||
| 4 | +Copyright (c) 2013-2014 winlin | ||
| 5 | + | ||
| 6 | +Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| 7 | +this software and associated documentation files (the "Software"), to deal in | ||
| 8 | +the Software without restriction, including without limitation the rights to | ||
| 9 | +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| 10 | +the Software, and to permit persons to whom the Software is furnished to do so, | ||
| 11 | +subject to the following conditions: | ||
| 12 | + | ||
| 13 | +The above copyright notice and this permission notice shall be included in all | ||
| 14 | +copies or substantial portions of the Software. | ||
| 15 | + | ||
| 16 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 17 | +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| 18 | +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| 19 | +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| 20 | +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 22 | +*/ | ||
| 23 | + | ||
| 24 | +#ifndef SRS_APP_INGEST_HPP | ||
| 25 | +#define SRS_APP_INGEST_HPP | ||
| 26 | + | ||
| 27 | +/* | ||
| 28 | +#include <srs_app_ingest.hpp> | ||
| 29 | +*/ | ||
| 30 | +#include <srs_core.hpp> | ||
| 31 | + | ||
| 32 | +#ifdef SRS_INGEST | ||
| 33 | + | ||
| 34 | +#endif | ||
| 35 | +#endif |
| @@ -61,6 +61,8 @@ file | @@ -61,6 +61,8 @@ file | ||
| 61 | ..\app\srs_app_http_conn.cpp, | 61 | ..\app\srs_app_http_conn.cpp, |
| 62 | ..\app\srs_app_http_hooks.hpp, | 62 | ..\app\srs_app_http_hooks.hpp, |
| 63 | ..\app\srs_app_http_hooks.cpp, | 63 | ..\app\srs_app_http_hooks.cpp, |
| 64 | + ..\app\srs_app_ingest.hpp, | ||
| 65 | + ..\app\srs_app_ingest.cpp, | ||
| 64 | ..\app\srs_app_json.hpp, | 66 | ..\app\srs_app_json.hpp, |
| 65 | ..\app\srs_app_json.cpp, | 67 | ..\app\srs_app_json.cpp, |
| 66 | ..\app\srs_app_log.hpp, | 68 | ..\app\srs_app_log.hpp, |
-
请 注册 或 登录 后发表评论