rename kernel stream to buffer

@@ -146,7 +146,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="KERNEL" 
 MODULE_DEPENDS=("CORE") 
 ModuleLibIncs=(${SRS_OBJS_DIR})
-MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
+MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_buffer"
         "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" 
         "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
         "srs_kernel_temp")

@@ -41,8 +41,8 @@ file
     ../../src/kernel/srs_kernel_mp3.cpp,
     ../../src/kernel/srs_rtsp_stack.hpp,
     ../../src/kernel/srs_rtsp_stack.cpp,
-    ../../src/kernel/srs_kernel_stream.hpp,
-    ../../src/kernel/srs_kernel_stream.cpp,
+    ../../src/kernel/srs_kernel_buffer.hpp,
+    ../../src/kernel/srs_kernel_buffer.cpp,
     ../../src/kernel/srs_kernel_ts.cpp,
     ../../src/kernel/srs_kernel_ts.hpp,
     ../../src/kernel/srs_kernel_utility.hpp,

@@ -113,7 +113,7 @@
     <ClInclude Include="..\..\src\kernel\srs_kernel_flv.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_log.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp" />
-    <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp" />
+    <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_ts.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp" />
     <ClInclude Include="..\..\src\libs\srs_librtmp.hpp" />
@@ -195,7 +195,7 @@
     <ClCompile Include="..\..\src\kernel\srs_kernel_flv.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_log.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp" />
-    <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp" />
+    <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_ts.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp" />
     <ClCompile Include="..\..\src\libs\srs_librtmp.cpp" />

@@ -157,7 +157,7 @@
     <ClCompile Include="..\..\src\kernel\srs_kernel_mp3.cpp">
       <Filter>srs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp">
+    <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp">
       <Filter>srs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\kernel\srs_kernel_utility.cpp">
@@ -372,7 +372,7 @@
     <ClInclude Include="..\..\src\kernel\srs_kernel_mp3.hpp">
       <Filter>srs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp">
+    <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
       <Filter>srs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp">

@@ -26,7 +26,7 @@
 		3C1232261AAE814D00CE8F6C /* srs_kernel_flv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232141AAE814D00CE8F6C /* srs_kernel_flv.cpp */; };
 		3C1232271AAE814D00CE8F6C /* srs_kernel_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232161AAE814D00CE8F6C /* srs_kernel_log.cpp */; };
 		3C1232281AAE814D00CE8F6C /* srs_kernel_mp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */; };
-		3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */; };
+		3C1232291AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */; };
 		3C12322A1AAE814D00CE8F6C /* srs_kernel_ts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */; };
 		3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */; };
 		3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; };
@@ -165,8 +165,8 @@
 		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>"; };
 		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>"; };
 		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>"; };
-		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>"; };
-		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>"; };
+		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>"; };
+		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>"; };
 		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>"; };
 		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>"; };
 		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 @@
 				3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */,
 				3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */,
 				3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */,
-				3C12321A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */,
-				3C12321B1AAE814D00CE8F6C /* srs_kernel_stream.hpp */,
+				3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */,
+				3C12321B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */,
 				3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */,
 				3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */,
 				3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */,
@@ -957,7 +957,7 @@
 				3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */,
 				3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */,
 				3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */,
-				3C1232291AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */,
+				3C1232291AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
 				3C663F181AB0155100286D8B /* srs_play.c in Sources */,
 				3C689F971AB6AAAC00C9CEEE /* io.c in Sources */,
 				3C1232B61AAE81D900CE8F6C /* srs_app_thread.cpp in Sources */,

@@ -13,10 +13,15 @@ if [[ $to == '' ]]; then
     exit 1
 fi
 
+if [[ ! -d src || ! -d ide ]]; then
+    echo "please execute the script under trunk"
+    exit 1
+fi
+
 echo "from=$from"
 echo "to=$to"
 
-files="configure `ls auto` `ls conf` `ls scripts` `find etc -type f` `find ide -type f` `find research -type f` `find src -type f`"
+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`"
 for file in $files; do 
     grep -in "$from" $file >/dev/null 2>&1; 
     if [[ 0 -eq $? ]]; then 

@@ -39,7 +39,7 @@ using namespace std;
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_rtmp_amf0.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_protocol_json.hpp>
 #include <srs_app_utility.hpp>
 

@@ -37,7 +37,7 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_config.hpp>

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
 #include <srs_kernel_ts.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_ts.hpp>
 #include <srs_kernel_temp.hpp>
 #include <srs_kernel_file.hpp>

@@ -33,7 +33,7 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_temp.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_amf0.hpp>

@@ -37,7 +37,7 @@ using namespace std;
 #include <srs_app_encoder.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_dvr.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_codec.hpp>

@@ -45,7 +45,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_protocol_json.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_rtmp_amf0.hpp>
 
 // the longest time to wait for a process to quit.

@@ -34,7 +34,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_codec.hpp>
 

@@ -29,7 +29,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_core_autofree.hpp>
 

@@ -34,7 +34,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_utility.hpp>

@@ -34,7 +34,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_codec.hpp>
 

@@ -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_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 
 using namespace std;
 

@@ -21,11 +21,11 @@ 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.
 */
 
-#ifndef SRS_KERNEL_STREAM_HPP
-#define SRS_KERNEL_STREAM_HPP
+#ifndef SRS_KERNEL_BUFFER_HPP
+#define SRS_KERNEL_BUFFER_HPP
 
 /*
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 */
 
 #include <srs_core.hpp>

@@ -38,7 +38,7 @@ using namespace std;
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_temp.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 
 // in ms, for HLS aac sync time.

@@ -40,7 +40,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_flv.hpp>
 
 // this value must:

@@ -42,7 +42,7 @@ using namespace std;
 #include <srs_core_autofree.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_codec.hpp>

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_kernel_temp.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_ts.hpp>
 #include <srs_app_http_client.hpp>
 #include <srs_core_autofree.hpp>

@@ -28,7 +28,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_codec.hpp>

@@ -30,7 +30,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_protocol_json.hpp>
 
 using namespace _srs_internal;

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_rtmp_io.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 
 #ifdef SRS_AUTO_SSL
 

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_rtmp_amf0.hpp>
 #include <srs_rtmp_io.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_buffer.hpp>

@@ -34,7 +34,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_consts.hpp>

@@ -34,7 +34,7 @@ using namespace std;
 #include <srs_kernel_consts.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 #include <srs_kernel_codec.hpp>
 
 #ifdef SRS_AUTO_STREAM_CASTER

@@ -29,7 +29,7 @@ using namespace std;
 
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_stream.hpp>
+#include <srs_kernel_buffer.hpp>
 
 /**
 * main scenario to use amf0.

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