Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-09-22 08:42:54 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ac2b03a3ed4a7e614a3adfd5b95dce7439c2b677
ac2b03a3
1 parent
faf6d158
rename srs_kernel_buffer to temp
隐藏空白字符变更
内嵌
并排对比
正在显示
14 个修改的文件
包含
22 行增加
和
22 行删除
trunk/configure
trunk/ide/srs_upp/srs_upp.upp
trunk/ide/srs_vs2010/srs.vcxproj
trunk/ide/srs_vs2010/srs.vcxproj.filters
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
trunk/scripts/sources_replace.sh
trunk/src/app/srs_app_mpegts_udp.cpp
trunk/src/app/srs_app_rtsp.cpp
trunk/src/kernel/srs_kernel_buffer.cpp
trunk/src/kernel/srs_kernel_buffer.hpp
trunk/src/kernel/srs_kernel_ts.cpp
trunk/src/main/srs_main_ingest_hls.cpp
trunk/src/protocol/srs_protocol_buffer.hpp
trunk/src/protocol/srs_rtsp_stack.cpp
trunk/configure
查看文件 @
ac2b03a
...
...
@@ -149,7 +149,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR})
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_stream"
"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_
buffer
"
)
"srs_kernel_
temp
"
)
KERNEL_INCS
=
"src/kernel"
;
MODULE_DIR
=
${
KERNEL_INCS
}
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
trunk/ide/srs_upp/srs_upp.upp
查看文件 @
ac2b03a
...
...
@@ -23,8 +23,8 @@ file
kernel readonly separator,
../../src/kernel/srs_kernel_aac.hpp,
../../src/kernel/srs_kernel_aac.cpp,
../../src/kernel/srs_kernel_buffer.hpp,
../../src/kernel/srs_kernel_buffer.cpp,
../../src/kernel/srs_kernel_temp.hpp,
../../src/kernel/srs_kernel_temp.cpp,
../../src/kernel/srs_kernel_codec.hpp,
../../src/kernel/srs_kernel_codec.cpp,
../../src/kernel/srs_kernel_consts.hpp,
...
...
trunk/ide/srs_vs2010/srs.vcxproj
查看文件 @
ac2b03a
...
...
@@ -105,7 +105,7 @@
<ClInclude Include="..\..\src\core\srs_core_performance.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_
buffer
.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_
temp
.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" />
<ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" />
...
...
@@ -187,7 +187,7 @@
<ClCompile Include="..\..\src\core\srs_core_performance.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_
buffer
.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_
temp
.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" />
<ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" />
...
...
trunk/ide/srs_vs2010/srs.vcxproj.filters
查看文件 @
ac2b03a
...
...
@@ -199,7 +199,7 @@
<ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kernel\srs_kernel_
buffer
.cpp">
<ClCompile Include="..\..\src\kernel\srs_kernel_
temp
.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp">
...
...
@@ -393,7 +393,7 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kernel\srs_kernel_
buffer
.hpp">
<ClInclude Include="..\..\src\kernel\srs_kernel_
temp
.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">
...
...
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
查看文件 @
ac2b03a
...
...
@@ -18,7 +18,7 @@
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 */; };
3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; };
3C1232211AAE814D00CE8F6C /* srs_kernel_
buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer
.cpp */; };
3C1232211AAE814D00CE8F6C /* srs_kernel_
temp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp
.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 */; };
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>"; };
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>"; };
3C12320A1AAE814D00CE8F6C /* 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>"; };
3C12320B1AAE814D00CE8F6C /* 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>"; };
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>"; };
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>"; };
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>"; };
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 = (
3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */,
3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */,
3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */,
3C12320B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */,
3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */,
3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */,
3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */,
3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */,
3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */,
...
...
@@ -967,7 +967,7 @@
3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
3C1232211AAE814D00CE8F6C /* srs_kernel_
buffer
.cpp in Sources */,
3C1232211AAE814D00CE8F6C /* srs_kernel_
temp
.cpp in Sources */,
3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */,
...
...
trunk/scripts/sources_replace.sh
查看文件 @
ac2b03a
...
...
@@ -21,6 +21,6 @@ for file in $files; do
grep -in
"
$from
"
$file
>/dev/null 2>&1;
if
[[
0 -eq
$?
]]
;
then
echo
"replace
$file
"
;
#
sed -i '' "s|$from|$to|g" $file;
sed -i
''
"s|
$from
|
$to
|g"
$file
;
fi
;
done
...
...
trunk/src/app/srs_app_mpegts_udp.cpp
查看文件 @
ac2b03a
...
...
@@ -38,7 +38,7 @@ using namespace std;
#include <srs_kernel_ts.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_ts.hpp>
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#include <srs_kernel_file.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
...
...
trunk/src/app/srs_app_rtsp.cpp
查看文件 @
ac2b03a
...
...
@@ -34,7 +34,7 @@ using namespace std;
#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>
#include <srs_rtmp_utility.hpp>
...
...
trunk/src/kernel/srs_kernel_buffer.cpp
查看文件 @
ac2b03a
...
...
@@ -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_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
...
...
trunk/src/kernel/srs_kernel_buffer.hpp
查看文件 @
ac2b03a
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_KERNEL_BUFFER_HPP
/*
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/kernel/srs_kernel_ts.cpp
查看文件 @
ac2b03a
...
...
@@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_file.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/main/srs_main_ingest_hls.cpp
查看文件 @
ac2b03a
...
...
@@ -35,7 +35,7 @@ using namespace std;
#include <srs_app_log.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_ts.hpp>
#include <srs_app_http_client.hpp>
...
...
trunk/src/protocol/srs_protocol_buffer.hpp
查看文件 @
ac2b03a
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_rtmp_io.hpp>
#include <srs_core_performance.hpp>
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#ifdef SRS_PERF_MERGED_READ
/**
...
...
trunk/src/protocol/srs_rtsp_stack.cpp
查看文件 @
ac2b03a
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_rtmp_io.hpp>
#include <srs_kernel_
buffer
.hpp>
#include <srs_kernel_
temp
.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_consts.hpp>
...
...
请
注册
或
登录
后发表评论