external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 11:21:52 +00:00
Code Issues Releases Wiki Activity

rename rtmp utility to protocol utility

Browse source
This commit is contained in:
winlin 2015-09-22 09:11:07 +08:00
parent 82ff05c1d4
commit df6ac8842c
26 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/configure vendored
View file

@ -158,7 +158,7 @@ MODULE_ID="PROTOCOL"
MODULE_DEPENDS=("CORE" "KERNEL") MODULE_DEPENDS=("CORE" "KERNEL")
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack" MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream" "srs_rtmp_handshake" "srs_protocol_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
"srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json" "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
"srs_kafka_stack") "srs_kafka_stack")
PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh

4
trunk/ide/srs_upp/srs_upp.upp
View file

@ -70,8 +70,8 @@ file
../../src/protocol/srs_rtmp_msg_array.cpp, ../../src/protocol/srs_rtmp_msg_array.cpp,
../../src/protocol/srs_rtmp_stack.hpp, ../../src/protocol/srs_rtmp_stack.hpp,
../../src/protocol/srs_rtmp_stack.cpp, ../../src/protocol/srs_rtmp_stack.cpp,
../../src/protocol/srs_rtmp_utility.hpp, ../../src/protocol/srs_protocol_utility.hpp,
../../src/protocol/srs_rtmp_utility.cpp, ../../src/protocol/srs_protocol_utility.cpp,
app readonly separator, app readonly separator,
../../src/app/srs_app_async_call.hpp, ../../src/app/srs_app_async_call.hpp,
../../src/app/srs_app_async_call.cpp, ../../src/app/srs_app_async_call.cpp,

4
trunk/ide/srs_vs2010/srs.vcxproj
View file

@ -127,7 +127,7 @@
<ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp" /> <ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" /> <ClInclude Include="..\..\src\protocol\srs_protocol_utility.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtsp_stack.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtsp_stack.hpp" />
<ClInclude Include="..\..\src\protocol\srs_protocol_kbps.hpp" /> <ClInclude Include="..\..\src\protocol\srs_protocol_kbps.hpp" />
</ItemGroup> </ItemGroup>
@ -210,7 +210,7 @@
<ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp" /> <ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" /> <ClCompile Include="..\..\src\protocol\srs_protocol_utility.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtsp_stack.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtsp_stack.cpp" />
<ClCompile Include="..\..\src\protocol\srs_protocol_kbps.cpp" /> <ClCompile Include="..\..\src\protocol\srs_protocol_kbps.cpp" />
</ItemGroup> </ItemGroup>

4
trunk/ide/srs_vs2010/srs.vcxproj.filters
View file

@ -220,7 +220,7 @@
<ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp"> <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp"> <ClCompile Include="..\..\src\protocol\srs_protocol_utility.cpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\app\srs_app_mpegts_udp.cpp"> <ClCompile Include="..\..\src\app\srs_app_mpegts_udp.cpp">
@ -414,7 +414,7 @@
<ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp"> <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp"> <ClInclude Include="..\..\src\protocol\srs_protocol_utility.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\app\srs_app_mpegts_udp.hpp"> <ClInclude Include="..\..\src\app\srs_app_mpegts_udp.hpp">

12
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
View file

