胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
a4f51564 1 parent 495f575a

rename kernel stream to buffer

内嵌 并排对比
正在显示 30 个修改的文件 包含 45 行增加 和 40 行删除
@@ -146,7 +146,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" @@ -146,7 +146,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
146 MODULE_ID="KERNEL" 146 MODULE_ID="KERNEL"
147 MODULE_DEPENDS=("CORE") 147 MODULE_DEPENDS=("CORE")
148 ModuleLibIncs=(${SRS_OBJS_DIR}) 148 ModuleLibIncs=(${SRS_OBJS_DIR})
149 -MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" 149 +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_buffer"
150 "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" 150 "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file"
151 "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts" 151 "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
152 "srs_kernel_temp") 152 "srs_kernel_temp")
@@ -41,8 +41,8 @@ file @@ -41,8 +41,8 @@ file
41 ../../src/kernel/srs_kernel_mp3.cpp, 41 ../../src/kernel/srs_kernel_mp3.cpp,
42 ../../src/kernel/srs_rtsp_stack.hpp, 42 ../../src/kernel/srs_rtsp_stack.hpp,
43 ../../src/kernel/srs_rtsp_stack.cpp, 43 ../../src/kernel/srs_rtsp_stack.cpp,
44 - ../../src/kernel/srs_kernel_stream.hpp,  
45 - ../../src/kernel/srs_kernel_stream.cpp, 44 + ../../src/kernel/srs_kernel_buffer.hpp,
  45 + ../../src/kernel/srs_kernel_buffer.cpp,
