Skip to content

Commit 6bcac14

Browse files
winlinvipwinlinvip
committed
Prefix with srs_protocol in protocol directory.
1 parent 665ad56 commit 6bcac14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+88
-88
lines changed

‎trunk/configure

+4-4
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
223223
MODULE_ID="PROTOCOL"
224224
MODULE_DEPENDS=("CORE" "KERNEL")
225225
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
226-
MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
227-
"srs_rtmp_handshake" "srs_protocol_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
228-
"srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
226+
MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack"
227+
"srs_protocol_rtmp_stack" "srs_protocol_utility" "srs_protocol_rtmp_msg_array" "srs_protocol_stream"
228+
"srs_protocol_raw_avc" "srs_protocol_rtsp_stack" "srs_protocol_http_stack" "srs_protocol_kbps" "srs_protocol_json"
229229
"srs_protocol_format" "srs_protocol_log" "srs_protocol_st" "srs_protocol_http_client"
230230
"srs_protocol_http_conn" "srs_protocol_rtmp_conn" "srs_protocol_conn")
231231
if [[ $SRS_RTC == YES ]]; then
232-
MODULE_FILES+=("srs_rtc_stun_stack")
232+
MODULE_FILES+=("srs_protocol_rtc_stun")
233233
ModuleLibIncs+=(${LibSrtpRoot})
234234
fi
235235
if [[ $SRS_FFMPEG_FIT == YES ]]; then

‎trunk/src/app/srs_app_bandwidth.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
using namespace std;
1313

14-
#include <srs_rtmp_stack.hpp>
14+
#include <srs_protocol_rtmp_stack.hpp>
1515
#include <srs_protocol_amf0.hpp>
1616
#include <srs_app_config.hpp>
1717
#include <srs_core_autofree.hpp>

‎trunk/src/app/srs_app_caster_flv.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using namespace std;
1717
#include <srs_app_http_conn.hpp>
1818
#include <srs_core_autofree.hpp>
1919
#include <srs_kernel_flv.hpp>
20-
#include <srs_rtmp_stack.hpp>
20+
#include <srs_protocol_rtmp_stack.hpp>
2121
#include <srs_protocol_utility.hpp>
2222
#include <srs_app_st.hpp>
2323
#include <srs_app_utility.hpp>

‎trunk/src/app/srs_app_config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using namespace std;
3838
#include <srs_protocol_json.hpp>
3939
#include <srs_app_http_hooks.hpp>
4040
#include <srs_kernel_utility.hpp>
41-
#include <srs_rtmp_stack.hpp>
41+
#include <srs_protocol_rtmp_stack.hpp>
4242

4343
using namespace srs_internal;
4444

‎trunk/src/app/srs_app_coworkers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using namespace std;
1111

1212
#include <srs_protocol_json.hpp>
1313
#include <srs_kernel_error.hpp>
14-
#include <srs_rtmp_stack.hpp>
14+
#include <srs_protocol_rtmp_stack.hpp>
1515
#include <srs_app_config.hpp>
1616
#include <srs_protocol_utility.hpp>
1717
#include <srs_protocol_utility.hpp>

‎trunk/src/app/srs_app_dash.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <srs_kernel_error.hpp>
1010
#include <srs_app_source.hpp>
1111
#include <srs_app_config.hpp>
12-
#include <srs_rtmp_stack.hpp>
12+
#include <srs_protocol_rtmp_stack.hpp>
1313
#include <srs_kernel_codec.hpp>
1414
#include <srs_kernel_utility.hpp>
1515
#include <srs_app_utility.hpp>

‎trunk/src/app/srs_app_dvr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using namespace std;
1313

1414
#include <srs_app_config.hpp>
15-
#include <srs_rtmp_stack.hpp>
15+
#include <srs_protocol_rtmp_stack.hpp>
1616
#include <srs_core_autofree.hpp>
1717
#include <srs_kernel_utility.hpp>
1818
#include <srs_app_http_hooks.hpp>

‎trunk/src/app/srs_app_edge.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using namespace std;
1515

