胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
4bb17f0c 1 parent 344ff24f

replace the TAB with 4spaces

内嵌 并排对比
正在显示 3 个修改的文件 包含 168 行增加 和 168 行删除
@@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27 27
28 SrsStreamInfo::SrsStreamInfo() 28 SrsStreamInfo::SrsStreamInfo()
29 { 29 {
30 - _req = NULL; 30 + _req = NULL;
31 } 31 }
32 32
33 SrsStreamInfo::~SrsStreamInfo() 33 SrsStreamInfo::~SrsStreamInfo()
34 { 34 {
35 - if (_req != NULL)  
36 - delete _req; 35 + if (_req != NULL)
  36 + delete _req;
37 } 37 }
38 38
39 SrsStatistic *SrsStatistic::_instance = NULL; 39 SrsStatistic *SrsStatistic::_instance = NULL;
@@ -45,31 +45,31 @@ SrsStatistic::SrsStatistic() @@ -45,31 +45,31 @@ SrsStatistic::SrsStatistic()
45 45
46 SrsStatistic::~SrsStatistic() 46 SrsStatistic::~SrsStatistic()
47 { 47 {
48 - SrsStreamInfoMap::iterator it;  
49 - for (it = pool.begin(); it != pool.end(); it++) {  
50 - delete it->second;  
51 - } 48 + SrsStreamInfoMap::iterator it;
  49 + for (it = pool.begin(); it != pool.end(); it++) {
  50 + delete it->second;
  51 + }
52 } 52 }
53 53
54 SrsStreamInfoMap* SrsStatistic::get_pool() 54 SrsStreamInfoMap* SrsStatistic::get_pool()
55 { 55 {
56 - return &pool; 56 + return &pool;
57 } 57 }
58 58
59 SrsStreamInfo* SrsStatistic::get(void *p) 59 SrsStreamInfo* SrsStatistic::get(void *p)
60 { 60 {
61 - SrsStreamInfoMap::iterator it = pool.find(p);  
62 - if (it == pool.end()) {  
63 - pool[p] = new SrsStreamInfo();  
64 - return pool[p];  
65 - } else {  
66 - return it->second;  
67 - } 61 + SrsStreamInfoMap::iterator it = pool.find(p);
  62 + if (it == pool.end()) {
  63 + pool[p] = new SrsStreamInfo();
  64 + return pool[p];
  65 + } else {
  66 + return it->second;
  67 + }
68 } 68 }
69 69
70 void SrsStatistic::add_request_info(void *p, SrsRequest *req) 70 void SrsStatistic::add_request_info(void *p, SrsRequest *req)
71 { 71 {
72 - SrsStreamInfo *info = get(p);  
73 - if (info->_req == NULL)  
74 - info->_req = req->copy(); 72 + SrsStreamInfo *info = get(p);
  73 + if (info->_req == NULL)
  74 + info->_req = req->copy();
75 } 75 }
@@ -68,4 +68,4 @@ private: @@ -68,4 +68,4 @@ private:
68 virtual SrsStreamInfo *get(void *p); 68 virtual SrsStreamInfo *get(void *p);
69 }; 69 };
70 70
71 -#endif  
  71 +#endif