46 ../../src/kernel/srs_kernel_ts.cpp, 46 ../../src/kernel/srs_kernel_ts.cpp,
47 ../../src/kernel/srs_kernel_ts.hpp, 47 ../../src/kernel/srs_kernel_ts.hpp,
48 ../../src/kernel/srs_kernel_utility.hpp, 48 ../../src/kernel/srs_kernel_utility.hpp,
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 <ClInclude Include="..\..\src\kernel\srs_kernel_flv.hpp" /> 113 <ClInclude Include="..\..\src\kernel\srs_kernel_flv.hpp" />
114 <ClInclude Include="..\..\src\kernel\srs_kernel_log.hpp" /> 114 <ClInclude Include="..\..\src\kernel\srs_kernel_log.hpp" />
115 <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp" /> 115 <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp" />
116 - <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp" /> 116 + <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp" />
117 <ClInclude Include="..\..\src\kernel\srs_kernel_ts.hpp" /> 117 <ClInclude Include="..\..\src\kernel\srs_kernel_ts.hpp" />
118 <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp" /> 118 <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp" />
119 <ClInclude Include="..\..\src\libs\srs_librtmp.hpp" /> 119 <ClInclude Include="..\..\src\libs\srs_librtmp.hpp" />
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
195 <ClCompile Include="..\..\src\kernel\srs_kernel_flv.cpp" /> 195 <ClCompile Include="..\..\src\kernel\srs_kernel_flv.cpp" />
196 <ClCompile Include="..\..\src\kernel\srs_kernel_log.cpp" /> 196 <ClCompile Include="..\..\src\kernel\srs_kernel_log.cpp" />
197 <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp" /> 197 <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp" />
198 - <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp" /> 198 + <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp" />
199 <ClCompile Include="..\..\src\kernel\srs_kernel_ts.cpp" /> 199 <ClCompile Include="..\..\src\kernel\srs_kernel_ts.cpp" />
200 <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp" /> 200 <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp" />
201 <ClCompile Include="..\..\src\libs\srs_librtmp.cpp" /> 201 <ClCompile Include="..\..\src\libs\srs_librtmp.cpp" />
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp"> 157 <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp">
158 <Filter>srs</Filter> 158 <Filter>srs</Filter>
159 </ClCompile> 159 </ClCompile>
160 - <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp"> 160 + <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp">
161 <Filter>srs</Filter> 161 <Filter>srs</Filter>
162 </ClCompile> 162 </ClCompile>
163 <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp"> 163 <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp">
@@ -372,7 +372,7 @@ @@ -372,7 +372,7 @@
372 <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp"> 372 <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp">
373 <Filter>srs</Filter> 373 <Filter>srs</Filter>
374 </ClInclude> 374 </ClInclude>
375 - <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp"> 375 + <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
376 <Filter>srs</Filter> 376 <Filter>srs</Filter>
377 </ClInclude> 377 </ClInclude>
378 <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp"> 378 <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp">
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 3C1232261AAE814D00CE8F6C /* srs_kernel_flv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232141AAE814D00CE8F6C /* srs_kernel_flv.cpp */; }; 26 3C1232261AAE814D00CE8F6C /* srs_kernel_flv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232141AAE814D00CE8F6C /* srs_kernel_flv.cpp */; };
27 3C1232271AAE814D00CE8F6C /* srs_kernel_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232161AAE814D00CE8F6C /* srs_kernel_log.cpp */; }; 27 3C1232271AAE814D00CE8F6C /* srs_kernel_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232161AAE814D00CE8F6C /* srs_kernel_log.cpp */; };
28 3C1232281AAE814D00CE8F6C /* srs_kernel_mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */; }; 28 3C1232281AAE814D00CE8F6C /* srs_kernel_mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */; };
29 - 3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */; }; 29 + 3C1232291AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */; };
30 3C12322A1AAE814D00CE8F6C /* srs_kernel_ts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */; }; 30 3C12322A1AAE814D00CE8F6C /* srs_kernel_ts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */; };
31 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */; }; 31 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */; };
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 */; };
@@ -165,8 +165,8 @@ @@ -165,8 +165,8 @@
165 3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_log.hpp; path = ../../../src/kernel/srs_kernel_log.hpp; sourceTree = "<group>"; }; 165 3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_log.hpp; path = ../../../src/kernel/srs_kernel_log.hpp; sourceTree = "<group>"; };
166 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_mp3.cpp; path = ../../../src/kernel/srs_kernel_mp3.cpp; sourceTree = "<group>"; }; 166 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_mp3.cpp; path = ../../../src/kernel/srs_kernel_mp3.cpp; sourceTree = "<group>"; };
167 3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_mp3.hpp; path = ../../../src/kernel/srs_kernel_mp3.hpp; sourceTree = "<group>"; }; 167 3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_mp3.hpp; path = ../../../src/kernel/srs_kernel_mp3.hpp; sourceTree = "<group>"; };
168 - 3C12321A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_stream.cpp; path = ../../../src/kernel/srs_kernel_stream.cpp; sourceTree = "<group>"; };  
169 - 3C12321B1AAE814D00CE8F6C /* srs_kernel_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_stream.hpp; path = ../../../src/kernel/srs_kernel_stream.hpp; sourceTree = "<group>"; }; 168 + 3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_buffer.cpp; path = ../../../src/kernel/srs_kernel_buffer.cpp; sourceTree = "<group>"; };
  169 + 3C12321B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_buffer.hpp; path = ../../../src/kernel/srs_kernel_buffer.hpp; sourceTree = "<group>"; };
170 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_ts.cpp; path = ../../../src/kernel/srs_kernel_ts.cpp; sourceTree = "<group>"; }; 170 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_ts.cpp; path = ../../../src/kernel/srs_kernel_ts.cpp; sourceTree = "<group>"; };
171 3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_ts.hpp; path = ../../../src/kernel/srs_kernel_ts.hpp; sourceTree = "<group>"; }; 171 3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_ts.hpp; path = ../../../src/kernel/srs_kernel_ts.hpp; sourceTree = "<group>"; };
172 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_utility.cpp; path = ../../../src/kernel/srs_kernel_utility.cpp; sourceTree = "<group>"; }; 172 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_utility.cpp; path = ../../../src/kernel/srs_kernel_utility.cpp; sourceTree = "<group>"; };
@@ -495,8 +495,8 @@ @@ -495,8 +495,8 @@
495 3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */, 495 3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */,
496 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */, 496 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */,
497 3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */, 497 3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */,
498 - 3C12321A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */,  
499 - 3C12321B1AAE814D00CE8F6C /* srs_kernel_stream.hpp */, 498 + 3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */,
  499 + 3C12321B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */,
