for #250, rename rtmp to protocol dir.

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 <srs_protocol_rtmp.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_amf0.hpp>
 #include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_config.cpp

@@ -40,7 +40,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_source.hpp>
 #include <srs_kernel_file.hpp>

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 <srs_app_config.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_http_hooks.hpp>

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 <srs_kernel_error.hpp>
-#include <srs_protocol_rtmp.hpp>
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_io.hpp>
 #include <srs_app_config.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_app_st_socket.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_kbps.hpp>
-#include <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 #include <srs_app_utility.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 
 // when error, edge ingester sleep for a while and retry.
 #define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL)

trunk/src/app/srs_app_encoder.cpp

@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_ffmpeg.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_forward.cpp

@@ -36,12 +36,12 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_pithy_print.hpp>
-#include <srs_protocol_rtmp.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_app_kbps.hpp>
-#include <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 #include <srs_app_utility.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 #include <srs_kernel_codec.hpp>
 
 // when error, forwarder sleep for a while and retry.

trunk/src/app/srs_app_hls.cpp

@@ -39,17 +39,17 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_protocol_amf0.hpp>
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_amf0.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_avc.hpp>
 #include <srs_kernel_file.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 
 // drop the segment when duration of ts too small.
 #define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100

trunk/src/app/srs_app_http.cpp

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_app_http_conn.hpp>
 #include <srs_app_json.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_core_autofree.hpp>
 

