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 13:39:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4e3f7843fec3455c182e2c05198551d694064095
4e3f7843
1 parent
4a8bc3b2
rename protocol dir to pro. move rtmp stack to protocol module
隐藏空白字符变更
内嵌
并排对比
正在显示
16 个修改的文件
包含
22 行增加
和
23 行删除
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_rtmp.cpp
trunk/src/app/srs_core_source.cpp
trunk/src/main/srs_main_bandcheck.cpp
trunk/src/protocol/srs_protocol_amf0.cpp → trunk/src/pro/srs_protocol_amf0.cpp
trunk/src/protocol/srs_protocol_amf0.hpp → trunk/src/pro/srs_protocol_amf0.hpp
trunk/src/protocol/srs_protocol_io.cpp → trunk/src/pro/srs_protocol_io.cpp
trunk/src/protocol/srs_protocol_io.hpp → trunk/src/pro/srs_protocol_io.hpp
trunk/src/app/srs_core_protocol.cpp → trunk/src/pro/srs_protocol_rtmp_stack.cpp
trunk/src/app/srs_core_protocol.hpp → trunk/src/pro/srs_protocol_rtmp_stack.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
4e3f784
...
...
@@ -142,8 +142,8 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"PROTOCOL"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_protocol_amf0"
"srs_protocol_io"
)
MODULE_DIR
=
"src/protocol"
. auto/modules.sh
MODULE_FILES
=(
"srs_protocol_amf0"
"srs_protocol_io"
"srs_protocol_rtmp_stack"
)
MODULE_DIR
=
"src/pro"
. auto/modules.sh
PROTOCOL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#App Module
...
...
@@ -151,10 +151,9 @@ MODULE_ID="APP"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"PROTOCOL"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
LibHttpParserRoot
}
${
LibSSLRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_core_server"
"srs_core_conn"
"srs_core_client"
"srs_core_conn"
"srs_core_client"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_protocol"
"srs_core_source"
"srs_core_codec"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
"srs_core_http"
"srs_core_thread"
"srs_core_bandwidth"
...
...
trunk/src/app/srs_core_bandwidth.cpp
查看文件 @
4e3f784
...
...
@@ -31,7 +31,7 @@ using namespace std;
#include <srs_core_rtmp.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_client.cpp
查看文件 @
4e3f784
...
...
@@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_source.hpp>
#include <srs_core_server.hpp>
...
...
trunk/src/app/srs_core_encoder.cpp
查看文件 @
4e3f784
...
...
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_config.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_kernel_pithy_print.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#ifdef SRS_FFMPEG
...
...
trunk/src/app/srs_core_forward.cpp
查看文件 @
4e3f784
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_kernel_pithy_print.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_kernel_config.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
4e3f784
...
...
@@ -36,7 +36,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_protocol_amf0.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_rtmp.cpp
查看文件 @
4e3f784
...
...
@@ -26,7 +26,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_protocol_io.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_core_handshake.hpp>
...
...
trunk/src/app/srs_core_source.cpp
查看文件 @
4e3f784
...
...
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_kernel_log.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_core_codec.hpp>
...
...
trunk/src/main/srs_main_bandcheck.cpp
查看文件 @
4e3f784
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h>
#include <srs_core_rtmp.hpp>
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/pro
tocol
/srs_protocol_amf0.cpp → trunk/src/pro/srs_protocol_amf0.cpp
查看文件 @
4e3f784
trunk/src/pro
tocol
/srs_protocol_amf0.hpp → trunk/src/pro/srs_protocol_amf0.hpp
查看文件 @
4e3f784
trunk/src/pro
tocol
/srs_protocol_io.cpp → trunk/src/pro/srs_protocol_io.cpp
查看文件 @
4e3f784
trunk/src/pro
tocol
/srs_protocol_io.hpp → trunk/src/pro/srs_protocol_io.hpp
查看文件 @
4e3f784
trunk/src/
app/srs_core_protocol
.cpp → trunk/src/
pro/srs_protocol_rtmp_stack
.cpp
查看文件 @
4e3f784
...
...
@@ -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_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_amf0.hpp>
...
...
trunk/src/
app/srs_core_protocol
.hpp → trunk/src/
pro/srs_protocol_rtmp_stack
.hpp
查看文件 @
4e3f784
...
...
@@ -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_PROTOCOL_HPP
#define SRS_CORE_PROTOCOL_HPP
#ifndef SRS_PROTOCOL_RTMP_STACK_HPP
#define SRS_PROTOCOL_RTMP_STACK_HPP
/*
#include <srs_
core_protocol
.hpp>
#include <srs_
protocol_rtmp_stack
.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
4e3f784
...
...
@@ -25,10 +25,12 @@ file
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
protocol readonly separator,
..\protocol\srs_protocol_amf0.hpp,
..\protocol\srs_protocol_amf0.cpp,
..\protocol\srs_protocol_io.hpp,
..\protocol\srs_protocol_io.cpp,
..\pro\srs_protocol_amf0.hpp,
..\pro\srs_protocol_amf0.cpp,
..\pro\srs_protocol_io.hpp,
..\pro\srs_protocol_io.cpp,
..\pro\srs_protocol_rtmp_stack.hpp,
..\pro\srs_protocol_rtmp_stack.cpp,
app readonly separator,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
...
...
@@ -50,8 +52,6 @@ file
..\app\srs_core_http.cpp,
..\app\srs_core_log_context.hpp,
..\app\srs_core_log_context.cpp,
..\app\srs_core_protocol.hpp,
..\app\srs_core_protocol.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_core_rtmp.hpp,
...
...
请
注册
或
登录
后发表评论