external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #250, rename rtmp to protocol dir.

Browse source
This commit is contained in:
winlin 2015-01-23 10:07:20 +08:00
parent d8c7267cfc
commit a4ba40952a
47 changed files with 174 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/configure vendored
View file

@ -374,9 +374,9 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="RTMP" MODULE_ID="RTMP"
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_protocol_stack" "srs_protocol_rtmp" MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
"srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer") "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer")
RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
RTMP_OBJS="${MODULE_OBJS[@]}" RTMP_OBJS="${MODULE_OBJS[@]}"
# #
#App Module #App Module

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

@ -44,23 +44,23 @@ file
../../src/kernel/srs_kernel_ts.hpp, ../../src/kernel/srs_kernel_ts.hpp,
../../src/kernel/srs_kernel_utility.hpp, ../../src/kernel/srs_kernel_utility.hpp,
../../src/kernel/srs_kernel_utility.cpp, ../../src/kernel/srs_kernel_utility.cpp,
rtmp-protocol readonly separator, protocol readonly separator,
../../src/rtmp/srs_protocol_amf0.hpp, ../../src/protocol/srs_rtmp_amf0.hpp,
../../src/rtmp/srs_protocol_amf0.cpp, ../../src/protocol/srs_rtmp_amf0.cpp,
../../src/rtmp/srs_protocol_buffer.hpp, ../../src/protocol/srs_rtmp_buffer.hpp,
../../src/rtmp/srs_protocol_buffer.cpp, ../../src/protocol/srs_rtmp_buffer.cpp,
../../src/rtmp/srs_protocol_handshake.hpp, ../../src/protocol/srs_rtmp_handshake.hpp,
../../src/rtmp/srs_protocol_handshake.cpp, ../../src/protocol/srs_rtmp_handshake.cpp,
../../src/rtmp/srs_protocol_io.hpp, ../../src/protocol/srs_rtmp_io.hpp,
../../src/rtmp/srs_protocol_io.cpp, ../../src/protocol/srs_rtmp_io.cpp,
../../src/rtmp/srs_protocol_msg_array.hpp, ../../src/protocol/srs_rtmp_msg_array.hpp,
../../src/rtmp/srs_protocol_msg_array.cpp, ../../src/protocol/srs_rtmp_msg_array.cpp,
../../src/rtmp/srs_protocol_rtmp.hpp, ../../src/protocol/srs_rtmp_sdk.hpp,
../../src/rtmp/srs_protocol_rtmp.cpp, ../../src/protocol/srs_rtmp_sdk.cpp,
../../src/rtmp/srs_protocol_stack.hpp, ../../src/protocol/srs_rtmp_stack.hpp,
../../src/rtmp/srs_protocol_stack.cpp, ../../src/protocol/srs_rtmp_stack.cpp,
../../src/rtmp/srs_protocol_utility.hpp, ../../src/protocol/srs_rtmp_utility.hpp,
../../src/rtmp/srs_protocol_utility.cpp, ../../src/protocol/srs_rtmp_utility.cpp,
app readonly separator, app readonly separator,
../../src/app/srs_app_bandwidth.hpp, ../../src/app/srs_app_bandwidth.hpp,
../../src/app/srs_app_bandwidth.cpp, ../../src/app/srs_app_bandwidth.cpp,

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

@ -115,14 +115,14 @@
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp" /> <ClInclude Include="..\..\src\libs\srs_librtmp.hpp" />
<ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp" /> <ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp" />
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp" /> <ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_amf0.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_buffer.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_handshake.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_io.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_msg_array.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_rtmp.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_stack.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_utility.hpp" /> <ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\research\hls\ts_info.cc" /> <ClCompile Include="..\..\research\hls\ts_info.cc" />
@ -191,14 +191,14 @@
<ClCompile Include="..\..\src\libs\srs_lib_bandwidth.cpp" /> <ClCompile Include="..\..\src\libs\srs_lib_bandwidth.cpp" />
<ClCompile Include="..\..\src\libs\srs_lib_simple_socket.cpp" /> <ClCompile Include="..\..\src\libs\srs_lib_simple_socket.cpp" />
<ClCompile Include="..\..\src\main\srs_main_server.cpp" /> <ClCompile Include="..\..\src\main\srs_main_server.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_amf0.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_buffer.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_handshake.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_io.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_msg_array.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_rtmp.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_sdk.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_stack.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_utility.cpp" /> <ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

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