1616
#include <srs_kernel_error.hpp>
17-
#include <srs_rtmp_stack.hpp>
17+
#include <srs_protocol_rtmp_stack.hpp>
1818
#include <srs_protocol_io.hpp>
1919
#include <srs_app_config.hpp>
2020
#include <srs_protocol_utility.hpp>
@@ -23,7 +23,7 @@ using namespace std;
2323
#include <srs_app_pithy_print.hpp>
2424
#include <srs_core_autofree.hpp>
2525
#include <srs_protocol_kbps.hpp>
26-
#include <srs_rtmp_msg_array.hpp>
26+
#include <srs_protocol_rtmp_msg_array.hpp>
2727
#include <srs_app_utility.hpp>
2828
#include <srs_protocol_amf0.hpp>
2929
#include <srs_kernel_utility.hpp>

‎trunk/src/app/srs_app_encoder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using namespace std;
1212
#include <srs_kernel_error.hpp>
1313
#include <srs_kernel_log.hpp>
1414
#include <srs_app_config.hpp>
15-
#include <srs_rtmp_stack.hpp>
15+
#include <srs_protocol_rtmp_stack.hpp>
1616
#include <srs_app_pithy_print.hpp>
1717
#include <srs_app_ffmpeg.hpp>
1818
#include <srs_kernel_utility.hpp>

‎trunk/src/app/srs_app_forward.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ using namespace std;
1919
#include <srs_kernel_log.hpp>
2020
#include <srs_app_config.hpp>
2121
#include <srs_app_pithy_print.hpp>
22-
#include <srs_rtmp_stack.hpp>
22+
#include <srs_protocol_rtmp_stack.hpp>
2323
#include <srs_protocol_utility.hpp>
2424
#include <srs_protocol_kbps.hpp>
25-
#include <srs_rtmp_msg_array.hpp>
25+
#include <srs_protocol_rtmp_msg_array.hpp>
2626
#include <srs_app_utility.hpp>
2727
#include <srs_protocol_amf0.hpp>
2828
#include <srs_kernel_codec.hpp>

‎trunk/src/app/srs_app_hds.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
using namespace std;
1818

1919
#include <srs_app_hds.hpp>
20-
#include <srs_rtmp_stack.hpp>
20+
#include <srs_protocol_rtmp_stack.hpp>
2121
#include <srs_kernel_log.hpp>
2222
#include <srs_kernel_codec.hpp>
23-
#include <srs_rtmp_stack.hpp>
23+
#include <srs_protocol_rtmp_stack.hpp>
2424
#include <srs_kernel_buffer.hpp>
2525
#include <srs_core_autofree.hpp>
2626
#include <srs_kernel_utility.hpp>

‎trunk/src/app/srs_app_hls.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ using namespace std;
2020
#include <srs_kernel_error.hpp>
2121
#include <srs_kernel_codec.hpp>
2222
#include <srs_protocol_amf0.hpp>
23-
#include <srs_rtmp_stack.hpp>
23+
#include <srs_protocol_rtmp_stack.hpp>
2424
#include <srs_app_config.hpp>
2525
#include <srs_app_source.hpp>
2626
#include <srs_core_autofree.hpp>
27-
#include <srs_rtmp_stack.hpp>
27+
#include <srs_protocol_rtmp_stack.hpp>
2828
#include <srs_app_pithy_print.hpp>
2929
#include <srs_kernel_utility.hpp>
3030
#include <srs_kernel_codec.hpp>

‎trunk/src/app/srs_app_http_api.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ using namespace std;
2020
#include <srs_kernel_utility.hpp>
2121
#include <srs_app_utility.hpp>
2222
#include <srs_app_statistic.hpp>
23-
#include <srs_rtmp_stack.hpp>
23+
#include <srs_protocol_rtmp_stack.hpp>
2424
#include <srs_app_dvr.hpp>
2525
#include <srs_app_config.hpp>
2626
#include <srs_app_source.hpp>

‎trunk/src/app/srs_app_http_api.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SrsHttpConn;
2424

