winlin

rename protocol dir to pro. move rtmp stack to protocol module

@@ -142,8 +142,8 @@ KERNEL_OBJS="${MODULE_OBJS[@]}" @@ -142,8 +142,8 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
142 MODULE_ID="PROTOCOL" 142 MODULE_ID="PROTOCOL"
143 MODULE_DEPENDS=("CORE" "KERNEL") 143 MODULE_DEPENDS=("CORE" "KERNEL")
144 ModuleLibIncs=(${SRS_OBJS}) 144 ModuleLibIncs=(${SRS_OBJS})
145 -MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io")  
146 -MODULE_DIR="src/protocol" . auto/modules.sh 145 +MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack")
  146 +MODULE_DIR="src/pro" . auto/modules.sh
147 PROTOCOL_OBJS="${MODULE_OBJS[@]}" 147 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
148 # 148 #
149 #App Module 149 #App Module
@@ -151,10 +151,9 @@ MODULE_ID="APP" @@ -151,10 +151,9 @@ MODULE_ID="APP"
151 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 151 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL")
152 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) 152 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
153 MODULE_FILES=("srs_core_server" 153 MODULE_FILES=("srs_core_server"
154 - "srs_core_conn" "srs_core_client" 154 + "srs_core_conn" "srs_core_client"
155 "srs_core_rtmp" "srs_core_socket" 155 "srs_core_rtmp" "srs_core_socket"
156 - "srs_core_protocol"  
157 - "srs_core_source" "srs_core_codec" 156 + "srs_core_source" "srs_core_codec"
158 "srs_core_handshake" "srs_core_refer" 157 "srs_core_handshake" "srs_core_refer"
159 "srs_core_hls" "srs_core_forward" "srs_core_encoder" 158 "srs_core_hls" "srs_core_forward" "srs_core_encoder"
160 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" 159 "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
@@ -31,7 +31,7 @@ using namespace std; @@ -31,7 +31,7 @@ using namespace std;
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_protocol_amf0.hpp> 33 #include <srs_protocol_amf0.hpp>
34 -#include <srs_core_protocol.hpp> 34 +#include <srs_protocol_rtmp_stack.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>
37 37
@@ -31,7 +31,7 @@ using namespace std; @@ -31,7 +31,7 @@ using namespace std;
31 #include <srs_kernel_error.hpp> 31 #include <srs_kernel_error.hpp>
32 #include <srs_kernel_log.hpp> 32 #include <srs_kernel_log.hpp>
33 #include <srs_core_rtmp.hpp> 33 #include <srs_core_rtmp.hpp>
34 -#include <srs_core_protocol.hpp> 34 +#include <srs_protocol_rtmp_stack.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 #include <srs_core_source.hpp> 36 #include <srs_core_source.hpp>
37 #include <srs_core_server.hpp> 37 #include <srs_core_server.hpp>
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
37 #include <srs_kernel_config.hpp> 37 #include <srs_kernel_config.hpp>
38 #include <srs_core_rtmp.hpp> 38 #include <srs_core_rtmp.hpp>
39 #include <srs_kernel_pithy_print.hpp> 39 #include <srs_kernel_pithy_print.hpp>
40 -#include <srs_core_protocol.hpp> 40 +#include <srs_protocol_rtmp_stack.hpp>
41 41
42 #ifdef SRS_FFMPEG 42 #ifdef SRS_FFMPEG
43 43
@@ -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_kernel_error.hpp> 31 #include <srs_kernel_error.hpp>
32 #include <srs_core_rtmp.hpp> 32 #include <srs_core_rtmp.hpp>
33 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
34 -#include <srs_core_protocol.hpp> 34 +#include <srs_protocol_rtmp_stack.hpp>
35 #include <srs_kernel_pithy_print.hpp> 35 #include <srs_kernel_pithy_print.hpp>
36 #include <srs_core_rtmp.hpp> 36 #include <srs_core_rtmp.hpp>
37 #include <srs_kernel_config.hpp> 37 #include <srs_kernel_config.hpp>
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
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_protocol_amf0.hpp> 38 #include <srs_protocol_amf0.hpp>
39 -#include <srs_core_protocol.hpp> 39 +#include <srs_protocol_rtmp_stack.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>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 #include <srs_kernel_log.hpp> 26 #include <srs_kernel_log.hpp>
27 #include <srs_kernel_error.hpp> 27 #include <srs_kernel_error.hpp>
28 #include <srs_protocol_io.hpp> 28 #include <srs_protocol_io.hpp>
29 -#include <srs_core_protocol.hpp> 29 +#include <srs_protocol_rtmp_stack.hpp>
30 #include <srs_core_autofree.hpp> 30 #include <srs_core_autofree.hpp>
31 #include <srs_protocol_amf0.hpp> 31 #include <srs_protocol_amf0.hpp>
32 #include <srs_core_handshake.hpp> 32 #include <srs_core_handshake.hpp>
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27 using namespace std; 27 using namespace std;
28 28
29 #include <srs_kernel_log.hpp> 29 #include <srs_kernel_log.hpp>
30 -#include <srs_core_protocol.hpp> 30 +#include <srs_protocol_rtmp_stack.hpp>
31 #include <srs_core_autofree.hpp> 31 #include <srs_core_autofree.hpp>
32 #include <srs_protocol_amf0.hpp> 32 #include <srs_protocol_amf0.hpp>
33 #include <srs_core_codec.hpp> 33 #include <srs_core_codec.hpp>
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 #include <stdlib.h> 29 #include <stdlib.h>
30 30
31 #include <srs_core_rtmp.hpp> 31 #include <srs_core_rtmp.hpp>
32 -#include <srs_core_protocol.hpp> 32 +#include <srs_protocol_rtmp_stack.hpp>
33 #include <srs_kernel_error.hpp> 33 #include <srs_kernel_error.hpp>
34 #include <srs_protocol_amf0.hpp> 34 #include <srs_protocol_amf0.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
@@ -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_protocol.hpp> 24 +#include <srs_protocol_rtmp_stack.hpp>
25 25
26 #include <srs_kernel_log.hpp> 26 #include <srs_kernel_log.hpp>
27 #include <srs_protocol_amf0.hpp> 27 #include <srs_protocol_amf0.hpp>
@@ -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_PROTOCOL_HPP  
25 -#define SRS_CORE_PROTOCOL_HPP 24 +#ifndef SRS_PROTOCOL_RTMP_STACK_HPP
  25 +#define SRS_PROTOCOL_RTMP_STACK_HPP
26 26
27 /* 27 /*
28 -#include <srs_core_protocol.hpp> 28 +#include <srs_protocol_rtmp_stack.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -25,10 +25,12 @@ file @@ -25,10 +25,12 @@ file
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, 27 protocol readonly separator,
28 - ..\protocol\srs_protocol_amf0.hpp,  
29 - ..\protocol\srs_protocol_amf0.cpp,  
30 - ..\protocol\srs_protocol_io.hpp,  
31 - ..\protocol\srs_protocol_io.cpp, 28 + ..\pro\srs_protocol_amf0.hpp,
  29 + ..\pro\srs_protocol_amf0.cpp,
  30 + ..\pro\srs_protocol_io.hpp,
  31 + ..\pro\srs_protocol_io.cpp,
  32 + ..\pro\srs_protocol_rtmp_stack.hpp,
  33 + ..\pro\srs_protocol_rtmp_stack.cpp,
32 app readonly separator, 34 app readonly separator,
33 ..\app\srs_core_bandwidth.hpp, 35 ..\app\srs_core_bandwidth.hpp,
34 ..\app\srs_core_bandwidth.cpp, 36 ..\app\srs_core_bandwidth.cpp,
@@ -50,8 +52,6 @@ file @@ -50,8 +52,6 @@ file
50 ..\app\srs_core_http.cpp, 52 ..\app\srs_core_http.cpp,
51 ..\app\srs_core_log_context.hpp, 53 ..\app\srs_core_log_context.hpp,
52 ..\app\srs_core_log_context.cpp, 54 ..\app\srs_core_log_context.cpp,
53 - ..\app\srs_core_protocol.hpp,  
54 - ..\app\srs_core_protocol.cpp,  
55 ..\app\srs_core_refer.hpp, 55 ..\app\srs_core_refer.hpp,
56 ..\app\srs_core_refer.cpp, 56 ..\app\srs_core_refer.cpp,
57 ..\app\srs_core_rtmp.hpp, 57 ..\app\srs_core_rtmp.hpp,