@ -172,30 +172,6 @@
<ClCompile Include="..\..\research\hls\ts_info.cc"> <ClCompile Include="..\..\research\hls\ts_info.cc">
<Filter>research</Filter> <Filter>research</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_amf0.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_buffer.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_handshake.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_io.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_msg_array.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_rtmp.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_stack.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\rtmp\srs_protocol_utility.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\research\librtmp\srs_audio_raw_publish.c"> <ClCompile Include="..\..\research\librtmp\srs_audio_raw_publish.c">
<Filter>research</Filter> <Filter>research</Filter>
</ClCompile> </ClCompile>
@ -223,6 +199,30 @@
<ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp"> <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_sdk.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp">
<Filter>srs</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\app\srs_app_bandwidth.hpp"> <ClInclude Include="..\..\src\app\srs_app_bandwidth.hpp">
@ -366,30 +366,6 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp"> <ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_utility.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_amf0.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_buffer.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_handshake.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_io.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_msg_array.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_rtmp.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_stack.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp"> <ClInclude Include="..\..\src\libs\srs_librtmp.hpp">
<Filter>librtmp</Filter> <Filter>librtmp</Filter>
</ClInclude> </ClInclude>
@ -408,6 +384,30 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp"> <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
<Filter>srs</Filter> <Filter>srs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp">
<Filter>srs</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="research"> <Filter Include="research">

4
trunk/src/app/srs_app_bandwidth.cpp
View file

@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.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_protocol_utility.hpp> #include <srs_rtmp_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_dvr.cpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_http_hooks.hpp> #include <srs_app_http_hooks.hpp>

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

@ -31,18 +31,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_app_st_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_kbps.hpp> #include <srs_app_kbps.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
// when error, edge ingester sleep for a while and retry. // when error, edge ingester sleep for a while and retry.
#define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL) #define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL)

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

@ -29,7 +29,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_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_app_ffmpeg.hpp> #include <srs_app_ffmpeg.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

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

@ -36,12 +36,12 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_app_kbps.hpp> #include <srs_app_kbps.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>
// when error, forwarder sleep for a while and retry. // when error, forwarder sleep for a while and retry.

8
trunk/src/app/srs_app_hls.cpp
View file

@ -39,17 +39,17 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_avc.hpp> #include <srs_kernel_avc.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
// drop the segment when duration of ts too small. // drop the segment when duration of ts too small.
#define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100 #define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100

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

@ -36,7 +36,7 @@ using namespace std;
#include <srs_app_http_conn.hpp> #include <srs_app_http_conn.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>

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

