Skip to content

Commit

Permalink
for ossrs#250, rename rtmp to protocol dir.
Browse files Browse the repository at this point in the history
  • Loading branch information
@winlinvip
winlinvip committed Jan 23, 2015
1 parent d8c7267 commit a4ba409
Show file tree
Hide file tree
Showing 47 changed files with 170 additions and 170 deletions.
6 changes: 3 additions & 3 deletions trunk/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,9 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="RTMP"
MODULE_DEPENDS=("CORE" "KERNEL")
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp"
"srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer")
RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_sdk"
"srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_rtmp_buffer")
RTMP_INCS="src/protocol"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
RTMP_OBJS="${MODULE_OBJS[@]}"
#
#App Module
Expand Down
34 changes: 17 additions & 17 deletions trunk/ide/srs_upp/srs_upp.upp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@ file
../../src/kernel/srs_kernel_ts.hpp,
../../src/kernel/srs_kernel_utility.hpp,
../../src/kernel/srs_kernel_utility.cpp,
rtmp-protocol readonly separator,
../../src/rtmp/srs_protocol_amf0.hpp,
../../src/rtmp/srs_protocol_amf0.cpp,
../../src/rtmp/srs_protocol_buffer.hpp,
../../src/rtmp/srs_protocol_buffer.cpp,
../../src/rtmp/srs_protocol_handshake.hpp,
../../src/rtmp/srs_protocol_handshake.cpp,
../../src/rtmp/srs_protocol_io.hpp,
../../src/rtmp/srs_protocol_io.cpp,
../../src/rtmp/srs_protocol_msg_array.hpp,
../../src/rtmp/srs_protocol_msg_array.cpp,
../../src/rtmp/srs_protocol_rtmp.hpp,
../../src/rtmp/srs_protocol_rtmp.cpp,
../../src/rtmp/srs_protocol_stack.hpp,
../../src/rtmp/srs_protocol_stack.cpp,
../../src/rtmp/srs_protocol_utility.hpp,
../../src/rtmp/srs_protocol_utility.cpp,
protocol readonly separator,
../../src/protocol/srs_rtmp_amf0.hpp,
../../src/protocol/srs_rtmp_amf0.cpp,
../../src/protocol/srs_rtmp_buffer.hpp,
../../src/protocol/srs_rtmp_buffer.cpp,
../../src/protocol/srs_rtmp_handshake.hpp,
../../src/protocol/srs_rtmp_handshake.cpp,
../../src/protocol/srs_rtmp_io.hpp,
../../src/protocol/srs_rtmp_io.cpp,
../../src/protocol/srs_rtmp_msg_array.hpp,
../../src/protocol/srs_rtmp_msg_array.cpp,
../../src/protocol/srs_rtmp_sdk.hpp,
../../src/protocol/srs_rtmp_sdk.cpp,
../../src/protocol/srs_rtmp_stack.hpp,
../../src/protocol/srs_rtmp_stack.cpp,
../../src/protocol/srs_rtmp_utility.hpp,
../../src/protocol/srs_rtmp_utility.cpp,
app readonly separator,
../../src/app/srs_app_bandwidth.hpp,
../../src/app/srs_app_bandwidth.cpp,
Expand Down
32 changes: 16 additions & 16 deletions trunk/ide/srs_vs2010/srs.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp" />
<ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp" />
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_amf0.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_buffer.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_handshake.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_io.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_msg_array.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_rtmp.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_stack.hpp" />
<ClInclude Include="..\..\src\rtmp\srs_protocol_utility.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
<ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\research\hls\ts_info.cc" />
Expand Down Expand Up @@ -191,14 +191,14 @@
<ClCompile Include="..\..\src\libs\srs_lib_bandwidth.cpp" />
<ClCompile Include="..\..\src\libs\srs_lib_simple_socket.cpp" />
<ClCompile Include="..\..\src\main\srs_main_server.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_amf0.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_buffer.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_handshake.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_io.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_msg_array.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_rtmp.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_stack.cpp" />
<ClCompile Include="..\..\src\rtmp\srs_protocol_utility.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_buffer.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_sdk.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
<ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
88 changes: 44 additions & 44 deletions trunk/ide/srs_vs2010/srs.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,30 +172,6 @@
<ClCompile Include="..\..\research\hls\ts_info.cc">
<Filter>research</Filter>
</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">
<Filter>research</Filter>
</ClCompile>
Expand Down Expand Up @@ -223,6 +199,30 @@
<ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp">
<Filter>srs</Filter>
</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>
<ClInclude Include="..\..\src\app\srs_app_bandwidth.hpp">
Expand Down Expand Up @@ -366,46 +366,46 @@
<ClInclude Include="..\..\src\kernel\srs_kernel_utility.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_utility.hpp">
<Filter>srs</Filter>
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp">
<Filter>librtmp</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_amf0.hpp">
<Filter>srs</Filter>
<ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp">
<Filter>librtmp</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_buffer.hpp">
<Filter>srs</Filter>
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp">
<Filter>librtmp</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_handshake.hpp">
<ClInclude Include="..\..\src\kernel\srs_kernel_ts.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_io.hpp">
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_msg_array.hpp">
<ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_rtmp.hpp">
<ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rtmp\srs_protocol_stack.hpp">
<ClInclude Include="..\..\src\protocol\srs_rtmp_buffer.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libs\srs_librtmp.hpp">
<Filter>librtmp</Filter>
<ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libs\srs_lib_bandwidth.hpp">
<Filter>librtmp</Filter>
<ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libs\srs_lib_simple_socket.hpp">
<Filter>librtmp</Filter>
<ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kernel\srs_kernel_ts.hpp">
<ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp">
<ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
<ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp">
<Filter>srs</Filter>
</ClInclude>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions trunk/src/app/srs_app_bandwidth.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

