胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
5908096f 1 parent af172d95

refine the thread, protocol, kbps code. 2.0.166

内嵌 并排对比
正在显示 15 个修改的文件 包含 22 行增加 和 21 行删除
@@ -562,6 +562,7 @@ Supported operating systems and hardware: @@ -562,6 +562,7 @@ Supported operating systems and hardware:
562 562
563 ### SRS 2.0 history 563 ### SRS 2.0 history
564 564
  565 +* v2.0, 2015-05-23, refine the thread, protocol, kbps code. 2.0.166
565 * v2.0, 2015-05-23, fix [#391](https://github.com/simple-rtmp-server/srs/issues/391) copy request for async call. 566 * v2.0, 2015-05-23, fix [#391](https://github.com/simple-rtmp-server/srs/issues/391) copy request for async call.
566 * v2.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 2.0.165 567 * v2.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 2.0.165
567 * v2.0, 2015-05-22, for [#400](https://github.com/simple-rtmp-server/srs/issues/400), parse when got entire http header, by feilong. 2.0.164. 568 * v2.0, 2015-05-22, for [#400](https://github.com/simple-rtmp-server/srs/issues/400), parse when got entire http header, by feilong. 2.0.164.
@@ -158,7 +158,7 @@ MODULE_ID="PROTOCOL" @@ -158,7 +158,7 @@ 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_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk" 160 MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
161 - "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer" 161 + "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer"
162 "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps") 162 "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps")
163 RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh 163 RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
164 RTMP_OBJS="${MODULE_OBJS[@]}" 164 RTMP_OBJS="${MODULE_OBJS[@]}"
@@ -54,8 +54,8 @@ file @@ -54,8 +54,8 @@ file
54 ../../src/protocol/srs_raw_avc.cpp, 54 ../../src/protocol/srs_raw_avc.cpp,
55 ../../src/protocol/srs_rtmp_amf0.hpp, 55 ../../src/protocol/srs_rtmp_amf0.hpp,
56 ../../src/protocol/srs_rtmp_amf0.cpp, 56 ../../src/protocol/srs_rtmp_amf0.cpp,
57 - ../../src/protocol/srs_rtmp_buffer.hpp,  
58 - ../../src/protocol/srs_rtmp_buffer.cpp, 57 + ../../src/protocol/srs_protocol_buffer.hpp,
  58 + ../../src/protocol/srs_protocol_buffer.cpp,
59 ../../src/protocol/srs_rtmp_handshake.hpp, 59 ../../src/protocol/srs_rtmp_handshake.hpp,
60 ../../src/protocol/srs_rtmp_handshake.cpp, 60 ../../src/protocol/srs_rtmp_handshake.cpp,
61 ../../src/protocol/srs_rtmp_io.hpp, 61 ../../src/protocol/srs_rtmp_io.hpp,
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <ClInclude Include="..\..\src\protocol\srs_http_stack.hpp" /> 120 <ClInclude Include="..\..\src\protocol\srs_http_stack.hpp" />
121 <ClInclude Include="..\..\src\protocol\srs_raw_avc.hpp" /> 121 <ClInclude Include="..\..\src\protocol\srs_raw_avc.hpp" />
122 <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" /> 122 <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" />
123 - <ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp" /> 123 + <ClInclude Include="..\..\src\protocol\srs_protocol_buffer.hpp" />
124 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" /> 124 <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
125 <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" /> 125 <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
126 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" /> 126 <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 <ClCompile Include="..\..\src\protocol\srs_http_stack.cpp" /> 202 <ClCompile Include="..\..\src\protocol\srs_http_stack.cpp" />
203 <ClCompile Include="..\..\src\protocol\srs_raw_avc.cpp" /> 203 <ClCompile Include="..\..\src\protocol\srs_raw_avc.cpp" />
204 <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" /> 204 <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" />
205 - <ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp" /> 205 + <ClCompile Include="..\..\src\protocol\srs_protocol_buffer.cpp" />
206 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" /> 206 <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
207 <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" /> 207 <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />
208 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" /> 208 <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 3C068D6A1B10149F00AA722C /* srs_protocol_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */; }; 10 3C068D6A1B10149F00AA722C /* srs_protocol_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */; };
  11 + 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */; };
