胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
82ff05c1 1 parent 168625dc

rename rtmp io to protocol io

内嵌 并排对比
正在显示 17 个修改的文件 包含 29 行增加 和 29 行删除
@@ -157,7 +157,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}" @@ -157,7 +157,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
157 MODULE_ID="PROTOCOL" 157 MODULE_ID="PROTOCOL"
158 MODULE_DEPENDS=("CORE" "KERNEL") 158 MODULE_DEPENDS=("CORE" "KERNEL")
159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) 159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
160 -MODULE_FILES=("srs_protocol_amf0" "srs_rtmp_io" "srs_rtmp_stack" 160 +MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
161 "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream" 161 "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
162 "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json" 162 "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
163 "srs_kafka_stack") 163 "srs_kafka_stack")
@@ -64,8 +64,8 @@ file @@ -64,8 +64,8 @@ file
64 ../../src/protocol/srs_protocol_json.cpp, 64 ../../src/protocol/srs_protocol_json.cpp,
65 ../../src/protocol/srs_rtmp_handshake.hpp, 65 ../../src/protocol/srs_rtmp_handshake.hpp,
66 ../../src/protocol/srs_rtmp_handshake.cpp, 66 ../../src/protocol/srs_rtmp_handshake.cpp,
67 - ../../src/protocol/srs_rtmp_io.hpp,  
68 - ../../src/protocol/srs_rtmp_io.cpp, 67 + ../../src/protocol/srs_protocol_io.hpp,
  68 + ../../src/protocol/srs_protocol_io.cpp,
69 ../../src/protocol/srs_rtmp_msg_array.hpp, 69 ../../src/protocol/srs_rtmp_msg_array.hpp,
70 ../../src/protocol/srs_rtmp_msg_array.cpp, 70 ../../src/protocol/srs_rtmp_msg_array.cpp,
71 ../../src/protocol/srs_rtmp_stack.hpp, 71 ../../src/protocol/srs_rtmp_stack.hpp,
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 <ClInclude Include="..\..\src\protocol\srs_protocol_amf0.hpp" /> 124 <ClInclude Include="..\..\src\protocol\srs_protocol_amf0.hpp" />
125 <ClInclude Include="..\..\src\protocol\srs_protocol_stream.hpp" /> 125 <ClInclude Include="..\..\src\protocol\srs_protocol_stream.hpp" />
126 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" /> 126 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
127 - <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" /> 127 + <ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp" />
128 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" /> 128 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
129 <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" /> 129 <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
130 <ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" /> 130 <ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" />
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 <ClCompile Include="..\..\src\protocol\srs_protocol_amf0.cpp" /> 207 <ClCompile Include="..\..\src\protocol\srs_protocol_amf0.cpp" />
208 <ClCompile Include="..\..\src\protocol\srs_protocol_stream.cpp" /> 208 <ClCompile Include="..\..\src\protocol\srs_protocol_stream.cpp" />
209 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" /> 209 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
210 - <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" /> 210 + <ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp" />
211 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" /> 211 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
212 <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" /> 212 <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
213 <ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" /> 213 <ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" />
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp"> 211 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp">
212 <Filter>srs</Filter> 212 <Filter>srs</Filter>
213 </ClCompile> 213 </ClCompile>
214 - <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp"> 214 + <ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp">
215 <Filter>srs</Filter> 215 <Filter>srs</Filter>
216 </ClCompile> 216 </ClCompile>
217 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp"> 217 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp">
@@ -405,7 +405,7 @@ @@ -405,7 +405,7 @@
405 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp"> 405 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp">
406 <Filter>srs</Filter> 406 <Filter>srs</Filter>
407 </ClInclude> 407 </ClInclude>
408 - <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp"> 408 + <ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp">
409 <Filter>srs</Filter> 409 <Filter>srs</Filter>
410 </ClInclude> 410 </ClInclude>
411 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp"> 411 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp">
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; }; 32 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; };
33 3C1232421AAE81A400CE8F6C /* srs_protocol_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */; }; 33 3C1232421AAE81A400CE8F6C /* srs_protocol_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */; };
34 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; }; 34 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; };
35 - 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; }; 35 + 3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */; };
36 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; }; 36 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
37 3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; }; 37 3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; };
38 3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */; }; 38 3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */; };
@@ -177,8 +177,8 @@ @@ -177,8 +177,8 @@
177 3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_amf0.hpp; path = ../../../src/protocol/srs_protocol_amf0.hpp; sourceTree = "<group>"; }; 177 3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_amf0.hpp; path = ../../../src/protocol/srs_protocol_amf0.hpp; sourceTree = "<group>"; };
178 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_handshake.cpp; path = ../../../src/protocol/srs_rtmp_handshake.cpp; sourceTree = "<group>"; }; 178 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_handshake.cpp; path = ../../../src/protocol/srs_rtmp_handshake.cpp; sourceTree = "<group>"; };
179 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_handshake.hpp; path = ../../../src/protocol/srs_rtmp_handshake.hpp; sourceTree = "<group>"; }; 179 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_handshake.hpp; path = ../../../src/protocol/srs_rtmp_handshake.hpp; sourceTree = "<group>"; };
180 - 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_io.cpp; path = ../../../src/protocol/srs_rtmp_io.cpp; sourceTree = "<group>"; };  
181 - 3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_io.hpp; path = ../../../src/protocol/srs_rtmp_io.hpp; sourceTree = "<group>"; }; 180 + 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_io.cpp; path = ../../../src/protocol/srs_protocol_io.cpp; sourceTree = "<group>"; };
  181 + 3C1232361AAE81A400CE8F6C /* srs_protocol_io.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_io.hpp; path = ../../../src/protocol/srs_protocol_io.hpp; sourceTree = "<group>"; };
182 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_msg_array.cpp; path = ../../../src/protocol/srs_rtmp_msg_array.cpp; sourceTree = "<group>"; }; 182 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_msg_array.cpp; path = ../../../src/protocol/srs_rtmp_msg_array.cpp; sourceTree = "<group>"; };
183 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; }; 183 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; };
184 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; }; 184 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; };
@@ -512,6 +512,10 @@ @@ -512,6 +512,10 @@
512 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */, 512 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */,
513 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */, 513 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */,
514 3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */, 514 3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */,
  515 + 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */,
  516 + 3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */,
  517 + 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */,
  518 + 3C1232361AAE81A400CE8F6C /* srs_protocol_io.hpp */,