@ -35,7 +35,7 @@
3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */; }; 3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */; };
3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; }; 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; }; 3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; };
3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */; }; 3C1232491AAE81A400CE8F6C /* srs_protocol_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_protocol_utility.cpp */; };
3C12324A1AAE81A400CE8F6C /* srs_rtsp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */; }; 3C12324A1AAE81A400CE8F6C /* srs_rtsp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */; };
3C1232941AAE81D900CE8F6C /* srs_app_bandwidth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12324C1AAE81D900CE8F6C /* srs_app_bandwidth.cpp */; }; 3C1232941AAE81D900CE8F6C /* srs_app_bandwidth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12324C1AAE81D900CE8F6C /* srs_app_bandwidth.cpp */; };
3C1232951AAE81D900CE8F6C /* srs_app_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12324E1AAE81D900CE8F6C /* srs_app_config.cpp */; }; 3C1232951AAE81D900CE8F6C /* srs_app_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12324E1AAE81D900CE8F6C /* srs_app_config.cpp */; };
@ -183,8 +183,8 @@
3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; }; 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; };
3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; }; 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; };
3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_stack.hpp; path = ../../../src/protocol/srs_rtmp_stack.hpp; sourceTree = "<group>"; }; 3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_stack.hpp; path = ../../../src/protocol/srs_rtmp_stack.hpp; sourceTree = "<group>"; };
3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_utility.cpp; path = ../../../src/protocol/srs_rtmp_utility.cpp; sourceTree = "<group>"; }; 3C12323D1AAE81A400CE8F6C /* srs_protocol_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_utility.cpp; path = ../../../src/protocol/srs_protocol_utility.cpp; sourceTree = "<group>"; };
3C12323E1AAE81A400CE8F6C /* srs_rtmp_utility.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_utility.hpp; path = ../../../src/protocol/srs_rtmp_utility.hpp; sourceTree = "<group>"; }; 3C12323E1AAE81A400CE8F6C /* srs_protocol_utility.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_utility.hpp; path = ../../../src/protocol/srs_protocol_utility.hpp; sourceTree = "<group>"; };
3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtsp_stack.cpp; path = ../../../src/protocol/srs_rtsp_stack.cpp; sourceTree = "<group>"; }; 3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtsp_stack.cpp; path = ../../../src/protocol/srs_rtsp_stack.cpp; sourceTree = "<group>"; };
3C1232401AAE81A400CE8F6C /* srs_rtsp_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtsp_stack.hpp; path = ../../../src/protocol/srs_rtsp_stack.hpp; sourceTree = "<group>"; }; 3C1232401AAE81A400CE8F6C /* srs_rtsp_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtsp_stack.hpp; path = ../../../src/protocol/srs_rtsp_stack.hpp; sourceTree = "<group>"; };
3C12324C1AAE81D900CE8F6C /* srs_app_bandwidth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_bandwidth.cpp; path = ../../../src/app/srs_app_bandwidth.cpp; sourceTree = "<group>"; }; 3C12324C1AAE81D900CE8F6C /* srs_app_bandwidth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_bandwidth.cpp; path = ../../../src/app/srs_app_bandwidth.cpp; sourceTree = "<group>"; };
@ -522,6 +522,8 @@
3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */, 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */,
3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */, 3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */,
3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */, 3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */,
3C12323D1AAE81A400CE8F6C /* srs_protocol_utility.cpp */,
3C12323E1AAE81A400CE8F6C /* srs_protocol_utility.hpp */,
3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */, 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */, 3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */,
3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */, 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */,
@ -530,8 +532,6 @@
3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */, 3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */,
3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */, 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */,
3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */, 3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */,
3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */,
3C12323E1AAE81A400CE8F6C /* srs_rtmp_utility.hpp */,
3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */, 3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */,
3C1232401AAE81A400CE8F6C /* srs_rtsp_stack.hpp */, 3C1232401AAE81A400CE8F6C /* srs_rtsp_stack.hpp */,
); );
@ -920,7 +920,7 @@
3C1EE6D71AB1367D00576EE9 /* README.md in Sources */, 3C1EE6D71AB1367D00576EE9 /* README.md in Sources */,
3C82802C1BAFF8CC004A1794 /* srs_kafka_stack.cpp in Sources */, 3C82802C1BAFF8CC004A1794 /* srs_kafka_stack.cpp in Sources */,
3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */, 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */,
3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */, 3C1232491AAE81A400CE8F6C /* srs_protocol_utility.cpp in Sources */,
3C663F191AB0155100286D8B /* srs_publish.c in Sources */, 3C663F191AB0155100286D8B /* srs_publish.c in Sources */,
3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */, 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */,
3C1232A01AAE81D900CE8F6C /* srs_app_http_client.cpp in Sources */, 3C1232A01AAE81D900CE8F6C /* srs_app_http_client.cpp in Sources */,

2
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -37,7 +37,7 @@ using namespace std;
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_flv.hpp> #include <srs_kernel_flv.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>

2
trunk/src/app/srs_app_config.cpp
View file

@ -40,7 +40,7 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>

