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 14:05:58 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4c498b67daad409d941c985263302fb4fb0c8ebb
4c498b67
1 parent
8d580615
rename pro to rtmp protocol.
隐藏空白字符变更
内嵌
并排对比
正在显示
12 个修改的文件
包含
18 行增加
和
18 行删除
trunk/configure
trunk/src/pro/srs_protocol_amf0.cpp → trunk/src/rtmp/srs_protocol_amf0.cpp
trunk/src/pro/srs_protocol_amf0.hpp → trunk/src/rtmp/srs_protocol_amf0.hpp
trunk/src/pro/srs_protocol_handshake.cpp → trunk/src/rtmp/srs_protocol_handshake.cpp
trunk/src/pro/srs_protocol_handshake.hpp → trunk/src/rtmp/srs_protocol_handshake.hpp
trunk/src/pro/srs_protocol_io.cpp → trunk/src/rtmp/srs_protocol_io.cpp
trunk/src/pro/srs_protocol_io.hpp → trunk/src/rtmp/srs_protocol_io.hpp
trunk/src/pro/srs_protocol_rtmp.cpp → trunk/src/rtmp/srs_protocol_rtmp.cpp
trunk/src/pro/srs_protocol_rtmp.hpp → trunk/src/rtmp/srs_protocol_rtmp.hpp
trunk/src/pro/srs_protocol_rtmp_stack.cpp → trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
trunk/src/pro/srs_protocol_rtmp_stack.hpp → trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
4c498b6
...
...
@@ -138,18 +138,18 @@ 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"
#RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
MODULE_ID
=
"RTMP"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
${
LibSSLRoot
}
)
MODULE_FILES
=(
"srs_protocol_amf0"
"srs_protocol_io"
"srs_protocol_rtmp_stack"
"srs_protocol_rtmp"
"srs_protocol_handshake"
)
MODULE_DIR
=
"src/pro"
. auto/modules.sh
PROTOCOL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
MODULE_DIR
=
"src/rtmp"
. auto/modules.sh
RTMP_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#App Module
MODULE_ID
=
"APP"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"
PROTOCOL
"
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"
RTMP
"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
LibHttpParserRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_core_server"
"srs_core_conn"
"srs_core_client"
...
...
@@ -164,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
#
#Main Module
MODULE_ID
=
"MAIN"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"
PROTOCOL
"
"APP"
)
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"
RTMP
"
"APP"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_main_server"
"srs_main_bandcheck"
)
MODULE_DIR
=
"src/main"
. auto/modules.sh
...
...
@@ -180,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
[@]
}
${
PROTOCOL
_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
KERNEL_OBJS
[@]
}
${
RTMP
_OBJS
[@]
}
${
APP_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
LINK_OPTIONS
=
"-ldl"
#
# srs:
...
...
trunk/src/
pro
/srs_protocol_amf0.cpp → trunk/src/
rtmp
/srs_protocol_amf0.cpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_amf0.hpp → trunk/src/
rtmp
/srs_protocol_amf0.hpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_handshake.cpp → trunk/src/
rtmp
/srs_protocol_handshake.cpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_handshake.hpp → trunk/src/
rtmp
/srs_protocol_handshake.hpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_io.cpp → trunk/src/
rtmp
/srs_protocol_io.cpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_io.hpp → trunk/src/
rtmp
/srs_protocol_io.hpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_rtmp.cpp → trunk/src/
rtmp
/srs_protocol_rtmp.cpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_rtmp.hpp → trunk/src/
rtmp
/srs_protocol_rtmp.hpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_rtmp_stack.cpp → trunk/src/
rtmp
/srs_protocol_rtmp_stack.cpp
查看文件 @
4c498b6
trunk/src/
pro
/srs_protocol_rtmp_stack.hpp → trunk/src/
rtmp
/srs_protocol_rtmp_stack.hpp
查看文件 @
4c498b6
trunk/src/srs/srs.upp
查看文件 @
4c498b6
...
...
@@ -24,17 +24,17 @@ file
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
protocol readonly separator,
..\pro\srs_protocol_amf0.hpp,
..\pro\srs_protocol_amf0.cpp,
..\app\srs_protocol_handshake.hpp,
..\app\srs_protocol_handshake.cpp,
..\pro\srs_protocol_io.hpp,
..\pro\srs_protocol_io.cpp,
..\pro\srs_protocol_rtmp.hpp,
..\pro\srs_protocol_rtmp.cpp,
..\pro\srs_protocol_rtmp_stack.hpp,
..\pro\srs_protocol_rtmp_stack.cpp,
rtmp protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_io.hpp,
..\rtmp\srs_protocol_io.cpp,
..\rtmp\srs_protocol_rtmp.hpp,
..\rtmp\srs_protocol_rtmp.cpp,
..\rtmp\srs_protocol_rtmp_stack.hpp,
..\rtmp\srs_protocol_rtmp_stack.cpp,
app readonly separator,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
...
...
请
注册
或
登录
后发表评论