515 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */, 519 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */,
516 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */, 520 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */,
517 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */, 521 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */,
@@ -520,12 +524,8 @@ @@ -520,12 +524,8 @@
520 3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */, 524 3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */,
521 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */, 525 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
522 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */, 526 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */,
523 - 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */,  
524 - 3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */,  
525 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */, 527 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */,
526 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */, 528 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */,
527 - 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */,  
528 - 3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */,  
529 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */, 529 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */,
530 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */, 530 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */,
531 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */, 531 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */,
@@ -966,7 +966,7 @@ @@ -966,7 +966,7 @@
966 3C1232B51AAE81D900CE8F6C /* srs_app_statistic.cpp in Sources */, 966 3C1232B51AAE81D900CE8F6C /* srs_app_statistic.cpp in Sources */,
967 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */, 967 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
968 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, 968 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
969 - 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, 969 + 3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */,
970 3C1232211AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */, 970 3C1232211AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */,
971 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */, 971 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
972 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */, 972 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
@@ -32,7 +32,7 @@ using namespace std; @@ -32,7 +32,7 @@ using namespace std;
32 32
33 #include <srs_kernel_error.hpp> 33 #include <srs_kernel_error.hpp>
34 #include <srs_rtmp_stack.hpp> 34 #include <srs_rtmp_stack.hpp>
35 -#include <srs_rtmp_io.hpp> 35 +#include <srs_protocol_io.hpp>
36 #include <srs_app_config.hpp> 36 #include <srs_app_config.hpp>
37 #include <srs_rtmp_utility.hpp> 37 #include <srs_rtmp_utility.hpp>
38 #include <srs_app_st.hpp> 38 #include <srs_app_st.hpp>
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33 #include <st.h> 33 #include <st.h>
34 34
35 #include <srs_app_st.hpp> 35 #include <srs_app_st.hpp>
36 -#include <srs_rtmp_io.hpp> 36 +#include <srs_protocol_io.hpp>
37 37
38 // the internal classes, user should never use it. 38 // the internal classes, user should never use it.
39 // user should use the public classes at the bellow: 39 // user should use the public classes at the bellow:
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
32 32
33 -#include <srs_rtmp_io.hpp> 33 +#include <srs_protocol_io.hpp>
34 #include <srs_librtmp.hpp> 34 #include <srs_librtmp.hpp>
35 35
36 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 36 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
@@ -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_rtmp_io.hpp> 24 +#include <srs_protocol_io.hpp>
25 25
26 ISrsBufferReader::ISrsBufferReader() 26 ISrsBufferReader::ISrsBufferReader()
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_RTMP_PROTOCOL_IO_HPP  
25 -#define SRS_RTMP_PROTOCOL_IO_HPP 24 +#ifndef SRS_PROTOCOL_IO_HPP
  25 +#define SRS_PROTOCOL_IO_HPP