1 file 1 file
2 - main readonly separator,  
3 - ..\main\srs_main_server.cpp,  
4 - auto readonly separator,  
5 - ..\..\objs\srs_auto_headers.hpp,  
6 - libs readonly separator,  
7 - ..\libs\srs_librtmp.hpp,  
8 - ..\libs\srs_librtmp.cpp,  
9 - ..\libs\srs_lib_bandwidth.hpp,  
10 - ..\libs\srs_lib_bandwidth.cpp,  
11 - ..\libs\srs_lib_simple_socket.hpp,  
12 - ..\libs\srs_lib_simple_socket.cpp,  
13 - core readonly separator,  
14 - ..\core\srs_core.hpp,  
15 - ..\core\srs_core.cpp,  
16 - ..\core\srs_core_autofree.hpp,  
17 - ..\core\srs_core_autofree.cpp,  
18 - ..\core\srs_core_performance.hpp,  
19 - ..\core\srs_core_performance.cpp,  
20 - kernel readonly separator,  
21 - ..\kernel\srs_kernel_codec.hpp,  
22 - ..\kernel\srs_kernel_codec.cpp,  
23 - ..\kernel\srs_kernel_consts.hpp,  
24 - ..\kernel\srs_kernel_consts.cpp,  
25 - ..\kernel\srs_kernel_error.hpp,  
26 - ..\kernel\srs_kernel_error.cpp,  
27 - ..\kernel\srs_kernel_file.hpp,  
28 - ..\kernel\srs_kernel_file.cpp,  
29 - ..\kernel\srs_kernel_flv.hpp,  
30 - ..\kernel\srs_kernel_flv.cpp,  
31 - ..\kernel\srs_kernel_log.hpp,  
32 - ..\kernel\srs_kernel_log.cpp,  
33 - ..\kernel\srs_kernel_stream.hpp,  
34 - ..\kernel\srs_kernel_stream.cpp,  
35 - ..\kernel\srs_kernel_utility.hpp,  
36 - ..\kernel\srs_kernel_utility.cpp,  
37 - rtmp-protocol readonly separator,  
38 - ..\rtmp\srs_protocol_amf0.hpp,  
39 - ..\rtmp\srs_protocol_amf0.cpp, 2 + main readonly separator,
  3 + ..\main\srs_main_server.cpp,
  4 + auto readonly separator,
  5 + ..\..\objs\srs_auto_headers.hpp,
  6 + libs readonly separator,
  7 + ..\libs\srs_librtmp.hpp,
  8 + ..\libs\srs_librtmp.cpp,
  9 + ..\libs\srs_lib_bandwidth.hpp,
  10 + ..\libs\srs_lib_bandwidth.cpp,
  11 + ..\libs\srs_lib_simple_socket.hpp,
  12 + ..\libs\srs_lib_simple_socket.cpp,
  13 + core readonly separator,
  14 + ..\core\srs_core.hpp,
  15 + ..\core\srs_core.cpp,
  16 + ..\core\srs_core_autofree.hpp,
  17 + ..\core\srs_core_autofree.cpp,
  18 + ..\core\srs_core_performance.hpp,
  19 + ..\core\srs_core_performance.cpp,
  20 + kernel readonly separator,
  21 + ..\kernel\srs_kernel_codec.hpp,
  22 + ..\kernel\srs_kernel_codec.cpp,
  23 + ..\kernel\srs_kernel_consts.hpp,
  24 + ..\kernel\srs_kernel_consts.cpp,
  25 + ..\kernel\srs_kernel_error.hpp,
  26 + ..\kernel\srs_kernel_error.cpp,
  27 + ..\kernel\srs_kernel_file.hpp,
  28 + ..\kernel\srs_kernel_file.cpp,
  29 + ..\kernel\srs_kernel_flv.hpp,
  30 + ..\kernel\srs_kernel_flv.cpp,
  31 + ..\kernel\srs_kernel_log.hpp,
  32 + ..\kernel\srs_kernel_log.cpp,
  33 + ..\kernel\srs_kernel_stream.hpp,
  34 + ..\kernel\srs_kernel_stream.cpp,
  35 + ..\kernel\srs_kernel_utility.hpp,
  36 + ..\kernel\srs_kernel_utility.cpp,
  37 + rtmp-protocol readonly separator,
  38 + ..\rtmp\srs_protocol_amf0.hpp,
  39 + ..\rtmp\srs_protocol_amf0.cpp,
