diff --git a/trunk/configure b/trunk/configure index abcc3b0a8..0ece47b2f 100755 --- a/trunk/configure +++ b/trunk/configure @@ -374,9 +374,9 @@ KERNEL_OBJS="${MODULE_OBJS[@]}" MODULE_ID="RTMP" MODULE_DEPENDS=("CORE" "KERNEL") ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) -MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp" - "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer") -RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh +MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk" + "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer") +RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh RTMP_OBJS="${MODULE_OBJS[@]}" # #App Module diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp index f7a50d4d3..9bfc97ce6 100755 --- a/trunk/ide/srs_upp/srs_upp.upp +++ b/trunk/ide/srs_upp/srs_upp.upp @@ -44,23 +44,23 @@ file ../../src/kernel/srs_kernel_ts.hpp, ../../src/kernel/srs_kernel_utility.hpp, ../../src/kernel/srs_kernel_utility.cpp, - rtmp-protocol readonly separator, - ../../src/rtmp/srs_protocol_amf0.hpp, - ../../src/rtmp/srs_protocol_amf0.cpp, - ../../src/rtmp/srs_protocol_buffer.hpp, - ../../src/rtmp/srs_protocol_buffer.cpp, - ../../src/rtmp/srs_protocol_handshake.hpp, - ../../src/rtmp/srs_protocol_handshake.cpp, - ../../src/rtmp/srs_protocol_io.hpp, - ../../src/rtmp/srs_protocol_io.cpp, - ../../src/rtmp/srs_protocol_msg_array.hpp, - ../../src/rtmp/srs_protocol_msg_array.cpp, - ../../src/rtmp/srs_protocol_rtmp.hpp, - ../../src/rtmp/srs_protocol_rtmp.cpp, - ../../src/rtmp/srs_protocol_stack.hpp, - ../../src/rtmp/srs_protocol_stack.cpp, - ../../src/rtmp/srs_protocol_utility.hpp, - ../../src/rtmp/srs_protocol_utility.cpp, + protocol readonly separator, + ../../src/protocol/srs_rtmp_amf0.hpp, + ../../src/protocol/srs_rtmp_amf0.cpp, + ../../src/protocol/srs_rtmp_buffer.hpp, + ../../src/protocol/srs_rtmp_buffer.cpp, + ../../src/protocol/srs_rtmp_handshake.hpp, + ../../src/protocol/srs_rtmp_handshake.cpp, + ../../src/protocol/srs_rtmp_io.hpp, + ../../src/protocol/srs_rtmp_io.cpp, + ../../src/protocol/srs_rtmp_msg_array.hpp, + ../../src/protocol/srs_rtmp_msg_array.cpp, + ../../src/protocol/srs_rtmp_sdk.hpp, + ../../src/protocol/srs_rtmp_sdk.cpp, + ../../src/protocol/srs_rtmp_stack.hpp, + ../../src/protocol/srs_rtmp_stack.cpp, + ../../src/protocol/srs_rtmp_utility.hpp, + ../../src/protocol/srs_rtmp_utility.cpp, app readonly separator, ../../src/app/srs_app_bandwidth.hpp, ../../src/app/srs_app_bandwidth.cpp, diff --git a/trunk/ide/srs_vs2010/srs.vcxproj b/trunk/ide/srs_vs2010/srs.vcxproj index 9ac526aff..16ed50fea 100755 --- a/trunk/ide/srs_vs2010/srs.vcxproj +++ b/trunk/ide/srs_vs2010/srs.vcxproj @@ -115,14 +115,14 @@ - - - - - - - - + + + + + + + + @@ -191,14 +191,14 @@ - - - - - - - - + + + + + + + + diff --git a/trunk/ide/srs_vs2010/srs.vcxproj.filters b/trunk/ide/srs_vs2010/srs.vcxproj.filters index 87d289359..1d78e4abc 100755 --- a/trunk/ide/srs_vs2010/srs.vcxproj.filters +++ b/trunk/ide/srs_vs2010/srs.vcxproj.filters @@ -172,30 +172,6 @@ research - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - research @@ -223,6 +199,30 @@ srs + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + @@ -366,30 +366,6 @@ srs - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - - - srs - librtmp @@ -408,6 +384,30 @@ srs + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + + + srs + diff --git a/trunk/src/app/srs_app_bandwidth.cpp b/trunk/src/app/srs_app_bandwidth.cpp index 3387ee072..ba0dde733 100644 --- a/trunk/src/app/srs_app_bandwidth.cpp +++ b/trunk/src/app/srs_app_bandwidth.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; -#include -#include +#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 45d4a7cc1..b1eb64ed7 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -40,7 +40,7 @@ using namespace std; #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp index 4d823666c..bc7e32624 100644 --- a/trunk/src/app/srs_app_dvr.cpp +++ b/trunk/src/app/srs_app_dvr.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index f0890db20..d69a50238 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -31,18 +31,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include -#include +#include #include -#include +#include // when error, edge ingester sleep for a while and retry. #define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL) diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp index d42582381..0c66f4b80 100644 --- a/trunk/src/app/srs_app_encoder.cpp +++ b/trunk/src/app/srs_app_encoder.cpp @@ -29,7 +29,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp index 116f5e5e6..da3846a67 100644 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -36,12 +36,12 @@ using namespace std; #include #include #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include // when error, forwarder sleep for a while and retry. diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 93bde04e2..20dcc4e3a 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -39,17 +39,17 @@ using namespace std; #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include #include -#include +#include // drop the segment when duration of ts too small. #define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100 diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index 3207042e1..492ff00c2 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -36,7 +36,7 @@ using namespace std; #include #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 083e9f9b3..7df84f1c5 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -36,7 +36,7 @@ using namespace std; #include #include #include -#include +#include SrsGoApiRoot::SrsGoApiRoot() { diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index de064342d..91685630a 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -41,9 +41,9 @@ using namespace std; #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index cfa4712f6..cd73a17eb 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_kbps.hpp b/trunk/src/app/srs_app_kbps.hpp index 468bb584f..bb6faee91 100644 --- a/trunk/src/app/srs_app_kbps.hpp +++ b/trunk/src/app/srs_app_kbps.hpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include /** * a kbps sample, for example, 1minute kbps, diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp index cc64a4853..1e5db7013 100644 --- a/trunk/src/app/srs_app_recv_thread.cpp +++ b/trunk/src/app/srs_app_recv_thread.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp index c3caf2068..aa886f0b3 100644 --- a/trunk/src/app/srs_app_recv_thread.hpp +++ b/trunk/src/app/srs_app_recv_thread.hpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index d9e96de4c..14754d6c1 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -32,7 +32,7 @@ using namespace std; #include #include -#include +#include #include #include #include @@ -46,8 +46,8 @@ using namespace std; #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_security.hpp b/trunk/src/app/srs_app_security.hpp index 9f1e9dec4..8ace5d576 100644 --- a/trunk/src/app/srs_app_security.hpp +++ b/trunk/src/app/srs_app_security.hpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include class SrsConfDirective; diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 03eb0e334..3bc7f2598 100644 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -28,20 +28,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include +#include #define CONST_MAX_JITTER_MS 500 #define DEFAULT_FRAME_TIME_MS 40 diff --git a/trunk/src/app/srs_app_st_socket.hpp b/trunk/src/app/srs_app_st_socket.hpp index fff1f0e01..031cb5ad8 100644 --- a/trunk/src/app/srs_app_st_socket.hpp +++ b/trunk/src/app/srs_app_st_socket.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include /** * the socket provides TCP socket over st, diff --git a/trunk/src/app/srs_app_statistic.cpp b/trunk/src/app/srs_app_statistic.cpp index 935044d2e..e58d547bb 100644 --- a/trunk/src/app/srs_app_statistic.cpp +++ b/trunk/src/app/srs_app_statistic.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -#include +#include #include int64_t __srs_gvid = getpid(); diff --git a/trunk/src/libs/srs_lib_bandwidth.cpp b/trunk/src/libs/srs_lib_bandwidth.cpp index a0cf4de1c..148638c93 100644 --- a/trunk/src/libs/srs_lib_bandwidth.cpp +++ b/trunk/src/libs/srs_lib_bandwidth.cpp @@ -32,11 +32,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include -#include +#include +#include #include #include -#include +#include /** * recv bandwidth helper. diff --git a/trunk/src/libs/srs_lib_simple_socket.hpp b/trunk/src/libs/srs_lib_simple_socket.hpp index 688c00cd5..1386c4b90 100644 --- a/trunk/src/libs/srs_lib_simple_socket.hpp +++ b/trunk/src/libs/srs_lib_simple_socket.hpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp index 16e66f573..76eaf56e3 100644 --- a/trunk/src/libs/srs_librtmp.cpp +++ b/trunk/src/libs/srs_librtmp.cpp @@ -35,14 +35,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include +#include #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/trunk/src/rtmp/srs_protocol_amf0.cpp b/trunk/src/protocol/srs_rtmp_amf0.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_amf0.cpp rename to trunk/src/protocol/srs_rtmp_amf0.cpp index e86994dc0..d5668ae26 100644 --- a/trunk/src/rtmp/srs_protocol_amf0.cpp +++ b/trunk/src/protocol/srs_rtmp_amf0.cpp @@ -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 +#include #include #include diff --git a/trunk/src/rtmp/srs_protocol_amf0.hpp b/trunk/src/protocol/srs_rtmp_amf0.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_amf0.hpp rename to trunk/src/protocol/srs_rtmp_amf0.hpp index 2f41b04cf..c3b32159c 100644 --- a/trunk/src/rtmp/srs_protocol_amf0.hpp +++ b/trunk/src/protocol/srs_rtmp_amf0.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_AMF0_HPP /* -#include +#include */ #include diff --git a/trunk/src/rtmp/srs_protocol_buffer.cpp b/trunk/src/protocol/srs_rtmp_buffer.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_buffer.cpp rename to trunk/src/protocol/srs_rtmp_buffer.cpp index e35f43ed3..d72a1d857 100644 --- a/trunk/src/rtmp/srs_protocol_buffer.cpp +++ b/trunk/src/protocol/srs_rtmp_buffer.cpp @@ -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 +#include #include #include diff --git a/trunk/src/rtmp/srs_protocol_buffer.hpp b/trunk/src/protocol/srs_rtmp_buffer.hpp similarity index 98% rename from trunk/src/rtmp/srs_protocol_buffer.hpp rename to trunk/src/protocol/srs_rtmp_buffer.hpp index 5535c56dd..98f6ec792 100644 --- a/trunk/src/rtmp/srs_protocol_buffer.hpp +++ b/trunk/src/protocol/srs_rtmp_buffer.hpp @@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_PROTOCOL_BUFFER_HPP /* -#include +#include */ #include -#include +#include #include #include diff --git a/trunk/src/rtmp/srs_protocol_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_handshake.cpp rename to trunk/src/protocol/srs_rtmp_handshake.cpp index a134b95c1..e21f1336b 100644 --- a/trunk/src/rtmp/srs_protocol_handshake.cpp +++ b/trunk/src/protocol/srs_rtmp_handshake.cpp @@ -21,16 +21,16 @@ 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 +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #ifdef SRS_AUTO_SSL diff --git a/trunk/src/rtmp/srs_protocol_handshake.hpp b/trunk/src/protocol/srs_rtmp_handshake.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_handshake.hpp rename to trunk/src/protocol/srs_rtmp_handshake.hpp index 5af01f696..2f5c3049b 100644 --- a/trunk/src/rtmp/srs_protocol_handshake.hpp +++ b/trunk/src/protocol/srs_rtmp_handshake.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP /* -#include +#include */ #include diff --git a/trunk/src/rtmp/srs_protocol_io.cpp b/trunk/src/protocol/srs_rtmp_io.cpp similarity index 98% rename from trunk/src/rtmp/srs_protocol_io.cpp rename to trunk/src/protocol/srs_rtmp_io.cpp index 1789bbeb4..3540d5ef5 100644 --- a/trunk/src/rtmp/srs_protocol_io.cpp +++ b/trunk/src/protocol/srs_rtmp_io.cpp @@ -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 +#include ISrsBufferReader::ISrsBufferReader() { diff --git a/trunk/src/rtmp/srs_protocol_io.hpp b/trunk/src/protocol/srs_rtmp_io.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_io.hpp rename to trunk/src/protocol/srs_rtmp_io.hpp index 29e6e625b..5a69642d2 100644 --- a/trunk/src/rtmp/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_rtmp_io.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_IO_HPP /* -#include +#include */ #include diff --git a/trunk/src/rtmp/srs_protocol_msg_array.cpp b/trunk/src/protocol/srs_rtmp_msg_array.cpp similarity index 96% rename from trunk/src/rtmp/srs_protocol_msg_array.cpp rename to trunk/src/protocol/srs_rtmp_msg_array.cpp index f4ff727d0..15d713d6c 100644 --- a/trunk/src/rtmp/srs_protocol_msg_array.cpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.cpp @@ -21,9 +21,9 @@ 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 +#include -#include +#include SrsMessageArray::SrsMessageArray(int max_msgs) { diff --git a/trunk/src/rtmp/srs_protocol_msg_array.hpp b/trunk/src/protocol/srs_rtmp_msg_array.hpp similarity index 98% rename from trunk/src/rtmp/srs_protocol_msg_array.hpp rename to trunk/src/protocol/srs_rtmp_msg_array.hpp index 157dfe1e5..2e315caef 100644 --- a/trunk/src/rtmp/srs_protocol_msg_array.hpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP /* -#include +#include */ #include diff --git a/trunk/src/rtmp/srs_protocol_rtmp.cpp b/trunk/src/protocol/srs_rtmp_sdk.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_rtmp.cpp rename to trunk/src/protocol/srs_rtmp_sdk.cpp index 7e44ec671..be631b1db 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.cpp +++ b/trunk/src/protocol/srs_rtmp_sdk.cpp @@ -21,13 +21,13 @@ 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 +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/trunk/src/rtmp/srs_protocol_rtmp.hpp b/trunk/src/protocol/srs_rtmp_sdk.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_rtmp.hpp rename to trunk/src/protocol/srs_rtmp_sdk.hpp index 7451823f1..26bfa5b14 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.hpp +++ b/trunk/src/protocol/srs_rtmp_sdk.hpp @@ -25,14 +25,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_RTMP_HPP /* -#include +#include */ #include #include -#include +#include #include class SrsProtocol; diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_stack.cpp rename to trunk/src/protocol/srs_rtmp_stack.cpp index 920c2df7e..59dd5a0b7 100644 --- a/trunk/src/rtmp/srs_protocol_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -21,15 +21,15 @@ 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 +#include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 #ifndef _WIN32 diff --git a/trunk/src/rtmp/srs_protocol_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_stack.hpp rename to trunk/src/protocol/srs_rtmp_stack.hpp index 2c0ffb826..10ede8c41 100644 --- a/trunk/src/rtmp/srs_protocol_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_STACK_HPP /* -#include +#include */ #include diff --git a/trunk/src/rtmp/srs_protocol_utility.cpp b/trunk/src/protocol/srs_rtmp_utility.cpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_utility.cpp rename to trunk/src/protocol/srs_rtmp_utility.cpp index 44e49692b..e3d23a21b 100644 --- a/trunk/src/rtmp/srs_protocol_utility.cpp +++ b/trunk/src/protocol/srs_rtmp_utility.cpp @@ -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 +#include #include using namespace std; @@ -29,7 +29,7 @@ using namespace std; #include #include #include -#include +#include void srs_discovery_tc_url( string tcUrl, diff --git a/trunk/src/rtmp/srs_protocol_utility.hpp b/trunk/src/protocol/srs_rtmp_utility.hpp similarity index 99% rename from trunk/src/rtmp/srs_protocol_utility.hpp rename to trunk/src/protocol/srs_rtmp_utility.hpp index 0bdc8c530..3200bdcf8 100644 --- a/trunk/src/rtmp/srs_protocol_utility.hpp +++ b/trunk/src/protocol/srs_rtmp_utility.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_RTMP_PROTOCOL_CONSTS_HPP /* -#include +#include */ #include diff --git a/trunk/src/utest/srs_utest_amf0.hpp b/trunk/src/utest/srs_utest_amf0.hpp index 97691441c..0a91e5aa6 100644 --- a/trunk/src/utest/srs_utest_amf0.hpp +++ b/trunk/src/utest/srs_utest_amf0.hpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include +#include #endif diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index e5fa21f90..28dc96a69 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -28,7 +28,7 @@ using namespace std; #include #include #include -#include +#include #include #define MAX_MOCK_DATA_SIZE 1024 * 1024 diff --git a/trunk/src/utest/srs_utest_kernel.hpp b/trunk/src/utest/srs_utest_kernel.hpp index 9c959f4cc..c745c7f96 100644 --- a/trunk/src/utest/srs_utest_kernel.hpp +++ b/trunk/src/utest/srs_utest_kernel.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include class MockBufferReader: public ISrsBufferReader { diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 912745006..3b36c42e6 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -26,13 +26,13 @@ using namespace std; #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include MockEmptyIO::MockEmptyIO() { diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index 43d7f4995..f1f00c97f 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -30,17 +30,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include -#include -#include -#include +#include +#include +#include #ifdef SRS_AUTO_SSL using namespace _srs_internal; #endif -#include +#include class MockEmptyIO : public ISrsProtocolReaderWriter {