2525
#include <srs_app_st.hpp>
2626
#include <srs_app_conn.hpp>
27-
#include <srs_http_stack.hpp>
27+
#include <srs_protocol_http_stack.hpp>
2828
#include <srs_app_reload.hpp>
2929
#include <srs_app_http_conn.hpp>
3030

‎trunk/src/app/srs_app_http_conn.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ using namespace std;
2424
#include <srs_kernel_utility.hpp>
2525
#include <srs_kernel_file.hpp>
2626
#include <srs_kernel_flv.hpp>
27-
#include <srs_rtmp_stack.hpp>
27+
#include <srs_protocol_rtmp_stack.hpp>
2828
#include <srs_app_source.hpp>
29-
#include <srs_rtmp_msg_array.hpp>
29+
#include <srs_protocol_rtmp_msg_array.hpp>
3030
#include <srs_kernel_aac.hpp>
3131
#include <srs_kernel_mp3.hpp>
3232
#include <srs_kernel_ts.hpp>

‎trunk/src/app/srs_app_http_hooks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using namespace std;
1111

1212
#include <srs_kernel_error.hpp>
13-
#include <srs_rtmp_stack.hpp>
13+
#include <srs_protocol_rtmp_stack.hpp>
1414
#include <srs_app_st.hpp>
1515
#include <srs_protocol_json.hpp>
1616
#include <srs_app_dvr.hpp>

‎trunk/src/app/srs_app_http_static.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ using namespace std;
2424
#include <srs_kernel_utility.hpp>
2525
#include <srs_kernel_file.hpp>
2626
#include <srs_kernel_flv.hpp>
27-
#include <srs_rtmp_stack.hpp>
27+
#include <srs_protocol_rtmp_stack.hpp>
2828
#include <srs_app_source.hpp>
29-
#include <srs_rtmp_msg_array.hpp>
29+
#include <srs_protocol_rtmp_msg_array.hpp>
3030
#include <srs_kernel_aac.hpp>
3131
#include <srs_kernel_mp3.hpp>
3232
#include <srs_kernel_ts.hpp>

‎trunk/src/app/srs_app_http_stream.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ using namespace std;
2727
#include <srs_kernel_utility.hpp>
2828
#include <srs_kernel_file.hpp>
2929
#include <srs_kernel_flv.hpp>
30-
#include <srs_rtmp_stack.hpp>
30+
#include <srs_protocol_rtmp_stack.hpp>
3131
#include <srs_app_source.hpp>
32-
#include <srs_rtmp_msg_array.hpp>
32+
#include <srs_protocol_rtmp_msg_array.hpp>
3333
#include <srs_kernel_aac.hpp>
3434
#include <srs_kernel_mp3.hpp>
3535
#include <srs_kernel_ts.hpp>

‎trunk/src/app/srs_app_mpegts_udp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ using namespace std;
2424
#include <srs_kernel_file.hpp>
2525
#include <srs_core_autofree.hpp>
2626
#include <srs_kernel_utility.hpp>
27-
#include <srs_rtmp_stack.hpp>
27+
#include <srs_protocol_rtmp_stack.hpp>
2828
#include <srs_app_st.hpp>
2929
#include <srs_protocol_utility.hpp>
3030
#include <srs_app_utility.hpp>
3131
#include <srs_protocol_amf0.hpp>
32-
#include <srs_raw_avc.hpp>
32+
#include <srs_protocol_raw_avc.hpp>
3333
#include <srs_app_pithy_print.hpp>
3434
#include <srs_app_rtmp_conn.hpp>
3535
#include <srs_protocol_utility.hpp>

‎trunk/src/app/srs_app_ng_exec.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using namespace std;
1212
#include <srs_kernel_error.hpp>
1313
#include <srs_kernel_log.hpp>
1414
#include <srs_app_config.hpp>
15-
#include <srs_rtmp_stack.hpp>
15+
#include <srs_protocol_rtmp_stack.hpp>
1616
#include <srs_app_pithy_print.hpp>
1717
#include <srs_app_process.hpp>
1818
#include <srs_kernel_utility.hpp>