40 ..\rtmp\srs_protocol_buffer.hpp, 40 ..\rtmp\srs_protocol_buffer.hpp,
41 ..\rtmp\srs_protocol_buffer.cpp, 41 ..\rtmp\srs_protocol_buffer.cpp,
42 - ..\rtmp\srs_protocol_handshake.hpp,  
43 - ..\rtmp\srs_protocol_handshake.cpp,  
44 - ..\rtmp\srs_protocol_io.hpp,  
45 - ..\rtmp\srs_protocol_io.cpp,  
46 - ..\rtmp\srs_protocol_msg_array.hpp,  
47 - ..\rtmp\srs_protocol_msg_array.cpp,  
48 - ..\rtmp\srs_protocol_rtmp.hpp,  
49 - ..\rtmp\srs_protocol_rtmp.cpp,  
50 - ..\rtmp\srs_protocol_stack.hpp,  
51 - ..\rtmp\srs_protocol_stack.cpp,  
52 - ..\rtmp\srs_protocol_utility.hpp,  
53 - ..\rtmp\srs_protocol_utility.cpp,  
54 - app readonly separator,  
55 - ..\app\srs_app_avc_aac.hpp,  
56 - ..\app\srs_app_avc_aac.cpp,  
57 - ..\app\srs_app_bandwidth.hpp,  
58 - ..\app\srs_app_bandwidth.cpp,  
59 - ..\app\srs_app_conn.hpp,  
60 - ..\app\srs_app_conn.cpp,  
61 - ..\app\srs_app_config.hpp,  
62 - ..\app\srs_app_config.cpp,  
63 - ..\app\srs_app_dvr.hpp,  
64 - ..\app\srs_app_dvr.cpp,  
65 - ..\app\srs_app_edge.hpp,  
66 - ..\app\srs_app_edge.cpp,  
67 - ..\app\srs_app_empty.hpp,  
68 - ..\app\srs_app_empty.cpp,  
69 - ..\app\srs_app_encoder.hpp,  
70 - ..\app\srs_app_encoder.cpp,  
71 - ..\app\srs_app_ffmpeg.hpp,  
72 - ..\app\srs_app_ffmpeg.cpp,  
73 - ..\app\srs_app_forward.hpp,  
74 - ..\app\srs_app_forward.cpp,  
75 - ..\app\srs_app_heartbeat.hpp,  
76 - ..\app\srs_app_heartbeat.cpp,  
77 - ..\app\srs_app_hls.hpp,  
78 - ..\app\srs_app_hls.cpp,  
79 - ..\app\srs_app_http.hpp,  
80 - ..\app\srs_app_http.cpp,  
81 - ..\app\srs_app_http_api.hpp,  
82 - ..\app\srs_app_http_api.cpp,  
83 - ..\app\srs_app_http_client.hpp,  
84 - ..\app\srs_app_http_client.cpp,  
85 - ..\app\srs_app_http_conn.hpp,  
86 - ..\app\srs_app_http_conn.cpp,  
87 - ..\app\srs_app_http_hooks.hpp,  
88 - ..\app\srs_app_http_hooks.cpp,  
89 - ..\app\srs_app_ingest.hpp,  
90 - ..\app\srs_app_ingest.cpp,  
91 - ..\app\srs_app_json.hpp,  
92 - ..\app\srs_app_json.cpp,  
93 - ..\app\srs_app_kbps.hpp,  
94 - ..\app\srs_app_kbps.cpp,  
95 - ..\app\srs_app_log.hpp,  
96 - ..\app\srs_app_log.cpp,  
97 - ..\app\srs_app_recv_thread.hpp,  
98 - ..\app\srs_app_recv_thread.cpp,  
99 - ..\app\srs_app_refer.hpp,  
100 - ..\app\srs_app_refer.cpp,  
101 - ..\app\srs_app_reload.hpp,  
102 - ..\app\srs_app_reload.cpp,  
103 - ..\app\srs_app_rtmp_conn.hpp,  
104 - ..\app\srs_app_rtmp_conn.cpp,  
105 - ..\app\srs_app_pithy_print.hpp,  
106 - ..\app\srs_app_pithy_print.cpp,  
107 - ..\app\srs_app_security.hpp,  
108 - ..\app\srs_app_security.cpp,  
109 - ..\app\srs_app_server.hpp,  
110 - ..\app\srs_app_server.cpp,  
111 - ..\app\srs_app_st.hpp,  
112 - ..\app\srs_app_st.cpp,  
113 - ..\app\srs_app_st_socket.hpp,  
114 - ..\app\srs_app_st_socket.cpp,  
115 - ..\app\srs_app_statistic.hpp,  
116 - ..\app\srs_app_statistic.cpp,  
117 - ..\app\srs_app_source.hpp,  
118 - ..\app\srs_app_source.cpp,  
119 - ..\app\srs_app_thread.hpp,  
120 - ..\app\srs_app_thread.cpp,  
121 - ..\app\srs_app_utility.hpp,  
122 - ..\app\srs_app_utility.cpp,  
123 - utest readonly separator,  
124 - ..\utest\srs_utest.hpp,  
125 - ..\utest\srs_utest.cpp,  
126 - ..\utest\srs_utest_amf0.hpp,  
127 - ..\utest\srs_utest_amf0.cpp,  
128 - ..\utest\srs_utest_config.hpp,  
129 - ..\utest\srs_utest_config.cpp,  
130 - ..\utest\srs_utest_core.hpp,  
131 - ..\utest\srs_utest_core.cpp,  
132 - ..\utest\srs_utest_kernel.hpp,  
133 - ..\utest\srs_utest_kernel.cpp,  
134 - ..\utest\srs_utest_protocol.hpp,  
135 - ..\utest\srs_utest_protocol.cpp,  
136 - ..\utest\srs_utest_reload.hpp,  
137 - ..\utest\srs_utest_reload.cpp,  
138 - research readonly separator,  
139 - ..\..\research\librtmp\srs_aac_raw_publish.c,  
140 - ..\..\research\librtmp\srs_audio_raw_publish.c,  
141 - ..\..\research\librtmp\srs_bandwidth_check.c,  
142 - ..\..\research\librtmp\srs_detect_rtmp.c,  
143 - ..\..\research\librtmp\srs_flv_injecter.c,  
144 - ..\..\research\librtmp\srs_flv_parser.c,  
145 - ..\..\research\librtmp\srs_h264_raw_publish.c,  
146 - ..\..\research\librtmp\srs_ingest_flv.c,  
147 - ..\..\research\librtmp\srs_ingest_rtmp.c,  
148 - ..\..\research\librtmp\srs_play.c,  
149 - ..\..\research\librtmp\srs_publish.c,  
150 - ..\..\research\librtmp\srs_rtmp_dump.c,  
151 - ..\..\research\hls\ts_info.cc; 42 + ..\rtmp\srs_protocol_handshake.hpp,
  43 + ..\rtmp\srs_protocol_handshake.cpp,
  44 + ..\rtmp\srs_protocol_io.hpp,
  45 + ..\rtmp\srs_protocol_io.cpp,
  46 + ..\rtmp\srs_protocol_msg_array.hpp,
  47 + ..\rtmp\srs_protocol_msg_array.cpp,
  48 + ..\rtmp\srs_protocol_rtmp.hpp,
  49 + ..\rtmp\srs_protocol_rtmp.cpp,
  50 + ..\rtmp\srs_protocol_stack.hpp,
  51 + ..\rtmp\srs_protocol_stack.cpp,
  52 + ..\rtmp\srs_protocol_utility.hpp,
  53 + ..\rtmp\srs_protocol_utility.cpp,
  54 + app readonly separator,
  55 + ..\app\srs_app_avc_aac.hpp,
  56 + ..\app\srs_app_avc_aac.cpp,
  57 + ..\app\srs_app_bandwidth.hpp,
  58 + ..\app\srs_app_bandwidth.cpp,
  59 + ..\app\srs_app_conn.hpp,
  60 + ..\app\srs_app_conn.cpp,
  61 + ..\app\srs_app_config.hpp,
  62 + ..\app\srs_app_config.cpp,
  63 + ..\app\srs_app_dvr.hpp,
  64 + ..\app\srs_app_dvr.cpp,
  65 + ..\app\srs_app_edge.hpp,
  66 + ..\app\srs_app_edge.cpp,
  67 + ..\app\srs_app_empty.hpp,
  68 + ..\app\srs_app_empty.cpp,
  69 + ..\app\srs_app_encoder.hpp,
  70 + ..\app\srs_app_encoder.cpp,
  71 + ..\app\srs_app_ffmpeg.hpp,
  72 + ..\app\srs_app_ffmpeg.cpp,
  73 + ..\app\srs_app_forward.hpp,
  74 + ..\app\srs_app_forward.cpp,
  75 + ..\app\srs_app_heartbeat.hpp,
  76 + ..\app\srs_app_heartbeat.cpp,
  77 + ..\app\srs_app_hls.hpp,
  78 + ..\app\srs_app_hls.cpp,
  79 + ..\app\srs_app_http.hpp,
  80 + ..\app\srs_app_http.cpp,
  81 + ..\app\srs_app_http_api.hpp,
  82 + ..\app\srs_app_http_api.cpp,
  83 + ..\app\srs_app_http_client.hpp,
  84 + ..\app\srs_app_http_client.cpp,
  85 + ..\app\srs_app_http_conn.hpp,
  86 + ..\app\srs_app_http_conn.cpp,
  87 + ..\app\srs_app_http_hooks.hpp,
  88 + ..\app\srs_app_http_hooks.cpp,
  89 + ..\app\srs_app_ingest.hpp,
  90 + ..\app\srs_app_ingest.cpp,
  91 + ..\app\srs_app_json.hpp,
  92 + ..\app\srs_app_json.cpp,
  93 + ..\app\srs_app_kbps.hpp,
  94 + ..\app\srs_app_kbps.cpp,
  95 + ..\app\srs_app_log.hpp,
  96 + ..\app\srs_app_log.cpp,
  97 + ..\app\srs_app_recv_thread.hpp,
  98 + ..\app\srs_app_recv_thread.cpp,
  99 + ..\app\srs_app_refer.hpp,
  100 + ..\app\srs_app_refer.cpp,
  101 + ..\app\srs_app_reload.hpp,
  102 + ..\app\srs_app_reload.cpp,
  103 + ..\app\srs_app_rtmp_conn.hpp,
  104 + ..\app\srs_app_rtmp_conn.cpp,
  105 + ..\app\srs_app_pithy_print.hpp,
  106 + ..\app\srs_app_pithy_print.cpp,
  107 + ..\app\srs_app_security.hpp,
  108 + ..\app\srs_app_security.cpp,
  109 + ..\app\srs_app_server.hpp,
  110 + ..\app\srs_app_server.cpp,
  111 + ..\app\srs_app_st.hpp,
  112 + ..\app\srs_app_st.cpp,
  113 + ..\app\srs_app_st_socket.hpp,
  114 + ..\app\srs_app_st_socket.cpp,
  115 + ..\app\srs_app_statistic.hpp,
  116 + ..\app\srs_app_statistic.cpp,
  117 + ..\app\srs_app_source.hpp,
  118 + ..\app\srs_app_source.cpp,
  119 + ..\app\srs_app_thread.hpp,
  120 + ..\app\srs_app_thread.cpp,
  121 + ..\app\srs_app_utility.hpp,
  122 + ..\app\srs_app_utility.cpp,
  123 + utest readonly separator,
  124 + ..\utest\srs_utest.hpp,
  125 + ..\utest\srs_utest.cpp,
  126 + ..\utest\srs_utest_amf0.hpp,
  127 + ..\utest\srs_utest_amf0.cpp,
  128 + ..\utest\srs_utest_config.hpp,
  129 + ..\utest\srs_utest_config.cpp,
  130 + ..\utest\srs_utest_core.hpp,
  131 + ..\utest\srs_utest_core.cpp,
  132 + ..\utest\srs_utest_kernel.hpp,
  133 + ..\utest\srs_utest_kernel.cpp,
  134 + ..\utest\srs_utest_protocol.hpp,
  135 + ..\utest\srs_utest_protocol.cpp,
  136 + ..\utest\srs_utest_reload.hpp,
  137 + ..\utest\srs_utest_reload.cpp,
  138 + research readonly separator,
  139 + ..\..\research\librtmp\srs_aac_raw_publish.c,
  140 + ..\..\research\librtmp\srs_audio_raw_publish.c,
  141 + ..\..\research\librtmp\srs_bandwidth_check.c,
  142 + ..\..\research\librtmp\srs_detect_rtmp.c,
  143 + ..\..\research\librtmp\srs_flv_injecter.c,
  144 + ..\..\research\librtmp\srs_flv_parser.c,
  145 + ..\..\research\librtmp\srs_h264_raw_publish.c,
  146 + ..\..\research\librtmp\srs_ingest_flv.c,
  147 + ..\..\research\librtmp\srs_ingest_rtmp.c,
  148 + ..\..\research\librtmp\srs_play.c,
  149 + ..\..\research\librtmp\srs_publish.c,
  150 + ..\..\research\librtmp\srs_rtmp_dump.c,
  151 + ..\..\research\hls\ts_info.cc;
152 152
153 mainconfig 153 mainconfig
154 - "" = "MAIN"; 154 + "" = "MAIN";
155 155