trunk/src/app/srs_app_http_api.cpp

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_statistic.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 
 SrsGoApiRoot::SrsGoApiRoot()
 {

trunk/src/app/srs_app_http_conn.cpp

@@ -41,9 +41,9 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_source.hpp>
-#include <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 #include <srs_kernel_aac.hpp>
 #include <srs_kernel_mp3.hpp>
 #include <srs_kernel_ts.hpp>

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 <srs_kernel_error.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_st_socket.hpp>
 #include <srs_app_http.hpp>
 #include <srs_app_json.hpp>

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 <srs_core.hpp>
 
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 
 /**
 * a kbps sample, for example, 1minute kbps, 

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 <srs_app_recv_thread.hpp>
 
-#include <srs_protocol_rtmp.hpp>
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_rtmp_conn.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_app_config.hpp>

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 <vector>
 
 #include <srs_app_thread.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_app_reload.hpp>
 

trunk/src/app/srs_app_rtmp_conn.cpp

@@ -32,7 +32,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
@@ -46,8 +46,8 @@ using namespace std;
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_app_utility.hpp>
-#include <srs_protocol_msg_array.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_msg_array.hpp>
+#include <srs_rtmp_amf0.hpp>
 #include <srs_app_recv_thread.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_kernel_utility.hpp>

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 <string>
 
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 
 class SrsConfDirective;
 

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 <srs_kernel_log.hpp>
-#include <srs_protocol_stack.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_stack.hpp>
+#include <srs_rtmp_amf0.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_app_hls.hpp>
 #include <srs_app_forward.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_encoder.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_avc.hpp>
-#include <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 
 #define CONST_MAX_JITTER_MS         500
 #define DEFAULT_FRAME_TIME_MS         40

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 <srs_core.hpp>
 
 #include <srs_app_st.hpp>
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 
 /**
 * the socket provides TCP socket over st,

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 <sstream>
 using namespace std;
 
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_app_json.hpp>
 
 int64_t __srs_gvid = getpid();

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 <srs_kernel_error.hpp>
-#include <srs_protocol_stack.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_stack.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 
 /**
 * recv bandwidth helper.

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 <srs_core.hpp>
 
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 #include <srs_librtmp.hpp>
 
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213

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 <srs_kernel_error.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_lib_simple_socket.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_stream.hpp>
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_file.hpp>

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 <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 
 #include <utility>
 #include <vector>

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 <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 */
 
 #include <srs_core.hpp>

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 <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>

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 <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 */
 
 #include <srs_core.hpp>
 
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_kernel_buffer.hpp>
 

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 <srs_protocol_handshake.hpp>
+#include <srs_rtmp_handshake.hpp>
 
 #include <time.h>
 
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_protocol_io.hpp>
-#include <srs_protocol_utility.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_io.hpp>
+#include <srs_rtmp_utility.hpp>
+#include <srs_rtmp_sdk.hpp>
 #include <srs_kernel_stream.hpp>
 
 #ifdef SRS_AUTO_SSL

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 <srs_protocol_handshake.hpp>
+#include <srs_rtmp_handshake.hpp>
 */
 
 #include <srs_core.hpp>

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 <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 
 ISrsBufferReader::ISrsBufferReader()
 {

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 <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 */
 
 #include <srs_core.hpp>

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 <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 
 SrsMessageArray::SrsMessageArray(int max_msgs)
 {

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 <srs_protocol_msg_array.hpp>
+#include <srs_rtmp_msg_array.hpp>
 */
 
 #include <srs_core.hpp>

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 <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 
 #include <srs_core_autofree.hpp>
-#include <srs_protocol_io.hpp>
-#include <srs_protocol_amf0.hpp>
-#include <srs_protocol_handshake.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_io.hpp>
+#include <srs_rtmp_amf0.hpp>
+#include <srs_rtmp_handshake.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_utility.hpp>
 

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 <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_sdk.hpp>
 */
 
 #include <srs_core.hpp>
 
 #include <string>
 
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_core_performance.hpp>
 
 class SrsProtocol;

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 <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 
-#include <srs_protocol_amf0.hpp>
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_amf0.hpp>
+#include <srs_rtmp_io.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_protocol_buffer.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_buffer.hpp>
+#include <srs_rtmp_utility.hpp>
 
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
 #ifndef _WIN32

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 <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 */
 
 #include <srs_core.hpp>

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 <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 
 #include <stdlib.h>
 using namespace std;
@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_stream.hpp>
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_stack.hpp>
 
 void srs_discovery_tc_url(
     string tcUrl, 

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 <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 */
 #include <srs_core.hpp>
 

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 <srs_utest.hpp>
 
-#include <srs_protocol_amf0.hpp>
+#include <srs_rtmp_amf0.hpp>
 
 #endif
 

trunk/src/utest/srs_utest_kernel.cpp

@@ -28,7 +28,7 @@ using namespace std;
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 #include <srs_kernel_stream.hpp>
 
 #define MAX_MOCK_DATA_SIZE 1024 * 1024

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 <string>
 #include <srs_kernel_file.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_buffer.hpp>
 
 class MockBufferReader: public ISrsBufferReader
 {

trunk/src/utest/srs_utest_protocol.cpp

@@ -26,13 +26,13 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_protocol_utility.hpp>
-#include <srs_protocol_msg_array.hpp>
-#include <srs_protocol_stack.hpp>
+#include <srs_rtmp_utility.hpp>
+#include <srs_rtmp_msg_array.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_st.hpp>
-#include <srs_protocol_amf0.hpp>
-#include <srs_protocol_rtmp.hpp>
+#include <srs_rtmp_amf0.hpp>
+#include <srs_rtmp_sdk.hpp>
 
 MockEmptyIO::MockEmptyIO()
 {

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 <srs_utest.hpp>
 
 #include <string>
-#include <srs_protocol_utility.hpp>
+#include <srs_rtmp_utility.hpp>
 
-#include <srs_protocol_rtmp.hpp>
-#include <srs_protocol_handshake.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_handshake.hpp>
+#include <srs_rtmp_buffer.hpp>
 
 #ifdef SRS_AUTO_SSL
 using namespace _srs_internal;
 #endif
 
-#include <srs_protocol_io.hpp>
+#include <srs_rtmp_io.hpp>
 
 class MockEmptyIO : public ISrsProtocolReaderWriter
 {