2
trunk/src/app/srs_app_edge.cpp
View file

@ -34,7 +34,7 @@ using namespace std;
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_protocol_io.hpp> #include <srs_protocol_io.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>

2
trunk/src/app/srs_app_forward.cpp
View file

@ -37,7 +37,7 @@ using namespace std;
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_protocol_kbps.hpp> #include <srs_protocol_kbps.hpp>
#include <srs_rtmp_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>

2
trunk/src/app/srs_app_http_conn.cpp
View file

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_protocol_stream.hpp> #include <srs_protocol_stream.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>

2
trunk/src/app/srs_app_http_static.cpp
View file

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_protocol_stream.hpp> #include <srs_protocol_stream.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>

2
trunk/src/app/srs_app_http_stream.cpp
View file

@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_protocol_stream.hpp> #include <srs_protocol_stream.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>

2
trunk/src/app/srs_app_mpegts_udp.cpp
View file

@ -44,7 +44,7 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_raw_avc.hpp> #include <srs_raw_avc.hpp>

2
trunk/src/app/srs_app_ng_exec.cpp
View file

@ -34,7 +34,7 @@ using namespace std;
#include <srs_app_process.hpp> #include <srs_app_process.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_consts.hpp> #include <srs_kernel_consts.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
// when error, ng-exec sleep for a while and retry. // when error, ng-exec sleep for a while and retry.
#define SRS_RTMP_EXEC_SLEEP_US (int64_t)(3*1000*1000LL) #define SRS_RTMP_EXEC_SLEEP_US (int64_t)(3*1000*1000LL)

2
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -53,7 +53,7 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_security.hpp> #include <srs_app_security.hpp>
#include <srs_app_statistic.hpp> #include <srs_app_statistic.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_protocol_json.hpp> #include <srs_protocol_json.hpp>
// when stream is busy, for example, streaming is already // when stream is busy, for example, streaming is already

2
trunk/src/app/srs_app_rtsp.cpp
View file

@ -37,7 +37,7 @@ using namespace std;
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_raw_avc.hpp> #include <srs_raw_avc.hpp>
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>

2
trunk/src/app/srs_app_source.cpp
View file

@ -45,7 +45,7 @@ using namespace std;
#include <srs_app_hds.hpp> #include <srs_app_hds.hpp>
#include <srs_app_statistic.hpp> #include <srs_app_statistic.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_app_ng_exec.hpp> #include <srs_app_ng_exec.hpp>
#define CONST_MAX_JITTER_MS 250 #define CONST_MAX_JITTER_MS 250

2
trunk/src/libs/srs_librtmp.cpp
View file

@ -38,7 +38,7 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_lib_simple_socket.hpp> #include <srs_lib_simple_socket.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

2
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -41,7 +41,7 @@ using namespace std;
#include <srs_app_http_client.hpp> #include <srs_app_http_client.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>

2
trunk/src/protocol/srs_rtmp_utility.cpp → trunk/src/protocol/srs_protocol_utility.cpp
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_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32 #ifndef _WIN32

6
trunk/src/protocol/srs_rtmp_utility.hpp → trunk/src/protocol/srs_protocol_utility.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_RTMP_PROTOCOL_CONSTS_HPP #ifndef SRS_PROTOCOL_UTILITY_HPP
#define SRS_RTMP_PROTOCOL_CONSTS_HPP #define SRS_PROTOCOL_UTILITY_HPP
/* /*
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

2
trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_protocol_io.hpp> #include <srs_protocol_io.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_kernel_buffer.hpp>

2
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_protocol_stream.hpp> #include <srs_protocol_stream.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_rtmp_handshake.hpp> #include <srs_rtmp_handshake.hpp>
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213

2
trunk/src/utest/srs_utest_kernel.cpp
View file

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

2
trunk/src/utest/srs_utest_protocol.cpp
View file

@ -26,7 +26,7 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_rtmp_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

2
trunk/src/utest/srs_utest_protocol.hpp
View file

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_utest.hpp> #include <srs_utest.hpp>
#include <string> #include <string>
#include <srs_rtmp_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_rtmp_handshake.hpp> #include <srs_rtmp_handshake.hpp>