500 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */, 500 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */,
501 3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */, 501 3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */,
502 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */, 502 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */,
@@ -957,7 +957,7 @@ @@ -957,7 +957,7 @@
957 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */, 957 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */,
958 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */, 958 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */,
959 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */, 959 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */,
960 - 3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */, 960 + 3C1232291AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
961 3C663F181AB0155100286D8B /* srs_play.c in Sources */, 961 3C663F181AB0155100286D8B /* srs_play.c in Sources */,
962 3C689F971AB6AAAC00C9CEEE /* io.c in Sources */, 962 3C689F971AB6AAAC00C9CEEE /* io.c in Sources */,
963 3C1232B61AAE81D900CE8F6C /* srs_app_thread.cpp in Sources */, 963 3C1232B61AAE81D900CE8F6C /* srs_app_thread.cpp in Sources */,
@@ -13,10 +13,15 @@ if [[ $to == '' ]]; then @@ -13,10 +13,15 @@ if [[ $to == '' ]]; then
13 exit 1 13 exit 1
14 fi 14 fi
15 15
  16 +if [[ ! -d src || ! -d ide ]]; then
  17 + echo "please execute the script under trunk"
  18 + exit 1
  19 +fi
  20 +
16 echo "from=$from" 21 echo "from=$from"
17 echo "to=$to" 22 echo "to=$to"
18 23
19 -files="configure `ls auto` `ls conf` `ls scripts` `find etc -type f` `find ide -type f` `find research -type f` `find src -type f`" 24 +files="configure `ls auto` `ls conf` `ls scripts` `find etc -type f` `find ide -type f|grep -v xcuserdata` `find research -type f|grep -v objs` `find src -type f`"
20 for file in $files; do 25 for file in $files; do
21 grep -in "$from" $file >/dev/null 2>&1; 26 grep -in "$from" $file >/dev/null 2>&1;
22 if [[ 0 -eq $? ]]; then 27 if [[ 0 -eq $? ]]; then
@@ -39,7 +39,7 @@ using namespace std; @@ -39,7 +39,7 @@ using namespace std;
39 #include <srs_kernel_flv.hpp> 39 #include <srs_kernel_flv.hpp>
40 #include <srs_kernel_file.hpp> 40 #include <srs_kernel_file.hpp>
41 #include <srs_rtmp_amf0.hpp> 41 #include <srs_rtmp_amf0.hpp>
42 -#include <srs_kernel_stream.hpp> 42 +#include <srs_kernel_buffer.hpp>
43 #include <srs_protocol_json.hpp> 43 #include <srs_protocol_json.hpp>
44 #include <srs_app_utility.hpp> 44 #include <srs_app_utility.hpp>
45 45
@@ -37,7 +37,7 @@ using namespace std; @@ -37,7 +37,7 @@ using namespace std;
37 #include <srs_kernel_log.hpp> 37 #include <srs_kernel_log.hpp>
38 #include <srs_kernel_codec.hpp> 38 #include <srs_kernel_codec.hpp>
39 #include <srs_rtmp_stack.hpp> 39 #include <srs_rtmp_stack.hpp>
40 -#include <srs_kernel_stream.hpp> 40 +#include <srs_kernel_buffer.hpp>
41 #include <srs_core_autofree.hpp> 41 #include <srs_core_autofree.hpp>
42 #include <srs_kernel_utility.hpp> 42 #include <srs_kernel_utility.hpp>
43 #include <srs_app_config.hpp> 43 #include <srs_app_config.hpp>
@@ -36,7 +36,7 @@ using namespace std; @@ -36,7 +36,7 @@ using namespace std;
36 #include <srs_kernel_log.hpp> 36 #include <srs_kernel_log.hpp>
37 #include <srs_app_config.hpp> 37 #include <srs_app_config.hpp>
38 #include <srs_kernel_ts.hpp> 38 #include <srs_kernel_ts.hpp>
39 -#include <srs_kernel_stream.hpp> 39 +#include <srs_kernel_buffer.hpp>
40 #include <srs_kernel_ts.hpp> 40 #include <srs_kernel_ts.hpp>
41 #include <srs_kernel_temp.hpp> 41 #include <srs_kernel_temp.hpp>
42 #include <srs_kernel_file.hpp> 42 #include <srs_kernel_file.hpp>
@@ -33,7 +33,7 @@ using namespace std; @@ -33,7 +33,7 @@ using namespace std;
33 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
34 #include <srs_app_utility.hpp> 34 #include <srs_app_utility.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 -#include <srs_kernel_stream.hpp> 36 +#include <srs_kernel_buffer.hpp>
37 #include <srs_kernel_temp.hpp> 37 #include <srs_kernel_temp.hpp>
38 #include <srs_rtmp_stack.hpp> 38 #include <srs_rtmp_stack.hpp>
39 #include <srs_rtmp_amf0.hpp> 39 #include <srs_rtmp_amf0.hpp>
@@ -37,7 +37,7 @@ using namespace std; @@ -37,7 +37,7 @@ using namespace std;
37 #include <srs_app_encoder.hpp> 37 #include <srs_app_encoder.hpp>
38 #include <srs_rtmp_stack.hpp> 38 #include <srs_rtmp_stack.hpp>
39 #include <srs_app_dvr.hpp> 39 #include <srs_app_dvr.hpp>
40 -#include <srs_kernel_stream.hpp> 40 +#include <srs_kernel_buffer.hpp>
41 #include <srs_app_edge.hpp> 41 #include <srs_app_edge.hpp>
42 #include <srs_kernel_utility.hpp> 42 #include <srs_kernel_utility.hpp>
43 #include <srs_kernel_codec.hpp> 43 #include <srs_kernel_codec.hpp>
@@ -45,7 +45,7 @@ using namespace std; @@ -45,7 +45,7 @@ using namespace std;
45 #include <srs_kernel_error.hpp> 45 #include <srs_kernel_error.hpp>
46 #include <srs_protocol_kbps.hpp> 46 #include <srs_protocol_kbps.hpp>
47 #include <srs_protocol_json.hpp> 47 #include <srs_protocol_json.hpp>
48 -#include <srs_kernel_stream.hpp> 48 +#include <srs_kernel_buffer.hpp>
49 #include <srs_rtmp_amf0.hpp> 49 #include <srs_rtmp_amf0.hpp>
50 50
51 // the longest time to wait for a process to quit. 51 // the longest time to wait for a process to quit.
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 34
35 #include <srs_kernel_log.hpp> 35 #include <srs_kernel_log.hpp>
36 #include <srs_kernel_error.hpp> 36 #include <srs_kernel_error.hpp>
37 -#include <srs_kernel_stream.hpp> 37 +#include <srs_kernel_buffer.hpp>
38 #include <srs_kernel_file.hpp> 38 #include <srs_kernel_file.hpp>
39 #include <srs_kernel_codec.hpp> 39 #include <srs_kernel_codec.hpp>
40 40
@@ -29,7 +29,7 @@ using namespace std; @@ -29,7 +29,7 @@ using namespace std;
29 29
30 #include <srs_kernel_error.hpp> 30 #include <srs_kernel_error.hpp>
31 #include <srs_kernel_log.hpp> 31 #include <srs_kernel_log.hpp>
32 -#include <srs_kernel_stream.hpp> 32 +#include <srs_kernel_buffer.hpp>
33 #include <srs_kernel_utility.hpp> 33 #include <srs_kernel_utility.hpp>
34 #include <srs_core_autofree.hpp> 34 #include <srs_core_autofree.hpp>
35 35
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 34
35 #include <srs_kernel_log.hpp> 35 #include <srs_kernel_log.hpp>
36 #include <srs_kernel_error.hpp> 36 #include <srs_kernel_error.hpp>
37 -#include <srs_kernel_stream.hpp> 37 +#include <srs_kernel_buffer.hpp>
38 #include <srs_kernel_file.hpp> 38 #include <srs_kernel_file.hpp>
39 #include <srs_kernel_codec.hpp> 39 #include <srs_kernel_codec.hpp>
40 #include <srs_kernel_utility.hpp> 40 #include <srs_kernel_utility.hpp>
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 34
35 #include <srs_kernel_log.hpp> 35 #include <srs_kernel_log.hpp>
36 #include <srs_kernel_error.hpp> 36 #include <srs_kernel_error.hpp>
37 -#include <srs_kernel_stream.hpp> 37 +#include <srs_kernel_buffer.hpp>
38 #include <srs_kernel_file.hpp> 38 #include <srs_kernel_file.hpp>
39 #include <srs_kernel_codec.hpp> 39 #include <srs_kernel_codec.hpp>
40 40
@@ -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_kernel_stream.hpp> 24 +#include <srs_kernel_buffer.hpp>
25 25
26 using namespace std; 26 using namespace std;
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_KERNEL_STREAM_HPP  
25 -#define SRS_KERNEL_STREAM_HPP 24 +#ifndef SRS_KERNEL_BUFFER_HPP
  25 +#define SRS_KERNEL_BUFFER_HPP
