1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00

rename temp to stream

This commit is contained in:
winlin 2015-09-22 08:52:00 +08:00
parent f33d736442
commit ca3577e11b
13 changed files with 25 additions and 25 deletions

2
trunk/configure vendored
View file

@ -149,7 +149,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR})
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_buffer" 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_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file"
"srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts" "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
"srs_kernel_temp") "srs_kernel_stream")
KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
KERNEL_OBJS="${MODULE_OBJS[@]}" KERNEL_OBJS="${MODULE_OBJS[@]}"
# #

View file

@ -23,8 +23,8 @@ file
kernel readonly separator, kernel readonly separator,
../../src/kernel/srs_kernel_aac.hpp, ../../src/kernel/srs_kernel_aac.hpp,
../../src/kernel/srs_kernel_aac.cpp, ../../src/kernel/srs_kernel_aac.cpp,
../../src/kernel/srs_kernel_temp.hpp, ../../src/kernel/srs_kernel_stream.hpp,
../../src/kernel/srs_kernel_temp.cpp, ../../src/kernel/srs_kernel_stream.cpp,
../../src/kernel/srs_kernel_codec.hpp, ../../src/kernel/srs_kernel_codec.hpp,
../../src/kernel/srs_kernel_codec.cpp, ../../src/kernel/srs_kernel_codec.cpp,
../../src/kernel/srs_kernel_consts.hpp, ../../src/kernel/srs_kernel_consts.hpp,

View file

@ -105,7 +105,7 @@
<ClInclude Include="..\..\src\core\srs_core_performance.hpp" /> <ClInclude Include="..\..\src\core\srs_core_performance.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" /> <ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" />
@ -187,7 +187,7 @@
<ClCompile Include="..\..\src\core\srs_core_performance.cpp" /> <ClCompile Include="..\..\src\core\srs_core_performance.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" /> <ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" />

View file

@ -199,7 +199,7 @@
<ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp"> <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp"> <ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp"> <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp">
@ -393,7 +393,7 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp"> <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp"> <ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp"> <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">

View file

@ -18,7 +18,7 @@
3C1231F81AAE652D00CE8F6C /* srs_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F41AAE652D00CE8F6C /* srs_core.cpp */; }; 3C1231F81AAE652D00CE8F6C /* srs_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F41AAE652D00CE8F6C /* srs_core.cpp */; };
3C1232061AAE812C00CE8F6C /* srs_main_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */; }; 3C1232061AAE812C00CE8F6C /* srs_main_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */; };
3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; }; 3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; };
3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */; }; 3C1232211AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */; };
3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */; }; 3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */; };
3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */; }; 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */; };
3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232101AAE814D00CE8F6C /* srs_kernel_error.cpp */; }; 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232101AAE814D00CE8F6C /* srs_kernel_error.cpp */; };
@ -149,8 +149,8 @@
3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_main_server.cpp; path = ../../../src/main/srs_main_server.cpp; sourceTree = "<group>"; }; 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_main_server.cpp; path = ../../../src/main/srs_main_server.cpp; sourceTree = "<group>"; };
3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_aac.cpp; path = ../../../src/kernel/srs_kernel_aac.cpp; sourceTree = "<group>"; }; 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_aac.cpp; path = ../../../src/kernel/srs_kernel_aac.cpp; sourceTree = "<group>"; };
3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_aac.hpp; path = ../../../src/kernel/srs_kernel_aac.hpp; sourceTree = "<group>"; }; 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_aac.hpp; path = ../../../src/kernel/srs_kernel_aac.hpp; sourceTree = "<group>"; };
3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_temp.cpp; path = ../../../src/kernel/srs_kernel_temp.cpp; sourceTree = "<group>"; }; 3C12320A1AAE814D00CE8F6C /* 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>"; };
3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_temp.hpp; path = ../../../src/kernel/srs_kernel_temp.hpp; sourceTree = "<group>"; }; 3C12320B1AAE814D00CE8F6C /* 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>"; };
3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_codec.cpp; path = ../../../src/kernel/srs_kernel_codec.cpp; sourceTree = "<group>"; }; 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_codec.cpp; path = ../../../src/kernel/srs_kernel_codec.cpp; sourceTree = "<group>"; };
3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_codec.hpp; path = ../../../src/kernel/srs_kernel_codec.hpp; sourceTree = "<group>"; }; 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_codec.hpp; path = ../../../src/kernel/srs_kernel_codec.hpp; sourceTree = "<group>"; };
3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_consts.cpp; path = ../../../src/kernel/srs_kernel_consts.cpp; sourceTree = "<group>"; }; 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_consts.cpp; path = ../../../src/kernel/srs_kernel_consts.cpp; sourceTree = "<group>"; };
@ -479,8 +479,8 @@
children = ( children = (
3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */, 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */,
3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */, 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */,
3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */, 3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */,
3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */, 3C12321B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */,
3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */, 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */,
3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */, 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */,
3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */, 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */,
@ -495,8 +495,8 @@
3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */, 3C1232171AAE814D00CE8F6C /* srs_kernel_log.hpp */,
3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */, 3C1232181AAE814D00CE8F6C /* srs_kernel_mp3.cpp */,
3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */, 3C1232191AAE814D00CE8F6C /* srs_kernel_mp3.hpp */,
3C12321A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */, 3C12320A1AAE814D00CE8F6C /* srs_kernel_stream.cpp */,
3C12321B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */, 3C12320B1AAE814D00CE8F6C /* srs_kernel_stream.hpp */,
3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */, 3C12321C1AAE814D00CE8F6C /* srs_kernel_ts.cpp */,
3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */, 3C12321D1AAE814D00CE8F6C /* srs_kernel_ts.hpp */,
3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */, 3C12321E1AAE814D00CE8F6C /* srs_kernel_utility.cpp */,
@ -967,7 +967,7 @@
3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */, 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */, 3C1232211AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */,
3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */, 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */, 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */, 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */,

View file

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

View file

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

View file

@ -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. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <srs_kernel_temp.hpp> #include <srs_kernel_stream.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>

View file

@ -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. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SRS_KERNEL_TEMP_HPP #ifndef SRS_KERNEL_STREAM_HPP
#define SRS_KERNEL_TEMP_HPP #define SRS_KERNEL_STREAM_HPP
/* /*
#include <srs_kernel_temp.hpp> #include <srs_kernel_stream.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

View file

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

View file

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

View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_rtmp_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
#include <srs_kernel_temp.hpp> #include <srs_kernel_stream.hpp>
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
/** /**

View file

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_rtmp_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_kernel_temp.hpp> #include <srs_kernel_stream.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_consts.hpp> #include <srs_kernel_consts.hpp>