Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-01 10:55:43 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cb99de4462ca07f7045c70abce0e151332bf6761
cb99de44
1 parent
5e14aa9c
move config to kernel module
显示空白字符变更
内嵌
并排对比
正在显示
15 个修改的文件
包含
19 行增加
和
19 行删除
trunk/configure
trunk/src/app/srs_core_bandwidth.cpp
trunk/src/app/srs_core_client.cpp
trunk/src/app/srs_core_encoder.cpp
trunk/src/app/srs_core_forward.cpp
trunk/src/app/srs_core_hls.cpp
trunk/src/app/srs_core_pithy_print.cpp
trunk/src/app/srs_core_refer.cpp
trunk/src/app/srs_core_rtmp.cpp
trunk/src/app/srs_core_server.cpp
trunk/src/app/srs_core_source.cpp
trunk/src/app/srs_core_config.cpp → trunk/src/kernel/srs_kernel_config.cpp
trunk/src/app/srs_core_config.hpp → trunk/src/kernel/srs_kernel_config.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
cb99de4
...
...
@@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
"srs_kernel_config"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_stream"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_pithy_print"
"srs_core_
config"
"srs_core_
refer"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
"srs_core_http"
"srs_core_thread"
"srs_core_bandwidth"
"srs_core_st"
"srs_core_log_context"
)
...
...
trunk/src/app/srs_core_bandwidth.cpp
查看文件 @
cb99de4
...
...
@@ -32,7 +32,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_autofree.hpp>
SrsBandwidth
::
SrsBandwidth
()
...
...
trunk/src/app/srs_core_client.cpp
查看文件 @
cb99de4
...
...
@@ -36,7 +36,7 @@ using namespace std;
#include <srs_core_source.hpp>
#include <srs_core_server.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_refer.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_http.hpp>
...
...
trunk/src/app/srs_core_encoder.cpp
查看文件 @
cb99de4
...
...
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_protocol.hpp>
...
...
trunk/src/app/srs_core_forward.cpp
查看文件 @
cb99de4
...
...
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_protocol.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
cb99de4
...
...
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_codec.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_rtmp.hpp>
...
...
trunk/src/app/srs_core_pithy_print.cpp
查看文件 @
cb99de4
...
...
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map>
#include <srs_kernel_log.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_kernel_reload.hpp>
#include <srs_kernel_error.hpp>
...
...
trunk/src/app/srs_core_refer.cpp
查看文件 @
cb99de4
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
int
SrsRefer
::
check
(
std
::
string
page_url
,
SrsConfDirective
*
refer
)
{
...
...
trunk/src/app/srs_core_rtmp.cpp
查看文件 @
cb99de4
...
...
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_autofree.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_handshake.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
using
namespace
std
;
...
...
trunk/src/app/srs_core_server.cpp
查看文件 @
cb99de4
...
...
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_client.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#define SERVER_LISTEN_BACKLOG 512
#define SRS_TIME_RESOLUTION_MS 500
...
...
trunk/src/app/srs_core_source.cpp
查看文件 @
cb99de4
...
...
@@ -33,7 +33,7 @@ using namespace std;
#include <srs_core_codec.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_forward.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_core_encoder.hpp>
#include <srs_core_rtmp.hpp>
...
...
trunk/src/
app/srs_core
_config.cpp → trunk/src/
kernel/srs_kernel
_config.cpp
查看文件 @
cb99de4
...
...
@@ -21,7 +21,7 @@ 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 <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <stdio.h>
#include <stdlib.h>
...
...
trunk/src/
app/srs_core
_config.hpp → trunk/src/
kernel/srs_kernel
_config.hpp
查看文件 @
cb99de4
...
...
@@ -21,11 +21,11 @@ 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_CORE_CONIFG_HPP
#define SRS_CORE_CONIFG_HPP
#ifndef SRS_KERNEL_CONIFG_HPP
#define SRS_KERNEL_CONIFG_HPP
/*
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
cb99de4
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_server.hpp>
#include <srs_
core
_config.hpp>
#include <srs_
kernel
_config.hpp>
#include <stdlib.h>
#include <signal.h>
...
...
trunk/src/srs/srs.upp
查看文件 @
cb99de4
...
...
@@ -10,6 +10,8 @@ file
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_config.hpp,
..\kernel\srs_kernel_config.cpp,
..\kernel\srs_kernel_error.hpp,
..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp,
...
...
@@ -27,8 +29,6 @@ file
..\app\srs_core_client.cpp,
..\app\srs_core_codec.hpp,
..\app\srs_core_codec.cpp,
..\app\srs_core_config.hpp,
..\app\srs_core_config.cpp,
..\app\srs_core_conn.hpp,
..\app\srs_core_conn.cpp,
..\app\srs_core_encoder.hpp,
...
...
请
注册
或
登录
后发表评论