26 26
27 /* 27 /*
28 -#include <srs_rtmp_io.hpp> 28 +#include <srs_protocol_io.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
32 32
33 -#include <srs_rtmp_io.hpp> 33 +#include <srs_protocol_io.hpp>
34 34
35 /** 35 /**
36 * a kbps sample, for example, 1minute kbps, 36 * a kbps sample, for example, 1minute kbps,
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
32 32
33 -#include <srs_rtmp_io.hpp> 33 +#include <srs_protocol_io.hpp>
34 #include <srs_core_performance.hpp> 34 #include <srs_core_performance.hpp>
35 #include <srs_kernel_stream.hpp> 35 #include <srs_kernel_stream.hpp>
36 36
@@ -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_autofree.hpp> 28 #include <srs_core_autofree.hpp>
29 #include <srs_kernel_error.hpp> 29 #include <srs_kernel_error.hpp>
30 #include <srs_kernel_log.hpp> 30 #include <srs_kernel_log.hpp>
31 -#include <srs_rtmp_io.hpp> 31 +#include <srs_protocol_io.hpp>
32 #include <srs_rtmp_utility.hpp> 32 #include <srs_rtmp_utility.hpp>
33 #include <srs_rtmp_stack.hpp> 33 #include <srs_rtmp_stack.hpp>
34 #include <srs_kernel_buffer.hpp> 34 #include <srs_kernel_buffer.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_rtmp_stack.hpp> 24 #include <srs_rtmp_stack.hpp>
25 25
26 #include <srs_protocol_amf0.hpp> 26 #include <srs_protocol_amf0.hpp>
27 -#include <srs_rtmp_io.hpp> 27 +#include <srs_protocol_io.hpp>
28 #include <srs_kernel_buffer.hpp> 28 #include <srs_kernel_buffer.hpp>
29 #include <srs_core_autofree.hpp> 29 #include <srs_core_autofree.hpp>
30 #include <srs_kernel_utility.hpp> 30 #include <srs_kernel_utility.hpp>
@@ -39,7 +39,7 @@ using namespace std; @@ -39,7 +39,7 @@ using namespace std;
39 #include <srs_kernel_codec.hpp> 39 #include <srs_kernel_codec.hpp>
40 #include <srs_kernel_consts.hpp> 40 #include <srs_kernel_consts.hpp>
41 #include <srs_rtmp_stack.hpp> 41 #include <srs_rtmp_stack.hpp>
42 -#include <srs_rtmp_io.hpp> 42 +#include <srs_protocol_io.hpp>
43 43
44 void srs_discovery_tc_url( 44 void srs_discovery_tc_url(
45 string tcUrl, 45 string tcUrl,
@@ -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 #include <map> 27 #include <map>
28 using namespace std; 28 using namespace std;
29 29
30 -#include <srs_rtmp_io.hpp> 30 +#include <srs_protocol_io.hpp>
31 #include <srs_kernel_stream.hpp> 31 #include <srs_kernel_stream.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
40 using namespace _srs_internal; 40 using namespace _srs_internal;
41 #endif 41 #endif
42 42
43 -#include <srs_rtmp_io.hpp> 43 +#include <srs_protocol_io.hpp>
44 44
45 class MockEmptyIO : public ISrsProtocolReaderWriter 45 class MockEmptyIO : public ISrsProtocolReaderWriter
46 { 46 {