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:58:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
8fea43345064dde4dc7a72c592071f3931175e32
8fea4334
1 parent
cb99de44
move stream to kernel module
显示空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
13 行增加
和
12 行删除
trunk/configure
trunk/src/app/srs_core_amf0.cpp
trunk/src/app/srs_core_codec.cpp
trunk/src/app/srs_core_protocol.cpp
trunk/src/app/srs_core_stream.cpp → trunk/src/kernel/srs_kernel_stream.cpp
trunk/src/app/srs_core_stream.hpp → trunk/src/kernel/srs_kernel_stream.hpp
trunk/src/main/srs_main_bandcheck.cpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
8fea433
...
...
@@ -133,7 +133,8 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
"srs_kernel_config"
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
"srs_kernel_config"
"srs_kernel_stream"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
@@ -145,7 +146,7 @@ MODULE_FILES=("srs_core_server"
"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"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_pithy_print"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
...
...
trunk/src/app/srs_core_amf0.cpp
查看文件 @
8fea433
...
...
@@ -27,7 +27,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
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
// AMF0 marker
#define RTMP_AMF0_Number 0x00
...
...
trunk/src/app/srs_core_codec.cpp
查看文件 @
8fea433
...
...
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
#include <srs_kernel_error.hpp>
#include <srs_
core
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_protocol.cpp
查看文件 @
8fea433
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_core_buffer.hpp>
#include <srs_
core
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
#include <srs_core_autofree.hpp>
using
namespace
std
;
...
...
trunk/src/
app/srs_core
_stream.cpp → trunk/src/
kernel/srs_kernel
_stream.cpp
查看文件 @
8fea433
...
...
@@ -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
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
...
...
trunk/src/
app/srs_core
_stream.hpp → trunk/src/
kernel/srs_kernel
_stream.hpp
查看文件 @
8fea433
...
...
@@ -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_STREAM_HPP
#define SRS_CORE_STREAM_HPP
#ifndef SRS_KERNEL_STREAM_HPP
#define SRS_KERNEL_STREAM_HPP
/*
#include <srs_
core
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/main/srs_main_bandcheck.cpp
查看文件 @
8fea433
...
...
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_autofree.hpp>
#include <srs_
core
_stream.hpp>
#include <srs_
kernel
_stream.hpp>
#include <st.h>
...
...
trunk/src/srs/srs.upp
查看文件 @
8fea433
...
...
@@ -18,6 +18,8 @@ file
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
...
...
@@ -57,8 +59,6 @@ file
..\app\srs_core_server.cpp,
..\app\srs_core_st.hpp,
..\app\srs_core_st.cpp,
..\app\srs_core_stream.hpp,
..\app\srs_core_stream.cpp,
..\app\srs_core_socket.hpp,
..\app\srs_core_socket.cpp,
..\app\srs_core_source.hpp,
...
...
请
注册
或
登录
后发表评论