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

extract method to process publish message

Browse source
This commit is contained in:
winlin 2013-11-23 20:33:10 +08:00
parent 195a857f22
commit b87318dec0
2 changed files with 62 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

100
trunk/src/core/srs_core_client.cpp
View file

@ -352,61 +352,73 @@ int SrsClient::publish(SrsSource* source, bool is_fmle)
(int)(srs_get_system_time_ms()/1000), pithy_print.get_age(), rtmp->get_send_bytes(), rtmp->get_recv_bytes(), rtmp->get_send_kbps(), rtmp->get_recv_kbps()); (int)(srs_get_system_time_ms()/1000), pithy_print.get_age(), rtmp->get_send_bytes(), rtmp->get_recv_bytes(), rtmp->get_send_kbps(), rtmp->get_recv_kbps());
} }
// process audio packet if ((ret = process_publish_message(source, hls, msg, is_fmle)) != ERROR_SUCCESS) {
if (msg->header.is_audio() && ((ret = source->on_audio(msg)) != ERROR_SUCCESS)) { srs_error("process publish message failed. ret=%d", ret);
srs_error("process audio message failed. ret=%d", ret);
return ret; return ret;
} }
// process video packet }
if (msg->header.is_video() && ((ret = source->on_video(msg)) != ERROR_SUCCESS)) {
srs_error("process video message failed. ret=%d", ret); return ret;
}
int SrsClient::process_publish_message(SrsSource* source, SrsHLS* hls, SrsCommonMessage* msg, bool is_fmle)
{
int ret = ERROR_SUCCESS;
// process audio packet
if (msg->header.is_audio() && ((ret = source->on_audio(msg)) != ERROR_SUCCESS)) {
srs_error("process audio message failed. ret=%d", ret);
return ret;
}
// process video packet
if (msg->header.is_video() && ((ret = source->on_video(msg)) != ERROR_SUCCESS)) {
srs_error("process video message failed. ret=%d", ret);
return ret;
}
// process onMetaData
if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) {
if ((ret = msg->decode_packet()) != ERROR_SUCCESS) {
srs_error("decode onMetaData message failed. ret=%d", ret);
return ret; return ret;
} }
// process onMetaData SrsPacket* pkt = msg->get_packet();
if (msg->header.is_amf0_data() || msg->header.is_amf3_data()) { if (dynamic_cast<SrsOnMetaDataPacket*>(pkt)) {
if ((ret = msg->decode_packet()) != ERROR_SUCCESS) { SrsOnMetaDataPacket* metadata = dynamic_cast<SrsOnMetaDataPacket*>(pkt);
srs_error("decode onMetaData message failed. ret=%d", ret); if ((ret = source->on_meta_data(msg, metadata)) != ERROR_SUCCESS) {
srs_error("process onMetaData message failed. ret=%d", ret);
return ret; return ret;
} }
srs_trace("process onMetaData message success.");
SrsPacket* pkt = msg->get_packet(); return ret;
if (dynamic_cast<SrsOnMetaDataPacket*>(pkt)) {
SrsOnMetaDataPacket* metadata = dynamic_cast<SrsOnMetaDataPacket*>(pkt);
if ((ret = source->on_meta_data(msg, metadata)) != ERROR_SUCCESS) {
srs_error("process onMetaData message failed. ret=%d", ret);
return ret;
}
srs_trace("process onMetaData message success.");
continue;
}
srs_trace("ignore AMF0/AMF3 data message.");
continue;
} }
// process UnPublish event. srs_trace("ignore AMF0/AMF3 data message.");
if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) { return ret;
if ((ret = msg->decode_packet()) != ERROR_SUCCESS) { }
srs_error("decode unpublish message failed. ret=%d", ret);
return ret;
}
// flash unpublish. // process UnPublish event.
if (!is_fmle) { if (msg->header.is_amf0_command() || msg->header.is_amf3_command()) {
srs_trace("flash publish finished."); if ((ret = msg->decode_packet()) != ERROR_SUCCESS) {
return ret; srs_error("decode unpublish message failed. ret=%d", ret);
} return ret;
SrsPacket* pkt = msg->get_packet();
if (dynamic_cast<SrsFMLEStartPacket*>(pkt)) {
SrsFMLEStartPacket* unpublish = dynamic_cast<SrsFMLEStartPacket*>(pkt);
return rtmp->fmle_unpublish(res->stream_id, unpublish->transaction_id);
}
srs_trace("ignore AMF0/AMF3 command message.");
continue;
} }
// flash unpublish.
if (!is_fmle) {
srs_trace("flash publish finished.");
return ret;
}
SrsPacket* pkt = msg->get_packet();
if (dynamic_cast<SrsFMLEStartPacket*>(pkt)) {
SrsFMLEStartPacket* unpublish = dynamic_cast<SrsFMLEStartPacket*>(pkt);
return rtmp->fmle_unpublish(res->stream_id, unpublish->transaction_id);
}
srs_trace("ignore AMF0/AMF3 command message.");
return ret;
} }
return ret; return ret;

2
trunk/src/core/srs_core_client.hpp
View file

@ -39,6 +39,7 @@ class SrsSource;
class SrsRefer; class SrsRefer;
class SrsConsumer; class SrsConsumer;
class SrsCommonMessage; class SrsCommonMessage;
class SrsHLS;
/** /**
* the client provides the main logic control for RTMP clients. * the client provides the main logic control for RTMP clients.
@ -60,6 +61,7 @@ private:
virtual int check_vhost(); virtual int check_vhost();
virtual int playing(SrsSource* source); virtual int playing(SrsSource* source);
virtual int publish(SrsSource* source, bool is_fmle); virtual int publish(SrsSource* source, bool is_fmle);
virtual int process_publish_message(SrsSource* source, SrsHLS* hls, SrsCommonMessage* msg, bool is_fmle);
virtual int get_peer_ip(); virtual int get_peer_ip();
virtual int process_play_control_msg(SrsConsumer* consumer, SrsCommonMessage* msg); virtual int process_play_control_msg(SrsConsumer* consumer, SrsCommonMessage* msg);
}; };