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 11:24:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
85cd1e1a4170c3cc6a1173fb117f159ae9a37cad
85cd1e1a
1 parent
7e14e7fa
extract protocol module, move amf0 to protocol module
隐藏空白字符变更
内嵌
并排对比
正在显示
11 个修改的文件
包含
27 行增加
和
19 行删除
README.md
trunk/configure
trunk/src/app/srs_core_bandwidth.cpp
trunk/src/app/srs_core_hls.cpp
trunk/src/app/srs_core_protocol.cpp
trunk/src/app/srs_core_rtmp.cpp
trunk/src/app/srs_core_source.cpp
trunk/src/main/srs_main_bandcheck.cpp
trunk/src/app/srs_core_amf0.cpp → trunk/src/protocol/srs_protocol_amf0.cpp
trunk/src/app/srs_core_amf0.hpp → trunk/src/protocol/srs_protocol_amf0.hpp
trunk/src/srs/srs.upp
README.md
查看文件 @
85cd1e1
...
...
@@ -367,7 +367,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
*
nginx v1.5.0: 139524 lines
<br/>
### History
*
v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/app/main module.
*
v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/
drm/
app/main module.
*
v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package.
*
v1.0, 2014-02-28, add wiki
[
BuildArm
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Build
)
,
[
FFMPEG
](
https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG
)
,
[
Reload
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Reload
)
*
v1.0, 2014-02-27, add wiki
[
LowLatency
](
https://github.com/winlinvip/simple-rtmp-server/wiki/LowLatency
)
,
[
HTTPCallback
](
https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback
)
,
[
ServerSideScript
](
https://github.com/winlinvip/simple-rtmp-server/wiki/ServerSideScript
)
,
[
IDE
](
https://github.com/winlinvip/simple-rtmp-server/wiki/IDE
)
...
...
trunk/configure
查看文件 @
85cd1e1
...
...
@@ -138,17 +138,24 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
MODULE_ID
=
"PROTOCOL"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_protocol_amf0"
)
MODULE_DIR
=
"src/protocol"
. auto/modules.sh
PROTOCOL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#App Module
MODULE_ID
=
"APP"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"PROTOCOL"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
LibHttpParserRoot
}
${
LibSSLRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_core_server"
"srs_core_conn"
"srs_core_client"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_protocol"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_refer"
"srs_core_handshake"
"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"
)
...
...
@@ -157,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
#
#Main Module
MODULE_ID
=
"MAIN"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"APP"
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"
PROTOCOL"
"
APP"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_main_server"
"srs_main_bandcheck"
)
MODULE_DIR
=
"src/main"
. auto/modules.sh
...
...
@@ -173,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
)
# all depends objects
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
PROTOCOL_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
LINK_OPTIONS
=
"-ldl"
#
# srs:
...
...
trunk/src/app/srs_core_bandwidth.cpp
查看文件 @
85cd1e1
...
...
@@ -30,7 +30,7 @@ using namespace std;
#include <srs_core_rtmp.hpp>
#include <srs_kernel_error.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
85cd1e1
...
...
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_core_codec.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_source.hpp>
...
...
trunk/src/app/srs_core_protocol.cpp
查看文件 @
85cd1e1
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_protocol.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_kernel_buffer.hpp>
...
...
trunk/src/app/srs_core_rtmp.cpp
查看文件 @
85cd1e1
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_socket.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_autofree.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_core_handshake.hpp>
#include <srs_kernel_config.hpp>
...
...
trunk/src/app/srs_core_source.cpp
查看文件 @
85cd1e1
...
...
@@ -29,7 +29,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_autofree.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_core_codec.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_forward.hpp>
...
...
trunk/src/main/srs_main_bandcheck.cpp
查看文件 @
85cd1e1
...
...
@@ -31,7 +31,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_kernel_error.hpp>
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_stream.hpp>
...
...
trunk/src/
app/srs_core
_amf0.cpp → trunk/src/
protocol/srs_protocol
_amf0.cpp
查看文件 @
85cd1e1
...
...
@@ -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
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
#include <utility>
...
...
trunk/src/
app/srs_core
_amf0.hpp → trunk/src/
protocol/srs_protocol
_amf0.hpp
查看文件 @
85cd1e1
...
...
@@ -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_AMF0_HPP
#define SRS_CORE_AMF0_HPP
#ifndef SRS_PROTOCOL_AMF0_HPP
#define SRS_PROTOCOL_AMF0_HPP
/*
#include <srs_
core
_amf0.hpp>
#include <srs_
protocol
_amf0.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
85cd1e1
...
...
@@ -24,9 +24,10 @@ file
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
protocol readonly separator,
..\protocol\srs_protocol_amf0.hpp,
..\protocol\srs_protocol_amf0.cpp,
app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
..\app\srs_core_client.hpp,
...
...
请
注册
或
登录
后发表评论