@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_app_statistic.hpp> #include <srs_app_statistic.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
SrsGoApiRoot::SrsGoApiRoot() SrsGoApiRoot::SrsGoApiRoot()
{ {

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

@ -41,9 +41,9 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_kernel_flv.hpp> #include <srs_kernel_flv.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_kernel_aac.hpp> #include <srs_kernel_aac.hpp>
#include <srs_kernel_mp3.hpp> #include <srs_kernel_mp3.hpp>
#include <srs_kernel_ts.hpp> #include <srs_kernel_ts.hpp>

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

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_st_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>

2
trunk/src/app/srs_app_kbps.hpp
View file

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
/** /**
* a kbps sample, for example, 1minute kbps, * a kbps sample, for example, 1minute kbps,

6
trunk/src/app/srs_app_recv_thread.cpp
View file

@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_recv_thread.hpp> #include <srs_app_recv_thread.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_app_rtmp_conn.hpp> #include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>

2
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector> #include <vector>
#include <srs_app_thread.hpp> #include <srs_app_thread.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
#include <srs_app_reload.hpp> #include <srs_app_reload.hpp>

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

@ -32,7 +32,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_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_app_server.hpp> #include <srs_app_server.hpp>
@ -46,8 +46,8 @@ using namespace std;
#include <srs_app_http_hooks.hpp> #include <srs_app_http_hooks.hpp>
#include <srs_app_edge.hpp> #include <srs_app_edge.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_app_recv_thread.hpp> #include <srs_app_recv_thread.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

2
trunk/src/app/srs_app_security.hpp
View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string> #include <string>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
class SrsConfDirective; class SrsConfDirective;

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

@ -28,20 +28,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>
#include <srs_app_hls.hpp> #include <srs_app_hls.hpp>
#include <srs_app_forward.hpp> #include <srs_app_forward.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_app_encoder.hpp> #include <srs_app_encoder.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_dvr.hpp> #include <srs_app_dvr.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_app_edge.hpp> #include <srs_app_edge.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_avc.hpp> #include <srs_kernel_avc.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#define CONST_MAX_JITTER_MS 500 #define CONST_MAX_JITTER_MS 500
#define DEFAULT_FRAME_TIME_MS 40 #define DEFAULT_FRAME_TIME_MS 40

2
trunk/src/app/srs_app_st_socket.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
/** /**
* the socket provides TCP socket over st, * the socket provides TCP socket over st,

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

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sstream> #include <sstream>
using namespace std; using namespace std;
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>
int64_t __srs_gvid = getpid(); int64_t __srs_gvid = getpid();

6
trunk/src/libs/srs_lib_bandwidth.cpp
View file

@ -32,11 +32,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
/** /**
* recv bandwidth helper. * recv bandwidth helper.

2
trunk/src/libs/srs_lib_simple_socket.hpp
View file

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_librtmp.hpp> #include <srs_librtmp.hpp>
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213

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

@ -35,14 +35,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std; using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_lib_simple_socket.hpp> #include <srs_lib_simple_socket.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_kernel_flv.hpp> #include <srs_kernel_flv.hpp>
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>

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

2
trunk/src/rtmp/srs_protocol_amf0.hpp → trunk/src/protocol/srs_rtmp_amf0.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_AMF0_HPP #define SRS_RTMP_PROTOCOL_AMF0_HPP
/* /*
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

2
trunk/src/rtmp/srs_protocol_buffer.cpp → trunk/src/protocol/srs_rtmp_buffer.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_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>

4
trunk/src/rtmp/srs_protocol_buffer.hpp → trunk/src/protocol/srs_rtmp_buffer.hpp
View file

@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_PROTOCOL_BUFFER_HPP #define SRS_PROTOCOL_BUFFER_HPP
/* /*
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_kernel_buffer.hpp>

8
trunk/src/rtmp/srs_protocol_handshake.cpp → trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -21,16 +21,16 @@ 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_protocol_handshake.hpp> #include <srs_rtmp_handshake.hpp>
#include <time.h> #include <time.h>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#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_rtmp_io.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#ifdef SRS_AUTO_SSL #ifdef SRS_AUTO_SSL

2
trunk/src/rtmp/srs_protocol_handshake.hpp → trunk/src/protocol/srs_rtmp_handshake.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP #define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP
/* /*
#include <srs_protocol_handshake.hpp> #include <srs_rtmp_handshake.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

2
trunk/src/rtmp/srs_protocol_io.cpp → trunk/src/protocol/srs_rtmp_io.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_protocol_io.hpp> #include <srs_rtmp_io.hpp>
ISrsBufferReader::ISrsBufferReader() ISrsBufferReader::ISrsBufferReader()
{ {

2
trunk/src/rtmp/srs_protocol_io.hpp → trunk/src/protocol/srs_rtmp_io.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_IO_HPP #define SRS_RTMP_PROTOCOL_IO_HPP
/* /*
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

4
trunk/src/rtmp/srs_protocol_msg_array.cpp → trunk/src/protocol/srs_rtmp_msg_array.cpp
View file

@ -21,9 +21,9 @@ 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_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
SrsMessageArray::SrsMessageArray(int max_msgs) SrsMessageArray::SrsMessageArray(int max_msgs)
{ {

2
trunk/src/rtmp/srs_protocol_msg_array.hpp → trunk/src/protocol/srs_rtmp_msg_array.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP #define SRS_RTMP_PROTOCOL_MSG_ARRAY_HPP
/* /*
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

10
trunk/src/rtmp/srs_protocol_rtmp.cpp → trunk/src/protocol/srs_rtmp_sdk.cpp
View file

@ -21,13 +21,13 @@ 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_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_protocol_handshake.hpp> #include <srs_rtmp_handshake.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

4
trunk/src/rtmp/srs_protocol_rtmp.hpp → trunk/src/protocol/srs_rtmp_sdk.hpp
View file

@ -25,14 +25,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_RTMP_HPP #define SRS_RTMP_PROTOCOL_RTMP_HPP
/* /*
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>
#include <string> #include <string>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_core_performance.hpp> #include <srs_core_performance.hpp>
class SrsProtocol; class SrsProtocol;

10
trunk/src/rtmp/srs_protocol_stack.cpp → trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -21,15 +21,15 @@ 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_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
// for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
#ifndef _WIN32 #ifndef _WIN32

2
trunk/src/rtmp/srs_protocol_stack.hpp → trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_STACK_HPP #define SRS_RTMP_PROTOCOL_STACK_HPP
/* /*
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

4
trunk/src/rtmp/srs_protocol_utility.cpp → trunk/src/protocol/srs_rtmp_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_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <stdlib.h> #include <stdlib.h>
using namespace std; using namespace std;
@ -29,7 +29,7 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
void srs_discovery_tc_url( void srs_discovery_tc_url(
string tcUrl, string tcUrl,

2
trunk/src/rtmp/srs_protocol_utility.hpp → trunk/src/protocol/srs_rtmp_utility.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_RTMP_PROTOCOL_CONSTS_HPP #define SRS_RTMP_PROTOCOL_CONSTS_HPP
/* /*
#include <srs_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

2
trunk/src/utest/srs_utest_amf0.hpp
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_utest.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#endif #endif

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_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_kernel_stream.hpp> #include <srs_kernel_stream.hpp>
#define MAX_MOCK_DATA_SIZE 1024 * 1024 #define MAX_MOCK_DATA_SIZE 1024 * 1024

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

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string> #include <string>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
class MockBufferReader: public ISrsBufferReader class MockBufferReader: public ISrsBufferReader
{ {

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

@ -26,13 +26,13 @@ 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_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_rtmp_msg_array.hpp>
#include <srs_protocol_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_rtmp_amf0.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
MockEmptyIO::MockEmptyIO() MockEmptyIO::MockEmptyIO()
{ {

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

@ -30,17 +30,17 @@ 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_protocol_utility.hpp> #include <srs_rtmp_utility.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_rtmp_sdk.hpp>
#include <srs_protocol_handshake.hpp> #include <srs_rtmp_handshake.hpp>
#include <srs_protocol_buffer.hpp> #include <srs_rtmp_buffer.hpp>
#ifdef SRS_AUTO_SSL #ifdef SRS_AUTO_SSL
using namespace _srs_internal; using namespace _srs_internal;
#endif #endif
#include <srs_protocol_io.hpp> #include <srs_rtmp_io.hpp>
class MockEmptyIO : public ISrsProtocolReaderWriter class MockEmptyIO : public ISrsProtocolReaderWriter
{ {