胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
80ddddf8 1 parent be4c182d

refine RTMP protocol completed, to 0.9.81

内嵌 并排对比
正在显示 20 个修改的文件 包含 343 行增加 和 353 行删除
@@ -189,21 +189,21 @@ int SrsBandwidth::do_bandwidth_check() @@ -189,21 +189,21 @@ int SrsBandwidth::do_bandwidth_check()
189 pkt->data->set("publish_bytes", SrsAmf0Any::number(publish_bytes)); 189 pkt->data->set("publish_bytes", SrsAmf0Any::number(publish_bytes));
190 pkt->data->set("publish_time", SrsAmf0Any::number(publish_actual_duration_ms)); 190 pkt->data->set("publish_time", SrsAmf0Any::number(publish_actual_duration_ms));
191 191
192 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 192 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
193 srs_error("send bandwidth check finish message failed. ret=%d", ret); 193 srs_error("send bandwidth check finish message failed. ret=%d", ret);
194 return ret; 194 return ret;
195 } 195 }
196 196
197 // if flash, we notice the result, and expect a final packet. 197 // if flash, we notice the result, and expect a final packet.
198 while (true) { 198 while (true) {
199 - __SrsMessage* msg = NULL; 199 + SrsMessage* msg = NULL;
200 SrsBandwidthPacket* pkt = NULL; 200 SrsBandwidthPacket* pkt = NULL;
201 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 201 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
202 // info level to ignore and return success. 202 // info level to ignore and return success.
203 srs_info("expect final message failed. ret=%d", ret); 203 srs_info("expect final message failed. ret=%d", ret);
204 return ERROR_SUCCESS; 204 return ERROR_SUCCESS;
205 } 205 }
206 - SrsAutoFree(__SrsMessage, msg, false); 206 + SrsAutoFree(SrsMessage, msg, false);
207 SrsAutoFree(SrsBandwidthPacket, pkt, false); 207 SrsAutoFree(SrsBandwidthPacket, pkt, false);
208 srs_info("get final message success."); 208 srs_info("get final message success.");
209 209
@@ -233,7 +233,7 @@ int SrsBandwidth::check_play( @@ -233,7 +233,7 @@ int SrsBandwidth::check_play(
233 pkt->data->set("duration_ms", SrsAmf0Any::number(duration_ms)); 233 pkt->data->set("duration_ms", SrsAmf0Any::number(duration_ms));
234 pkt->data->set("interval_ms", SrsAmf0Any::number(interval_ms)); 234 pkt->data->set("interval_ms", SrsAmf0Any::number(interval_ms));
235 235
236 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 236 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
237 srs_error("send bandwidth check start play message failed. ret=%d", ret); 237 srs_error("send bandwidth check start play message failed. ret=%d", ret);
238 return ret; 238 return ret;
239 } 239 }
@@ -242,13 +242,13 @@ int SrsBandwidth::check_play( @@ -242,13 +242,13 @@ int SrsBandwidth::check_play(
242 242
243 while (true) { 243 while (true) {
244 // recv client's starting play response 244 // recv client's starting play response
245 - __SrsMessage* msg = NULL; 245 + SrsMessage* msg = NULL;
246 SrsBandwidthPacket* pkt = NULL; 246 SrsBandwidthPacket* pkt = NULL;
247 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 247 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
248 srs_error("expect bandwidth message failed. ret=%d", ret); 248 srs_error("expect bandwidth message failed. ret=%d", ret);
249 return ret; 249 return ret;
250 } 250 }
251 - SrsAutoFree(__SrsMessage, msg, false); 251 + SrsAutoFree(SrsMessage, msg, false);
252 SrsAutoFree(SrsBandwidthPacket, pkt, false); 252 SrsAutoFree(SrsBandwidthPacket, pkt, false);
253 srs_info("get bandwidth message succes."); 253 srs_info("get bandwidth message succes.");
254 254
@@ -281,10 +281,10 @@ int SrsBandwidth::check_play( @@ -281,10 +281,10 @@ int SrsBandwidth::check_play(
281 } 281 }
282 data_count += 2; 282 data_count += 2;
283 283
284 - // TODO: FIXME: get length from the rtmp protocol stack.  
285 - play_bytes += pkt->get_payload_length(); 284 + // get length from the rtmp protocol stack.
  285 + play_bytes = rtmp->get_send_bytes();
286 286
287 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 287 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
288 srs_error("send bandwidth check play messages failed. ret=%d", ret); 288 srs_error("send bandwidth check play messages failed. ret=%d", ret);
289 return ret; 289 return ret;
290 } 290 }
@@ -314,7 +314,7 @@ int SrsBandwidth::check_play( @@ -314,7 +314,7 @@ int SrsBandwidth::check_play(
314 pkt->data->set("duration_delta", SrsAmf0Any::number(actual_duration_ms)); 314 pkt->data->set("duration_delta", SrsAmf0Any::number(actual_duration_ms));
315 pkt->data->set("bytes_delta", SrsAmf0Any::number(play_bytes)); 315 pkt->data->set("bytes_delta", SrsAmf0Any::number(play_bytes));
316 316
317 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 317 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
318 srs_error("send bandwidth check stop play message failed. ret=%d", ret); 318 srs_error("send bandwidth check stop play message failed. ret=%d", ret);
319 return ret; 319 return ret;
320 } 320 }
@@ -323,13 +323,13 @@ int SrsBandwidth::check_play( @@ -323,13 +323,13 @@ int SrsBandwidth::check_play(
323 323
324 while (true) { 324 while (true) {
325 // recv client's stop play response. 325 // recv client's stop play response.
326 - __SrsMessage* msg = NULL; 326 + SrsMessage* msg = NULL;
327 SrsBandwidthPacket* pkt = NULL; 327 SrsBandwidthPacket* pkt = NULL;
328 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 328 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
329 srs_error("expect bandwidth message failed. ret=%d", ret); 329 srs_error("expect bandwidth message failed. ret=%d", ret);
330 return ret; 330 return ret;
331 } 331 }
332 - SrsAutoFree(__SrsMessage, msg, false); 332 + SrsAutoFree(SrsMessage, msg, false);
333 SrsAutoFree(SrsBandwidthPacket, pkt, false); 333 SrsAutoFree(SrsBandwidthPacket, pkt, false);
334 srs_info("get bandwidth message succes."); 334 srs_info("get bandwidth message succes.");
335 335
@@ -357,7 +357,7 @@ int SrsBandwidth::check_publish( @@ -357,7 +357,7 @@ int SrsBandwidth::check_publish(
357 pkt->data->set("duration_ms", SrsAmf0Any::number(duration_ms)); 357 pkt->data->set("duration_ms", SrsAmf0Any::number(duration_ms));
358 pkt->data->set("interval_ms", SrsAmf0Any::number(interval_ms)); 358 pkt->data->set("interval_ms", SrsAmf0Any::number(interval_ms));
359 359
360 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 360 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
361 srs_error("send bandwidth check start publish message failed. ret=%d", ret); 361 srs_error("send bandwidth check start publish message failed. ret=%d", ret);
362 return ret; 362 return ret;
363 } 363 }
@@ -366,13 +366,13 @@ int SrsBandwidth::check_publish( @@ -366,13 +366,13 @@ int SrsBandwidth::check_publish(
366 366
367 while (true) { 367 while (true) {
368 // read client's notification of starting publish 368 // read client's notification of starting publish
369 - __SrsMessage* msg = NULL; 369 + SrsMessage* msg = NULL;
370 SrsBandwidthPacket* pkt = NULL; 370 SrsBandwidthPacket* pkt = NULL;
371 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 371 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
372 srs_error("expect bandwidth message failed. ret=%d", ret); 372 srs_error("expect bandwidth message failed. ret=%d", ret);
373 return ret; 373 return ret;
374 } 374 }
375 - SrsAutoFree(__SrsMessage, msg, false); 375 + SrsAutoFree(SrsMessage, msg, false);
376 SrsAutoFree(SrsBandwidthPacket, pkt, false); 376 SrsAutoFree(SrsBandwidthPacket, pkt, false);
377 srs_info("get bandwidth message succes."); 377 srs_info("get bandwidth message succes.");
378 378
@@ -387,15 +387,14 @@ int SrsBandwidth::check_publish( @@ -387,15 +387,14 @@ int SrsBandwidth::check_publish(
387 while ( (srs_get_system_time_ms() - current_time) < duration_ms ) { 387 while ( (srs_get_system_time_ms() - current_time) < duration_ms ) {
388 st_usleep(0); 388 st_usleep(0);
389 389
390 - __SrsMessage* msg = NULL;  
391 - if ((ret = rtmp->__recv_message(&msg)) != ERROR_SUCCESS) { 390 + SrsMessage* msg = NULL;
  391 + if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
392 srs_error("recv message failed. ret=%d", ret); 392 srs_error("recv message failed. ret=%d", ret);
393 return ret; 393 return ret;
394 } 394 }
395 - SrsAutoFree(__SrsMessage, msg, false); 395 + SrsAutoFree(SrsMessage, msg, false);
396 396
397 - // TODO: FIXME.  
398 - publish_bytes += msg->header.payload_length; 397 + publish_bytes = rtmp->get_recv_bytes();
399 398
400 int kbps = 0; 399 int kbps = 0;
401 while (true) { 400 while (true) {
@@ -420,7 +419,7 @@ int SrsBandwidth::check_publish( @@ -420,7 +419,7 @@ int SrsBandwidth::check_publish(
420 pkt->data->set("duration_delta", SrsAmf0Any::number(actual_duration_ms)); 419 pkt->data->set("duration_delta", SrsAmf0Any::number(actual_duration_ms));
421 pkt->data->set("bytes_delta", SrsAmf0Any::number(publish_bytes)); 420 pkt->data->set("bytes_delta", SrsAmf0Any::number(publish_bytes));
422 421
423 - if ((ret = rtmp->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 422 + if ((ret = rtmp->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
424 srs_error("send bandwidth check stop publish message failed. ret=%d", ret); 423 srs_error("send bandwidth check stop publish message failed. ret=%d", ret);
425 return ret; 424 return ret;
426 } 425 }
@@ -435,13 +434,13 @@ int SrsBandwidth::check_publish( @@ -435,13 +434,13 @@ int SrsBandwidth::check_publish(
435 // TODO: FIXME: check whether flash client. 434 // TODO: FIXME: check whether flash client.
436 while (false) { 435 while (false) {
437 // recv client's stop publish response. 436 // recv client's stop publish response.
438 - __SrsMessage* msg = NULL; 437 + SrsMessage* msg = NULL;
439 SrsBandwidthPacket* pkt = NULL; 438 SrsBandwidthPacket* pkt = NULL;
440 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 439 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
441 srs_error("expect bandwidth message failed. ret=%d", ret); 440 srs_error("expect bandwidth message failed. ret=%d", ret);
442 return ret; 441 return ret;
443 } 442 }
444 - SrsAutoFree(__SrsMessage, msg, false); 443 + SrsAutoFree(SrsMessage, msg, false);
445 SrsAutoFree(SrsBandwidthPacket, pkt, false); 444 SrsAutoFree(SrsBandwidthPacket, pkt, false);
446 srs_info("get bandwidth message succes."); 445 srs_info("get bandwidth message succes.");
447 446
@@ -455,7 +455,7 @@ int SrsDvrPlan::on_meta_data(SrsOnMetaDataPacket* metadata) @@ -455,7 +455,7 @@ int SrsDvrPlan::on_meta_data(SrsOnMetaDataPacket* metadata)
455 return ret; 455 return ret;
456 } 456 }
457 457
458 -int SrsDvrPlan::on_audio(__SrsSharedPtrMessage* audio) 458 +int SrsDvrPlan::on_audio(SrsSharedPtrMessage* audio)
459 { 459 {
460 int ret = ERROR_SUCCESS; 460 int ret = ERROR_SUCCESS;
461 461
@@ -481,7 +481,7 @@ int SrsDvrPlan::on_audio(__SrsSharedPtrMessage* audio) @@ -481,7 +481,7 @@ int SrsDvrPlan::on_audio(__SrsSharedPtrMessage* audio)
481 return ret; 481 return ret;
482 } 482 }
483 483
484 -int SrsDvrPlan::on_video(__SrsSharedPtrMessage* video) 484 +int SrsDvrPlan::on_video(SrsSharedPtrMessage* video)
485 { 485 {
486 int ret = ERROR_SUCCESS; 486 int ret = ERROR_SUCCESS;
487 487
@@ -573,7 +573,7 @@ int SrsDvrPlan::flv_close() @@ -573,7 +573,7 @@ int SrsDvrPlan::flv_close()
573 return ret; 573 return ret;
574 } 574 }
575 575
576 -int SrsDvrPlan::update_duration(__SrsSharedPtrMessage* msg) 576 +int SrsDvrPlan::update_duration(SrsSharedPtrMessage* msg)
577 { 577 {
578 int ret = ERROR_SUCCESS; 578 int ret = ERROR_SUCCESS;
579 579
@@ -720,7 +720,7 @@ void SrsDvrSegmentPlan::on_unpublish() @@ -720,7 +720,7 @@ void SrsDvrSegmentPlan::on_unpublish()
720 dvr_enabled = false; 720 dvr_enabled = false;
721 } 721 }
722 722
723 -int SrsDvrSegmentPlan::update_duration(__SrsSharedPtrMessage* msg) 723 +int SrsDvrSegmentPlan::update_duration(SrsSharedPtrMessage* msg)
724 { 724 {
725 int ret = ERROR_SUCCESS; 725 int ret = ERROR_SUCCESS;
726 726
@@ -903,7 +903,7 @@ int SrsDvrHssPlan::on_dvr_reap_flv_header(string path) @@ -903,7 +903,7 @@ int SrsDvrHssPlan::on_dvr_reap_flv_header(string path)
903 return ret; 903 return ret;
904 } 904 }
905 905
906 -int SrsDvrHssPlan::update_duration(__SrsSharedPtrMessage* msg) 906 +int SrsDvrHssPlan::update_duration(SrsSharedPtrMessage* msg)
907 { 907 {
908 int ret = ERROR_SUCCESS; 908 int ret = ERROR_SUCCESS;
909 909
@@ -998,11 +998,11 @@ int SrsDvr::on_meta_data(SrsOnMetaDataPacket* metadata) @@ -998,11 +998,11 @@ int SrsDvr::on_meta_data(SrsOnMetaDataPacket* metadata)
998 return ret; 998 return ret;
999 } 999 }
1000 1000
1001 -int SrsDvr::on_audio(__SrsSharedPtrMessage* audio) 1001 +int SrsDvr::on_audio(SrsSharedPtrMessage* audio)
1002 { 1002 {
1003 int ret = ERROR_SUCCESS; 1003 int ret = ERROR_SUCCESS;
1004 1004
1005 - SrsAutoFree(__SrsSharedPtrMessage, audio, false); 1005 + SrsAutoFree(SrsSharedPtrMessage, audio, false);
1006 1006
1007 if ((ret = plan->on_audio(audio)) != ERROR_SUCCESS) { 1007 if ((ret = plan->on_audio(audio)) != ERROR_SUCCESS) {
1008 return ret; 1008 return ret;
@@ -1011,11 +1011,11 @@ int SrsDvr::on_audio(__SrsSharedPtrMessage* audio) @@ -1011,11 +1011,11 @@ int SrsDvr::on_audio(__SrsSharedPtrMessage* audio)
1011 return ret; 1011 return ret;
1012 } 1012 }
1013 1013
1014 -int SrsDvr::on_video(__SrsSharedPtrMessage* video) 1014 +int SrsDvr::on_video(SrsSharedPtrMessage* video)
1015 { 1015 {
1016 int ret = ERROR_SUCCESS; 1016 int ret = ERROR_SUCCESS;
1017 1017
1018 - SrsAutoFree(__SrsSharedPtrMessage, video, false); 1018 + SrsAutoFree(SrsSharedPtrMessage, video, false);
1019 1019
1020 if ((ret = plan->on_video(video)) != ERROR_SUCCESS) { 1020 if ((ret = plan->on_video(video)) != ERROR_SUCCESS) {
1021 return ret; 1021 return ret;
@@ -36,7 +36,7 @@ class SrsRequest; @@ -36,7 +36,7 @@ class SrsRequest;
36 class SrsStream; 36 class SrsStream;
37 class SrsRtmpJitter; 37 class SrsRtmpJitter;
38 class SrsOnMetaDataPacket; 38 class SrsOnMetaDataPacket;
39 -class __SrsSharedPtrMessage; 39 +class SrsSharedPtrMessage;
40 40
41 /** 41 /**
42 * file stream to read/write file. 42 * file stream to read/write file.
@@ -185,13 +185,13 @@ public: @@ -185,13 +185,13 @@ public:
185 virtual int on_publish(); 185 virtual int on_publish();
186 virtual void on_unpublish() = 0; 186 virtual void on_unpublish() = 0;
187 virtual int on_meta_data(SrsOnMetaDataPacket* metadata); 187 virtual int on_meta_data(SrsOnMetaDataPacket* metadata);
188 - virtual int on_audio(__SrsSharedPtrMessage* audio);  
189 - virtual int on_video(__SrsSharedPtrMessage* video); 188 + virtual int on_audio(SrsSharedPtrMessage* audio);
  189 + virtual int on_video(SrsSharedPtrMessage* video);
190 protected: 190 protected:
191 virtual int flv_open(std::string stream, std::string path); 191 virtual int flv_open(std::string stream, std::string path);
192 virtual int flv_close(); 192 virtual int flv_close();
193 virtual int open_new_segment(); 193 virtual int open_new_segment();
194 - virtual int update_duration(__SrsSharedPtrMessage* msg); 194 + virtual int update_duration(SrsSharedPtrMessage* msg);
195 virtual int write_flv_header(); 195 virtual int write_flv_header();
196 virtual int on_dvr_request_sh(); 196 virtual int on_dvr_request_sh();
197 virtual int on_video_keyframe(); 197 virtual int on_video_keyframe();
@@ -233,7 +233,7 @@ public: @@ -233,7 +233,7 @@ public:
233 virtual int on_publish(); 233 virtual int on_publish();
234 virtual void on_unpublish(); 234 virtual void on_unpublish();
235 private: 235 private:
236 - virtual int update_duration(__SrsSharedPtrMessage* msg); 236 + virtual int update_duration(SrsSharedPtrMessage* msg);
237 }; 237 };
238 238
239 /** 239 /**
@@ -260,7 +260,7 @@ protected: @@ -260,7 +260,7 @@ protected:
260 virtual int64_t filter_timestamp(int64_t timestamp); 260 virtual int64_t filter_timestamp(int64_t timestamp);
261 private: 261 private:
262 virtual int on_dvr_reap_flv_header(std::string path); 262 virtual int on_dvr_reap_flv_header(std::string path);
263 - virtual int update_duration(__SrsSharedPtrMessage* msg); 263 + virtual int update_duration(SrsSharedPtrMessage* msg);
264 }; 264 };
265 265
266 /** 266 /**
@@ -300,11 +300,11 @@ public: @@ -300,11 +300,11 @@ public:
300 /** 300 /**
301 * mux the audio packets to dvr. 301 * mux the audio packets to dvr.
302 */ 302 */
303 - virtual int on_audio(__SrsSharedPtrMessage* audio); 303 + virtual int on_audio(SrsSharedPtrMessage* audio);
304 /** 304 /**
305 * mux the video packets to dvr. 305 * mux the video packets to dvr.
306 */ 306 */
307 - virtual int on_video(__SrsSharedPtrMessage* video); 307 + virtual int on_video(SrsSharedPtrMessage* video);
308 }; 308 };
309 309
310 #endif 310 #endif
@@ -175,15 +175,15 @@ int SrsEdgeIngester::ingest() @@ -175,15 +175,15 @@ int SrsEdgeIngester::ingest()
175 } 175 }
176 176
177 // read from client. 177 // read from client.
178 - __SrsMessage* msg = NULL;  
179 - if ((ret = client->__recv_message(&msg)) != ERROR_SUCCESS) { 178 + SrsMessage* msg = NULL;
  179 + if ((ret = client->recv_message(&msg)) != ERROR_SUCCESS) {
180 srs_error("ingest recv origin server message failed. ret=%d", ret); 180 srs_error("ingest recv origin server message failed. ret=%d", ret);
181 return ret; 181 return ret;
182 } 182 }
183 srs_verbose("edge loop recv message. ret=%d", ret); 183 srs_verbose("edge loop recv message. ret=%d", ret);
184 184
185 srs_assert(msg); 185 srs_assert(msg);
186 - SrsAutoFree(__SrsMessage, msg, false); 186 + SrsAutoFree(SrsMessage, msg, false);
187 187
188 if ((ret = process_publish_message(msg)) != ERROR_SUCCESS) { 188 if ((ret = process_publish_message(msg)) != ERROR_SUCCESS) {
189 return ret; 189 return ret;
@@ -193,7 +193,7 @@ int SrsEdgeIngester::ingest() @@ -193,7 +193,7 @@ int SrsEdgeIngester::ingest()
193 return ret; 193 return ret;
194 } 194 }
195 195
196 -int SrsEdgeIngester::process_publish_message(__SrsMessage* msg) 196 +int SrsEdgeIngester::process_publish_message(SrsMessage* msg)
197 { 197 {
198 int ret = ERROR_SUCCESS; 198 int ret = ERROR_SUCCESS;
199 199
@@ -218,7 +218,7 @@ int SrsEdgeIngester::process_publish_message(__SrsMessage* msg) @@ -218,7 +218,7 @@ int SrsEdgeIngester::process_publish_message(__SrsMessage* msg)
218 // process onMetaData 218 // process onMetaData
219 if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) { 219 if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) {
220 SrsPacket* pkt = NULL; 220 SrsPacket* pkt = NULL;
221 - if ((ret = client->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 221 + if ((ret = client->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
222 srs_error("decode onMetaData message failed. ret=%d", ret); 222 srs_error("decode onMetaData message failed. ret=%d", ret);
223 return ret; 223 return ret;
224 } 224 }
@@ -420,8 +420,8 @@ int SrsEdgeForwarder::cycle() @@ -420,8 +420,8 @@ int SrsEdgeForwarder::cycle()
420 420
421 // read from client. 421 // read from client.
422 if (true) { 422 if (true) {
423 - __SrsMessage* msg = NULL;  
424 - ret = client->__recv_message(&msg); 423 + SrsMessage* msg = NULL;
  424 + ret = client->recv_message(&msg);
425 425
426 srs_verbose("edge loop recv message. ret=%d", ret); 426 srs_verbose("edge loop recv message. ret=%d", ret);
427 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) { 427 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@@ -435,7 +435,7 @@ int SrsEdgeForwarder::cycle() @@ -435,7 +435,7 @@ int SrsEdgeForwarder::cycle()
435 435
436 // forward all messages. 436 // forward all messages.
437 int count = 0; 437 int count = 0;
438 - __SrsSharedPtrMessage** msgs = NULL; 438 + SrsSharedPtrMessage** msgs = NULL;
439 if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) { 439 if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
440 srs_error("get message to forward to origin failed. ret=%d", ret); 440 srs_error("get message to forward to origin failed. ret=%d", ret);
441 return ret; 441 return ret;
@@ -456,16 +456,16 @@ int SrsEdgeForwarder::cycle() @@ -456,16 +456,16 @@ int SrsEdgeForwarder::cycle()
456 srs_verbose("no packets to forward."); 456 srs_verbose("no packets to forward.");
457 continue; 457 continue;
458 } 458 }
459 - SrsAutoFree(__SrsSharedPtrMessage*, msgs, true); 459 + SrsAutoFree(SrsSharedPtrMessage*, msgs, true);
460 460
461 // all msgs to forward. 461 // all msgs to forward.
462 for (int i = 0; i < count; i++) { 462 for (int i = 0; i < count; i++) {
463 - __SrsSharedPtrMessage* msg = msgs[i]; 463 + SrsSharedPtrMessage* msg = msgs[i];
464 464
465 srs_assert(msg); 465 srs_assert(msg);
466 msgs[i] = NULL; 466 msgs[i] = NULL;
467 467
468 - if ((ret = client->__send_and_free_message(msg)) != ERROR_SUCCESS) { 468 + if ((ret = client->send_and_free_message(msg)) != ERROR_SUCCESS) {
469 srs_error("edge publish forwarder send message to server failed. ret=%d", ret); 469 srs_error("edge publish forwarder send message to server failed. ret=%d", ret);
470 return ret; 470 return ret;
471 } 471 }
@@ -475,7 +475,7 @@ int SrsEdgeForwarder::cycle() @@ -475,7 +475,7 @@ int SrsEdgeForwarder::cycle()
475 return ret; 475 return ret;
476 } 476 }
477 477
478 -int SrsEdgeForwarder::proxy(__SrsMessage* msg) 478 +int SrsEdgeForwarder::proxy(SrsMessage* msg)
479 { 479 {
480 int ret = ERROR_SUCCESS; 480 int ret = ERROR_SUCCESS;
481 481
@@ -495,8 +495,8 @@ int SrsEdgeForwarder::proxy(__SrsMessage* msg) @@ -495,8 +495,8 @@ int SrsEdgeForwarder::proxy(__SrsMessage* msg)
495 } 495 }
496 496
497 // TODO: FIXME: use utility to copy msg to shared ptr msg. 497 // TODO: FIXME: use utility to copy msg to shared ptr msg.
498 - __SrsSharedPtrMessage* copy = new __SrsSharedPtrMessage();  
499 - SrsAutoFree(__SrsSharedPtrMessage, copy, false); 498 + SrsSharedPtrMessage* copy = new SrsSharedPtrMessage();
  499 + SrsAutoFree(SrsSharedPtrMessage, copy, false);
500 if ((ret = copy->initialize(msg)) != ERROR_SUCCESS) { 500 if ((ret = copy->initialize(msg)) != ERROR_SUCCESS) {
501 srs_error("initialize the msg failed. ret=%d", ret); 501 srs_error("initialize the msg failed. ret=%d", ret);
502 return ret; 502 return ret;
@@ -724,7 +724,7 @@ int SrsPublishEdge::on_client_publish() @@ -724,7 +724,7 @@ int SrsPublishEdge::on_client_publish()
724 return ret; 724 return ret;
725 } 725 }
726 726
727 -int SrsPublishEdge::on_proxy_publish(__SrsMessage* msg) 727 +int SrsPublishEdge::on_proxy_publish(SrsMessage* msg)
728 { 728 {
729 return forwarder->proxy(msg); 729 return forwarder->proxy(msg);
730 } 730 }
@@ -40,7 +40,7 @@ class SrsRequest; @@ -40,7 +40,7 @@ class SrsRequest;
40 class SrsPlayEdge; 40 class SrsPlayEdge;
41 class SrsPublishEdge; 41 class SrsPublishEdge;
42 class SrsRtmpClient; 42 class SrsRtmpClient;
43 -class __SrsMessage; 43 +class SrsMessage;
44 class SrsMessageQueue; 44 class SrsMessageQueue;
45 class ISrsProtocolReaderWriter; 45 class ISrsProtocolReaderWriter;
46 46
@@ -99,7 +99,7 @@ private: @@ -99,7 +99,7 @@ private:
99 virtual int ingest(); 99 virtual int ingest();
100 virtual void close_underlayer_socket(); 100 virtual void close_underlayer_socket();
101 virtual int connect_server(); 101 virtual int connect_server();
102 - virtual int process_publish_message(__SrsMessage* msg); 102 + virtual int process_publish_message(SrsMessage* msg);
103 }; 103 };
104 104
105 /** 105 /**
@@ -142,7 +142,7 @@ public: @@ -142,7 +142,7 @@ public:
142 public: 142 public:
143 virtual int cycle(); 143 virtual int cycle();
144 public: 144 public:
145 - virtual int proxy(__SrsMessage* msg); 145 + virtual int proxy(SrsMessage* msg);
146 private: 146 private:
147 virtual void close_underlayer_socket(); 147 virtual void close_underlayer_socket();
148 virtual int connect_server(); 148 virtual int connect_server();
@@ -202,7 +202,7 @@ public: @@ -202,7 +202,7 @@ public:
202 /** 202 /**
203 * proxy publish stream to edge 203 * proxy publish stream to edge
204 */ 204 */
205 - virtual int on_proxy_publish(__SrsMessage* msg); 205 + virtual int on_proxy_publish(SrsMessage* msg);
206 /** 206 /**
207 * proxy unpublish stream to edge. 207 * proxy unpublish stream to edge.
208 */ 208 */
@@ -148,7 +148,7 @@ void SrsForwarder::on_unpublish() @@ -148,7 +148,7 @@ void SrsForwarder::on_unpublish()
148 srs_freep(io); 148 srs_freep(io);
149 } 149 }
150 150
151 -int SrsForwarder::on_meta_data(__SrsSharedPtrMessage* metadata) 151 +int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
152 { 152 {
153 int ret = ERROR_SUCCESS; 153 int ret = ERROR_SUCCESS;
154 154
@@ -164,7 +164,7 @@ int SrsForwarder::on_meta_data(__SrsSharedPtrMessage* metadata) @@ -164,7 +164,7 @@ int SrsForwarder::on_meta_data(__SrsSharedPtrMessage* metadata)
164 return ret; 164 return ret;
165 } 165 }
166 166
167 -int SrsForwarder::on_audio(__SrsSharedPtrMessage* msg) 167 +int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
168 { 168 {
169 int ret = ERROR_SUCCESS; 169 int ret = ERROR_SUCCESS;
170 170
@@ -180,7 +180,7 @@ int SrsForwarder::on_audio(__SrsSharedPtrMessage* msg) @@ -180,7 +180,7 @@ int SrsForwarder::on_audio(__SrsSharedPtrMessage* msg)
180 return ret; 180 return ret;
181 } 181 }
182 182
183 -int SrsForwarder::on_video(__SrsSharedPtrMessage* msg) 183 +int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
184 { 184 {
185 int ret = ERROR_SUCCESS; 185 int ret = ERROR_SUCCESS;
186 186
@@ -315,8 +315,8 @@ int SrsForwarder::forward() @@ -315,8 +315,8 @@ int SrsForwarder::forward()
315 315
316 // read from client. 316 // read from client.
317 if (true) { 317 if (true) {
318 - __SrsMessage* msg = NULL;  
319 - ret = client->__recv_message(&msg); 318 + SrsMessage* msg = NULL;
  319 + ret = client->recv_message(&msg);
320 320
321 srs_verbose("play loop recv message. ret=%d", ret); 321 srs_verbose("play loop recv message. ret=%d", ret);
322 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) { 322 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@@ -329,7 +329,7 @@ int SrsForwarder::forward() @@ -329,7 +329,7 @@ int SrsForwarder::forward()
329 329
330 // forward all messages. 330 // forward all messages.
331 int count = 0; 331 int count = 0;
332 - __SrsSharedPtrMessage** msgs = NULL; 332 + SrsSharedPtrMessage** msgs = NULL;
333 if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) { 333 if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
334 srs_error("get message to forward failed. ret=%d", ret); 334 srs_error("get message to forward failed. ret=%d", ret);
335 return ret; 335 return ret;
@@ -348,16 +348,16 @@ int SrsForwarder::forward() @@ -348,16 +348,16 @@ int SrsForwarder::forward()
348 srs_verbose("no packets to forward."); 348 srs_verbose("no packets to forward.");
349 continue; 349 continue;
350 } 350 }
351 - SrsAutoFree(__SrsSharedPtrMessage*, msgs, true); 351 + SrsAutoFree(SrsSharedPtrMessage*, msgs, true);
352 352
353 // all msgs to forward. 353 // all msgs to forward.
354 for (int i = 0; i < count; i++) { 354 for (int i = 0; i < count; i++) {
355 - __SrsSharedPtrMessage* msg = msgs[i]; 355 + SrsSharedPtrMessage* msg = msgs[i];
356 356
357 srs_assert(msg); 357 srs_assert(msg);
358 msgs[i] = NULL; 358 msgs[i] = NULL;
359 359
360 - if ((ret = client->__send_and_free_message(msg)) != ERROR_SUCCESS) { 360 + if ((ret = client->send_and_free_message(msg)) != ERROR_SUCCESS) {
361 srs_error("forwarder send message to server failed. ret=%d", ret); 361 srs_error("forwarder send message to server failed. ret=%d", ret);
362 return ret; 362 return ret;
363 } 363 }
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 #include <srs_app_thread.hpp> 35 #include <srs_app_thread.hpp>
36 36
37 class ISrsProtocolReaderWriter; 37 class ISrsProtocolReaderWriter;
38 -class __SrsSharedPtrMessage; 38 +class SrsSharedPtrMessage;
39 class SrsOnMetaDataPacket; 39 class SrsOnMetaDataPacket;
40 class SrsMessageQueue; 40 class SrsMessageQueue;
41 class SrsRtmpJitter; 41 class SrsRtmpJitter;
@@ -72,9 +72,9 @@ public: @@ -72,9 +72,9 @@ public:
72 public: 72 public:
73 virtual int on_publish(SrsRequest* req, std::string forward_server); 73 virtual int on_publish(SrsRequest* req, std::string forward_server);
74 virtual void on_unpublish(); 74 virtual void on_unpublish();
75 - virtual int on_meta_data(__SrsSharedPtrMessage* metadata);  
76 - virtual int on_audio(__SrsSharedPtrMessage* msg);  
77 - virtual int on_video(__SrsSharedPtrMessage* msg); 75 + virtual int on_meta_data(SrsSharedPtrMessage* metadata);
  76 + virtual int on_audio(SrsSharedPtrMessage* msg);
  77 + virtual int on_video(SrsSharedPtrMessage* msg);
78 // interface ISrsThreadHandler. 78 // interface ISrsThreadHandler.
79 public: 79 public:
80 virtual int cycle(); 80 virtual int cycle();
@@ -1379,11 +1379,11 @@ int SrsHls::on_meta_data(SrsAmf0Object* metadata) @@ -1379,11 +1379,11 @@ int SrsHls::on_meta_data(SrsAmf0Object* metadata)
1379 return ret; 1379 return ret;
1380 } 1380 }
1381 1381
1382 -int SrsHls::on_audio(__SrsSharedPtrMessage* audio) 1382 +int SrsHls::on_audio(SrsSharedPtrMessage* audio)
1383 { 1383 {
1384 int ret = ERROR_SUCCESS; 1384 int ret = ERROR_SUCCESS;
1385 1385
1386 - SrsAutoFree(__SrsSharedPtrMessage, audio, false); 1386 + SrsAutoFree(SrsSharedPtrMessage, audio, false);
1387 1387
1388 if (!hls_enabled) { 1388 if (!hls_enabled) {
1389 return ret; 1389 return ret;
@@ -1423,11 +1423,11 @@ int SrsHls::on_audio(__SrsSharedPtrMessage* audio) @@ -1423,11 +1423,11 @@ int SrsHls::on_audio(__SrsSharedPtrMessage* audio)
1423 return ret; 1423 return ret;
1424 } 1424 }
1425 1425
1426 -int SrsHls::on_video(__SrsSharedPtrMessage* video) 1426 +int SrsHls::on_video(SrsSharedPtrMessage* video)
1427 { 1427 {
1428 int ret = ERROR_SUCCESS; 1428 int ret = ERROR_SUCCESS;
1429 1429
1430 - SrsAutoFree(__SrsSharedPtrMessage, video, false); 1430 + SrsAutoFree(SrsSharedPtrMessage, video, false);
1431 1431
1432 if (!hls_enabled) { 1432 if (!hls_enabled) {
1433 return ret; 1433 return ret;
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 #include <string> 34 #include <string>
35 #include <vector> 35 #include <vector>
36 36
37 -class __SrsSharedPtrMessage; 37 +class SrsSharedPtrMessage;
38 class SrsCodecSample; 38 class SrsCodecSample;
39 class SrsCodecBuffer; 39 class SrsCodecBuffer;
40 class SrsMpegtsFrame; 40 class SrsMpegtsFrame;
@@ -314,11 +314,11 @@ public: @@ -314,11 +314,11 @@ public:
314 /** 314 /**
315 * mux the audio packets to ts. 315 * mux the audio packets to ts.
316 */ 316 */
317 - virtual int on_audio(__SrsSharedPtrMessage* audio); 317 + virtual int on_audio(SrsSharedPtrMessage* audio);
318 /** 318 /**
319 * mux the video packets to ts. 319 * mux the video packets to ts.
320 */ 320 */
321 - virtual int on_video(__SrsSharedPtrMessage* video); 321 + virtual int on_video(SrsSharedPtrMessage* video);
322 private: 322 private:
323 virtual void hls_mux(); 323 virtual void hls_mux();
324 }; 324 };
@@ -472,8 +472,8 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -472,8 +472,8 @@ int SrsRtmpConn::playing(SrsSource* source)
472 // read from client. 472 // read from client.
473 int ctl_msg_ret = ERROR_SUCCESS; 473 int ctl_msg_ret = ERROR_SUCCESS;
474 if (true) { 474 if (true) {
475 - __SrsMessage* msg = NULL;  
476 - ctl_msg_ret = ret = rtmp->__recv_message(&msg); 475 + SrsMessage* msg = NULL;
  476 + ctl_msg_ret = ret = rtmp->recv_message(&msg);
477 477
478 srs_verbose("play loop recv message. ret=%d", ret); 478 srs_verbose("play loop recv message. ret=%d", ret);
479 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) { 479 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@@ -491,7 +491,7 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -491,7 +491,7 @@ int SrsRtmpConn::playing(SrsSource* source)
491 } 491 }
492 492
493 // get messages from consumer. 493 // get messages from consumer.
494 - __SrsSharedPtrMessage** msgs = NULL; 494 + SrsSharedPtrMessage** msgs = NULL;
495 int count = 0; 495 int count = 0;
496 if ((ret = consumer->get_packets(0, msgs, count)) != ERROR_SUCCESS) { 496 if ((ret = consumer->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
497 srs_error("get messages from consumer failed. ret=%d", ret); 497 srs_error("get messages from consumer failed. ret=%d", ret);
@@ -510,11 +510,11 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -510,11 +510,11 @@ int SrsRtmpConn::playing(SrsSource* source)
510 srs_verbose("no packets in queue."); 510 srs_verbose("no packets in queue.");
511 continue; 511 continue;
512 } 512 }
513 - SrsAutoFree(__SrsSharedPtrMessage*, msgs, true); 513 + SrsAutoFree(SrsSharedPtrMessage*, msgs, true);
514 514
515 // sendout messages 515 // sendout messages
516 for (int i = 0; i < count; i++) { 516 for (int i = 0; i < count; i++) {
517 - __SrsSharedPtrMessage* msg = msgs[i]; 517 + SrsSharedPtrMessage* msg = msgs[i];
518 518
519 // the send_message will free the msg, 519 // the send_message will free the msg,
520 // so set the msgs[i] to NULL. 520 // so set the msgs[i] to NULL.
@@ -530,7 +530,7 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -530,7 +530,7 @@ int SrsRtmpConn::playing(SrsSource* source)
530 duration += msg->header.timestamp - starttime; 530 duration += msg->header.timestamp - starttime;
531 starttime = msg->header.timestamp; 531 starttime = msg->header.timestamp;
532 532
533 - if ((ret = rtmp->__send_and_free_message(msg)) != ERROR_SUCCESS) { 533 + if ((ret = rtmp->send_and_free_message(msg)) != ERROR_SUCCESS) {
534 srs_error("send message to client failed. ret=%d", ret); 534 srs_error("send message to client failed. ret=%d", ret);
535 return ret; 535 return ret;
536 } 536 }
@@ -573,13 +573,13 @@ int SrsRtmpConn::fmle_publish(SrsSource* source) @@ -573,13 +573,13 @@ int SrsRtmpConn::fmle_publish(SrsSource* source)
573 // switch to other st-threads. 573 // switch to other st-threads.
574 st_usleep(0); 574 st_usleep(0);
575 575
576 - __SrsMessage* msg = NULL;  
577 - if ((ret = rtmp->__recv_message(&msg)) != ERROR_SUCCESS) { 576 + SrsMessage* msg = NULL;
  577 + if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
578 srs_error("fmle recv identify client message failed. ret=%d", ret); 578 srs_error("fmle recv identify client message failed. ret=%d", ret);
579 return ret; 579 return ret;
580 } 580 }
581 581
582 - SrsAutoFree(__SrsMessage, msg, false); 582 + SrsAutoFree(SrsMessage, msg, false);
583 583
584 pithy_print.elapse(); 584 pithy_print.elapse();
585 585
@@ -594,7 +594,7 @@ int SrsRtmpConn::fmle_publish(SrsSource* source) @@ -594,7 +594,7 @@ int SrsRtmpConn::fmle_publish(SrsSource* source)
594 // process UnPublish event. 594 // process UnPublish event.
595 if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) { 595 if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) {
596 SrsPacket* pkt = NULL; 596 SrsPacket* pkt = NULL;
597 - if ((ret = rtmp->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 597 + if ((ret = rtmp->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
598 srs_error("fmle decode unpublish message failed. ret=%d", ret); 598 srs_error("fmle decode unpublish message failed. ret=%d", ret);
599 return ret; 599 return ret;
600 } 600 }
@@ -648,15 +648,15 @@ int SrsRtmpConn::flash_publish(SrsSource* source) @@ -648,15 +648,15 @@ int SrsRtmpConn::flash_publish(SrsSource* source)
648 // switch to other st-threads. 648 // switch to other st-threads.
649 st_usleep(0); 649 st_usleep(0);
650 650
651 - __SrsMessage* msg = NULL;  
652 - if ((ret = rtmp->__recv_message(&msg)) != ERROR_SUCCESS) { 651 + SrsMessage* msg = NULL;
  652 + if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
653 if (!srs_is_client_gracefully_close(ret)) { 653 if (!srs_is_client_gracefully_close(ret)) {
654 srs_error("flash recv identify client message failed. ret=%d", ret); 654 srs_error("flash recv identify client message failed. ret=%d", ret);
655 } 655 }
656 return ret; 656 return ret;
657 } 657 }
658 658
659 - SrsAutoFree(__SrsMessage, msg, false); 659 + SrsAutoFree(SrsMessage, msg, false);
660 660
661 pithy_print.elapse(); 661 pithy_print.elapse();
662 662
@@ -671,7 +671,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source) @@ -671,7 +671,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source)
671 // process UnPublish event. 671 // process UnPublish event.
672 if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) { 672 if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) {
673 SrsPacket* pkt = NULL; 673 SrsPacket* pkt = NULL;
674 - if ((ret = rtmp->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 674 + if ((ret = rtmp->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
675 srs_error("flash decode unpublish message failed. ret=%d", ret); 675 srs_error("flash decode unpublish message failed. ret=%d", ret);
676 return ret; 676 return ret;
677 } 677 }
@@ -694,7 +694,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source) @@ -694,7 +694,7 @@ int SrsRtmpConn::flash_publish(SrsSource* source)
694 return ret; 694 return ret;
695 } 695 }
696 696
697 -int SrsRtmpConn::process_publish_message(SrsSource* source, __SrsMessage* msg, bool vhost_is_edge) 697 +int SrsRtmpConn::process_publish_message(SrsSource* source, SrsMessage* msg, bool vhost_is_edge)
698 { 698 {
699 int ret = ERROR_SUCCESS; 699 int ret = ERROR_SUCCESS;
700 700
@@ -727,7 +727,7 @@ int SrsRtmpConn::process_publish_message(SrsSource* source, __SrsMessage* msg, b @@ -727,7 +727,7 @@ int SrsRtmpConn::process_publish_message(SrsSource* source, __SrsMessage* msg, b
727 // process onMetaData 727 // process onMetaData
728 if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) { 728 if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) {
729 SrsPacket* pkt = NULL; 729 SrsPacket* pkt = NULL;
730 - if ((ret = rtmp->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 730 + if ((ret = rtmp->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
731 srs_error("decode onMetaData message failed. ret=%d", ret); 731 srs_error("decode onMetaData message failed. ret=%d", ret);
732 return ret; 732 return ret;
733 } 733 }
@@ -750,7 +750,7 @@ int SrsRtmpConn::process_publish_message(SrsSource* source, __SrsMessage* msg, b @@ -750,7 +750,7 @@ int SrsRtmpConn::process_publish_message(SrsSource* source, __SrsMessage* msg, b
750 return ret; 750 return ret;
751 } 751 }
752 752
753 -int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, __SrsMessage* msg) 753 +int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg)
754 { 754 {
755 int ret = ERROR_SUCCESS; 755 int ret = ERROR_SUCCESS;
756 756
@@ -758,7 +758,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, __SrsMessage* m @@ -758,7 +758,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, __SrsMessage* m
758 srs_verbose("ignore all empty message."); 758 srs_verbose("ignore all empty message.");
759 return ret; 759 return ret;
760 } 760 }
761 - SrsAutoFree(__SrsMessage, msg, false); 761 + SrsAutoFree(SrsMessage, msg, false);
762 762
763 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) { 763 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
764 srs_info("ignore all message except amf0/amf3 command."); 764 srs_info("ignore all message except amf0/amf3 command.");
@@ -766,7 +766,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, __SrsMessage* m @@ -766,7 +766,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, __SrsMessage* m
766 } 766 }
767 767
768 SrsPacket* pkt = NULL; 768 SrsPacket* pkt = NULL;
769 - if ((ret = rtmp->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 769 + if ((ret = rtmp->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
770 srs_error("decode the amf0/amf3 command packet failed. ret=%d", ret); 770 srs_error("decode the amf0/amf3 command packet failed. ret=%d", ret);
771 return ret; 771 return ret;
772 } 772 }
@@ -40,7 +40,7 @@ class SrsResponse; @@ -40,7 +40,7 @@ class SrsResponse;
40 class SrsSource; 40 class SrsSource;
41 class SrsRefer; 41 class SrsRefer;
42 class SrsConsumer; 42 class SrsConsumer;
43 -class __SrsMessage; 43 +class SrsMessage;
44 class SrsSocket; 44 class SrsSocket;
45 #ifdef SRS_AUTO_HTTP_CALLBACK 45 #ifdef SRS_AUTO_HTTP_CALLBACK
46 class SrsHttpHooks; 46 class SrsHttpHooks;
@@ -80,8 +80,8 @@ private: @@ -80,8 +80,8 @@ private:
80 virtual int playing(SrsSource* source); 80 virtual int playing(SrsSource* source);
81 virtual int fmle_publish(SrsSource* source); 81 virtual int fmle_publish(SrsSource* source);
82 virtual int flash_publish(SrsSource* source); 82 virtual int flash_publish(SrsSource* source);
83 - virtual int process_publish_message(SrsSource* source, __SrsMessage* msg, bool vhost_is_edge);  
84 - virtual int process_play_control_msg(SrsConsumer* consumer, __SrsMessage* msg); 83 + virtual int process_publish_message(SrsSource* source, SrsMessage* msg, bool vhost_is_edge);
  84 + virtual int process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg);
85 private: 85 private:
86 virtual int http_hooks_on_connect(); 86 virtual int http_hooks_on_connect();
87 virtual void http_hooks_on_close(); 87 virtual void http_hooks_on_close();
@@ -52,7 +52,7 @@ SrsRtmpJitter::~SrsRtmpJitter() @@ -52,7 +52,7 @@ SrsRtmpJitter::~SrsRtmpJitter()
52 { 52 {
53 } 53 }
54 54
55 -int SrsRtmpJitter::correct(__SrsSharedPtrMessage* msg, int tba, int tbv) 55 +int SrsRtmpJitter::correct(SrsSharedPtrMessage* msg, int tba, int tbv)
56 { 56 {
57 int ret = ERROR_SUCCESS; 57 int ret = ERROR_SUCCESS;
58 58
@@ -130,7 +130,7 @@ void SrsMessageQueue::set_queue_size(double queue_size) @@ -130,7 +130,7 @@ void SrsMessageQueue::set_queue_size(double queue_size)
130 queue_size_ms = (int)(queue_size * 1000); 130 queue_size_ms = (int)(queue_size * 1000);
131 } 131 }
132 132
133 -int SrsMessageQueue::enqueue(__SrsSharedPtrMessage* msg) 133 +int SrsMessageQueue::enqueue(SrsSharedPtrMessage* msg)
134 { 134 {
135 int ret = ERROR_SUCCESS; 135 int ret = ERROR_SUCCESS;
136 136
@@ -151,7 +151,7 @@ int SrsMessageQueue::enqueue(__SrsSharedPtrMessage* msg) @@ -151,7 +151,7 @@ int SrsMessageQueue::enqueue(__SrsSharedPtrMessage* msg)
151 return ret; 151 return ret;
152 } 152 }
153 153
154 -int SrsMessageQueue::get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs, int& count) 154 +int SrsMessageQueue::get_packets(int max_count, SrsSharedPtrMessage**& pmsgs, int& count)
155 { 155 {
156 int ret = ERROR_SUCCESS; 156 int ret = ERROR_SUCCESS;
157 157
@@ -169,13 +169,13 @@ int SrsMessageQueue::get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs, @@ -169,13 +169,13 @@ int SrsMessageQueue::get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs,
169 return ret; 169 return ret;
170 } 170 }
171 171
172 - pmsgs = new __SrsSharedPtrMessage*[count]; 172 + pmsgs = new SrsSharedPtrMessage*[count];
173 173
174 for (int i = 0; i < count; i++) { 174 for (int i = 0; i < count; i++) {
175 pmsgs[i] = msgs[i]; 175 pmsgs[i] = msgs[i];
176 } 176 }
177 177
178 - __SrsSharedPtrMessage* last = msgs[count - 1]; 178 + SrsSharedPtrMessage* last = msgs[count - 1];
179 av_start_time = last->header.timestamp; 179 av_start_time = last->header.timestamp;
180 180
181 if (count == (int)msgs.size()) { 181 if (count == (int)msgs.size()) {
@@ -196,7 +196,7 @@ void SrsMessageQueue::shrink() @@ -196,7 +196,7 @@ void SrsMessageQueue::shrink()
196 // for when we shrinked, the first is the iframe, 196 // for when we shrinked, the first is the iframe,
197 // we will directly remove the gop next time. 197 // we will directly remove the gop next time.
198 for (int i = 1; i < (int)msgs.size(); i++) { 198 for (int i = 1; i < (int)msgs.size(); i++) {
199 - __SrsSharedPtrMessage* msg = msgs[i]; 199 + SrsSharedPtrMessage* msg = msgs[i];
200 200
201 if (msg->header.is_video()) { 201 if (msg->header.is_video()) {
202 if (SrsCodec::video_is_keyframe(msg->payload, msg->size)) { 202 if (SrsCodec::video_is_keyframe(msg->payload, msg->size)) {
@@ -222,7 +222,7 @@ void SrsMessageQueue::shrink() @@ -222,7 +222,7 @@ void SrsMessageQueue::shrink()
222 222
223 // remove the first gop from the front 223 // remove the first gop from the front
224 for (int i = 0; i < iframe_index; i++) { 224 for (int i = 0; i < iframe_index; i++) {
225 - __SrsSharedPtrMessage* msg = msgs[i]; 225 + SrsSharedPtrMessage* msg = msgs[i];
226 srs_freep(msg); 226 srs_freep(msg);
227 } 227 }
228 msgs.erase(msgs.begin(), msgs.begin() + iframe_index); 228 msgs.erase(msgs.begin(), msgs.begin() + iframe_index);
@@ -230,10 +230,10 @@ void SrsMessageQueue::shrink() @@ -230,10 +230,10 @@ void SrsMessageQueue::shrink()
230 230
231 void SrsMessageQueue::clear() 231 void SrsMessageQueue::clear()
232 { 232 {
233 - std::vector<__SrsSharedPtrMessage*>::iterator it; 233 + std::vector<SrsSharedPtrMessage*>::iterator it;
234 234
235 for (it = msgs.begin(); it != msgs.end(); ++it) { 235 for (it = msgs.begin(); it != msgs.end(); ++it) {
236 - __SrsSharedPtrMessage* msg = *it; 236 + SrsSharedPtrMessage* msg = *it;
237 srs_freep(msg); 237 srs_freep(msg);
238 } 238 }
239 239
@@ -267,7 +267,7 @@ int SrsConsumer::get_time() @@ -267,7 +267,7 @@ int SrsConsumer::get_time()
267 return jitter->get_time(); 267 return jitter->get_time();
268 } 268 }
269 269
270 -int SrsConsumer::enqueue(__SrsSharedPtrMessage* msg, int tba, int tbv) 270 +int SrsConsumer::enqueue(SrsSharedPtrMessage* msg, int tba, int tbv)
271 { 271 {
272 int ret = ERROR_SUCCESS; 272 int ret = ERROR_SUCCESS;
273 273
@@ -285,7 +285,7 @@ int SrsConsumer::enqueue(__SrsSharedPtrMessage* msg, int tba, int tbv) @@ -285,7 +285,7 @@ int SrsConsumer::enqueue(__SrsSharedPtrMessage* msg, int tba, int tbv)
285 return ret; 285 return ret;
286 } 286 }
287 287
288 -int SrsConsumer::get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs, int& count) 288 +int SrsConsumer::get_packets(int max_count, SrsSharedPtrMessage**& pmsgs, int& count)
289 { 289 {
290 // paused, return nothing. 290 // paused, return nothing.
291 if (paused) { 291 if (paused) {
@@ -329,7 +329,7 @@ void SrsGopCache::set(bool enabled) @@ -329,7 +329,7 @@ void SrsGopCache::set(bool enabled)
329 srs_info("enable gop cache"); 329 srs_info("enable gop cache");
330 } 330 }
331 331
332 -int SrsGopCache::cache(__SrsSharedPtrMessage* msg) 332 +int SrsGopCache::cache(SrsSharedPtrMessage* msg)
333 { 333 {
334 int ret = ERROR_SUCCESS; 334 int ret = ERROR_SUCCESS;
335 335
@@ -368,9 +368,9 @@ int SrsGopCache::cache(__SrsSharedPtrMessage* msg) @@ -368,9 +368,9 @@ int SrsGopCache::cache(__SrsSharedPtrMessage* msg)
368 368
369 void SrsGopCache::clear() 369 void SrsGopCache::clear()
370 { 370 {
371 - std::vector<__SrsSharedPtrMessage*>::iterator it; 371 + std::vector<SrsSharedPtrMessage*>::iterator it;
372 for (it = gop_cache.begin(); it != gop_cache.end(); ++it) { 372 for (it = gop_cache.begin(); it != gop_cache.end(); ++it) {
373 - __SrsSharedPtrMessage* msg = *it; 373 + SrsSharedPtrMessage* msg = *it;
374 srs_freep(msg); 374 srs_freep(msg);
375 } 375 }
376 gop_cache.clear(); 376 gop_cache.clear();
@@ -382,9 +382,9 @@ int SrsGopCache::dump(SrsConsumer* consumer, int tba, int tbv) @@ -382,9 +382,9 @@ int SrsGopCache::dump(SrsConsumer* consumer, int tba, int tbv)
382 { 382 {
383 int ret = ERROR_SUCCESS; 383 int ret = ERROR_SUCCESS;
384 384
385 - std::vector<__SrsSharedPtrMessage*>::iterator it; 385 + std::vector<SrsSharedPtrMessage*>::iterator it;
386 for (it = gop_cache.begin(); it != gop_cache.end(); ++it) { 386 for (it = gop_cache.begin(); it != gop_cache.end(); ++it) {
387 - __SrsSharedPtrMessage* msg = *it; 387 + SrsSharedPtrMessage* msg = *it;
388 if ((ret = consumer->enqueue(msg->copy(), tba, tbv)) != ERROR_SUCCESS) { 388 if ((ret = consumer->enqueue(msg->copy(), tba, tbv)) != ERROR_SUCCESS) {
389 srs_error("dispatch cached gop failed. ret=%d", ret); 389 srs_error("dispatch cached gop failed. ret=%d", ret);
390 return ret; 390 return ret;
@@ -406,7 +406,7 @@ int64_t SrsGopCache::get_start_time() @@ -406,7 +406,7 @@ int64_t SrsGopCache::get_start_time()
406 return 0; 406 return 0;
407 } 407 }
408 408
409 - __SrsSharedPtrMessage* msg = gop_cache[0]; 409 + SrsSharedPtrMessage* msg = gop_cache[0];
410 srs_assert(msg); 410 srs_assert(msg);
411 411
412 return msg->header.timestamp; 412 return msg->header.timestamp;
@@ -789,7 +789,7 @@ bool SrsSource::can_publish() @@ -789,7 +789,7 @@ bool SrsSource::can_publish()
789 return _can_publish; 789 return _can_publish;
790 } 790 }
791 791
792 -int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata) 792 +int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
793 { 793 {
794 int ret = ERROR_SUCCESS; 794 int ret = ERROR_SUCCESS;
795 795
@@ -823,13 +823,7 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata) @@ -823,13 +823,7 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata)
823 } 823 }
824 824
825 // encode the metadata to payload 825 // encode the metadata to payload
826 - int size = metadata->get_payload_length();  
827 - if (size <= 0) {  
828 - srs_warn("ignore the invalid metadata. size=%d", size);  
829 - return ret;  
830 - }  
831 - srs_verbose("get metadata size success.");  
832 - 826 + int size = 0;
833 char* payload = NULL; 827 char* payload = NULL;
834 if ((ret = metadata->encode(size, payload)) != ERROR_SUCCESS) { 828 if ((ret = metadata->encode(size, payload)) != ERROR_SUCCESS) {
835 srs_error("encode metadata error. ret=%d", ret); 829 srs_error("encode metadata error. ret=%d", ret);
@@ -838,9 +832,14 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata) @@ -838,9 +832,14 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata)
838 } 832 }
839 srs_verbose("encode metadata success."); 833 srs_verbose("encode metadata success.");
840 834
  835 + if (size <= 0) {
  836 + srs_warn("ignore the invalid metadata. size=%d", size);
  837 + return ret;
  838 + }
  839 +
841 // create a shared ptr message. 840 // create a shared ptr message.
842 srs_freep(cache_metadata); 841 srs_freep(cache_metadata);
843 - cache_metadata = new __SrsSharedPtrMessage(); 842 + cache_metadata = new SrsSharedPtrMessage();
844 843
845 // dump message to shared ptr message. 844 // dump message to shared ptr message.
846 if ((ret = cache_metadata->initialize(&msg->header, payload, size)) != ERROR_SUCCESS) { 845 if ((ret = cache_metadata->initialize(&msg->header, payload, size)) != ERROR_SUCCESS) {
@@ -877,12 +876,12 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata) @@ -877,12 +876,12 @@ int SrsSource::on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata)
877 return ret; 876 return ret;
878 } 877 }
879 878
880 -int SrsSource::on_audio(__SrsMessage* audio) 879 +int SrsSource::on_audio(SrsMessage* audio)
881 { 880 {
882 int ret = ERROR_SUCCESS; 881 int ret = ERROR_SUCCESS;
883 882
884 - __SrsSharedPtrMessage* msg = new __SrsSharedPtrMessage();  
885 - SrsAutoFree(__SrsSharedPtrMessage, msg, false); 883 + SrsSharedPtrMessage* msg = new SrsSharedPtrMessage();
  884 + SrsAutoFree(SrsSharedPtrMessage, msg, false);
886 if ((ret = msg->initialize(audio)) != ERROR_SUCCESS) { 885 if ((ret = msg->initialize(audio)) != ERROR_SUCCESS) {
887 srs_error("initialize the audio failed. ret=%d", ret); 886 srs_error("initialize the audio failed. ret=%d", ret);
888 return ret; 887 return ret;
@@ -966,12 +965,12 @@ int SrsSource::on_audio(__SrsMessage* audio) @@ -966,12 +965,12 @@ int SrsSource::on_audio(__SrsMessage* audio)
966 return ret; 965 return ret;
967 } 966 }
968 967
969 -int SrsSource::on_video(__SrsMessage* video) 968 +int SrsSource::on_video(SrsMessage* video)
970 { 969 {
971 int ret = ERROR_SUCCESS; 970 int ret = ERROR_SUCCESS;
972 971
973 - __SrsSharedPtrMessage* msg = new __SrsSharedPtrMessage();  
974 - SrsAutoFree(__SrsSharedPtrMessage, msg, false); 972 + SrsSharedPtrMessage* msg = new SrsSharedPtrMessage();
  973 + SrsAutoFree(SrsSharedPtrMessage, msg, false);
975 if ((ret = msg->initialize(video)) != ERROR_SUCCESS) { 974 if ((ret = msg->initialize(video)) != ERROR_SUCCESS) {
976 srs_error("initialize the video failed. ret=%d", ret); 975 srs_error("initialize the video failed. ret=%d", ret);
977 return ret; 976 return ret;
@@ -1207,7 +1206,7 @@ int SrsSource::on_edge_start_publish() @@ -1207,7 +1206,7 @@ int SrsSource::on_edge_start_publish()
1207 return publish_edge->on_client_publish(); 1206 return publish_edge->on_client_publish();
1208 } 1207 }
1209 1208
1210 -int SrsSource::on_edge_proxy_publish(__SrsMessage* msg) 1209 +int SrsSource::on_edge_proxy_publish(SrsMessage* msg)
1211 { 1210 {
1212 return publish_edge->on_proxy_publish(msg); 1211 return publish_edge->on_proxy_publish(msg);
1213 } 1212 }
@@ -40,9 +40,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -40,9 +40,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
40 class SrsPlayEdge; 40 class SrsPlayEdge;
41 class SrsPublishEdge; 41 class SrsPublishEdge;
42 class SrsSource; 42 class SrsSource;
43 -class __SrsMessage; 43 +class SrsMessage;
44 class SrsOnMetaDataPacket; 44 class SrsOnMetaDataPacket;
45 -class __SrsSharedPtrMessage; 45 +class SrsSharedPtrMessage;
46 class SrsForwarder; 46 class SrsForwarder;
47 class SrsRequest; 47 class SrsRequest;
48 class SrsSocket; 48 class SrsSocket;
@@ -74,7 +74,7 @@ public: @@ -74,7 +74,7 @@ public:
74 /** 74 /**
75 * detect the time jitter and correct it. 75 * detect the time jitter and correct it.
76 */ 76 */
77 - virtual int correct(__SrsSharedPtrMessage* msg, int tba, int tbv); 77 + virtual int correct(SrsSharedPtrMessage* msg, int tba, int tbv);
78 /** 78 /**
79 * get current client time, the last packet time. 79 * get current client time, the last packet time.
80 */ 80 */
@@ -91,7 +91,7 @@ private: @@ -91,7 +91,7 @@ private:
91 int64_t av_start_time; 91 int64_t av_start_time;
92 int64_t av_end_time; 92 int64_t av_end_time;
93 int queue_size_ms; 93 int queue_size_ms;
94 - std::vector<__SrsSharedPtrMessage*> msgs; 94 + std::vector<SrsSharedPtrMessage*> msgs;
95 public: 95 public:
96 SrsMessageQueue(); 96 SrsMessageQueue();
97 virtual ~SrsMessageQueue(); 97 virtual ~SrsMessageQueue();
@@ -106,14 +106,14 @@ public: @@ -106,14 +106,14 @@ public:
106 * enqueue the message, the timestamp always monotonically. 106 * enqueue the message, the timestamp always monotonically.
107 * @param msg, the msg to enqueue, user never free it whatever the return code. 107 * @param msg, the msg to enqueue, user never free it whatever the return code.
108 */ 108 */
109 - virtual int enqueue(__SrsSharedPtrMessage* msg); 109 + virtual int enqueue(SrsSharedPtrMessage* msg);
110 /** 110 /**
111 * get packets in consumer queue. 111 * get packets in consumer queue.
112 * @pmsgs SrsMessages*[], output the prt array. 112 * @pmsgs SrsMessages*[], output the prt array.
113 * @count the count in array. 113 * @count the count in array.
114 * @max_count the max count to dequeue, 0 to dequeue all. 114 * @max_count the max count to dequeue, 0 to dequeue all.
115 */ 115 */
116 - virtual int get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs, int& count); 116 + virtual int get_packets(int max_count, SrsSharedPtrMessage**& pmsgs, int& count);
117 private: 117 private:
118 /** 118 /**
119 * remove a gop from the front. 119 * remove a gop from the front.
@@ -150,14 +150,14 @@ public: @@ -150,14 +150,14 @@ public:
150 * @param tbv timebase of video. 150 * @param tbv timebase of video.
151 * used to calc the video time delta if time-jitter detected. 151 * used to calc the video time delta if time-jitter detected.
152 */ 152 */
153 - virtual int enqueue(__SrsSharedPtrMessage* msg, int tba, int tbv); 153 + virtual int enqueue(SrsSharedPtrMessage* msg, int tba, int tbv);
154 /** 154 /**
155 * get packets in consumer queue. 155 * get packets in consumer queue.
156 * @pmsgs SrsMessages*[], output the prt array. 156 * @pmsgs SrsMessages*[], output the prt array.
157 * @count the count in array. 157 * @count the count in array.
158 * @max_count the max count to dequeue, 0 to dequeue all. 158 * @max_count the max count to dequeue, 0 to dequeue all.
159 */ 159 */
160 - virtual int get_packets(int max_count, __SrsSharedPtrMessage**& pmsgs, int& count); 160 + virtual int get_packets(int max_count, SrsSharedPtrMessage**& pmsgs, int& count);
161 /** 161 /**
162 * when client send the pause message. 162 * when client send the pause message.
163 */ 163 */
@@ -185,7 +185,7 @@ private: @@ -185,7 +185,7 @@ private:
185 /** 185 /**
186 * cached gop. 186 * cached gop.
187 */ 187 */
188 - std::vector<__SrsSharedPtrMessage*> gop_cache; 188 + std::vector<SrsSharedPtrMessage*> gop_cache;
189 public: 189 public:
190 SrsGopCache(); 190 SrsGopCache();
191 virtual ~SrsGopCache(); 191 virtual ~SrsGopCache();
@@ -196,7 +196,7 @@ public: @@ -196,7 +196,7 @@ public:
196 * 1. cache the gop when got h264 video packet. 196 * 1. cache the gop when got h264 video packet.
197 * 2. clear gop when got keyframe. 197 * 2. clear gop when got keyframe.
198 */ 198 */
199 - virtual int cache(__SrsSharedPtrMessage* msg); 199 + virtual int cache(SrsSharedPtrMessage* msg);
200 virtual void clear(); 200 virtual void clear();
201 virtual int dump(SrsConsumer* consumer, int tba, int tbv); 201 virtual int dump(SrsConsumer* consumer, int tba, int tbv);
202 /** 202 /**
@@ -267,11 +267,11 @@ private: @@ -267,11 +267,11 @@ private:
267 // TODO: FIXME: to support reload atc. 267 // TODO: FIXME: to support reload atc.
268 bool atc; 268 bool atc;
269 private: 269 private:
270 - __SrsSharedPtrMessage* cache_metadata; 270 + SrsSharedPtrMessage* cache_metadata;
271 // the cached video sequence header. 271 // the cached video sequence header.
272 - __SrsSharedPtrMessage* cache_sh_video; 272 + SrsSharedPtrMessage* cache_sh_video;
273 // the cached audio sequence header. 273 // the cached audio sequence header.
274 - __SrsSharedPtrMessage* cache_sh_audio; 274 + SrsSharedPtrMessage* cache_sh_audio;
275 public: 275 public:
276 /** 276 /**
277 * @param _req the client request object, 277 * @param _req the client request object,
@@ -299,9 +299,9 @@ public: @@ -299,9 +299,9 @@ public:
299 virtual int on_dvr_request_sh(); 299 virtual int on_dvr_request_sh();
300 public: 300 public:
301 virtual bool can_publish(); 301 virtual bool can_publish();
302 - virtual int on_meta_data(__SrsMessage* msg, SrsOnMetaDataPacket* metadata);  
303 - virtual int on_audio(__SrsMessage* audio);  
304 - virtual int on_video(__SrsMessage* video); 302 + virtual int on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata);
  303 + virtual int on_audio(SrsMessage* audio);
  304 + virtual int on_video(SrsMessage* video);
305 /** 305 /**
306 * publish stream event notify. 306 * publish stream event notify.
307 * @param _req the request from client, the source will deep copy it, 307 * @param _req the request from client, the source will deep copy it,
@@ -322,7 +322,7 @@ public: @@ -322,7 +322,7 @@ public:
322 // for edge, when publish edge stream, check the state 322 // for edge, when publish edge stream, check the state
323 virtual int on_edge_start_publish(); 323 virtual int on_edge_start_publish();
324 // for edge, proxy the publish 324 // for edge, proxy the publish
325 - virtual int on_edge_proxy_publish(__SrsMessage* msg); 325 + virtual int on_edge_proxy_publish(SrsMessage* msg);
326 // for edge, proxy stop publish 326 // for edge, proxy stop publish
327 virtual void on_edge_proxy_unpublish(); 327 virtual void on_edge_proxy_unpublish();
328 private: 328 private:
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "80" 34 +#define VERSION_REVISION "81"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"
@@ -283,15 +283,15 @@ int srs_read_packet(srs_rtmp_t rtmp, int* type, u_int32_t* timestamp, char** dat @@ -283,15 +283,15 @@ int srs_read_packet(srs_rtmp_t rtmp, int* type, u_int32_t* timestamp, char** dat
283 Context* context = (Context*)rtmp; 283 Context* context = (Context*)rtmp;
284 284
285 for (;;) { 285 for (;;) {
286 - __SrsMessage* msg = NULL;  
287 - if ((ret = context->rtmp->__recv_message(&msg)) != ERROR_SUCCESS) { 286 + SrsMessage* msg = NULL;
  287 + if ((ret = context->rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
288 return ret; 288 return ret;
289 } 289 }
290 if (!msg) { 290 if (!msg) {
291 continue; 291 continue;
292 } 292 }
293 293
294 - SrsAutoFree(__SrsMessage, msg, false); 294 + SrsAutoFree(SrsMessage, msg, false);
295 295
296 if (msg->header.is_audio()) { 296 if (msg->header.is_audio()) {
297 *type = SRS_RTMP_TYPE_AUDIO; 297 *type = SRS_RTMP_TYPE_AUDIO;
@@ -332,13 +332,13 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data, @@ -332,13 +332,13 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data,
332 srs_assert(rtmp != NULL); 332 srs_assert(rtmp != NULL);
333 Context* context = (Context*)rtmp; 333 Context* context = (Context*)rtmp;
334 334
335 - __SrsSharedPtrMessage* msg = NULL; 335 + SrsSharedPtrMessage* msg = NULL;
336 336
337 if (type == SRS_RTMP_TYPE_AUDIO) { 337 if (type == SRS_RTMP_TYPE_AUDIO) {
338 SrsMessageHeader header; 338 SrsMessageHeader header;
339 header.initialize_audio(size, timestamp, context->stream_id); 339 header.initialize_audio(size, timestamp, context->stream_id);
340 340
341 - msg = new __SrsSharedPtrMessage(); 341 + msg = new SrsSharedPtrMessage();
342 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) { 342 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) {
343 srs_freepa(data); 343 srs_freepa(data);
344 return ret; 344 return ret;
@@ -347,7 +347,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data, @@ -347,7 +347,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data,
347 SrsMessageHeader header; 347 SrsMessageHeader header;
348 header.initialize_video(size, timestamp, context->stream_id); 348 header.initialize_video(size, timestamp, context->stream_id);
349 349
350 - msg = new __SrsSharedPtrMessage(); 350 + msg = new SrsSharedPtrMessage();
351 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) { 351 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) {
352 srs_freepa(data); 352 srs_freepa(data);
353 return ret; 353 return ret;
@@ -356,7 +356,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data, @@ -356,7 +356,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data,
356 SrsMessageHeader header; 356 SrsMessageHeader header;
357 header.initialize_amf0_script(size, context->stream_id); 357 header.initialize_amf0_script(size, context->stream_id);
358 358
359 - msg = new __SrsSharedPtrMessage(); 359 + msg = new SrsSharedPtrMessage();
360 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) { 360 if ((ret = msg->initialize(&header, data, size)) != ERROR_SUCCESS) {
361 srs_freepa(data); 361 srs_freepa(data);
362 return ret; 362 return ret;
@@ -365,7 +365,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data, @@ -365,7 +365,7 @@ int srs_write_packet(srs_rtmp_t rtmp, int type, u_int32_t timestamp, char* data,
365 365
366 if (msg) { 366 if (msg) {
367 // send out encoded msg. 367 // send out encoded msg.
368 - if ((ret = context->rtmp->__send_and_free_message(msg)) != ERROR_SUCCESS) { 368 + if ((ret = context->rtmp->send_and_free_message(msg)) != ERROR_SUCCESS) {
369 return ret; 369 return ret;
370 } 370 }
371 } else { 371 } else {
@@ -203,6 +203,7 @@ static std::string g_vhost = "bandcheck.srs.com"; @@ -203,6 +203,7 @@ static std::string g_vhost = "bandcheck.srs.com";
203 203
204 #define BUILD_VERSION "srs band check 0.1" 204 #define BUILD_VERSION "srs band check 0.1"
205 205
  206 +// TODO: FIXME: by winlin, the bandwidth test tool has logic bug.
206 int main(int argc ,char* argv[]) 207 int main(int argc ,char* argv[])
207 { 208 {
208 int ret = ERROR_SUCCESS; 209 int ret = ERROR_SUCCESS;
@@ -341,13 +342,13 @@ int SrsBandCheckClient::expect_start_play() @@ -341,13 +342,13 @@ int SrsBandCheckClient::expect_start_play()
341 int ret = ERROR_SUCCESS; 342 int ret = ERROR_SUCCESS;
342 343
343 // expect connect _result 344 // expect connect _result
344 - __SrsMessage* msg = NULL; 345 + SrsMessage* msg = NULL;
345 SrsBandwidthPacket* pkt = NULL; 346 SrsBandwidthPacket* pkt = NULL;
346 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 347 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
347 srs_error("expect bandcheck start play message failed. ret=%d", ret); 348 srs_error("expect bandcheck start play message failed. ret=%d", ret);
348 return ret; 349 return ret;
349 } 350 }
350 - SrsAutoFree(__SrsMessage, msg, false); 351 + SrsAutoFree(SrsMessage, msg, false);
351 SrsAutoFree(SrsBandwidthPacket, pkt, false); 352 SrsAutoFree(SrsBandwidthPacket, pkt, false);
352 srs_info("get bandcheck start play message"); 353 srs_info("get bandcheck start play message");
353 354
@@ -365,7 +366,7 @@ int SrsBandCheckClient::send_starting_play() @@ -365,7 +366,7 @@ int SrsBandCheckClient::send_starting_play()
365 366
366 SrsBandwidthPacket* pkt = new SrsBandwidthPacket; 367 SrsBandwidthPacket* pkt = new SrsBandwidthPacket;
367 pkt->command_name = SRS_BW_CHECK_STARTING_PLAY; 368 pkt->command_name = SRS_BW_CHECK_STARTING_PLAY;
368 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 369 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
369 srs_error("send starting play msg failed. ret=%d", ret); 370 srs_error("send starting play msg failed. ret=%d", ret);
370 return ret; 371 return ret;
371 } 372 }
@@ -378,13 +379,13 @@ int SrsBandCheckClient::expect_stop_play() @@ -378,13 +379,13 @@ int SrsBandCheckClient::expect_stop_play()
378 int ret = ERROR_SUCCESS; 379 int ret = ERROR_SUCCESS;
379 380
380 while (true) { 381 while (true) {
381 - __SrsMessage* msg = NULL; 382 + SrsMessage* msg = NULL;
382 SrsBandwidthPacket* pkt = NULL; 383 SrsBandwidthPacket* pkt = NULL;
383 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 384 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
384 srs_error("expect stop play message failed. ret=%d", ret); 385 srs_error("expect stop play message failed. ret=%d", ret);
385 return ret; 386 return ret;
386 } 387 }
387 - SrsAutoFree(__SrsMessage, msg, false); 388 + SrsAutoFree(SrsMessage, msg, false);
388 SrsAutoFree(SrsBandwidthPacket, pkt, false); 389 SrsAutoFree(SrsBandwidthPacket, pkt, false);
389 srs_info("get bandcheck stop play message"); 390 srs_info("get bandcheck stop play message");
390 391
@@ -402,7 +403,7 @@ int SrsBandCheckClient::send_stopped_play() @@ -402,7 +403,7 @@ int SrsBandCheckClient::send_stopped_play()
402 403
403 SrsBandwidthPacket* pkt = new SrsBandwidthPacket; 404 SrsBandwidthPacket* pkt = new SrsBandwidthPacket;
404 pkt->command_name = SRS_BW_CHECK_STOPPED_PLAY; 405 pkt->command_name = SRS_BW_CHECK_STOPPED_PLAY;
405 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 406 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
406 srs_error("send stopped play msg failed. ret=%d", ret); 407 srs_error("send stopped play msg failed. ret=%d", ret);
407 return ret; 408 return ret;
408 } 409 }
@@ -415,13 +416,13 @@ int SrsBandCheckClient::expect_start_pub() @@ -415,13 +416,13 @@ int SrsBandCheckClient::expect_start_pub()
415 int ret = ERROR_SUCCESS; 416 int ret = ERROR_SUCCESS;
416 417
417 while (true) { 418 while (true) {
418 - __SrsMessage* msg = NULL; 419 + SrsMessage* msg = NULL;
419 SrsBandwidthPacket* pkt = NULL; 420 SrsBandwidthPacket* pkt = NULL;
420 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 421 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
421 srs_error("expect start pub message failed. ret=%d", ret); 422 srs_error("expect start pub message failed. ret=%d", ret);
422 return ret; 423 return ret;
423 } 424 }
424 - SrsAutoFree(__SrsMessage, msg, false); 425 + SrsAutoFree(SrsMessage, msg, false);
425 SrsAutoFree(SrsBandwidthPacket, pkt, false); 426 SrsAutoFree(SrsBandwidthPacket, pkt, false);
426 srs_info("get bandcheck start pub message"); 427 srs_info("get bandcheck start pub message");
427 428
@@ -439,7 +440,7 @@ int SrsBandCheckClient::send_starting_pub() @@ -439,7 +440,7 @@ int SrsBandCheckClient::send_starting_pub()
439 440
440 SrsBandwidthPacket* pkt = new SrsBandwidthPacket; 441 SrsBandwidthPacket* pkt = new SrsBandwidthPacket;
441 pkt->command_name = SRS_BW_CHECK_STARTING_PUBLISH; 442 pkt->command_name = SRS_BW_CHECK_STARTING_PUBLISH;
442 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 443 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
443 srs_error("send starting play msg failed. ret=%d", ret); 444 srs_error("send starting play msg failed. ret=%d", ret);
444 return ret; 445 return ret;
445 } 446 }
@@ -465,7 +466,7 @@ int SrsBandCheckClient::send_pub_data() @@ -465,7 +466,7 @@ int SrsBandCheckClient::send_pub_data()
465 } 466 }
466 data_count += 100; 467 data_count += 100;
467 468
468 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 469 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
469 srs_error("send publish message failed.ret=%d", ret); 470 srs_error("send publish message failed.ret=%d", ret);
470 return ret; 471 return ret;
471 } 472 }
@@ -485,12 +486,12 @@ int SrsBandCheckClient::expect_stop_pub() @@ -485,12 +486,12 @@ int SrsBandCheckClient::expect_stop_pub()
485 this->set_recv_timeout(1000 * 1000); 486 this->set_recv_timeout(1000 * 1000);
486 this->set_send_timeout(1000 * 1000); 487 this->set_send_timeout(1000 * 1000);
487 488
488 - __SrsMessage* msg; 489 + SrsMessage* msg;
489 SrsBandwidthPacket* pkt; 490 SrsBandwidthPacket* pkt;
490 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(this->protocol, &msg, &pkt)) != ERROR_SUCCESS) { 491 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(this->protocol, &msg, &pkt)) != ERROR_SUCCESS) {
491 return ret; 492 return ret;
492 } 493 }
493 - SrsAutoFree(__SrsMessage, msg, false); 494 + SrsAutoFree(SrsMessage, msg, false);
494 SrsAutoFree(SrsBandwidthPacket, pkt, false); 495 SrsAutoFree(SrsBandwidthPacket, pkt, false);
495 if (pkt->command_name == SRS_BW_CHECK_STOP_PUBLISH) { 496 if (pkt->command_name == SRS_BW_CHECK_STOP_PUBLISH) {
496 return ret; 497 return ret;
@@ -504,13 +505,13 @@ int SrsBandCheckClient::expect_finished() @@ -504,13 +505,13 @@ int SrsBandCheckClient::expect_finished()
504 int ret = ERROR_SUCCESS; 505 int ret = ERROR_SUCCESS;
505 506
506 while (true) { 507 while (true) {
507 - __SrsMessage* msg = NULL; 508 + SrsMessage* msg = NULL;
508 SrsBandwidthPacket* pkt = NULL; 509 SrsBandwidthPacket* pkt = NULL;
509 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 510 if ((ret = __srs_rtmp_expect_message<SrsBandwidthPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
510 srs_error("expect finished message failed. ret=%d", ret); 511 srs_error("expect finished message failed. ret=%d", ret);
511 return ret; 512 return ret;
512 } 513 }
513 - SrsAutoFree(__SrsMessage, msg, false); 514 + SrsAutoFree(SrsMessage, msg, false);
514 SrsAutoFree(SrsBandwidthPacket, pkt, false); 515 SrsAutoFree(SrsBandwidthPacket, pkt, false);
515 srs_info("get bandcheck finished message"); 516 srs_info("get bandcheck finished message");
516 517
@@ -593,7 +594,7 @@ int SrsBandCheckClient::send_stopped_pub() @@ -593,7 +594,7 @@ int SrsBandCheckClient::send_stopped_pub()
593 594
594 SrsBandwidthPacket* pkt = new SrsBandwidthPacket; 595 SrsBandwidthPacket* pkt = new SrsBandwidthPacket;
595 pkt->command_name = SRS_BW_CHECK_STOPPED_PUBLISH; 596 pkt->command_name = SRS_BW_CHECK_STOPPED_PUBLISH;
596 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 597 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
597 srs_error("send stopped pub msg failed. ret=%d", ret); 598 srs_error("send stopped pub msg failed. ret=%d", ret);
598 return ret; 599 return ret;
599 } 600 }
@@ -608,7 +609,7 @@ int SrsBandCheckClient::send_final() @@ -608,7 +609,7 @@ int SrsBandCheckClient::send_final()
608 609
609 SrsBandwidthPacket* pkt = new SrsBandwidthPacket; 610 SrsBandwidthPacket* pkt = new SrsBandwidthPacket;
610 pkt->command_name = SRS_BW_CHECK_FLASH_FINAL; 611 pkt->command_name = SRS_BW_CHECK_FLASH_FINAL;
611 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 612 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
612 srs_error("send final msg failed. ret=%d", ret); 613 srs_error("send final msg failed. ret=%d", ret);
613 return ret; 614 return ret;
614 } 615 }
@@ -372,24 +372,24 @@ int SrsRtmpClient::get_send_kbps() @@ -372,24 +372,24 @@ int SrsRtmpClient::get_send_kbps()
372 return protocol->get_send_kbps(); 372 return protocol->get_send_kbps();
373 } 373 }
374 374
375 -int SrsRtmpClient::__recv_message(__SrsMessage** pmsg) 375 +int SrsRtmpClient::recv_message(SrsMessage** pmsg)
376 { 376 {
377 - return protocol->__recv_message(pmsg); 377 + return protocol->recv_message(pmsg);
378 } 378 }
379 379
380 -int SrsRtmpClient::__decode_message(__SrsMessage* msg, SrsPacket** ppacket) 380 +int SrsRtmpClient::decode_message(SrsMessage* msg, SrsPacket** ppacket)
381 { 381 {
382 - return protocol->__decode_message(msg, ppacket); 382 + return protocol->decode_message(msg, ppacket);
383 } 383 }
384 384
385 -int SrsRtmpClient::__send_and_free_message(__SrsMessage* msg) 385 +int SrsRtmpClient::send_and_free_message(SrsMessage* msg)
386 { 386 {
387 - return protocol->__send_and_free_message(msg); 387 + return protocol->send_and_free_message(msg);
388 } 388 }
389 389
390 -int SrsRtmpClient::__send_and_free_packet(SrsPacket* packet, int stream_id) 390 +int SrsRtmpClient::send_and_free_packet(SrsPacket* packet, int stream_id)
391 { 391 {
392 - return protocol->__send_and_free_packet(packet, stream_id); 392 + return protocol->send_and_free_packet(packet, stream_id);
393 } 393 }
394 394
395 int SrsRtmpClient::handshake() 395 int SrsRtmpClient::handshake()
@@ -466,7 +466,7 @@ int SrsRtmpClient::connect_app(string app, string tc_url) @@ -466,7 +466,7 @@ int SrsRtmpClient::connect_app(string app, string tc_url)
466 pkt->command_object->set("pageUrl", SrsAmf0Any::str()); 466 pkt->command_object->set("pageUrl", SrsAmf0Any::str());
467 pkt->command_object->set("objectEncoding", SrsAmf0Any::number(0)); 467 pkt->command_object->set("objectEncoding", SrsAmf0Any::number(0));
468 468
469 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 469 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
470 return ret; 470 return ret;
471 } 471 }
472 } 472 }
@@ -475,19 +475,19 @@ int SrsRtmpClient::connect_app(string app, string tc_url) @@ -475,19 +475,19 @@ int SrsRtmpClient::connect_app(string app, string tc_url)
475 if (true) { 475 if (true) {
476 SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket(); 476 SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket();
477 pkt->ackowledgement_window_size = 2500000; 477 pkt->ackowledgement_window_size = 2500000;
478 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 478 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
479 return ret; 479 return ret;
480 } 480 }
481 } 481 }
482 482
483 // expect connect _result 483 // expect connect _result
484 - __SrsMessage* msg = NULL; 484 + SrsMessage* msg = NULL;
485 SrsConnectAppResPacket* pkt = NULL; 485 SrsConnectAppResPacket* pkt = NULL;
486 if ((ret = __srs_rtmp_expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 486 if ((ret = __srs_rtmp_expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
487 srs_error("expect connect app response message failed. ret=%d", ret); 487 srs_error("expect connect app response message failed. ret=%d", ret);
488 return ret; 488 return ret;
489 } 489 }
490 - SrsAutoFree(__SrsMessage, msg, false); 490 + SrsAutoFree(SrsMessage, msg, false);
491 SrsAutoFree(SrsConnectAppResPacket, pkt, false); 491 SrsAutoFree(SrsConnectAppResPacket, pkt, false);
492 srs_info("get connect app response message"); 492 srs_info("get connect app response message");
493 493
@@ -501,20 +501,20 @@ int SrsRtmpClient::create_stream(int& stream_id) @@ -501,20 +501,20 @@ int SrsRtmpClient::create_stream(int& stream_id)
501 // CreateStream 501 // CreateStream
502 if (true) { 502 if (true) {
503 SrsCreateStreamPacket* pkt = new SrsCreateStreamPacket(); 503 SrsCreateStreamPacket* pkt = new SrsCreateStreamPacket();
504 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 504 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
505 return ret; 505 return ret;
506 } 506 }
507 } 507 }
508 508
509 // CreateStream _result. 509 // CreateStream _result.
510 if (true) { 510 if (true) {
511 - __SrsMessage* msg = NULL; 511 + SrsMessage* msg = NULL;
512 SrsCreateStreamResPacket* pkt = NULL; 512 SrsCreateStreamResPacket* pkt = NULL;
513 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 513 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
514 srs_error("expect create stream response message failed. ret=%d", ret); 514 srs_error("expect create stream response message failed. ret=%d", ret);
515 return ret; 515 return ret;
516 } 516 }
517 - SrsAutoFree(__SrsMessage, msg, false); 517 + SrsAutoFree(SrsMessage, msg, false);
518 SrsAutoFree(SrsCreateStreamResPacket, pkt, false); 518 SrsAutoFree(SrsCreateStreamResPacket, pkt, false);
519 srs_info("get create stream response message"); 519 srs_info("get create stream response message");
520 520
@@ -532,7 +532,7 @@ int SrsRtmpClient::play(string stream, int stream_id) @@ -532,7 +532,7 @@ int SrsRtmpClient::play(string stream, int stream_id)
532 if (true) { 532 if (true) {
533 SrsPlayPacket* pkt = new SrsPlayPacket(); 533 SrsPlayPacket* pkt = new SrsPlayPacket();
534 pkt->stream_name = stream; 534 pkt->stream_name = stream;
535 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 535 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
536 srs_error("send play stream failed. " 536 srs_error("send play stream failed. "
537 "stream=%s, stream_id=%d, ret=%d", 537 "stream=%s, stream_id=%d, ret=%d",
538 stream.c_str(), stream_id, ret); 538 stream.c_str(), stream_id, ret);
@@ -549,7 +549,7 @@ int SrsRtmpClient::play(string stream, int stream_id) @@ -549,7 +549,7 @@ int SrsRtmpClient::play(string stream, int stream_id)
549 pkt->event_data = stream_id; 549 pkt->event_data = stream_id;
550 pkt->extra_data = buffer_length_ms; 550 pkt->extra_data = buffer_length_ms;
551 551
552 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 552 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
553 srs_error("send set buffer length failed. " 553 srs_error("send set buffer length failed. "
554 "stream=%s, stream_id=%d, bufferLength=%d, ret=%d", 554 "stream=%s, stream_id=%d, bufferLength=%d, ret=%d",
555 stream.c_str(), stream_id, buffer_length_ms, ret); 555 stream.c_str(), stream_id, buffer_length_ms, ret);
@@ -561,7 +561,7 @@ int SrsRtmpClient::play(string stream, int stream_id) @@ -561,7 +561,7 @@ int SrsRtmpClient::play(string stream, int stream_id)
561 if (true) { 561 if (true) {
562 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket(); 562 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket();
563 pkt->chunk_size = SRS_CONF_DEFAULT_CHUNK_SIZE; 563 pkt->chunk_size = SRS_CONF_DEFAULT_CHUNK_SIZE;
564 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 564 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
565 srs_error("send set chunk size failed. " 565 srs_error("send set chunk size failed. "
566 "stream=%s, chunk_size=%d, ret=%d", 566 "stream=%s, chunk_size=%d, ret=%d",
567 stream.c_str(), SRS_CONF_DEFAULT_CHUNK_SIZE, ret); 567 stream.c_str(), SRS_CONF_DEFAULT_CHUNK_SIZE, ret);
@@ -580,7 +580,7 @@ int SrsRtmpClient::publish(string stream, int stream_id) @@ -580,7 +580,7 @@ int SrsRtmpClient::publish(string stream, int stream_id)
580 if (true) { 580 if (true) {
581 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket(); 581 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket();
582 pkt->chunk_size = SRS_CONF_DEFAULT_CHUNK_SIZE; 582 pkt->chunk_size = SRS_CONF_DEFAULT_CHUNK_SIZE;
583 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 583 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
584 srs_error("send set chunk size failed. " 584 srs_error("send set chunk size failed. "
585 "stream=%s, chunk_size=%d, ret=%d", 585 "stream=%s, chunk_size=%d, ret=%d",
586 stream.c_str(), SRS_CONF_DEFAULT_CHUNK_SIZE, ret); 586 stream.c_str(), SRS_CONF_DEFAULT_CHUNK_SIZE, ret);
@@ -592,7 +592,7 @@ int SrsRtmpClient::publish(string stream, int stream_id) @@ -592,7 +592,7 @@ int SrsRtmpClient::publish(string stream, int stream_id)
592 if (true) { 592 if (true) {
593 SrsPublishPacket* pkt = new SrsPublishPacket(); 593 SrsPublishPacket* pkt = new SrsPublishPacket();
594 pkt->stream_name = stream; 594 pkt->stream_name = stream;
595 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 595 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
596 srs_error("send publish message failed. " 596 srs_error("send publish message failed. "
597 "stream=%s, stream_id=%d, ret=%d", 597 "stream=%s, stream_id=%d, ret=%d",
598 stream.c_str(), stream_id, ret); 598 stream.c_str(), stream_id, ret);
@@ -612,7 +612,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id) @@ -612,7 +612,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
612 // SrsFMLEStartPacket 612 // SrsFMLEStartPacket
613 if (true) { 613 if (true) {
614 SrsFMLEStartPacket* pkt = SrsFMLEStartPacket::create_release_stream(stream); 614 SrsFMLEStartPacket* pkt = SrsFMLEStartPacket::create_release_stream(stream);
615 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 615 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
616 srs_error("send FMLE publish " 616 srs_error("send FMLE publish "
617 "release stream failed. stream=%s, ret=%d", stream.c_str(), ret); 617 "release stream failed. stream=%s, ret=%d", stream.c_str(), ret);
618 return ret; 618 return ret;
@@ -622,7 +622,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id) @@ -622,7 +622,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
622 // FCPublish 622 // FCPublish
623 if (true) { 623 if (true) {
624 SrsFMLEStartPacket* pkt = SrsFMLEStartPacket::create_FC_publish(stream); 624 SrsFMLEStartPacket* pkt = SrsFMLEStartPacket::create_FC_publish(stream);
625 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 625 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
626 srs_error("send FMLE publish " 626 srs_error("send FMLE publish "
627 "FCPublish failed. stream=%s, ret=%d", stream.c_str(), ret); 627 "FCPublish failed. stream=%s, ret=%d", stream.c_str(), ret);
628 return ret; 628 return ret;
@@ -633,7 +633,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id) @@ -633,7 +633,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
633 if (true) { 633 if (true) {
634 SrsCreateStreamPacket* pkt = new SrsCreateStreamPacket(); 634 SrsCreateStreamPacket* pkt = new SrsCreateStreamPacket();
635 pkt->transaction_id = 4; 635 pkt->transaction_id = 4;
636 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 636 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
637 srs_error("send FMLE publish " 637 srs_error("send FMLE publish "
638 "createStream failed. stream=%s, ret=%d", stream.c_str(), ret); 638 "createStream failed. stream=%s, ret=%d", stream.c_str(), ret);
639 return ret; 639 return ret;
@@ -642,13 +642,13 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id) @@ -642,13 +642,13 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
642 642
643 // expect result of CreateStream 643 // expect result of CreateStream
644 if (true) { 644 if (true) {
645 - __SrsMessage* msg = NULL; 645 + SrsMessage* msg = NULL;
646 SrsCreateStreamResPacket* pkt = NULL; 646 SrsCreateStreamResPacket* pkt = NULL;
647 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 647 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
648 srs_error("expect create stream response message failed. ret=%d", ret); 648 srs_error("expect create stream response message failed. ret=%d", ret);
649 return ret; 649 return ret;
650 } 650 }
651 - SrsAutoFree(__SrsMessage, msg, false); 651 + SrsAutoFree(SrsMessage, msg, false);
652 SrsAutoFree(SrsCreateStreamResPacket, pkt, false); 652 SrsAutoFree(SrsCreateStreamResPacket, pkt, false);
653 srs_info("get create stream response message"); 653 srs_info("get create stream response message");
654 654
@@ -659,7 +659,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id) @@ -659,7 +659,7 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
659 if (true) { 659 if (true) {
660 SrsPublishPacket* pkt = new SrsPublishPacket(); 660 SrsPublishPacket* pkt = new SrsPublishPacket();
661 pkt->stream_name = stream; 661 pkt->stream_name = stream;
662 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 662 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
663 srs_error("send FMLE publish publish failed. " 663 srs_error("send FMLE publish publish failed. "
664 "stream=%s, stream_id=%d, ret=%d", stream.c_str(), stream_id, ret); 664 "stream=%s, stream_id=%d, ret=%d", stream.c_str(), stream_id, ret);
665 return ret; 665 return ret;
@@ -727,24 +727,24 @@ int SrsRtmpServer::get_send_kbps() @@ -727,24 +727,24 @@ int SrsRtmpServer::get_send_kbps()
727 return protocol->get_send_kbps(); 727 return protocol->get_send_kbps();
728 } 728 }
729 729
730 -int SrsRtmpServer::__recv_message(__SrsMessage** pmsg) 730 +int SrsRtmpServer::recv_message(SrsMessage** pmsg)
731 { 731 {
732 - return protocol->__recv_message(pmsg); 732 + return protocol->recv_message(pmsg);
733 } 733 }
734 734
735 -int SrsRtmpServer::__decode_message(__SrsMessage* msg, SrsPacket** ppacket) 735 +int SrsRtmpServer::decode_message(SrsMessage* msg, SrsPacket** ppacket)
736 { 736 {
737 - return protocol->__decode_message(msg, ppacket); 737 + return protocol->decode_message(msg, ppacket);
738 } 738 }
739 739
740 -int SrsRtmpServer::__send_and_free_message(__SrsMessage* msg) 740 +int SrsRtmpServer::send_and_free_message(SrsMessage* msg)
741 { 741 {
742 - return protocol->__send_and_free_message(msg); 742 + return protocol->send_and_free_message(msg);
743 } 743 }
744 744
745 -int SrsRtmpServer::__send_and_free_packet(SrsPacket* packet, int stream_id) 745 +int SrsRtmpServer::send_and_free_packet(SrsPacket* packet, int stream_id)
746 { 746 {
747 - return protocol->__send_and_free_packet(packet, stream_id); 747 + return protocol->send_and_free_packet(packet, stream_id);
748 } 748 }
749 749
750 int SrsRtmpServer::handshake() 750 int SrsRtmpServer::handshake()
@@ -773,13 +773,13 @@ int SrsRtmpServer::connect_app(SrsRequest* req) @@ -773,13 +773,13 @@ int SrsRtmpServer::connect_app(SrsRequest* req)
773 { 773 {
774 int ret = ERROR_SUCCESS; 774 int ret = ERROR_SUCCESS;
775 775
776 - __SrsMessage* msg = NULL; 776 + SrsMessage* msg = NULL;
777 SrsConnectAppPacket* pkt = NULL; 777 SrsConnectAppPacket* pkt = NULL;
778 if ((ret = __srs_rtmp_expect_message<SrsConnectAppPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 778 if ((ret = __srs_rtmp_expect_message<SrsConnectAppPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
779 srs_error("expect connect app message failed. ret=%d", ret); 779 srs_error("expect connect app message failed. ret=%d", ret);
780 return ret; 780 return ret;
781 } 781 }
782 - SrsAutoFree(__SrsMessage, msg, false); 782 + SrsAutoFree(SrsMessage, msg, false);
783 SrsAutoFree(SrsConnectAppPacket, pkt, false); 783 SrsAutoFree(SrsConnectAppPacket, pkt, false);
784 srs_info("get connect app message"); 784 srs_info("get connect app message");
785 785
@@ -815,7 +815,7 @@ int SrsRtmpServer::set_window_ack_size(int ack_size) @@ -815,7 +815,7 @@ int SrsRtmpServer::set_window_ack_size(int ack_size)
815 815
816 SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket(); 816 SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket();
817 pkt->ackowledgement_window_size = ack_size; 817 pkt->ackowledgement_window_size = ack_size;
818 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 818 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
819 srs_error("send ack size message failed. ret=%d", ret); 819 srs_error("send ack size message failed. ret=%d", ret);
820 return ret; 820 return ret;
821 } 821 }
@@ -831,7 +831,7 @@ int SrsRtmpServer::set_peer_bandwidth(int bandwidth, int type) @@ -831,7 +831,7 @@ int SrsRtmpServer::set_peer_bandwidth(int bandwidth, int type)
831 SrsSetPeerBandwidthPacket* pkt = new SrsSetPeerBandwidthPacket(); 831 SrsSetPeerBandwidthPacket* pkt = new SrsSetPeerBandwidthPacket();
832 pkt->bandwidth = bandwidth; 832 pkt->bandwidth = bandwidth;
833 pkt->type = type; 833 pkt->type = type;
834 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 834 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
835 srs_error("send set bandwidth message failed. ret=%d", ret); 835 srs_error("send set bandwidth message failed. ret=%d", ret);
836 return ret; 836 return ret;
837 } 837 }
@@ -874,7 +874,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) @@ -874,7 +874,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip)
874 data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); 874 data->set("srs_server_ip", SrsAmf0Any::str(server_ip));
875 } 875 }
876 876
877 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 877 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
878 srs_error("send connect app response message failed. ret=%d", ret); 878 srs_error("send connect app response message failed. ret=%d", ret);
879 return ret; 879 return ret;
880 } 880 }
@@ -894,7 +894,7 @@ void SrsRtmpServer::response_connect_reject(SrsRequest *req, const char* desc) @@ -894,7 +894,7 @@ void SrsRtmpServer::response_connect_reject(SrsRequest *req, const char* desc)
894 pkt->props->set(StatusDescription, SrsAmf0Any::str(desc)); 894 pkt->props->set(StatusDescription, SrsAmf0Any::str(desc));
895 //pkt->props->set("objectEncoding", SrsAmf0Any::number(req->objectEncoding)); 895 //pkt->props->set("objectEncoding", SrsAmf0Any::number(req->objectEncoding));
896 896
897 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 897 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
898 srs_error("send connect app response rejected message failed. ret=%d", ret); 898 srs_error("send connect app response rejected message failed. ret=%d", ret);
899 return; 899 return;
900 } 900 }
@@ -908,7 +908,7 @@ int SrsRtmpServer::on_bw_done() @@ -908,7 +908,7 @@ int SrsRtmpServer::on_bw_done()
908 int ret = ERROR_SUCCESS; 908 int ret = ERROR_SUCCESS;
909 909
910 SrsOnBWDonePacket* pkt = new SrsOnBWDonePacket(); 910 SrsOnBWDonePacket* pkt = new SrsOnBWDonePacket();
911 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 911 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
912 srs_error("send onBWDone message failed. ret=%d", ret); 912 srs_error("send onBWDone message failed. ret=%d", ret);
913 return ret; 913 return ret;
914 } 914 }
@@ -923,13 +923,13 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string& @@ -923,13 +923,13 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
923 int ret = ERROR_SUCCESS; 923 int ret = ERROR_SUCCESS;
924 924
925 while (true) { 925 while (true) {
926 - __SrsMessage* msg = NULL;  
927 - if ((ret = protocol->__recv_message(&msg)) != ERROR_SUCCESS) { 926 + SrsMessage* msg = NULL;
  927 + if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
928 srs_error("recv identify client message failed. ret=%d", ret); 928 srs_error("recv identify client message failed. ret=%d", ret);
929 return ret; 929 return ret;
930 } 930 }
931 931
932 - SrsAutoFree(__SrsMessage, msg, false); 932 + SrsAutoFree(SrsMessage, msg, false);
933 933
934 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) { 934 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
935 srs_trace("identify ignore messages except " 935 srs_trace("identify ignore messages except "
@@ -938,7 +938,7 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string& @@ -938,7 +938,7 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
938 } 938 }
939 939
940 SrsPacket* pkt = NULL; 940 SrsPacket* pkt = NULL;
941 - if ((ret = protocol->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 941 + if ((ret = protocol->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
942 srs_error("identify decode message failed. ret=%d", ret); 942 srs_error("identify decode message failed. ret=%d", ret);
943 return ret; 943 return ret;
944 } 944 }
@@ -970,7 +970,7 @@ int SrsRtmpServer::set_chunk_size(int chunk_size) @@ -970,7 +970,7 @@ int SrsRtmpServer::set_chunk_size(int chunk_size)
970 970
971 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket(); 971 SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket();
972 pkt->chunk_size = chunk_size; 972 pkt->chunk_size = chunk_size;
973 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 973 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
974 srs_error("send set chunk size message failed. ret=%d", ret); 974 srs_error("send set chunk size message failed. ret=%d", ret);
975 return ret; 975 return ret;
976 } 976 }
@@ -988,7 +988,7 @@ int SrsRtmpServer::start_play(int stream_id) @@ -988,7 +988,7 @@ int SrsRtmpServer::start_play(int stream_id)
988 SrsUserControlPacket* pkt = new SrsUserControlPacket(); 988 SrsUserControlPacket* pkt = new SrsUserControlPacket();
989 pkt->event_type = SrcPCUCStreamBegin; 989 pkt->event_type = SrcPCUCStreamBegin;
990 pkt->event_data = stream_id; 990 pkt->event_data = stream_id;
991 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 991 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
992 srs_error("send PCUC(StreamBegin) message failed. ret=%d", ret); 992 srs_error("send PCUC(StreamBegin) message failed. ret=%d", ret);
993 return ret; 993 return ret;
994 } 994 }
@@ -1005,7 +1005,7 @@ int SrsRtmpServer::start_play(int stream_id) @@ -1005,7 +1005,7 @@ int SrsRtmpServer::start_play(int stream_id)
1005 pkt->data->set(StatusDetails, SrsAmf0Any::str("stream")); 1005 pkt->data->set(StatusDetails, SrsAmf0Any::str("stream"));
1006 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID)); 1006 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID));
1007 1007
1008 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1008 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1009 srs_error("send onStatus(NetStream.Play.Reset) message failed. ret=%d", ret); 1009 srs_error("send onStatus(NetStream.Play.Reset) message failed. ret=%d", ret);
1010 return ret; 1010 return ret;
1011 } 1011 }
@@ -1022,7 +1022,7 @@ int SrsRtmpServer::start_play(int stream_id) @@ -1022,7 +1022,7 @@ int SrsRtmpServer::start_play(int stream_id)
1022 pkt->data->set(StatusDetails, SrsAmf0Any::str("stream")); 1022 pkt->data->set(StatusDetails, SrsAmf0Any::str("stream"));
1023 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID)); 1023 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID));
1024 1024
1025 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1025 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1026 srs_error("send onStatus(NetStream.Play.Reset) message failed. ret=%d", ret); 1026 srs_error("send onStatus(NetStream.Play.Reset) message failed. ret=%d", ret);
1027 return ret; 1027 return ret;
1028 } 1028 }
@@ -1032,7 +1032,7 @@ int SrsRtmpServer::start_play(int stream_id) @@ -1032,7 +1032,7 @@ int SrsRtmpServer::start_play(int stream_id)
1032 // |RtmpSampleAccess(false, false) 1032 // |RtmpSampleAccess(false, false)
1033 if (true) { 1033 if (true) {
1034 SrsSampleAccessPacket* pkt = new SrsSampleAccessPacket(); 1034 SrsSampleAccessPacket* pkt = new SrsSampleAccessPacket();
1035 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1035 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1036 srs_error("send |RtmpSampleAccess(false, false) message failed. ret=%d", ret); 1036 srs_error("send |RtmpSampleAccess(false, false) message failed. ret=%d", ret);
1037 return ret; 1037 return ret;
1038 } 1038 }
@@ -1043,7 +1043,7 @@ int SrsRtmpServer::start_play(int stream_id) @@ -1043,7 +1043,7 @@ int SrsRtmpServer::start_play(int stream_id)
1043 if (true) { 1043 if (true) {
1044 SrsOnStatusDataPacket* pkt = new SrsOnStatusDataPacket(); 1044 SrsOnStatusDataPacket* pkt = new SrsOnStatusDataPacket();
1045 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeDataStart)); 1045 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeDataStart));
1046 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1046 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1047 srs_error("send onStatus(NetStream.Data.Start) message failed. ret=%d", ret); 1047 srs_error("send onStatus(NetStream.Data.Start) message failed. ret=%d", ret);
1048 return ret; 1048 return ret;
1049 } 1049 }
@@ -1068,7 +1068,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause) @@ -1068,7 +1068,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause)
1068 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeStreamPause)); 1068 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeStreamPause));
1069 pkt->data->set(StatusDescription, SrsAmf0Any::str("Paused stream.")); 1069 pkt->data->set(StatusDescription, SrsAmf0Any::str("Paused stream."));
1070 1070
1071 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1071 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1072 srs_error("send onStatus(NetStream.Pause.Notify) message failed. ret=%d", ret); 1072 srs_error("send onStatus(NetStream.Pause.Notify) message failed. ret=%d", ret);
1073 return ret; 1073 return ret;
1074 } 1074 }
@@ -1081,7 +1081,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause) @@ -1081,7 +1081,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause)
1081 pkt->event_type = SrcPCUCStreamEOF; 1081 pkt->event_type = SrcPCUCStreamEOF;
1082 pkt->event_data = stream_id; 1082 pkt->event_data = stream_id;
1083 1083
1084 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1084 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1085 srs_error("send PCUC(StreamEOF) message failed. ret=%d", ret); 1085 srs_error("send PCUC(StreamEOF) message failed. ret=%d", ret);
1086 return ret; 1086 return ret;
1087 } 1087 }
@@ -1096,7 +1096,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause) @@ -1096,7 +1096,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause)
1096 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeStreamUnpause)); 1096 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeStreamUnpause));
1097 pkt->data->set(StatusDescription, SrsAmf0Any::str("Unpaused stream.")); 1097 pkt->data->set(StatusDescription, SrsAmf0Any::str("Unpaused stream."));
1098 1098
1099 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1099 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1100 srs_error("send onStatus(NetStream.Unpause.Notify) message failed. ret=%d", ret); 1100 srs_error("send onStatus(NetStream.Unpause.Notify) message failed. ret=%d", ret);
1101 return ret; 1101 return ret;
1102 } 1102 }
@@ -1109,7 +1109,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause) @@ -1109,7 +1109,7 @@ int SrsRtmpServer::on_play_client_pause(int stream_id, bool is_pause)
1109 pkt->event_type = SrcPCUCStreamBegin; 1109 pkt->event_type = SrcPCUCStreamBegin;
1110 pkt->event_data = stream_id; 1110 pkt->event_data = stream_id;
1111 1111
1112 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1112 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1113 srs_error("send PCUC(StreanBegin) message failed. ret=%d", ret); 1113 srs_error("send PCUC(StreanBegin) message failed. ret=%d", ret);
1114 return ret; 1114 return ret;
1115 } 1115 }
@@ -1127,7 +1127,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1127,7 +1127,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1127 // FCPublish 1127 // FCPublish
1128 double fc_publish_tid = 0; 1128 double fc_publish_tid = 0;
1129 if (true) { 1129 if (true) {
1130 - __SrsMessage* msg = NULL; 1130 + SrsMessage* msg = NULL;
1131 SrsFMLEStartPacket* pkt = NULL; 1131 SrsFMLEStartPacket* pkt = NULL;
1132 if ((ret = __srs_rtmp_expect_message<SrsFMLEStartPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 1132 if ((ret = __srs_rtmp_expect_message<SrsFMLEStartPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
1133 srs_error("recv FCPublish message failed. ret=%d", ret); 1133 srs_error("recv FCPublish message failed. ret=%d", ret);
@@ -1135,7 +1135,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1135,7 +1135,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1135 } 1135 }
1136 srs_info("recv FCPublish request message success."); 1136 srs_info("recv FCPublish request message success.");
1137 1137
1138 - SrsAutoFree(__SrsMessage, msg, false); 1138 + SrsAutoFree(SrsMessage, msg, false);
1139 SrsAutoFree(SrsFMLEStartPacket, pkt, false); 1139 SrsAutoFree(SrsFMLEStartPacket, pkt, false);
1140 1140
1141 fc_publish_tid = pkt->transaction_id; 1141 fc_publish_tid = pkt->transaction_id;
@@ -1143,7 +1143,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1143,7 +1143,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1143 // FCPublish response 1143 // FCPublish response
1144 if (true) { 1144 if (true) {
1145 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(fc_publish_tid); 1145 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(fc_publish_tid);
1146 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1146 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1147 srs_error("send FCPublish response message failed. ret=%d", ret); 1147 srs_error("send FCPublish response message failed. ret=%d", ret);
1148 return ret; 1148 return ret;
1149 } 1149 }
@@ -1153,7 +1153,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1153,7 +1153,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1153 // createStream 1153 // createStream
1154 double create_stream_tid = 0; 1154 double create_stream_tid = 0;
1155 if (true) { 1155 if (true) {
1156 - __SrsMessage* msg = NULL; 1156 + SrsMessage* msg = NULL;
1157 SrsCreateStreamPacket* pkt = NULL; 1157 SrsCreateStreamPacket* pkt = NULL;
1158 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 1158 if ((ret = __srs_rtmp_expect_message<SrsCreateStreamPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
1159 srs_error("recv createStream message failed. ret=%d", ret); 1159 srs_error("recv createStream message failed. ret=%d", ret);
@@ -1161,7 +1161,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1161,7 +1161,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1161 } 1161 }
1162 srs_info("recv createStream request message success."); 1162 srs_info("recv createStream request message success.");
1163 1163
1164 - SrsAutoFree(__SrsMessage, msg, false); 1164 + SrsAutoFree(SrsMessage, msg, false);
1165 SrsAutoFree(SrsCreateStreamPacket, pkt, false); 1165 SrsAutoFree(SrsCreateStreamPacket, pkt, false);
1166 1166
1167 create_stream_tid = pkt->transaction_id; 1167 create_stream_tid = pkt->transaction_id;
@@ -1169,7 +1169,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1169,7 +1169,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1169 // createStream response 1169 // createStream response
1170 if (true) { 1170 if (true) {
1171 SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(create_stream_tid, stream_id); 1171 SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(create_stream_tid, stream_id);
1172 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1172 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1173 srs_error("send createStream response message failed. ret=%d", ret); 1173 srs_error("send createStream response message failed. ret=%d", ret);
1174 return ret; 1174 return ret;
1175 } 1175 }
@@ -1178,7 +1178,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1178,7 +1178,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1178 1178
1179 // publish 1179 // publish
1180 if (true) { 1180 if (true) {
1181 - __SrsMessage* msg = NULL; 1181 + SrsMessage* msg = NULL;
1182 SrsPublishPacket* pkt = NULL; 1182 SrsPublishPacket* pkt = NULL;
1183 if ((ret = __srs_rtmp_expect_message<SrsPublishPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { 1183 if ((ret = __srs_rtmp_expect_message<SrsPublishPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
1184 srs_error("recv publish message failed. ret=%d", ret); 1184 srs_error("recv publish message failed. ret=%d", ret);
@@ -1186,7 +1186,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1186,7 +1186,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1186 } 1186 }
1187 srs_info("recv publish request message success."); 1187 srs_info("recv publish request message success.");
1188 1188
1189 - SrsAutoFree(__SrsMessage, msg, false); 1189 + SrsAutoFree(SrsMessage, msg, false);
1190 SrsAutoFree(SrsPublishPacket, pkt, false); 1190 SrsAutoFree(SrsPublishPacket, pkt, false);
1191 } 1191 }
1192 // publish response onFCPublish(NetStream.Publish.Start) 1192 // publish response onFCPublish(NetStream.Publish.Start)
@@ -1197,7 +1197,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1197,7 +1197,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1197 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodePublishStart)); 1197 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodePublishStart));
1198 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream.")); 1198 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream."));
1199 1199
1200 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1200 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1201 srs_error("send onFCPublish(NetStream.Publish.Start) message failed. ret=%d", ret); 1201 srs_error("send onFCPublish(NetStream.Publish.Start) message failed. ret=%d", ret);
1202 return ret; 1202 return ret;
1203 } 1203 }
@@ -1212,7 +1212,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id) @@ -1212,7 +1212,7 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
1212 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream.")); 1212 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream."));
1213 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID)); 1213 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID));
1214 1214
1215 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1215 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1216 srs_error("send onStatus(NetStream.Publish.Start) message failed. ret=%d", ret); 1216 srs_error("send onStatus(NetStream.Publish.Start) message failed. ret=%d", ret);
1217 return ret; 1217 return ret;
1218 } 1218 }
@@ -1236,7 +1236,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid) @@ -1236,7 +1236,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid)
1236 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeUnpublishSuccess)); 1236 pkt->data->set(StatusCode, SrsAmf0Any::str(StatusCodeUnpublishSuccess));
1237 pkt->data->set(StatusDescription, SrsAmf0Any::str("Stop publishing stream.")); 1237 pkt->data->set(StatusDescription, SrsAmf0Any::str("Stop publishing stream."));
1238 1238
1239 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1239 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1240 srs_error("send onFCUnpublish(NetStream.unpublish.Success) message failed. ret=%d", ret); 1240 srs_error("send onFCUnpublish(NetStream.unpublish.Success) message failed. ret=%d", ret);
1241 return ret; 1241 return ret;
1242 } 1242 }
@@ -1245,7 +1245,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid) @@ -1245,7 +1245,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid)
1245 // FCUnpublish response 1245 // FCUnpublish response
1246 if (true) { 1246 if (true) {
1247 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(unpublish_tid); 1247 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(unpublish_tid);
1248 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1248 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1249 srs_error("send FCUnpublish response message failed. ret=%d", ret); 1249 srs_error("send FCUnpublish response message failed. ret=%d", ret);
1250 return ret; 1250 return ret;
1251 } 1251 }
@@ -1260,7 +1260,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid) @@ -1260,7 +1260,7 @@ int SrsRtmpServer::fmle_unpublish(int stream_id, double unpublish_tid)
1260 pkt->data->set(StatusDescription, SrsAmf0Any::str("Stream is now unpublished")); 1260 pkt->data->set(StatusDescription, SrsAmf0Any::str("Stream is now unpublished"));
1261 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID)); 1261 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID));
1262 1262
1263 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1263 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1264 srs_error("send onStatus(NetStream.Unpublish.Success) message failed. ret=%d", ret); 1264 srs_error("send onStatus(NetStream.Unpublish.Success) message failed. ret=%d", ret);
1265 return ret; 1265 return ret;
1266 } 1266 }
@@ -1285,7 +1285,7 @@ int SrsRtmpServer::start_flash_publish(int stream_id) @@ -1285,7 +1285,7 @@ int SrsRtmpServer::start_flash_publish(int stream_id)
1285 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream.")); 1285 pkt->data->set(StatusDescription, SrsAmf0Any::str("Started publishing stream."));
1286 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID)); 1286 pkt->data->set(StatusClientId, SrsAmf0Any::str(RTMP_SIG_CLIENT_ID));
1287 1287
1288 - if ((ret = protocol->__send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) { 1288 + if ((ret = protocol->send_and_free_packet(pkt, stream_id)) != ERROR_SUCCESS) {
1289 srs_error("send onStatus(NetStream.Publish.Start) message failed. ret=%d", ret); 1289 srs_error("send onStatus(NetStream.Publish.Start) message failed. ret=%d", ret);
1290 return ret; 1290 return ret;
1291 } 1291 }
@@ -1303,7 +1303,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int @@ -1303,7 +1303,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
1303 1303
1304 if (true) { 1304 if (true) {
1305 SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(req->transaction_id, stream_id); 1305 SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(req->transaction_id, stream_id);
1306 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1306 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1307 srs_error("send createStream response message failed. ret=%d", ret); 1307 srs_error("send createStream response message failed. ret=%d", ret);
1308 return ret; 1308 return ret;
1309 } 1309 }
@@ -1311,13 +1311,13 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int @@ -1311,13 +1311,13 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
1311 } 1311 }
1312 1312
1313 while (true) { 1313 while (true) {
1314 - __SrsMessage* msg = NULL;  
1315 - if ((ret = protocol->__recv_message(&msg)) != ERROR_SUCCESS) { 1314 + SrsMessage* msg = NULL;
  1315 + if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
1316 srs_error("recv identify client message failed. ret=%d", ret); 1316 srs_error("recv identify client message failed. ret=%d", ret);
1317 return ret; 1317 return ret;
1318 } 1318 }
1319 1319
1320 - SrsAutoFree(__SrsMessage, msg, false); 1320 + SrsAutoFree(SrsMessage, msg, false);
1321 1321
1322 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) { 1322 if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
1323 srs_trace("identify ignore messages except " 1323 srs_trace("identify ignore messages except "
@@ -1326,7 +1326,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int @@ -1326,7 +1326,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
1326 } 1326 }
1327 1327
1328 SrsPacket* pkt = NULL; 1328 SrsPacket* pkt = NULL;
1329 - if ((ret = protocol->__decode_message(msg, &pkt)) != ERROR_SUCCESS) { 1329 + if ((ret = protocol->decode_message(msg, &pkt)) != ERROR_SUCCESS) {
1330 srs_error("identify decode message failed. ret=%d", ret); 1330 srs_error("identify decode message failed. ret=%d", ret);
1331 return ret; 1331 return ret;
1332 } 1332 }
@@ -1358,7 +1358,7 @@ int SrsRtmpServer::identify_fmle_publish_client(SrsFMLEStartPacket* req, SrsRtmp @@ -1358,7 +1358,7 @@ int SrsRtmpServer::identify_fmle_publish_client(SrsFMLEStartPacket* req, SrsRtmp
1358 // releaseStream response 1358 // releaseStream response
1359 if (true) { 1359 if (true) {
1360 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(req->transaction_id); 1360 SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(req->transaction_id);
1361 - if ((ret = protocol->__send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1361 + if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1362 srs_error("send releaseStream response message failed. ret=%d", ret); 1362 srs_error("send releaseStream response message failed. ret=%d", ret);
1363 return ret; 1363 return ret;
1364 } 1364 }
@@ -39,10 +39,9 @@ class SrsCommonMessage; @@ -39,10 +39,9 @@ class SrsCommonMessage;
39 class SrsCreateStreamPacket; 39 class SrsCreateStreamPacket;
40 class SrsFMLEStartPacket; 40 class SrsFMLEStartPacket;
41 class SrsPublishPacket; 41 class SrsPublishPacket;
42 -class SrsSharedPtrMessage;  
43 class SrsOnMetaDataPacket; 42 class SrsOnMetaDataPacket;
44 class SrsPlayPacket; 43 class SrsPlayPacket;
45 -class __SrsMessage; 44 +class SrsMessage;
46 class SrsPacket; 45 class SrsPacket;
47 46
48 /** 47 /**
@@ -164,10 +163,10 @@ public: @@ -164,10 +163,10 @@ public:
164 virtual int64_t get_send_bytes(); 163 virtual int64_t get_send_bytes();
165 virtual int get_recv_kbps(); 164 virtual int get_recv_kbps();
166 virtual int get_send_kbps(); 165 virtual int get_send_kbps();
167 - virtual int __recv_message(__SrsMessage** pmsg);  
168 - virtual int __decode_message(__SrsMessage* msg, SrsPacket** ppacket);  
169 - virtual int __send_and_free_message(__SrsMessage* msg);  
170 - virtual int __send_and_free_packet(SrsPacket* packet, int stream_id); 166 + virtual int recv_message(SrsMessage** pmsg);
  167 + virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
  168 + virtual int send_and_free_message(SrsMessage* msg);
  169 + virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
171 public: 170 public:
172 // try complex, then simple handshake. 171 // try complex, then simple handshake.
173 virtual int handshake(); 172 virtual int handshake();
@@ -211,10 +210,10 @@ public: @@ -211,10 +210,10 @@ public:
211 virtual int64_t get_send_bytes(); 210 virtual int64_t get_send_bytes();
212 virtual int get_recv_kbps(); 211 virtual int get_recv_kbps();
213 virtual int get_send_kbps(); 212 virtual int get_send_kbps();
214 - virtual int __recv_message(__SrsMessage** pmsg);  
215 - virtual int __decode_message(__SrsMessage* msg, SrsPacket** ppacket);  
216 - virtual int __send_and_free_message(__SrsMessage* msg);  
217 - virtual int __send_and_free_packet(SrsPacket* packet, int stream_id); 213 + virtual int recv_message(SrsMessage** pmsg);
  214 + virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
  215 + virtual int send_and_free_message(SrsMessage* msg);
  216 + virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
218 public: 217 public:
219 virtual int handshake(); 218 virtual int handshake();
220 virtual int connect_app(SrsRequest* req); 219 virtual int connect_app(SrsRequest* req);
@@ -306,14 +306,14 @@ SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io) @@ -306,14 +306,14 @@ SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io)
306 SrsProtocol::~SrsProtocol() 306 SrsProtocol::~SrsProtocol()
307 { 307 {
308 if (true) { 308 if (true) {
309 - std::map<int, __SrsChunkStream*>::iterator it; 309 + std::map<int, SrsChunkStream*>::iterator it;
310 310
311 - for (it = __chunk_streams.begin(); it != __chunk_streams.end(); ++it) {  
312 - __SrsChunkStream* stream = it->second; 311 + for (it = chunk_streams.begin(); it != chunk_streams.end(); ++it) {
  312 + SrsChunkStream* stream = it->second;
313 srs_freep(stream); 313 srs_freep(stream);
314 } 314 }
315 315
316 - __chunk_streams.clear(); 316 + chunk_streams.clear();
317 } 317 }
318 318
319 srs_freep(decode_stream); 319 srs_freep(decode_stream);
@@ -369,16 +369,16 @@ int SrsProtocol::get_send_kbps() @@ -369,16 +369,16 @@ int SrsProtocol::get_send_kbps()
369 return skt->get_send_kbps(); 369 return skt->get_send_kbps();
370 } 370 }
371 371
372 -int SrsProtocol::__recv_message(__SrsMessage** pmsg) 372 +int SrsProtocol::recv_message(SrsMessage** pmsg)
373 { 373 {
374 *pmsg = NULL; 374 *pmsg = NULL;
375 375
376 int ret = ERROR_SUCCESS; 376 int ret = ERROR_SUCCESS;
377 377
378 while (true) { 378 while (true) {
379 - __SrsMessage* msg = NULL; 379 + SrsMessage* msg = NULL;
380 380
381 - if ((ret = __recv_interlaced_message(&msg)) != ERROR_SUCCESS) { 381 + if ((ret = recv_interlaced_message(&msg)) != ERROR_SUCCESS) {
382 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { 382 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
383 srs_error("recv interlaced message failed. ret=%d", ret); 383 srs_error("recv interlaced message failed. ret=%d", ret);
384 } 384 }
@@ -398,7 +398,7 @@ int SrsProtocol::__recv_message(__SrsMessage** pmsg) @@ -398,7 +398,7 @@ int SrsProtocol::__recv_message(__SrsMessage** pmsg)
398 continue; 398 continue;
399 } 399 }
400 400
401 - if ((ret = __on_recv_message(msg)) != ERROR_SUCCESS) { 401 + if ((ret = on_recv_message(msg)) != ERROR_SUCCESS) {
402 srs_error("hook the received msg failed. ret=%d", ret); 402 srs_error("hook the received msg failed. ret=%d", ret);
403 srs_freep(msg); 403 srs_freep(msg);
404 return ret; 404 return ret;
@@ -412,7 +412,7 @@ int SrsProtocol::__recv_message(__SrsMessage** pmsg) @@ -412,7 +412,7 @@ int SrsProtocol::__recv_message(__SrsMessage** pmsg)
412 return ret; 412 return ret;
413 } 413 }
414 414
415 -int SrsProtocol::__decode_message(__SrsMessage* msg, SrsPacket** ppacket) 415 +int SrsProtocol::decode_message(SrsMessage* msg, SrsPacket** ppacket)
416 { 416 {
417 *ppacket = NULL; 417 *ppacket = NULL;
418 418
@@ -432,7 +432,7 @@ int SrsProtocol::__decode_message(__SrsMessage* msg, SrsPacket** ppacket) @@ -432,7 +432,7 @@ int SrsProtocol::__decode_message(__SrsMessage* msg, SrsPacket** ppacket)
432 432
433 // decode the packet. 433 // decode the packet.
434 SrsPacket* packet = NULL; 434 SrsPacket* packet = NULL;
435 - if ((ret = __do_decode_message(msg->header, decode_stream, &packet)) != ERROR_SUCCESS) { 435 + if ((ret = do_decode_message(msg->header, decode_stream, &packet)) != ERROR_SUCCESS) {
436 srs_freep(packet); 436 srs_freep(packet);
437 return ret; 437 return ret;
438 } 438 }
@@ -443,7 +443,7 @@ int SrsProtocol::__decode_message(__SrsMessage* msg, SrsPacket** ppacket) @@ -443,7 +443,7 @@ int SrsProtocol::__decode_message(__SrsMessage* msg, SrsPacket** ppacket)
443 return ret; 443 return ret;
444 } 444 }
445 445
446 -int SrsProtocol::__do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet) 446 +int SrsProtocol::do_send_and_free_message(SrsMessage* msg, SrsPacket* packet)
447 { 447 {
448 int ret = ERROR_SUCCESS; 448 int ret = ERROR_SUCCESS;
449 449
@@ -561,7 +561,7 @@ int SrsProtocol::__do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet @@ -561,7 +561,7 @@ int SrsProtocol::__do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet
561 } 561 }
562 } while (p < (char*)msg->payload + msg->size); 562 } while (p < (char*)msg->payload + msg->size);
563 563
564 - if ((ret = __on_send_message(msg, packet)) != ERROR_SUCCESS) { 564 + if ((ret = on_send_message(msg, packet)) != ERROR_SUCCESS) {
565 srs_error("hook the send message failed. ret=%d", ret); 565 srs_error("hook the send message failed. ret=%d", ret);
566 return ret; 566 return ret;
567 } 567 }
@@ -569,7 +569,7 @@ int SrsProtocol::__do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet @@ -569,7 +569,7 @@ int SrsProtocol::__do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet
569 return ret; 569 return ret;
570 } 570 }
571 571
572 -int SrsProtocol::__do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket) 572 +int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket)
573 { 573 {
574 int ret = ERROR_SUCCESS; 574 int ret = ERROR_SUCCESS;
575 575
@@ -728,15 +728,15 @@ int SrsProtocol::__do_decode_message(SrsMessageHeader& header, SrsStream* stream @@ -728,15 +728,15 @@ int SrsProtocol::__do_decode_message(SrsMessageHeader& header, SrsStream* stream
728 return ret; 728 return ret;
729 } 729 }
730 730
731 -int SrsProtocol::__send_and_free_message(__SrsMessage* msg) 731 +int SrsProtocol::send_and_free_message(SrsMessage* msg)
732 { 732 {
733 srs_assert(msg); 733 srs_assert(msg);
734 - SrsAutoFree(__SrsMessage, msg, false); 734 + SrsAutoFree(SrsMessage, msg, false);
735 735
736 - return __do_send_and_free_message(msg, NULL); 736 + return do_send_and_free_message(msg, NULL);
737 } 737 }
738 738
739 -int SrsProtocol::__send_and_free_packet(SrsPacket* packet, int stream_id) 739 +int SrsProtocol::send_and_free_packet(SrsPacket* packet, int stream_id)
740 { 740 {
741 int ret = ERROR_SUCCESS; 741 int ret = ERROR_SUCCESS;
742 742
@@ -757,7 +757,7 @@ int SrsProtocol::__send_and_free_packet(SrsPacket* packet, int stream_id) @@ -757,7 +757,7 @@ int SrsProtocol::__send_and_free_packet(SrsPacket* packet, int stream_id)
757 } 757 }
758 758
759 // to message 759 // to message
760 - __SrsMessage* msg = new __SrsMessage(); 760 + SrsMessage* msg = new SrsMessage();
761 761
762 msg->payload = (int8_t*)payload; 762 msg->payload = (int8_t*)payload;
763 msg->size = (int32_t)size; 763 msg->size = (int32_t)size;
@@ -767,14 +767,14 @@ int SrsProtocol::__send_and_free_packet(SrsPacket* packet, int stream_id) @@ -767,14 +767,14 @@ int SrsProtocol::__send_and_free_packet(SrsPacket* packet, int stream_id)
767 msg->header.stream_id = stream_id; 767 msg->header.stream_id = stream_id;
768 msg->header.perfer_cid = packet->get_perfer_cid(); 768 msg->header.perfer_cid = packet->get_perfer_cid();
769 769
770 - if ((ret = __do_send_and_free_message(msg, packet)) != ERROR_SUCCESS) { 770 + if ((ret = do_send_and_free_message(msg, packet)) != ERROR_SUCCESS) {
771 return ret; 771 return ret;
772 } 772 }
773 773
774 return ret; 774 return ret;
775 } 775 }
776 776
777 -int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) 777 +int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg)
778 { 778 {
779 int ret = ERROR_SUCCESS; 779 int ret = ERROR_SUCCESS;
780 780
@@ -782,7 +782,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) @@ -782,7 +782,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg)
782 char fmt = 0; 782 char fmt = 0;
783 int cid = 0; 783 int cid = 0;
784 int bh_size = 0; 784 int bh_size = 0;
785 - if ((ret = __read_basic_header(fmt, cid, bh_size)) != ERROR_SUCCESS) { 785 + if ((ret = read_basic_header(fmt, cid, bh_size)) != ERROR_SUCCESS) {
786 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { 786 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
787 srs_error("read basic header failed. ret=%d", ret); 787 srs_error("read basic header failed. ret=%d", ret);
788 } 788 }
@@ -805,16 +805,16 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) @@ -805,16 +805,16 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg)
805 } 805 }
806 806
807 // get the cached chunk stream. 807 // get the cached chunk stream.
808 - __SrsChunkStream* chunk = NULL; 808 + SrsChunkStream* chunk = NULL;
809 809
810 - if (__chunk_streams.find(cid) == __chunk_streams.end()) {  
811 - chunk = __chunk_streams[cid] = new __SrsChunkStream(cid); 810 + if (chunk_streams.find(cid) == chunk_streams.end()) {
  811 + chunk = chunk_streams[cid] = new SrsChunkStream(cid);
812 // set the perfer cid of chunk, 812 // set the perfer cid of chunk,
813 // which will copy to the message received. 813 // which will copy to the message received.
814 chunk->header.perfer_cid = cid; 814 chunk->header.perfer_cid = cid;
815 srs_verbose("cache new chunk stream: fmt=%d, cid=%d", fmt, cid); 815 srs_verbose("cache new chunk stream: fmt=%d, cid=%d", fmt, cid);
816 } else { 816 } else {
817 - chunk = __chunk_streams[cid]; 817 + chunk = chunk_streams[cid];
818 srs_verbose("cached chunk stream: fmt=%d, cid=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", 818 srs_verbose("cached chunk stream: fmt=%d, cid=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)",
819 chunk->fmt, chunk->cid, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, chunk->header.payload_length, 819 chunk->fmt, chunk->cid, (chunk->msg? chunk->msg->size : 0), chunk->header.message_type, chunk->header.payload_length,
820 chunk->header.timestamp, chunk->header.stream_id); 820 chunk->header.timestamp, chunk->header.stream_id);
@@ -822,7 +822,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) @@ -822,7 +822,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg)
822 822
823 // chunk stream message header 823 // chunk stream message header
824 int mh_size = 0; 824 int mh_size = 0;
825 - if ((ret = __read_message_header(chunk, fmt, bh_size, mh_size)) != ERROR_SUCCESS) { 825 + if ((ret = read_message_header(chunk, fmt, bh_size, mh_size)) != ERROR_SUCCESS) {
826 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { 826 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
827 srs_error("read message header failed. ret=%d", ret); 827 srs_error("read message header failed. ret=%d", ret);
828 } 828 }
@@ -834,9 +834,9 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) @@ -834,9 +834,9 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg)
834 chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id); 834 chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id);
835 835
836 // read msg payload from chunk stream. 836 // read msg payload from chunk stream.
837 - __SrsMessage* msg = NULL; 837 + SrsMessage* msg = NULL;
838 int payload_size = 0; 838 int payload_size = 0;
839 - if ((ret = __read_message_payload(chunk, bh_size, mh_size, payload_size, &msg)) != ERROR_SUCCESS) { 839 + if ((ret = read_message_payload(chunk, bh_size, mh_size, payload_size, &msg)) != ERROR_SUCCESS) {
840 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { 840 if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
841 srs_error("read message payload failed. ret=%d", ret); 841 srs_error("read message payload failed. ret=%d", ret);
842 } 842 }
@@ -865,7 +865,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg) @@ -865,7 +865,7 @@ int SrsProtocol::__recv_interlaced_message(__SrsMessage** pmsg)
865 return ret; 865 return ret;
866 } 866 }
867 867
868 -int SrsProtocol::__read_basic_header(char& fmt, int& cid, int& bh_size) 868 +int SrsProtocol::read_basic_header(char& fmt, int& cid, int& bh_size)
869 { 869 {
870 int ret = ERROR_SUCCESS; 870 int ret = ERROR_SUCCESS;
871 871
@@ -923,7 +923,7 @@ int SrsProtocol::__read_basic_header(char& fmt, int& cid, int& bh_size) @@ -923,7 +923,7 @@ int SrsProtocol::__read_basic_header(char& fmt, int& cid, int& bh_size)
923 return ret; 923 return ret;
924 } 924 }
925 925
926 -int SrsProtocol::__read_message_header(__SrsChunkStream* chunk, char fmt, int bh_size, int& mh_size) 926 +int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_size, int& mh_size)
927 { 927 {
928 int ret = ERROR_SUCCESS; 928 int ret = ERROR_SUCCESS;
929 929
@@ -971,7 +971,7 @@ int SrsProtocol::__read_message_header(__SrsChunkStream* chunk, char fmt, int bh @@ -971,7 +971,7 @@ int SrsProtocol::__read_message_header(__SrsChunkStream* chunk, char fmt, int bh
971 971
972 // create msg when new chunk stream start 972 // create msg when new chunk stream start
973 if (!chunk->msg) { 973 if (!chunk->msg) {
974 - chunk->msg = new __SrsMessage(); 974 + chunk->msg = new SrsMessage();
975 srs_verbose("create message for new chunk, fmt=%d, cid=%d", fmt, chunk->cid); 975 srs_verbose("create message for new chunk, fmt=%d, cid=%d", fmt, chunk->cid);
976 } 976 }
977 977
@@ -1157,7 +1157,7 @@ int SrsProtocol::__read_message_header(__SrsChunkStream* chunk, char fmt, int bh @@ -1157,7 +1157,7 @@ int SrsProtocol::__read_message_header(__SrsChunkStream* chunk, char fmt, int bh
1157 return ret; 1157 return ret;
1158 } 1158 }
1159 1159
1160 -int SrsProtocol::__read_message_payload(__SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, __SrsMessage** pmsg) 1160 +int SrsProtocol::read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsMessage** pmsg)
1161 { 1161 {
1162 int ret = ERROR_SUCCESS; 1162 int ret = ERROR_SUCCESS;
1163 1163
@@ -1222,7 +1222,7 @@ int SrsProtocol::__read_message_payload(__SrsChunkStream* chunk, int bh_size, in @@ -1222,7 +1222,7 @@ int SrsProtocol::__read_message_payload(__SrsChunkStream* chunk, int bh_size, in
1222 return ret; 1222 return ret;
1223 } 1223 }
1224 1224
1225 -int SrsProtocol::__on_recv_message(__SrsMessage* msg) 1225 +int SrsProtocol::on_recv_message(SrsMessage* msg)
1226 { 1226 {
1227 int ret = ERROR_SUCCESS; 1227 int ret = ERROR_SUCCESS;
1228 1228
@@ -1242,7 +1242,7 @@ int SrsProtocol::__on_recv_message(__SrsMessage* msg) @@ -1242,7 +1242,7 @@ int SrsProtocol::__on_recv_message(__SrsMessage* msg)
1242 case RTMP_MSG_SetChunkSize: 1242 case RTMP_MSG_SetChunkSize:
1243 case RTMP_MSG_UserControlMessage: 1243 case RTMP_MSG_UserControlMessage:
1244 case RTMP_MSG_WindowAcknowledgementSize: 1244 case RTMP_MSG_WindowAcknowledgementSize:
1245 - if ((ret = __decode_message(msg, &packet)) != ERROR_SUCCESS) { 1245 + if ((ret = decode_message(msg, &packet)) != ERROR_SUCCESS) {
1246 srs_error("decode packet from message payload failed. ret=%d", ret); 1246 srs_error("decode packet from message payload failed. ret=%d", ret);
1247 return ret; 1247 return ret;
1248 } 1248 }
@@ -1298,7 +1298,7 @@ int SrsProtocol::__on_recv_message(__SrsMessage* msg) @@ -1298,7 +1298,7 @@ int SrsProtocol::__on_recv_message(__SrsMessage* msg)
1298 return ret; 1298 return ret;
1299 } 1299 }
1300 1300
1301 -int SrsProtocol::__on_send_message(__SrsMessage* msg, SrsPacket* packet) 1301 +int SrsProtocol::on_send_message(SrsMessage* msg, SrsPacket* packet)
1302 { 1302 {
1303 int ret = ERROR_SUCCESS; 1303 int ret = ERROR_SUCCESS;
1304 1304
@@ -1353,7 +1353,7 @@ int SrsProtocol::response_acknowledgement_message() @@ -1353,7 +1353,7 @@ int SrsProtocol::response_acknowledgement_message()
1353 1353
1354 SrsAcknowledgementPacket* pkt = new SrsAcknowledgementPacket(); 1354 SrsAcknowledgementPacket* pkt = new SrsAcknowledgementPacket();
1355 in_ack_size.acked_size = pkt->sequence_number = skt->get_recv_bytes(); 1355 in_ack_size.acked_size = pkt->sequence_number = skt->get_recv_bytes();
1356 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1356 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1357 srs_error("send acknowledgement failed. ret=%d", ret); 1357 srs_error("send acknowledgement failed. ret=%d", ret);
1358 return ret; 1358 return ret;
1359 } 1359 }
@@ -1373,7 +1373,7 @@ int SrsProtocol::response_ping_message(int32_t timestamp) @@ -1373,7 +1373,7 @@ int SrsProtocol::response_ping_message(int32_t timestamp)
1373 pkt->event_type = SrcPCUCPingResponse; 1373 pkt->event_type = SrcPCUCPingResponse;
1374 pkt->event_data = timestamp; 1374 pkt->event_data = timestamp;
1375 1375
1376 - if ((ret = __send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) { 1376 + if ((ret = send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {
1377 srs_error("send ping response failed. ret=%d", ret); 1377 srs_error("send ping response failed. ret=%d", ret);
1378 return ret; 1378 return ret;
1379 } 1379 }
@@ -1474,7 +1474,7 @@ void SrsMessageHeader::initialize_video(int size, u_int32_t time, int stream) @@ -1474,7 +1474,7 @@ void SrsMessageHeader::initialize_video(int size, u_int32_t time, int stream)
1474 stream_id = (int32_t)stream; 1474 stream_id = (int32_t)stream;
1475 } 1475 }
1476 1476
1477 -__SrsChunkStream::__SrsChunkStream(int _cid) 1477 +SrsChunkStream::SrsChunkStream(int _cid)
1478 { 1478 {
1479 fmt = 0; 1479 fmt = 0;
1480 cid = _cid; 1480 cid = _cid;
@@ -1483,39 +1483,39 @@ __SrsChunkStream::__SrsChunkStream(int _cid) @@ -1483,39 +1483,39 @@ __SrsChunkStream::__SrsChunkStream(int _cid)
1483 msg_count = 0; 1483 msg_count = 0;
1484 } 1484 }
1485 1485
1486 -__SrsChunkStream::~__SrsChunkStream() 1486 +SrsChunkStream::~SrsChunkStream()
1487 { 1487 {
1488 srs_freep(msg); 1488 srs_freep(msg);
1489 } 1489 }
1490 1490
1491 -__SrsMessage::__SrsMessage() 1491 +SrsMessage::SrsMessage()
1492 { 1492 {
1493 payload = NULL; 1493 payload = NULL;
1494 size = 0; 1494 size = 0;
1495 } 1495 }
1496 1496
1497 -__SrsMessage::~__SrsMessage() 1497 +SrsMessage::~SrsMessage()
1498 { 1498 {
1499 } 1499 }
1500 1500
1501 -__SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr() 1501 +SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr()
1502 { 1502 {
1503 payload = NULL; 1503 payload = NULL;
1504 size = 0; 1504 size = 0;
1505 shared_count = 0; 1505 shared_count = 0;
1506 } 1506 }
1507 1507
1508 -__SrsSharedPtrMessage::__SrsSharedPtr::~__SrsSharedPtr() 1508 +SrsSharedPtrMessage::__SrsSharedPtr::~__SrsSharedPtr()
1509 { 1509 {
1510 srs_freepa(payload); 1510 srs_freepa(payload);
1511 } 1511 }
1512 1512
1513 -__SrsSharedPtrMessage::__SrsSharedPtrMessage() 1513 +SrsSharedPtrMessage::SrsSharedPtrMessage()
1514 { 1514 {
1515 ptr = NULL; 1515 ptr = NULL;
1516 } 1516 }
1517 1517
1518 -__SrsSharedPtrMessage::~__SrsSharedPtrMessage() 1518 +SrsSharedPtrMessage::~SrsSharedPtrMessage()
1519 { 1519 {
1520 if (ptr) { 1520 if (ptr) {
1521 if (ptr->shared_count == 0) { 1521 if (ptr->shared_count == 0) {
@@ -1526,7 +1526,7 @@ __SrsSharedPtrMessage::~__SrsSharedPtrMessage() @@ -1526,7 +1526,7 @@ __SrsSharedPtrMessage::~__SrsSharedPtrMessage()
1526 } 1526 }
1527 } 1527 }
1528 1528
1529 -int __SrsSharedPtrMessage::initialize(__SrsMessage* source) 1529 +int SrsSharedPtrMessage::initialize(SrsMessage* source)
1530 { 1530 {
1531 int ret = ERROR_SUCCESS; 1531 int ret = ERROR_SUCCESS;
1532 1532
@@ -1541,7 +1541,7 @@ int __SrsSharedPtrMessage::initialize(__SrsMessage* source) @@ -1541,7 +1541,7 @@ int __SrsSharedPtrMessage::initialize(__SrsMessage* source)
1541 return ret; 1541 return ret;
1542 } 1542 }
1543 1543
1544 -int __SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, int size) 1544 +int SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, int size)
1545 { 1545 {
1546 int ret = ERROR_SUCCESS; 1546 int ret = ERROR_SUCCESS;
1547 1547
@@ -1563,13 +1563,13 @@ int __SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, i @@ -1563,13 +1563,13 @@ int __SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, i
1563 ptr->payload = payload; 1563 ptr->payload = payload;
1564 ptr->size = size; 1564 ptr->size = size;
1565 1565
1566 - __SrsMessage::payload = (int8_t*)ptr->payload;  
1567 - __SrsMessage::size = ptr->size; 1566 + SrsMessage::payload = (int8_t*)ptr->payload;
  1567 + SrsMessage::size = ptr->size;
1568 1568
1569 return ret; 1569 return ret;
1570 } 1570 }
1571 1571
1572 -__SrsSharedPtrMessage* __SrsSharedPtrMessage::copy() 1572 +SrsSharedPtrMessage* SrsSharedPtrMessage::copy()
1573 { 1573 {
1574 if (!ptr) { 1574 if (!ptr) {
1575 srs_error("invoke initialize to initialize the ptr."); 1575 srs_error("invoke initialize to initialize the ptr.");
@@ -1577,7 +1577,7 @@ __SrsSharedPtrMessage* __SrsSharedPtrMessage::copy() @@ -1577,7 +1577,7 @@ __SrsSharedPtrMessage* __SrsSharedPtrMessage::copy()
1577 return NULL; 1577 return NULL;
1578 } 1578 }
1579 1579
1580 - __SrsSharedPtrMessage* copy = new __SrsSharedPtrMessage(); 1580 + SrsSharedPtrMessage* copy = new SrsSharedPtrMessage();
1581 1581
1582 copy->header = header; 1582 copy->header = header;
1583 1583
@@ -1621,11 +1621,6 @@ int SrsPacket::get_message_type() @@ -1621,11 +1621,6 @@ int SrsPacket::get_message_type()
1621 return 0; 1621 return 0;
1622 } 1622 }
1623 1623
1624 -int SrsPacket::get_payload_length()  
1625 -{  
1626 - return get_size();  
1627 -}  
1628 -  
1629 int SrsPacket::encode(int& psize, char*& ppayload) 1624 int SrsPacket::encode(int& psize, char*& ppayload)
1630 { 1625 {
1631 int ret = ERROR_SUCCESS; 1626 int ret = ERROR_SUCCESS;
@@ -43,8 +43,8 @@ class SrsStream; @@ -43,8 +43,8 @@ class SrsStream;
43 class SrsAmf0Object; 43 class SrsAmf0Object;
44 class SrsAmf0Any; 44 class SrsAmf0Any;
45 class SrsMessageHeader; 45 class SrsMessageHeader;
46 -class __SrsMessage;  
47 -class __SrsChunkStream; 46 +class SrsMessage;
  47 +class SrsChunkStream;
48 48
49 // the following is the timeout for rtmp protocol, 49 // the following is the timeout for rtmp protocol,
50 // to avoid death connection. 50 // to avoid death connection.
@@ -109,8 +109,7 @@ private: @@ -109,8 +109,7 @@ private:
109 std::map<double, std::string> requests; 109 std::map<double, std::string> requests;
110 // peer in 110 // peer in
111 private: 111 private:
112 - // TODO: FIXME: rename to chunk_streams  
113 - std::map<int, __SrsChunkStream*> __chunk_streams; 112 + std::map<int, SrsChunkStream*> chunk_streams;
114 SrsStream* decode_stream; 113 SrsStream* decode_stream;
115 SrsBuffer* buffer; 114 SrsBuffer* buffer;
116 int32_t in_chunk_size; 115 int32_t in_chunk_size;
@@ -150,21 +149,21 @@ public: @@ -150,21 +149,21 @@ public:
150 * NULL for unknown packet but return success. 149 * NULL for unknown packet but return success.
151 * never NULL if decode success. 150 * never NULL if decode success.
152 */ 151 */
153 - virtual int __recv_message(__SrsMessage** pmsg); 152 + virtual int recv_message(SrsMessage** pmsg);
154 /** 153 /**
155 * decode bytes oriented RTMP message to RTMP packet, 154 * decode bytes oriented RTMP message to RTMP packet,
156 * @param ppacket, output decoded packet, 155 * @param ppacket, output decoded packet,
157 * always NULL if error, never NULL if success. 156 * always NULL if error, never NULL if success.
158 * @return error when unknown packet, error when decode failed. 157 * @return error when unknown packet, error when decode failed.
159 */ 158 */
160 - virtual int __decode_message(__SrsMessage* msg, SrsPacket** ppacket); 159 + virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
161 /** 160 /**
162 * send the RTMP message and always free it. 161 * send the RTMP message and always free it.
163 * user must never free or use the msg after this method, 162 * user must never free or use the msg after this method,
164 * for it will always free the msg. 163 * for it will always free the msg.
165 * @param msg, the msg to send out, never be NULL. 164 * @param msg, the msg to send out, never be NULL.
166 */ 165 */
167 - virtual int __send_and_free_message(__SrsMessage* msg); 166 + virtual int send_and_free_message(SrsMessage* msg);
168 /** 167 /**
169 * send the RTMP packet and always free it. 168 * send the RTMP packet and always free it.
170 * user must never free or use the packet after this method, 169 * user must never free or use the packet after this method,
@@ -172,50 +171,50 @@ public: @@ -172,50 +171,50 @@ public:
172 * @param packet, the packet to send out, never be NULL. 171 * @param packet, the packet to send out, never be NULL.
173 * @param stream_id, the stream id of packet to send over, 0 for control message. 172 * @param stream_id, the stream id of packet to send over, 0 for control message.
174 */ 173 */
175 - virtual int __send_and_free_packet(SrsPacket* packet, int stream_id); 174 + virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
176 private: 175 private:
177 /** 176 /**
178 - * imp for __send_and_free_message 177 + * imp for send_and_free_message
179 * @param packet the packet of message, NULL for raw message. 178 * @param packet the packet of message, NULL for raw message.
180 */ 179 */
181 - virtual int __do_send_and_free_message(__SrsMessage* msg, SrsPacket* packet); 180 + virtual int do_send_and_free_message(SrsMessage* msg, SrsPacket* packet);
182 /** 181 /**
183 - * imp for __decode_message 182 + * imp for decode_message
184 */ 183 */
185 - virtual int __do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket); 184 + virtual int do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket);
186 /** 185 /**
187 * recv bytes oriented RTMP message from protocol stack. 186 * recv bytes oriented RTMP message from protocol stack.
188 * return error if error occur and nerver set the pmsg, 187 * return error if error occur and nerver set the pmsg,
189 * return success and pmsg set to NULL if no entire message got, 188 * return success and pmsg set to NULL if no entire message got,
190 * return success and pmsg set to entire message if got one. 189 * return success and pmsg set to entire message if got one.
191 */ 190 */
192 - virtual int __recv_interlaced_message(__SrsMessage** pmsg); 191 + virtual int recv_interlaced_message(SrsMessage** pmsg);
193 /** 192 /**
194 * read the chunk basic header(fmt, cid) from chunk stream. 193 * read the chunk basic header(fmt, cid) from chunk stream.
195 * user can discovery a SrsChunkStream by cid. 194 * user can discovery a SrsChunkStream by cid.
196 * @bh_size return the chunk basic header size, to remove the used bytes when finished. 195 * @bh_size return the chunk basic header size, to remove the used bytes when finished.
197 */ 196 */
198 - virtual int __read_basic_header(char& fmt, int& cid, int& bh_size); 197 + virtual int read_basic_header(char& fmt, int& cid, int& bh_size);
199 /** 198 /**
200 * read the chunk message header(timestamp, payload_length, message_type, stream_id) 199 * read the chunk message header(timestamp, payload_length, message_type, stream_id)
201 * from chunk stream and save to SrsChunkStream. 200 * from chunk stream and save to SrsChunkStream.
202 * @mh_size return the chunk message header size, to remove the used bytes when finished. 201 * @mh_size return the chunk message header size, to remove the used bytes when finished.
203 */ 202 */
204 - virtual int __read_message_header(__SrsChunkStream* chunk, char fmt, int bh_size, int& mh_size); 203 + virtual int read_message_header(SrsChunkStream* chunk, char fmt, int bh_size, int& mh_size);
205 /** 204 /**
206 * read the chunk payload, remove the used bytes in buffer, 205 * read the chunk payload, remove the used bytes in buffer,
207 * if got entire message, set the pmsg. 206 * if got entire message, set the pmsg.
208 * @payload_size read size in this roundtrip, generally a chunk size or left message size. 207 * @payload_size read size in this roundtrip, generally a chunk size or left message size.
209 */ 208 */
210 - virtual int __read_message_payload(__SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, __SrsMessage** pmsg); 209 + virtual int read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsMessage** pmsg);
211 /** 210 /**
212 * when recv message, update the context. 211 * when recv message, update the context.
213 */ 212 */
214 - virtual int __on_recv_message(__SrsMessage* msg); 213 + virtual int on_recv_message(SrsMessage* msg);
215 /** 214 /**
216 * when message sentout, update the context. 215 * when message sentout, update the context.
217 */ 216 */
218 - virtual int __on_send_message(__SrsMessage* msg, SrsPacket* packet); 217 + virtual int on_send_message(SrsMessage* msg, SrsPacket* packet);
219 private: 218 private:
220 virtual int response_acknowledgement_message(); 219 virtual int response_acknowledgement_message();
221 virtual int response_ping_message(int32_t timestamp); 220 virtual int response_ping_message(int32_t timestamp);
@@ -261,7 +260,6 @@ public: @@ -261,7 +260,6 @@ public:
261 * get the perfered cid(chunk stream id) which sendout over. 260 * get the perfered cid(chunk stream id) which sendout over.
262 * set at decoding, and canbe used for directly send message, 261 * set at decoding, and canbe used for directly send message,
263 * for example, dispatch to all connections. 262 * for example, dispatch to all connections.
264 - * @see: SrsSharedPtrMessage.SrsSharedPtr.perfer_cid  
265 */ 263 */
266 int perfer_cid; 264 int perfer_cid;
267 265
@@ -289,7 +287,7 @@ public: @@ -289,7 +287,7 @@ public:
289 * incoming chunk stream maybe interlaced, 287 * incoming chunk stream maybe interlaced,
290 * use the chunk stream to cache the input RTMP chunk streams. 288 * use the chunk stream to cache the input RTMP chunk streams.
291 */ 289 */
292 -class __SrsChunkStream 290 +class SrsChunkStream
293 { 291 {
294 public: 292 public:
295 /** 293 /**
@@ -313,14 +311,14 @@ public: @@ -313,14 +311,14 @@ public:
313 /** 311 /**
314 * partially read message. 312 * partially read message.
315 */ 313 */
316 - __SrsMessage* msg; 314 + SrsMessage* msg;
317 /** 315 /**
318 * decoded msg count, to identify whether the chunk stream is fresh. 316 * decoded msg count, to identify whether the chunk stream is fresh.
319 */ 317 */
320 int64_t msg_count; 318 int64_t msg_count;
321 public: 319 public:
322 - __SrsChunkStream(int _cid);  
323 - virtual ~__SrsChunkStream(); 320 + SrsChunkStream(int _cid);
  321 + virtual ~SrsChunkStream();
324 }; 322 };
325 323
326 /** 324 /**
@@ -328,7 +326,7 @@ public: @@ -328,7 +326,7 @@ public:
328 * protcol always recv RTMP message, and can send RTMP message or RTMP packet. 326 * protcol always recv RTMP message, and can send RTMP message or RTMP packet.
329 * the shared-ptr message is a special RTMP message, use ref-count for performance issue. 327 * the shared-ptr message is a special RTMP message, use ref-count for performance issue.
330 */ 328 */
331 -class __SrsMessage 329 +class SrsMessage
332 { 330 {
333 // 4.1. Message Header 331 // 4.1. Message Header
334 public: 332 public:
@@ -344,8 +342,8 @@ public: @@ -344,8 +342,8 @@ public:
344 int32_t size; 342 int32_t size;
345 int8_t* payload; 343 int8_t* payload;
346 public: 344 public:
347 - __SrsMessage();  
348 - virtual ~__SrsMessage(); 345 + SrsMessage();
  346 + virtual ~SrsMessage();
349 }; 347 };
350 348
351 /** 349 /**
@@ -353,7 +351,7 @@ public: @@ -353,7 +351,7 @@ public:
353 * for audio/video/data message that need less memory copy. 351 * for audio/video/data message that need less memory copy.
354 * and only for output. 352 * and only for output.
355 */ 353 */
356 -class __SrsSharedPtrMessage : public __SrsMessage 354 +class SrsSharedPtrMessage : public SrsMessage
357 { 355 {
358 private: 356 private:
359 struct __SrsSharedPtr 357 struct __SrsSharedPtr
@@ -367,15 +365,15 @@ private: @@ -367,15 +365,15 @@ private:
367 }; 365 };
368 __SrsSharedPtr* ptr; 366 __SrsSharedPtr* ptr;
369 public: 367 public:
370 - __SrsSharedPtrMessage();  
371 - virtual ~__SrsSharedPtrMessage(); 368 + SrsSharedPtrMessage();
  369 + virtual ~SrsSharedPtrMessage();
372 public: 370 public:
373 /** 371 /**
374 * set the shared payload. 372 * set the shared payload.
375 * we will detach the payload of source, 373 * we will detach the payload of source,
376 * so ensure donot use it before. 374 * so ensure donot use it before.
377 */ 375 */
378 - virtual int initialize(__SrsMessage* source); 376 + virtual int initialize(SrsMessage* source);
379 /** 377 /**
380 * set the shared payload. 378 * set the shared payload.
381 * use source header, and specified param payload. 379 * use source header, and specified param payload.
@@ -385,7 +383,7 @@ public: @@ -385,7 +383,7 @@ public:
385 /** 383 /**
386 * copy current shared ptr message, use ref-count. 384 * copy current shared ptr message, use ref-count.
387 */ 385 */
388 - virtual __SrsSharedPtrMessage* copy(); 386 + virtual SrsSharedPtrMessage* copy();
389 }; 387 };
390 388
391 /** 389 /**
@@ -423,7 +421,6 @@ public: @@ -423,7 +421,6 @@ public:
423 */ 421 */
424 public: 422 public:
425 virtual int get_perfer_cid(); 423 virtual int get_perfer_cid();
426 - virtual int get_payload_length();  
427 public: 424 public:
428 /** 425 /**
429 * subpacket must override to provide the right message type. 426 * subpacket must override to provide the right message type.
@@ -1133,7 +1130,7 @@ protected: @@ -1133,7 +1130,7 @@ protected:
1133 * if need to set timeout, use set timeout of SrsProtocol. 1130 * if need to set timeout, use set timeout of SrsProtocol.
1134 */ 1131 */
1135 template<class T> 1132 template<class T>
1136 -int __srs_rtmp_expect_message(SrsProtocol* protocol, __SrsMessage** pmsg, T** ppacket) 1133 +int __srs_rtmp_expect_message(SrsProtocol* protocol, SrsMessage** pmsg, T** ppacket)
1137 { 1134 {
1138 *pmsg = NULL; 1135 *pmsg = NULL;
1139 *ppacket = NULL; 1136 *ppacket = NULL;
@@ -1141,15 +1138,15 @@ int __srs_rtmp_expect_message(SrsProtocol* protocol, __SrsMessage** pmsg, T** pp @@ -1141,15 +1138,15 @@ int __srs_rtmp_expect_message(SrsProtocol* protocol, __SrsMessage** pmsg, T** pp
1141 int ret = ERROR_SUCCESS; 1138 int ret = ERROR_SUCCESS;
1142 1139
1143 while (true) { 1140 while (true) {
1144 - __SrsMessage* msg = NULL;  
1145 - if ((ret = protocol->__recv_message(&msg)) != ERROR_SUCCESS) { 1141 + SrsMessage* msg = NULL;
  1142 + if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
1146 srs_error("recv message failed. ret=%d", ret); 1143 srs_error("recv message failed. ret=%d", ret);
1147 return ret; 1144 return ret;
1148 } 1145 }
1149 srs_verbose("recv message success."); 1146 srs_verbose("recv message success.");
1150 1147
1151 SrsPacket* packet = NULL; 1148 SrsPacket* packet = NULL;
1152 - if ((ret = protocol->__decode_message(msg, &packet)) != ERROR_SUCCESS) { 1149 + if ((ret = protocol->decode_message(msg, &packet)) != ERROR_SUCCESS) {
1153 srs_error("decode message failed. ret=%d", ret); 1150 srs_error("decode message failed. ret=%d", ret);
1154 srs_freep(msg); 1151 srs_freep(msg);
1155 return ret; 1152 return ret;