11 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */; }; 12 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */; };
12 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F01AAE652C00CE8F6C /* srs_core_autofree.cpp */; }; 13 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F01AAE652C00CE8F6C /* srs_core_autofree.cpp */; };
13 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F21AAE652C00CE8F6C /* srs_core_performance.cpp */; }; 14 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F21AAE652C00CE8F6C /* srs_core_performance.cpp */; };
@@ -27,7 +28,6 @@ @@ -27,7 +28,6 @@
27 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */; }; 28 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */; };
28 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; }; 29 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; };
29 3C1232421AAE81A400CE8F6C /* srs_rtmp_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */; }; 30 3C1232421AAE81A400CE8F6C /* srs_rtmp_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */; };
30 - 3C1232431AAE81A400CE8F6C /* srs_rtmp_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232311AAE81A400CE8F6C /* srs_rtmp_buffer.cpp */; };  
31 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; }; 31 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; };
32 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; }; 32 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; };
33 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; }; 33 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
@@ -124,6 +124,8 @@ @@ -124,6 +124,8 @@
124 /* Begin PBXFileReference section */ 124 /* Begin PBXFileReference section */
125 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_kbps.cpp; path = ../../../src/protocol/srs_protocol_kbps.cpp; sourceTree = "<group>"; }; 125 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_kbps.cpp; path = ../../../src/protocol/srs_protocol_kbps.cpp; sourceTree = "<group>"; };
126 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_kbps.hpp; path = ../../../src/protocol/srs_protocol_kbps.hpp; sourceTree = "<group>"; }; 126 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_kbps.hpp; path = ../../../src/protocol/srs_protocol_kbps.hpp; sourceTree = "<group>"; };
  127 + 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_buffer.cpp; path = ../../../src/protocol/srs_protocol_buffer.cpp; sourceTree = "<group>"; };
  128 + 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_buffer.hpp; path = ../../../src/protocol/srs_protocol_buffer.hpp; sourceTree = "<group>"; };
127 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_http_stack.cpp; path = ../../../src/protocol/srs_http_stack.cpp; sourceTree = "<group>"; }; 129 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_http_stack.cpp; path = ../../../src/protocol/srs_http_stack.cpp; sourceTree = "<group>"; };
128 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_http_stack.hpp; path = ../../../src/protocol/srs_http_stack.hpp; sourceTree = "<group>"; }; 130 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_http_stack.hpp; path = ../../../src/protocol/srs_http_stack.hpp; sourceTree = "<group>"; };
129 3C1231E51AAE64A400CE8F6C /* srs_xcode */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = srs_xcode; sourceTree = BUILT_PRODUCTS_DIR; }; 131 3C1231E51AAE64A400CE8F6C /* srs_xcode */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = srs_xcode; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -163,8 +165,6 @@ @@ -163,8 +165,6 @@
163 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_raw_avc.hpp; path = ../../../src/protocol/srs_raw_avc.hpp; sourceTree = "<group>"; }; 165 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_raw_avc.hpp; path = ../../../src/protocol/srs_raw_avc.hpp; sourceTree = "<group>"; };
164 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_amf0.cpp; path = ../../../src/protocol/srs_rtmp_amf0.cpp; sourceTree = "<group>"; }; 166 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_amf0.cpp; path = ../../../src/protocol/srs_rtmp_amf0.cpp; sourceTree = "<group>"; };
165 3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_amf0.hpp; path = ../../../src/protocol/srs_rtmp_amf0.hpp; sourceTree = "<group>"; }; 167 3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_amf0.hpp; path = ../../../src/protocol/srs_rtmp_amf0.hpp; sourceTree = "<group>"; };
166 - 3C1232311AAE81A400CE8F6C /* srs_rtmp_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_buffer.cpp; path = ../../../src/protocol/srs_rtmp_buffer.cpp; sourceTree = "<group>"; };  
167 - 3C1232321AAE81A400CE8F6C /* srs_rtmp_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_buffer.hpp; path = ../../../src/protocol/srs_rtmp_buffer.hpp; sourceTree = "<group>"; };  
168 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>"; }; 168 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>"; };
169 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>"; }; 169 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>"; };
170 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>"; }; 170 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>"; };
@@ -489,14 +489,14 @@ @@ -489,14 +489,14 @@
489 children = ( 489 children = (
490 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */, 490 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */,
491 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */, 491 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */,
  492 + 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */,
  493 + 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */,
492 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */, 494 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */,
493 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */, 495 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */,
494 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */, 496 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
495 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */, 497 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */,
496 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */, 498 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */,
497 3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */, 499 3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */,
498 - 3C1232311AAE81A400CE8F6C /* srs_rtmp_buffer.cpp */,  
499 - 3C1232321AAE81A400CE8F6C /* srs_rtmp_buffer.hpp */,  
500 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */, 500 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */,
501 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */, 501 3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */,
502 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */, 502 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */,
@@ -916,6 +916,7 @@ @@ -916,6 +916,7 @@
916 3CE6CD311AE4AFB800706E07 /* srs_main_ingest_hls.cpp in Sources */, 916 3CE6CD311AE4AFB800706E07 /* srs_main_ingest_hls.cpp in Sources */,
917 3C28EDDF1AF5C43F00A3AEAC /* srs_app_caster_flv.cpp in Sources */, 917 3C28EDDF1AF5C43F00A3AEAC /* srs_app_caster_flv.cpp in Sources */,
918 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */, 918 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */,
  919 + 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */,
