external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

extract protocol module, move amf0 to protocol module

Browse source
This commit is contained in:
winlin 2014-03-01 11:24:40 +08:00
parent 7e14e7fa57
commit 85cd1e1a41
11 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -367,7 +367,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
* nginx v1.5.0: 139524 lines <br/> * nginx v1.5.0: 139524 lines <br/>
### History ### 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, 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-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) * 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)

19
trunk/configure vendored
View file

@ -138,17 +138,24 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne
MODULE_DIR="src/kernel" . auto/modules.sh MODULE_DIR="src/kernel" . auto/modules.sh
KERNEL_OBJS="${MODULE_OBJS[@]}" 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 #App Module
MODULE_ID="APP" MODULE_ID="APP"
MODULE_DEPENDS=("CORE" "KERNEL") MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL")
ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
MODULE_FILES=("srs_core_server" 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_rtmp" "srs_core_socket"
"srs_core_protocol" "srs_core_amf0" "srs_core_protocol"
"srs_core_source" "srs_core_codec" "srs_core_source" "srs_core_codec"
"srs_core_handshake" "srs_core_handshake" "srs_core_refer"
"srs_core_refer"
"srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_hls" "srs_core_forward" "srs_core_encoder"
"srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
"srs_core_st" "srs_core_log_context") "srs_core_st" "srs_core_log_context")
@ -157,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
# #
#Main Module #Main Module
MODULE_ID="MAIN" MODULE_ID="MAIN"
MODULE_DEPENDS=("CORE" "KERNEL" "APP") MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
MODULE_FILES=("srs_main_server" "srs_main_bandcheck") MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
MODULE_DIR="src/main" . auto/modules.sh MODULE_DIR="src/main" . auto/modules.sh
@ -173,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries # all depends libraries
ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
# all depends objects # 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" LINK_OPTIONS="-ldl"
# #
# srs: # srs:

2
trunk/src/app/srs_core_bandwidth.cpp
View file

@ -30,7 +30,7 @@ using namespace std;
#include <srs_core_rtmp.hpp> #include <srs_core_rtmp.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_kernel_config.hpp> #include <srs_kernel_config.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>

2
trunk/src/app/srs_core_hls.cpp
View file

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_core_codec.hpp> #include <srs_core_codec.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_kernel_config.hpp> #include <srs_kernel_config.hpp>
#include <srs_core_source.hpp> #include <srs_core_source.hpp>

2
trunk/src/app/srs_core_protocol.cpp
View file

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_core_socket.hpp> #include <srs_core_socket.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_kernel_buffer.hpp>

2
trunk/src/app/srs_core_rtmp.cpp
View file

@ -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_socket.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_core_handshake.hpp> #include <srs_core_handshake.hpp>
#include <srs_kernel_config.hpp> #include <srs_kernel_config.hpp>

2
trunk/src/app/srs_core_source.cpp
View file

@ -29,7 +29,7 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_core_codec.hpp> #include <srs_core_codec.hpp>
#include <srs_core_hls.hpp> #include <srs_core_hls.hpp>
#include <srs_core_forward.hpp> #include <srs_core_forward.hpp>

2
trunk/src/main/srs_main_bandcheck.cpp
View file

@ -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_rtmp.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>

2
trunk/src/app/srs_core_amf0.cpp → trunk/src/protocol/srs_protocol_amf0.cpp
View file

@ -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. 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> #include <utility>

6
trunk/src/app/srs_core_amf0.hpp → trunk/src/protocol/srs_protocol_amf0.hpp
View file

@ -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. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SRS_CORE_AMF0_HPP #ifndef SRS_PROTOCOL_AMF0_HPP
#define SRS_CORE_AMF0_HPP #define SRS_PROTOCOL_AMF0_HPP
/* /*
#include <srs_core_amf0.hpp> #include <srs_protocol_amf0.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

5
trunk/src/srs/srs.upp
View file

@ -24,9 +24,10 @@ file
..\kernel\srs_kernel_reload.cpp, ..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp, ..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp, ..\kernel\srs_kernel_stream.cpp,
protocol readonly separator,
..\protocol\srs_protocol_amf0.hpp,
..\protocol\srs_protocol_amf0.cpp,
app readonly separator, app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
..\app\srs_core_bandwidth.hpp, ..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp, ..\app\srs_core_bandwidth.cpp,
..\app\srs_core_client.hpp, ..\app\srs_core_client.hpp,