‎trunk/src/app/srs_app_recv_thread.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include <srs_app_recv_thread.hpp>
88

9-
#include <srs_rtmp_stack.hpp>
10-
#include <srs_rtmp_stack.hpp>
9+
#include <srs_protocol_rtmp_stack.hpp>
10+
#include <srs_protocol_rtmp_stack.hpp>
1111
#include <srs_app_rtmp_conn.hpp>
1212
#include <srs_protocol_stream.hpp>
1313
#include <srs_kernel_utility.hpp>

‎trunk/src/app/srs_app_rtc_api.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <srs_core.hpp>
1111

12-
#include <srs_http_stack.hpp>
12+
#include <srs_protocol_http_stack.hpp>
1313

1414
class SrsRtcServer;
1515
class SrsRequest;

‎trunk/src/app/srs_app_rtc_conn.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ using namespace std;
2424
#include <srs_kernel_rtc_rtp.hpp>
2525
#include <srs_kernel_error.hpp>
2626
#include <srs_kernel_log.hpp>
27-
#include <srs_rtc_stun_stack.hpp>
28-
#include <srs_rtmp_stack.hpp>
29-
#include <srs_rtmp_msg_array.hpp>
27+
#include <srs_protocol_rtc_stun.hpp>
28+
#include <srs_protocol_rtmp_stack.hpp>
29+
#include <srs_protocol_rtmp_msg_array.hpp>
3030
#include <srs_app_utility.hpp>
3131
#include <srs_app_config.hpp>
3232
#include <srs_app_rtc_queue.hpp>
3333
#include <srs_app_source.hpp>
3434
#include <srs_app_server.hpp>
3535
#include <srs_protocol_utility.hpp>
36-
#include <srs_http_stack.hpp>
36+
#include <srs_protocol_http_stack.hpp>
3737
#include <srs_app_http_api.hpp>
3838
#include <srs_app_statistic.hpp>
3939
#include <srs_app_pithy_print.hpp>

‎trunk/src/app/srs_app_rtc_conn.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <srs_app_listener.hpp>
1212
#include <srs_protocol_st.hpp>
1313
#include <srs_kernel_utility.hpp>
14-
#include <srs_rtmp_stack.hpp>
14+
#include <srs_protocol_rtmp_stack.hpp>
1515
#include <srs_app_hybrid.hpp>
1616
#include <srs_app_hourglass.hpp>
1717
#include <srs_app_rtc_sdp.hpp>

‎trunk/src/app/srs_app_rtc_dtls.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ using namespace std;
1414
#include <srs_kernel_error.hpp>
1515
#include <srs_app_config.hpp>
1616
#include <srs_core_autofree.hpp>
17-
#include <srs_rtmp_stack.hpp>
17+
#include <srs_protocol_rtmp_stack.hpp>
1818
#include <srs_app_utility.hpp>
1919
#include <srs_kernel_rtc_rtp.hpp>
2020
#include <srs_app_log.hpp>

‎trunk/src/app/srs_app_rtc_server.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ using namespace std;
1818
#include <srs_app_pithy_print.hpp>
1919
#include <srs_core_autofree.hpp>
2020
#include <srs_app_rtc_conn.hpp>
21-
#include <srs_rtc_stun_stack.hpp>
22-
#include <srs_http_stack.hpp>
21+
#include <srs_protocol_rtc_stun.hpp>
22+
#include <srs_protocol_http_stack.hpp>
2323
#include <srs_app_server.hpp>
2424
#include <srs_app_http_api.hpp>
2525
#include <srs_app_rtc_dtls.hpp>

‎trunk/src/app/srs_app_rtc_source.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#include <unistd.h>
1111

