github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename rtmp amf0 to protocol amf0.

Browse Source
pull/556/head
winlin 10 years ago
parent 1310c0f577
commit 168625dce2
31 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
trunk/configure vendored
Unescape Escape View File

@ -157,7 +157,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="PROTOCOL"
MODULE_DEPENDS=("CORE" "KERNEL")
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack"
MODULE_FILES=("srs_protocol_amf0" "srs_rtmp_io" "srs_rtmp_stack"
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
"srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
"srs_kafka_stack")

4
trunk/ide/srs_upp/srs_upp.upp
Unescape Escape View File

@ -56,8 +56,8 @@ file
../../src/protocol/srs_protocol_kbps.cpp,
../../src/protocol/srs_raw_avc.hpp,
../../src/protocol/srs_raw_avc.cpp,
../../src/protocol/srs_rtmp_amf0.hpp,
../../src/protocol/srs_rtmp_amf0.cpp,
../../src/protocol/srs_protocol_amf0.hpp,
../../src/protocol/srs_protocol_amf0.cpp,
../../src/protocol/srs_protocol_stream.hpp,
../../src/protocol/srs_protocol_stream.cpp,
../../src/protocol/srs_protocol_json.hpp,

4
trunk/ide/srs_vs2010/srs.vcxproj
Unescape Escape View File

@ -121,7 +121,7 @@
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp" />
<ClInclude Include="..\..\src\protocol\srs_http_stack.hpp" />
<ClInclude Include="..\..\src\protocol\srs_raw_avc.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" />
<ClInclude Include="..\..\src\protocol\srs_protocol_amf0.hpp" />
<ClInclude Include="..\..\src\protocol\srs_protocol_stream.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
@ -204,7 +204,7 @@
<ClCompile Include="..\..\src\main\srs_main_server.cpp" />
<ClCompile Include="..\..\src\protocol\srs_http_stack.cpp" />
<ClCompile Include="..\..\src\protocol\srs_raw_avc.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" />
<ClCompile Include="..\..\src\protocol\srs_protocol_amf0.cpp" />
<ClCompile Include="..\..\src\protocol\srs_protocol_stream.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />

4
trunk/ide/srs_vs2010/srs.vcxproj.filters
Unescape Escape View File

@ -202,7 +202,7 @@
<ClCompile Include="..\..\src\kernel\srs_kernel_stream.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp">
<ClCompile Include="..\..\src\protocol\srs_protocol_amf0.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp">
@ -396,7 +396,7 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_stream.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">
<ClInclude Include="..\..\src\protocol\srs_protocol_amf0.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp">

16
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
Unescape Escape View File

@ -30,7 +30,7 @@
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 */; };
3C1232421AAE81A400CE8F6C /* srs_rtmp_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */; };
3C1232421AAE81A400CE8F6C /* srs_protocol_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */; };
3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; };
3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; };
3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
@ -173,8 +173,8 @@
3C12321F1AAE814D00CE8F6C /* srs_kernel_utility.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_utility.hpp; path = ../../../src/kernel/srs_kernel_utility.hpp; sourceTree = "<group>"; };
3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_raw_avc.cpp; path = ../../../src/protocol/srs_raw_avc.cpp; sourceTree = "<group>"; };
3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_raw_avc.hpp; path = ../../../src/protocol/srs_raw_avc.hpp; sourceTree = "<group>"; };
3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_amf0.cpp; path = ../../../src/protocol/srs_rtmp_amf0.cpp; sourceTree = "<group>"; };
3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_amf0.hpp; path = ../../../src/protocol/srs_rtmp_amf0.hpp; sourceTree = "<group>"; };
3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_amf0.cpp; path = ../../../src/protocol/srs_protocol_amf0.cpp; sourceTree = "<group>"; };
3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_amf0.hpp; path = ../../../src/protocol/srs_protocol_amf0.hpp; sourceTree = "<group>"; };
3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_handshake.cpp; path = ../../../src/protocol/srs_rtmp_handshake.cpp; sourceTree = "<group>"; };
3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_handshake.hpp; path = ../../../src/protocol/srs_rtmp_handshake.hpp; sourceTree = "<group>"; };
3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_io.cpp; path = ../../../src/protocol/srs_rtmp_io.cpp; sourceTree = "<group>"; };
@ -512,16 +512,16 @@
3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */,
3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */,
3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */,
3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */,
3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */,
3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */,
3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */,
3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */,
3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */,
3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */,
3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */,
3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */,
3C12322F1AAE81A400CE8F6C /* srs_rtmp_amf0.cpp */,
3C1232301AAE81A400CE8F6C /* srs_rtmp_amf0.hpp */,
3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */,
3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */,
3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */,
3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */,
3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */,
@ -926,7 +926,7 @@
3C1232A01AAE81D900CE8F6C /* srs_app_http_client.cpp in Sources */,
3C689F981AB6AAAC00C9CEEE /* key.c in Sources */,
3C12329B1AAE81D900CE8F6C /* srs_app_ffmpeg.cpp in Sources */,
3C1232421AAE81A400CE8F6C /* srs_rtmp_amf0.cpp in Sources */,
3C1232421AAE81A400CE8F6C /* srs_protocol_amf0.cpp in Sources */,
3C4AB9331B8C9148006627D3 /* srs_app_ng_exec.cpp in Sources */,
3C1232AA1AAE81D900CE8F6C /* srs_app_pithy_print.cpp in Sources */,
3C12329C1AAE81D900CE8F6C /* srs_app_forward.cpp in Sources */,