using namespace std;

#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_app_config.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ using namespace std;

#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_rtmp_utility.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_source.hpp>
#include <srs_kernel_file.hpp>
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_dvr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std;

#include <srs_app_config.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_http_hooks.hpp>
Expand Down
10 changes: 5 additions & 5 deletions trunk/src/app/srs_app_edge.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std;

#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_io.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_rtmp_io.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_source.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_core_autofree.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_protocol_amf0.hpp>
#include <srs_rtmp_amf0.hpp>

// when error, edge ingester sleep for a while and retry.
#define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL)
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_encoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.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_ffmpeg.hpp>
#include <srs_kernel_utility.hpp>
Expand Down
8 changes: 4 additions & 4 deletions trunk/src/app/srs_app_forward.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_rtmp_utility.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_protocol_amf0.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_kernel_codec.hpp>

// when error, forwarder sleep for a while and retry.
Expand Down
8 changes: 4 additions & 4 deletions trunk/src/app/srs_app_hls.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ using namespace std;

#include <srs_kernel_error.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_app_config.hpp>
#include <srs_app_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_avc.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.
#define SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS 100
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_http.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using namespace std;
#include <srs_app_http_conn.hpp>
#include <srs_app_json.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_protocol_buffer.hpp>
#include <srs_rtmp_buffer.hpp>
#include <srs_kernel_file.hpp>
#include <srs_core_autofree.hpp>

Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_http_api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_utility.hpp>
#include <srs_app_utility.hpp>
#include <srs_app_statistic.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_rtmp_sdk.hpp>

SrsGoApiRoot::SrsGoApiRoot()
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/src/app/srs_app_http_conn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ using namespace std;
#include <srs_kernel_utility.hpp>
#include <srs_kernel_file.hpp>
#include <srs_kernel_flv.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_rtmp_sdk.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_mp3.hpp>
#include <srs_kernel_ts.hpp>
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_http_hooks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using namespace std;

#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp>
#include <srs_app_json.hpp>
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_kbps.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#include <srs_core.hpp>

#include <srs_protocol_io.hpp>
#include <srs_rtmp_io.hpp>

/**
* a kbps sample, for example, 1minute kbps,
Expand Down
6 changes: 3 additions & 3 deletions trunk/src/app/srs_app_recv_thread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_protocol_rtmp.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_rtmp_sdk.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_buffer.hpp>
#include <srs_rtmp_buffer.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_core_performance.hpp>
#include <srs_app_config.hpp>
Expand Down
Loading

0 comments on commit a4ba409

Please sign in to comment.