919 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */, 920 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */,
920 3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */, 921 3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */,
921 3C663F181AB0155100286D8B /* srs_play.c in Sources */, 922 3C663F181AB0155100286D8B /* srs_play.c in Sources */,
@@ -927,7 +928,6 @@ @@ -927,7 +928,6 @@
927 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */, 928 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
928 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, 929 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
929 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, 930 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
930 - 3C1232431AAE81A400CE8F6C /* srs_rtmp_buffer.cpp in Sources */,  
931 3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */, 931 3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
932 3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */, 932 3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */,
933 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */, 933 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
@@ -51,7 +51,7 @@ using namespace std; @@ -51,7 +51,7 @@ using namespace std;
51 #include <srs_kernel_utility.hpp> 51 #include <srs_kernel_utility.hpp>
52 #include <srs_kernel_codec.hpp> 52 #include <srs_kernel_codec.hpp>
53 #include <srs_kernel_file.hpp> 53 #include <srs_kernel_file.hpp>
54 -#include <srs_rtmp_buffer.hpp> 54 +#include <srs_protocol_buffer.hpp>
55 #include <srs_kernel_ts.hpp> 55 #include <srs_kernel_ts.hpp>
56 #include <srs_app_utility.hpp> 56 #include <srs_app_utility.hpp>
57 #include <srs_app_http_hooks.hpp> 57 #include <srs_app_http_hooks.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 <sstream> 33 #include <sstream>
34 using namespace std; 34 using namespace std;
35 35
36 -#include <srs_rtmp_buffer.hpp> 36 +#include <srs_protocol_buffer.hpp>
37 #include <srs_rtmp_utility.hpp> 37 #include <srs_rtmp_utility.hpp>
38 #include <srs_kernel_log.hpp> 38 #include <srs_kernel_log.hpp>
39 #include <srs_kernel_error.hpp> 39 #include <srs_kernel_error.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_rtmp_sdk.hpp> 26 #include <srs_rtmp_sdk.hpp>
27 #include <srs_rtmp_stack.hpp> 27 #include <srs_rtmp_stack.hpp>
28 #include <srs_app_rtmp_conn.hpp> 28 #include <srs_app_rtmp_conn.hpp>
29 -#include <srs_rtmp_buffer.hpp> 29 +#include <srs_protocol_buffer.hpp>
30 #include <srs_kernel_utility.hpp> 30 #include <srs_kernel_utility.hpp>
31 #include <srs_core_performance.hpp> 31 #include <srs_core_performance.hpp>
32 #include <srs_app_config.hpp> 32 #include <srs_app_config.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 <vector> 33 #include <vector>
34 34
35 #include <srs_app_thread.hpp> 35 #include <srs_app_thread.hpp>
36 -#include <srs_rtmp_buffer.hpp> 36 +#include <srs_protocol_buffer.hpp>
37 #include <srs_core_performance.hpp> 37 #include <srs_core_performance.hpp>
38 #include <srs_app_reload.hpp> 38 #include <srs_app_reload.hpp>
39 39
@@ -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 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 165 34 +#define VERSION_REVISION 166
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
@@ -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_buffer.hpp> 24 +#include <srs_protocol_buffer.hpp>
25 25
26 #include <stdlib.h> 26 #include <stdlib.h>
27 27
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25 #define SRS_PROTOCOL_BUFFER_HPP 25 #define SRS_PROTOCOL_BUFFER_HPP
26 26
27 /* 27 /*
28 -#include <srs_rtmp_buffer.hpp> 28 +#include <srs_protocol_buffer.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.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_kernel_stream.hpp> 28 #include <srs_kernel_stream.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>
31 -#include <srs_rtmp_buffer.hpp> 31 +#include <srs_protocol_buffer.hpp>
32 #include <srs_rtmp_utility.hpp> 32 #include <srs_rtmp_utility.hpp>
33 33
34 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 34 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
@@ -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 31
32 #include <string> 32 #include <string>
33 #include <srs_kernel_file.hpp> 33 #include <srs_kernel_file.hpp>
34 -#include <srs_rtmp_buffer.hpp> 34 +#include <srs_protocol_buffer.hpp>
35 35
36 class MockBufferReader: public ISrsBufferReader 36 class MockBufferReader: public ISrsBufferReader
37 { 37 {
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 34
35 #include <srs_rtmp_sdk.hpp> 35 #include <srs_rtmp_sdk.hpp>
36 #include <srs_rtmp_handshake.hpp> 36 #include <srs_rtmp_handshake.hpp>
37 -#include <srs_rtmp_buffer.hpp> 37 +#include <srs_protocol_buffer.hpp>
38 38
39 #ifdef SRS_AUTO_SSL 39 #ifdef SRS_AUTO_SSL
40 using namespace _srs_internal; 40 using namespace _srs_internal;