2
trunk/src/app/srs_app_bandwidth.cpp
Unescape Escape View File

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std;
#include <srs_rtmp_stack.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_app_config.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>

2
trunk/src/app/srs_app_caster_flv.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ using namespace std;
#include <srs_rtmp_utility.hpp>
#include <srs_app_st.hpp>
#include <srs_app_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_utility.hpp>
#define SRS_HTTP_FLV_STREAM_BUFFER 4096

2
trunk/src/app/srs_app_config.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ using namespace std;
#include <srs_kernel_file.hpp>
#include <srs_app_utility.hpp>
#include <srs_core_performance.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_app_statistic.hpp>
#include <srs_protocol_json.hpp>
#include <srs_app_http_hooks.hpp>

2
trunk/src/app/srs_app_dvr.cpp
Unescape Escape View File

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

2
trunk/src/app/srs_app_edge.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ using namespace std;
#include <srs_protocol_kbps.hpp>
#include <srs_rtmp_msg_array.hpp>
#include <srs_app_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_utility.hpp>
// when error, edge ingester sleep for a while and retry.

2
trunk/src/app/srs_app_forward.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ using namespace std;
#include <srs_protocol_kbps.hpp>
#include <srs_rtmp_msg_array.hpp>
#include <srs_app_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_core_autofree.hpp>

2
trunk/src/app/srs_app_heartbeat.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ using namespace std;
#include <srs_app_utility.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
SrsHttpHeartbeat::SrsHttpHeartbeat()
{

2
trunk/src/app/srs_app_hls.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_app_config.hpp>
#include <srs_app_source.hpp>

2
trunk/src/app/srs_app_http_api.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ using namespace std;
#include <srs_app_http_conn.hpp>
#include <srs_kernel_consts.hpp>
#include <srs_app_server.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data)
{

2
trunk/src/app/srs_app_http_conn.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ using namespace std;
#include <srs_app_http_api.hpp>
#include <srs_protocol_json.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#endif

2
trunk/src/app/srs_app_http_hooks.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ using namespace std;
#include <srs_app_config.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#define SRS_HTTP_RESPONSE_OK SRS_XSTR(ERROR_SUCCESS)

2
trunk/src/app/srs_app_mpegts_udp.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ using namespace std;
#include <srs_app_st.hpp>
#include <srs_rtmp_utility.hpp>
#include <srs_app_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_raw_avc.hpp>
#include <srs_app_pithy_print.hpp>

2
trunk/src/app/srs_app_rtmp_conn.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ using namespace std;
#include <srs_app_edge.hpp>
#include <srs_app_utility.hpp>
#include <srs_rtmp_msg_array.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_app_recv_thread.hpp>
#include <srs_core_performance.hpp>
#include <srs_kernel_utility.hpp>

2
trunk/src/app/srs_app_rtsp.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_buffer.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_rtmp_utility.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_raw_avc.hpp>

2
trunk/src/app/srs_app_source.cpp
Unescape Escape View File

@ -29,7 +29,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_app_hls.hpp>
#include <srs_app_forward.hpp>

2
trunk/src/app/srs_app_statistic.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ using namespace std;
#include <srs_app_conn.hpp>
#include <srs_app_config.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
int64_t srs_gvid = getpid();

2
trunk/src/app/srs_app_utility.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ using namespace std;
#include <srs_protocol_kbps.hpp>
#include <srs_protocol_json.hpp>
#include <srs_kernel_buffer.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
// the longest time to wait for a process to quit.
#define SRS_PROCESS_QUIT_TIMEOUT_MS 1000

2
trunk/src/libs/srs_lib_bandwidth.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ using namespace std;
#include <srs_rtmp_stack.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
/**
* recv bandwidth helper.

2
trunk/src/libs/srs_librtmp.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ using namespace std;
#include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_buffer.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_flv.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_kernel_file.hpp>

2
trunk/src/main/srs_main_ingest_hls.cpp
Unescape Escape View File

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

2
trunk/src/protocol/srs_rtmp_amf0.cpp → trunk/src/protocol/srs_protocol_amf0.cpp
Unescape Escape 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.
*/
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <utility>
#include <vector>

6
trunk/src/protocol/srs_rtmp_amf0.hpp → trunk/src/protocol/srs_protocol_amf0.hpp
Unescape Escape 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.
*/
#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP
#define SRS_RTMP_PROTOCOL_AMF0_HPP
#ifndef SRS_PROTOCOL_AMF0_HPP
#define SRS_PROTOCOL_AMF0_HPP
/*
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
*/
#include <srs_core.hpp>

2
trunk/src/protocol/srs_protocol_json.cpp
Unescape Escape View File

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
/* json encode
cout<< SRS_JOBJECT_START

2
trunk/src/protocol/srs_rtmp_stack.cpp
Unescape Escape View File

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_rtmp_stack.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_rtmp_io.hpp>
#include <srs_kernel_buffer.hpp>
#include <srs_core_autofree.hpp>

2
trunk/src/utest/srs_utest_amf0.hpp
Unescape Escape View File

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_utest.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#endif

2
trunk/src/utest/srs_utest_protocol.cpp
Unescape Escape View File

@ -31,7 +31,7 @@ using namespace std;
#include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_st.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_rtmp_stack.hpp>
MockEmptyIO::MockEmptyIO()

Write Preview
Loading…
Cancel
Save