26 26
27 /* 27 /*
28 -#include <srs_kernel_stream.hpp> 28 +#include <srs_kernel_buffer.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -38,7 +38,7 @@ using namespace std; @@ -38,7 +38,7 @@ using namespace std;
38 #include <srs_kernel_codec.hpp> 38 #include <srs_kernel_codec.hpp>
39 #include <srs_kernel_temp.hpp> 39 #include <srs_kernel_temp.hpp>
40 #include <srs_kernel_utility.hpp> 40 #include <srs_kernel_utility.hpp>
41 -#include <srs_kernel_stream.hpp> 41 +#include <srs_kernel_buffer.hpp>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
43 43
44 // in ms, for HLS aac sync time. 44 // in ms, for HLS aac sync time.
@@ -40,7 +40,7 @@ using namespace std; @@ -40,7 +40,7 @@ using namespace std;
40 40
41 #include <srs_kernel_log.hpp> 41 #include <srs_kernel_log.hpp>
42 #include <srs_kernel_error.hpp> 42 #include <srs_kernel_error.hpp>
43 -#include <srs_kernel_stream.hpp> 43 +#include <srs_kernel_buffer.hpp>
44 #include <srs_kernel_flv.hpp> 44 #include <srs_kernel_flv.hpp>
45 45
46 // this value must: 46 // this value must:
@@ -42,7 +42,7 @@ using namespace std; @@ -42,7 +42,7 @@ using namespace std;
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
43 #include <srs_rtmp_stack.hpp> 43 #include <srs_rtmp_stack.hpp>
44 #include <srs_kernel_utility.hpp> 44 #include <srs_kernel_utility.hpp>
45 -#include <srs_kernel_stream.hpp> 45 +#include <srs_kernel_buffer.hpp>
46 #include <srs_rtmp_amf0.hpp> 46 #include <srs_rtmp_amf0.hpp>
47 #include <srs_kernel_flv.hpp> 47 #include <srs_kernel_flv.hpp>
48 #include <srs_kernel_codec.hpp> 48 #include <srs_kernel_codec.hpp>
@@ -36,7 +36,7 @@ using namespace std; @@ -36,7 +36,7 @@ using namespace std;
36 #include <srs_kernel_utility.hpp> 36 #include <srs_kernel_utility.hpp>
37 #include <srs_rtmp_stack.hpp> 37 #include <srs_rtmp_stack.hpp>
38 #include <srs_kernel_temp.hpp> 38 #include <srs_kernel_temp.hpp>
39 -#include <srs_kernel_stream.hpp> 39 +#include <srs_kernel_buffer.hpp>
40 #include <srs_kernel_ts.hpp> 40 #include <srs_kernel_ts.hpp>
41 #include <srs_app_http_client.hpp> 41 #include <srs_app_http_client.hpp>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
@@ -28,7 +28,7 @@ using namespace std; @@ -28,7 +28,7 @@ using namespace std;
28 28
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_kernel_stream.hpp> 31 +#include <srs_kernel_buffer.hpp>
32 #include <srs_kernel_utility.hpp> 32 #include <srs_kernel_utility.hpp>
33 #include <srs_core_autofree.hpp> 33 #include <srs_core_autofree.hpp>
34 #include <srs_kernel_codec.hpp> 34 #include <srs_kernel_codec.hpp>
@@ -30,7 +30,7 @@ using namespace std; @@ -30,7 +30,7 @@ using namespace std;
30 30
31 #include <srs_kernel_log.hpp> 31 #include <srs_kernel_log.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 -#include <srs_kernel_stream.hpp> 33 +#include <srs_kernel_buffer.hpp>
34 #include <srs_protocol_json.hpp> 34 #include <srs_protocol_json.hpp>
35 35
36 using namespace _srs_internal; 36 using namespace _srs_internal;
@@ -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_rtmp_io.hpp> 31 #include <srs_rtmp_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_stream.hpp> 34 +#include <srs_kernel_buffer.hpp>
35 35
36 #ifdef SRS_AUTO_SSL 36 #ifdef SRS_AUTO_SSL
37 37
@@ -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 25
26 #include <srs_rtmp_amf0.hpp> 26 #include <srs_rtmp_amf0.hpp>
27 #include <srs_rtmp_io.hpp> 27 #include <srs_rtmp_io.hpp>
28 -#include <srs_kernel_stream.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>
31 #include <srs_protocol_buffer.hpp> 31 #include <srs_protocol_buffer.hpp>
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 34
35 #include <srs_kernel_log.hpp> 35 #include <srs_kernel_log.hpp>
36 #include <srs_kernel_utility.hpp> 36 #include <srs_kernel_utility.hpp>
37 -#include <srs_kernel_stream.hpp> 37 +#include <srs_kernel_buffer.hpp>
38 #include <srs_rtmp_stack.hpp> 38 #include <srs_rtmp_stack.hpp>
39 #include <srs_kernel_codec.hpp> 39 #include <srs_kernel_codec.hpp>
40 #include <srs_kernel_consts.hpp> 40 #include <srs_kernel_consts.hpp>
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 #include <srs_kernel_consts.hpp> 34 #include <srs_kernel_consts.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 #include <srs_kernel_utility.hpp> 36 #include <srs_kernel_utility.hpp>
37 -#include <srs_kernel_stream.hpp> 37 +#include <srs_kernel_buffer.hpp>
38 #include <srs_kernel_codec.hpp> 38 #include <srs_kernel_codec.hpp>
39 39
40 #ifdef SRS_AUTO_STREAM_CASTER 40 #ifdef SRS_AUTO_STREAM_CASTER
@@ -29,7 +29,7 @@ using namespace std; @@ -29,7 +29,7 @@ using namespace std;
29 29
30 #include <srs_core_autofree.hpp> 30 #include <srs_core_autofree.hpp>
31 #include <srs_kernel_error.hpp> 31 #include <srs_kernel_error.hpp>
32 -#include <srs_kernel_stream.hpp> 32 +#include <srs_kernel_buffer.hpp>
33 33
34 /** 34 /**
35 * main scenario to use amf0. 35 * main scenario to use amf0.
@@ -29,7 +29,7 @@ using namespace std; @@ -29,7 +29,7 @@ using namespace std;
29 #include <srs_kernel_flv.hpp> 29 #include <srs_kernel_flv.hpp>
30 #include <srs_kernel_utility.hpp> 30 #include <srs_kernel_utility.hpp>
31 #include <srs_rtmp_utility.hpp> 31 #include <srs_rtmp_utility.hpp>
32 -#include <srs_kernel_stream.hpp> 32 +#include <srs_kernel_buffer.hpp>
33 33
34 #define MAX_MOCK_DATA_SIZE 1024 * 1024 34 #define MAX_MOCK_DATA_SIZE 1024 * 1024
35 35