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:30:16 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
dea66a322dad752a299d6c736b81a537d77f2c36
dea66a32
1 parent
bcbea862
extract kernel module, depends on core and provides kernel service(no stream)
隐藏空白字符变更
内嵌
并排对比
正在显示
28 个修改的文件
包含
44 行增加
和
35 行删除
trunk/configure
trunk/src/app/srs_core_amf0.cpp
trunk/src/app/srs_core_bandwidth.cpp
trunk/src/app/srs_core_buffer.cpp
trunk/src/app/srs_core_client.cpp
trunk/src/app/srs_core_codec.cpp
trunk/src/app/srs_core_config.cpp
trunk/src/app/srs_core_conn.cpp
trunk/src/app/srs_core_encoder.cpp
trunk/src/app/srs_core_forward.cpp
trunk/src/app/srs_core_handshake.cpp
trunk/src/app/srs_core_hls.cpp
trunk/src/app/srs_core_http.cpp
trunk/src/app/srs_core_pithy_print.cpp
trunk/src/app/srs_core_protocol.cpp
trunk/src/app/srs_core_protocol.hpp
trunk/src/app/srs_core_refer.cpp
trunk/src/app/srs_core_reload.cpp
trunk/src/app/srs_core_rtmp.cpp
trunk/src/app/srs_core_server.cpp
trunk/src/app/srs_core_socket.cpp
trunk/src/app/srs_core_stream.cpp
trunk/src/app/srs_core_thread.cpp
trunk/src/app/srs_core_error.cpp → trunk/src/kernel/srs_kernel_error.cpp
trunk/src/app/srs_core_error.hpp → trunk/src/kernel/srs_kernel_error.hpp
trunk/src/main/srs_main_bandcheck.cpp
trunk/src/main/srs_main_server.cpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
dea66a3
...
...
@@ -121,7 +121,7 @@ fi
#####################################################################################
# Modules, compile each module, then link to binary
#
#Core
Module
#Core
, depends only on system apis.
MODULE_ID
=
"CORE"
MODULE_DEPENDS
=()
ModuleLibIncs
=(
${
SRS_OBJS
}
)
...
...
@@ -129,12 +129,20 @@ MODULE_FILES=("srs_core" "srs_core_autofree")
MODULE_DIR
=
"src/core"
. auto/modules.sh
CORE_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#Kernel, depends on core, provides error/log/config, nothing about stream information.
MODULE_ID
=
"KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#App Module
MODULE_ID
=
"APP"
MODULE_DEPENDS
=(
"CORE"
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
LibHttpParserRoot
}
${
LibSSLRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_core_log"
"srs_core_server"
"srs_core_error"
"srs_core_conn"
"srs_core_client"
"srs_core_conn"
"srs_core_client"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_buffer"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_stream"
"srs_core_source"
"srs_core_codec"
...
...
@@ -148,7 +156,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
#
#Main Module
MODULE_ID
=
"MAIN"
MODULE_DEPENDS
=(
"CORE"
"APP"
)
MODULE_DEPENDS
=(
"CORE"
"
KERNEL"
"
APP"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_main_server"
"srs_main_bandcheck"
)
MODULE_DIR
=
"src/main"
. auto/modules.sh
...
...
@@ -164,7 +172,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
)
# all depends objects
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
LINK_OPTIONS
=
"-ldl"
#
# srs:
...
...
trunk/src/app/srs_core_amf0.cpp
查看文件 @
dea66a3
...
...
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <utility>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_stream.hpp>
// AMF0 marker
...
...
trunk/src/app/srs_core_bandwidth.cpp
查看文件 @
dea66a3
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_core_rtmp.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_config.hpp>
...
...
trunk/src/app/srs_core_buffer.cpp
查看文件 @
dea66a3
...
...
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_buffer.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_core_log.hpp>
...
...
trunk/src/app/srs_core_client.cpp
查看文件 @
dea66a3
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_protocol.hpp>
...
...
trunk/src/app/srs_core_codec.cpp
查看文件 @
dea66a3
...
...
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string.h>
#include <stdlib.h>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_stream.hpp>
#include <srs_core_log.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_config.cpp
查看文件 @
dea66a3
...
...
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
using
namespace
std
;
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_conn.cpp
查看文件 @
dea66a3
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_conn.hpp>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_server.hpp>
SrsConnection
::
SrsConnection
(
SrsServer
*
srs_server
,
st_netfd_t
client_stfd
)
...
...
trunk/src/app/srs_core_encoder.cpp
查看文件 @
dea66a3
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
#include <srs_core_config.hpp>
#include <srs_core_rtmp.hpp>
...
...
trunk/src/app/srs_core_forward.cpp
查看文件 @
dea66a3
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <netinet/in.h>
#include <arpa/inet.h>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_log.hpp>
#include <srs_core_protocol.hpp>
...
...
trunk/src/app/srs_core_handshake.cpp
查看文件 @
dea66a3
...
...
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <time.h>
#include <stdlib.h>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_socket.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
dea66a3
...
...
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_codec.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
...
...
trunk/src/app/srs_core_http.cpp
查看文件 @
dea66a3
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <netinet/in.h>
#include <arpa/inet.h>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_log.hpp>
#include <srs_core_socket.hpp>
...
...
trunk/src/app/srs_core_pithy_print.cpp
查看文件 @
dea66a3
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_log.hpp>
#include <srs_core_config.hpp>
#include <srs_core_reload.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#define SRS_STAGE_DEFAULT_INTERVAL_MS 1200
...
...
trunk/src/app/srs_core_protocol.cpp
查看文件 @
dea66a3
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_log.hpp>
#include <srs_core_amf0.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_core_buffer.hpp>
#include <srs_core_stream.hpp>
...
...
trunk/src/app/srs_core_protocol.hpp
查看文件 @
dea66a3
...
...
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_st.hpp>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
// the following is the timeout for rtmp protocol,
// to avoid death connection.
...
...
trunk/src/app/srs_core_refer.cpp
查看文件 @
dea66a3
...
...
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_refer.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
#include <srs_core_config.hpp>
...
...
trunk/src/app/srs_core_reload.cpp
查看文件 @
dea66a3
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
ISrsReloadHandler
::
ISrsReloadHandler
()
{
...
...
trunk/src/app/srs_core_rtmp.cpp
查看文件 @
dea66a3
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_rtmp.hpp>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_server.cpp
查看文件 @
dea66a3
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <algorithm>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_client.hpp>
#include <srs_core_config.hpp>
...
...
trunk/src/app/srs_core_socket.cpp
查看文件 @
dea66a3
...
...
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_socket.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
SrsSocket
::
SrsSocket
(
st_netfd_t
client_stfd
)
{
...
...
trunk/src/app/srs_core_stream.cpp
查看文件 @
dea66a3
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_stream.hpp>
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
SrsStream
::
SrsStream
()
{
...
...
trunk/src/app/srs_core_thread.cpp
查看文件 @
dea66a3
...
...
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_thread.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_log.hpp>
ISrsThreadHandler
::
ISrsThreadHandler
()
...
...
trunk/src/
app/srs_core
_error.cpp → trunk/src/
kernel/srs_kernel
_error.cpp
查看文件 @
dea66a3
...
...
@@ -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
_error.hpp>
#include <srs_
kernel
_error.hpp>
bool
srs_is_system_control_error
(
int
error_code
)
{
...
...
trunk/src/
app/srs_core
_error.hpp → trunk/src/
kernel/srs_kernel
_error.hpp
查看文件 @
dea66a3
...
...
@@ -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_ERROR_HPP
#define SRS_CORE_ERROR_HPP
#ifndef SRS_KERNEL_ERROR_HPP
#define SRS_KERNEL_ERROR_HPP
/*
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/main/srs_main_bandcheck.cpp
查看文件 @
dea66a3
...
...
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_rtmp.hpp>
#include <srs_core_protocol.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_stream.hpp>
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
dea66a3
...
...
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core_log.hpp>
#include <srs_
core
_error.hpp>
#include <srs_
kernel
_error.hpp>
#include <srs_core_server.hpp>
#include <srs_core_config.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
dea66a3
...
...
@@ -9,6 +9,9 @@ file
..\core\srs_core.cpp,
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_error.hpp,
..\kernel\srs_kernel_error.cpp,
app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
...
...
@@ -26,8 +29,6 @@ file
..\app\srs_core_conn.cpp,
..\app\srs_core_encoder.hpp,
..\app\srs_core_encoder.cpp,
..\app\srs_core_error.hpp,
..\app\srs_core_error.cpp,
..\app\srs_core_forward.hpp,
..\app\srs_core_forward.cpp,
..\app\srs_core_handshake.hpp,
...
...
请
注册
或
登录
后发表评论