winlin

extract protocol module, move amf0 to protocol module

@@ -367,7 +367,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv @@ -367,7 +367,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
367 * nginx v1.5.0: 139524 lines <br/> 367 * nginx v1.5.0: 139524 lines <br/>
368 368
369 ### History 369 ### History
370 -* v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/app/main module. 370 +* v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/drm/app/main module.
371 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. 371 * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package.
372 * 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) 372 * 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)
373 * 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) 373 * 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)
@@ -138,17 +138,24 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne @@ -138,17 +138,24 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne
138 MODULE_DIR="src/kernel" . auto/modules.sh 138 MODULE_DIR="src/kernel" . auto/modules.sh
139 KERNEL_OBJS="${MODULE_OBJS[@]}" 139 KERNEL_OBJS="${MODULE_OBJS[@]}"
140 # 140 #
  141 +#Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
  142 +MODULE_ID="PROTOCOL"
  143 +MODULE_DEPENDS=("CORE" "KERNEL")
  144 +ModuleLibIncs=(${SRS_OBJS})
  145 +MODULE_FILES=("srs_protocol_amf0")
  146 +MODULE_DIR="src/protocol" . auto/modules.sh
  147 +PROTOCOL_OBJS="${MODULE_OBJS[@]}"
  148 +#
141 #App Module 149 #App Module
142 MODULE_ID="APP" 150 MODULE_ID="APP"
143 -MODULE_DEPENDS=("CORE" "KERNEL") 151 +MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL")
144 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) 152 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
145 MODULE_FILES=("srs_core_server" 153 MODULE_FILES=("srs_core_server"
146 "srs_core_conn" "srs_core_client" 154 "srs_core_conn" "srs_core_client"
147 "srs_core_rtmp" "srs_core_socket" 155 "srs_core_rtmp" "srs_core_socket"
148 - "srs_core_protocol" "srs_core_amf0" 156 + "srs_core_protocol"
149 "srs_core_source" "srs_core_codec" 157 "srs_core_source" "srs_core_codec"
150 - "srs_core_handshake"  
151 - "srs_core_refer" 158 + "srs_core_handshake" "srs_core_refer"
152 "srs_core_hls" "srs_core_forward" "srs_core_encoder" 159 "srs_core_hls" "srs_core_forward" "srs_core_encoder"
153 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" 160 "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
154 "srs_core_st" "srs_core_log_context") 161 "srs_core_st" "srs_core_log_context")
@@ -157,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}" @@ -157,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
157 # 164 #
158 #Main Module 165 #Main Module
159 MODULE_ID="MAIN" 166 MODULE_ID="MAIN"
160 -MODULE_DEPENDS=("CORE" "KERNEL" "APP") 167 +MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
161 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) 168 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
162 MODULE_FILES=("srs_main_server" "srs_main_bandcheck") 169 MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
163 MODULE_DIR="src/main" . auto/modules.sh 170 MODULE_DIR="src/main" . auto/modules.sh
@@ -173,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") @@ -173,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
173 # all depends libraries 180 # all depends libraries
174 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) 181 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
175 # all depends objects 182 # all depends objects
176 -MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" 183 +MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}"
177 LINK_OPTIONS="-ldl" 184 LINK_OPTIONS="-ldl"
178 # 185 #
179 # srs: 186 # srs:
@@ -30,7 +30,7 @@ using namespace std; @@ -30,7 +30,7 @@ using namespace std;
30 30
31 #include <srs_core_rtmp.hpp> 31 #include <srs_core_rtmp.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 -#include <srs_core_amf0.hpp> 33 +#include <srs_protocol_amf0.hpp>
34 #include <srs_core_protocol.hpp> 34 #include <srs_core_protocol.hpp>
35 #include <srs_kernel_config.hpp> 35 #include <srs_kernel_config.hpp>
36 #include <srs_core_autofree.hpp> 36 #include <srs_core_autofree.hpp>
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 35
36 #include <srs_kernel_error.hpp> 36 #include <srs_kernel_error.hpp>
37 #include <srs_core_codec.hpp> 37 #include <srs_core_codec.hpp>
38 -#include <srs_core_amf0.hpp> 38 +#include <srs_protocol_amf0.hpp>
39 #include <srs_core_protocol.hpp> 39 #include <srs_core_protocol.hpp>
40 #include <srs_kernel_config.hpp> 40 #include <srs_kernel_config.hpp>
41 #include <srs_core_source.hpp> 41 #include <srs_core_source.hpp>
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24 #include <srs_core_protocol.hpp> 24 #include <srs_core_protocol.hpp>
25 25
26 #include <srs_kernel_log.hpp> 26 #include <srs_kernel_log.hpp>
27 -#include <srs_core_amf0.hpp> 27 +#include <srs_protocol_amf0.hpp>
28 #include <srs_kernel_error.hpp> 28 #include <srs_kernel_error.hpp>
29 #include <srs_core_socket.hpp> 29 #include <srs_core_socket.hpp>
30 #include <srs_kernel_buffer.hpp> 30 #include <srs_kernel_buffer.hpp>
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 #include <srs_core_socket.hpp> 28 #include <srs_core_socket.hpp>
29 #include <srs_core_protocol.hpp> 29 #include <srs_core_protocol.hpp>
30 #include <srs_core_autofree.hpp> 30 #include <srs_core_autofree.hpp>
31 -#include <srs_core_amf0.hpp> 31 +#include <srs_protocol_amf0.hpp>
32 #include <srs_core_handshake.hpp> 32 #include <srs_core_handshake.hpp>
33 #include <srs_kernel_config.hpp> 33 #include <srs_kernel_config.hpp>
34 34
@@ -29,7 +29,7 @@ using namespace std; @@ -29,7 +29,7 @@ using namespace std;
29 #include <srs_kernel_log.hpp> 29 #include <srs_kernel_log.hpp>
30 #include <srs_core_protocol.hpp> 30 #include <srs_core_protocol.hpp>
31 #include <srs_core_autofree.hpp> 31 #include <srs_core_autofree.hpp>
32 -#include <srs_core_amf0.hpp> 32 +#include <srs_protocol_amf0.hpp>
33 #include <srs_core_codec.hpp> 33 #include <srs_core_codec.hpp>
34 #include <srs_core_hls.hpp> 34 #include <srs_core_hls.hpp>
35 #include <srs_core_forward.hpp> 35 #include <srs_core_forward.hpp>
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 #include <srs_core_rtmp.hpp> 31 #include <srs_core_rtmp.hpp>
32 #include <srs_core_protocol.hpp> 32 #include <srs_core_protocol.hpp>
33 #include <srs_kernel_error.hpp> 33 #include <srs_kernel_error.hpp>
34 -#include <srs_core_amf0.hpp> 34 +#include <srs_protocol_amf0.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 #include <srs_kernel_stream.hpp> 36 #include <srs_kernel_stream.hpp>
37 37
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#include <srs_core_amf0.hpp> 24 +#include <srs_protocol_amf0.hpp>
25 25
26 #include <utility> 26 #include <utility>
27 27
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_CORE_AMF0_HPP  
25 -#define SRS_CORE_AMF0_HPP 24 +#ifndef SRS_PROTOCOL_AMF0_HPP
  25 +#define SRS_PROTOCOL_AMF0_HPP
26 26
27 /* 27 /*
28 -#include <srs_core_amf0.hpp> 28 +#include <srs_protocol_amf0.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -24,9 +24,10 @@ file @@ -24,9 +24,10 @@ file
24 ..\kernel\srs_kernel_reload.cpp, 24 ..\kernel\srs_kernel_reload.cpp,
25 ..\kernel\srs_kernel_stream.hpp, 25 ..\kernel\srs_kernel_stream.hpp,
26 ..\kernel\srs_kernel_stream.cpp, 26 ..\kernel\srs_kernel_stream.cpp,
  27 + protocol readonly separator,
  28 + ..\protocol\srs_protocol_amf0.hpp,
  29 + ..\protocol\srs_protocol_amf0.cpp,
27 app readonly separator, 30 app readonly separator,
28 - ..\app\srs_core_amf0.hpp,  
29 - ..\app\srs_core_amf0.cpp,  
30 ..\app\srs_core_bandwidth.hpp, 31 ..\app\srs_core_bandwidth.hpp,
31 ..\app\srs_core_bandwidth.cpp, 32 ..\app\srs_core_bandwidth.cpp,
32 ..\app\srs_core_client.hpp, 33 ..\app\srs_core_client.hpp,