1212
#include <srs_app_conn.hpp>
13-
#include <srs_rtmp_stack.hpp>
13+
#include <srs_protocol_rtmp_stack.hpp>
1414
#include <srs_app_config.hpp>
1515
#include <srs_app_source.hpp>
1616
#include <srs_kernel_flv.hpp>
1717
#include <srs_kernel_codec.hpp>
18-
#include <srs_rtmp_msg_array.hpp>
18+
#include <srs_protocol_rtmp_msg_array.hpp>
1919
#include <srs_kernel_utility.hpp>
2020
#include <srs_protocol_format.hpp>
2121
#include <srs_kernel_buffer.hpp>

‎trunk/src/app/srs_app_rtmp_conn.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace std;
1616

1717
#include <srs_kernel_error.hpp>
1818
#include <srs_kernel_log.hpp>
19-
#include <srs_rtmp_stack.hpp>
19+
#include <srs_protocol_rtmp_stack.hpp>
2020
#include <srs_core_autofree.hpp>
2121
#include <srs_app_source.hpp>
2222
#include <srs_app_server.hpp>
@@ -29,7 +29,7 @@ using namespace std;
2929
#include <srs_app_http_hooks.hpp>
3030
#include <srs_app_edge.hpp>
3131
#include <srs_app_utility.hpp>
32-
#include <srs_rtmp_msg_array.hpp>
32+
#include <srs_protocol_rtmp_msg_array.hpp>
3333
#include <srs_protocol_amf0.hpp>
3434
#include <srs_app_recv_thread.hpp>
3535
#include <srs_core_performance.hpp>

‎trunk/src/app/srs_app_rtmp_conn.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <srs_app_st.hpp>
1515
#include <srs_app_conn.hpp>
1616
#include <srs_app_reload.hpp>
17-
#include <srs_rtmp_stack.hpp>
17+
#include <srs_protocol_rtmp_stack.hpp>
1818
#include <srs_protocol_rtmp_conn.hpp>
1919

2020
class SrsServer;

‎trunk/src/app/srs_app_security.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <string>
1313

14-
#include <srs_rtmp_stack.hpp>
14+
#include <srs_protocol_rtmp_stack.hpp>
1515
#include <srs_protocol_utility.hpp>
1616

1717
class SrsConfDirective;

‎trunk/src/app/srs_app_source.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
using namespace std;
1212

1313
#include <srs_kernel_log.hpp>
14-
#include <srs_rtmp_stack.hpp>
14+
#include <srs_protocol_rtmp_stack.hpp>
1515
#include <srs_protocol_amf0.hpp>
1616
#include <srs_kernel_codec.hpp>
1717
#include <srs_kernel_rtc_rtp.hpp>
1818
#include <srs_app_hls.hpp>
1919
#include <srs_app_forward.hpp>
2020
#include <srs_app_config.hpp>
2121
#include <srs_app_encoder.hpp>
22-
#include <srs_rtmp_stack.hpp>
22+
#include <srs_protocol_rtmp_stack.hpp>
2323
#include <srs_app_dvr.hpp>
2424
#include <srs_kernel_buffer.hpp>
2525
#include <srs_app_edge.hpp>
2626
#include <srs_kernel_utility.hpp>
2727
#include <srs_kernel_codec.hpp>
28-
#include <srs_rtmp_msg_array.hpp>
28+
#include <srs_protocol_rtmp_msg_array.hpp>
2929
#include <srs_app_hds.hpp>
3030
#include <srs_app_statistic.hpp>
3131
#include <srs_core_autofree.hpp>

‎trunk/src/app/srs_app_statistic.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <sstream>
1111
using namespace std;
1212

13-
#include <srs_rtmp_stack.hpp>
13+
#include <srs_protocol_rtmp_stack.hpp>
1414
#include <srs_protocol_json.hpp>
1515
#include <srs_protocol_kbps.hpp>
1616
#include <srs_app_conn.hpp>

‎trunk/src/app/srs_app_statistic.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <vector>
1515

1616
#include <srs_kernel_codec.hpp>
17-
#include <srs_rtmp_stack.hpp>
17+
#include <srs_protocol_rtmp_stack.hpp>
1818

1919
class SrsKbps;
2020
class SrsWallClock;

0 commit comments

Comments
 (0)