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

rename SrsMessage to SrsCommonMessage

Browse source
This commit is contained in:
winlin 2013-10-22 19:44:12 +08:00
parent c64ed83378
commit cdd843a641
7 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,28 +172,28 @@ int SrsClient::streaming_play(SrsSource* source)
// read from client. // read from client.
if (ready) { if (ready) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) { if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv client control message failed. ret=%d", ret); srs_error("recv client control message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
// TODO: process it. // TODO: process it.
} }
// get messages from consumer. // get messages from consumer.
SrsMessage** msgs = NULL; SrsCommonMessage** msgs = NULL;
int count = 0; int count = 0;
if ((ret = consumer->get_packets(0, msgs, count)) != ERROR_SUCCESS) { if ((ret = consumer->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
srs_error("get messages from consumer failed. ret=%d", ret); srs_error("get messages from consumer failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage*, msgs, true); SrsAutoFree(SrsCommonMessage*, msgs, true);
// sendout messages // sendout messages
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
SrsMessage* msg = msgs[i]; SrsCommonMessage* msg = msgs[i];
if ((ret = rtmp->send_message(msg)) != ERROR_SUCCESS) { if ((ret = rtmp->send_message(msg)) != ERROR_SUCCESS) {
srs_error("send message to client failed. ret=%d", ret); srs_error("send message to client failed. ret=%d", ret);
return ret; return ret;
@ -209,13 +209,13 @@ int SrsClient::streaming_publish(SrsSource* source)
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
while (true) { while (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) { if ((ret = rtmp->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv identify client message failed. ret=%d", ret); srs_error("recv identify client message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
// process audio packet // process audio packet
if (msg->header.is_audio() && ((ret = source->on_audio(msg)) != ERROR_SUCCESS)) { if (msg->header.is_audio() && ((ret = source->on_audio(msg)) != ERROR_SUCCESS)) {

30
trunk/src/core/srs_core_protocol.cpp
View file

@ -279,14 +279,14 @@ int SrsProtocol::can_read(int timeout_ms, bool& ready)
return skt->can_read(timeout_ms, ready); return skt->can_read(timeout_ms, ready);
} }
int SrsProtocol::recv_message(SrsMessage** pmsg) int SrsProtocol::recv_message(SrsCommonMessage** pmsg)
{ {
*pmsg = NULL; *pmsg = NULL;
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
while (true) { while (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = recv_interlaced_message(&msg)) != ERROR_SUCCESS) { if ((ret = recv_interlaced_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv interlaced message failed. ret=%d", ret); srs_error("recv interlaced message failed. ret=%d", ret);
@ -440,7 +440,7 @@ int SrsProtocol::send_message(SrsOutputableMessage* msg)
return ret; return ret;
} }
int SrsProtocol::on_recv_message(SrsMessage* msg) int SrsProtocol::on_recv_message(SrsCommonMessage* msg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -483,7 +483,7 @@ int SrsProtocol::on_send_message(SrsOutputableMessage* msg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* common_msg = dynamic_cast<SrsMessage*>(msg); SrsCommonMessage* common_msg = dynamic_cast<SrsCommonMessage*>(msg);
if (!msg) { if (!msg) {
srs_verbose("ignore the shared ptr message."); srs_verbose("ignore the shared ptr message.");
return ret; return ret;
@ -506,7 +506,7 @@ int SrsProtocol::on_send_message(SrsOutputableMessage* msg)
return ret; return ret;
} }
int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg) int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -545,7 +545,7 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg)
chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id); chunk->header.payload_length, chunk->header.timestamp, chunk->header.stream_id);
// read msg payload from chunk stream. // read msg payload from chunk stream.
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
int payload_size = 0; int payload_size = 0;
if ((ret = read_message_payload(chunk, bh_size, mh_size, payload_size, &msg)) != ERROR_SUCCESS) { if ((ret = read_message_payload(chunk, bh_size, mh_size, payload_size, &msg)) != ERROR_SUCCESS) {
srs_error("read message payload failed. ret=%d", ret); srs_error("read message payload failed. ret=%d", ret);
@ -668,7 +668,7 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz
// create msg when new chunk stream start // create msg when new chunk stream start
if (!chunk->msg) { if (!chunk->msg) {
chunk->msg = new SrsMessage(); chunk->msg = new SrsCommonMessage();
srs_verbose("create message for new chunk, fmt=%d, cid=%d", fmt, chunk->cid); srs_verbose("create message for new chunk, fmt=%d, cid=%d", fmt, chunk->cid);
} }
@ -794,7 +794,7 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz
return ret; return ret;
} }
int SrsProtocol::read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsMessage** pmsg) int SrsProtocol::read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsCommonMessage** pmsg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -943,19 +943,19 @@ void SrsOutputableMessage::free_payload()
srs_freepa(payload); srs_freepa(payload);
} }
SrsMessage::SrsMessage() SrsCommonMessage::SrsCommonMessage()
{ {
stream = NULL; stream = NULL;
packet = NULL; packet = NULL;
} }
SrsMessage::~SrsMessage() SrsCommonMessage::~SrsCommonMessage()
{ {
srs_freep(packet); srs_freep(packet);
srs_freep(stream); srs_freep(stream);
} }
int SrsMessage::decode_packet() int SrsCommonMessage::decode_packet()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -1061,7 +1061,7 @@ int SrsMessage::decode_packet()
return ret; return ret;
} }
SrsPacket* SrsMessage::get_packet() SrsPacket* SrsCommonMessage::get_packet()
{ {
if (!packet) { if (!packet) {
srs_error("the payload is raw/undecoded, invoke decode_packet to decode it."); srs_error("the payload is raw/undecoded, invoke decode_packet to decode it.");
@ -1071,7 +1071,7 @@ SrsPacket* SrsMessage::get_packet()
return packet; return packet;
} }
int SrsMessage::get_perfer_cid() int SrsCommonMessage::get_perfer_cid()
{ {
if (!packet) { if (!packet) {
return RTMP_CID_ProtocolControl; return RTMP_CID_ProtocolControl;
@ -1086,7 +1086,7 @@ int SrsMessage::get_perfer_cid()
return packet->get_perfer_cid(); return packet->get_perfer_cid();
} }
void SrsMessage::set_packet(SrsPacket* pkt, int stream_id) void SrsCommonMessage::set_packet(SrsPacket* pkt, int stream_id)
{ {
srs_freep(packet); srs_freep(packet);
@ -1097,7 +1097,7 @@ void SrsMessage::set_packet(SrsPacket* pkt, int stream_id)
header.stream_id = stream_id; header.stream_id = stream_id;
} }
int SrsMessage::encode_packet() int SrsCommonMessage::encode_packet()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;

22
trunk/src/core/srs_core_protocol.hpp
View file

@ -42,7 +42,7 @@ class SrsSocket;
class SrsBuffer; class SrsBuffer;
class SrsPacket; class SrsPacket;
class SrsStream; class SrsStream;
class SrsMessage; class SrsCommonMessage;
class SrsChunkStream; class SrsChunkStream;
class SrsAmf0Object; class SrsAmf0Object;
class SrsAmf0Null; class SrsAmf0Null;
@ -105,7 +105,7 @@ public:
* @pmsg, user must free it. NULL if not success. * @pmsg, user must free it. NULL if not success.
* @remark, only when success, user can use and must free the pmsg. * @remark, only when success, user can use and must free the pmsg.
*/ */
virtual int recv_message(SrsMessage** pmsg); virtual int recv_message(SrsCommonMessage** pmsg);
/** /**
* send out message with encoded payload to peer. * send out message with encoded payload to peer.
* use the message encode method to encode to payload, * use the message encode method to encode to payload,
@ -117,7 +117,7 @@ private:
/** /**
* when recv message, update the context. * when recv message, update the context.
*/ */
virtual int on_recv_message(SrsMessage* msg); virtual int on_recv_message(SrsCommonMessage* msg);
/** /**
* when message sentout, update the context. * when message sentout, update the context.
*/ */
@ -128,7 +128,7 @@ private:
* return success and pmsg set to NULL if no entire message got, * return success and pmsg set to NULL if no entire message got,
* return success and pmsg set to entire message if got one. * return success and pmsg set to entire message if got one.
*/ */
virtual int recv_interlaced_message(SrsMessage** pmsg); virtual int recv_interlaced_message(SrsCommonMessage** pmsg);
/** /**
* read the chunk basic header(fmt, cid) from chunk stream. * read the chunk basic header(fmt, cid) from chunk stream.
* user can discovery a SrsChunkStream by cid. * user can discovery a SrsChunkStream by cid.
@ -146,7 +146,7 @@ private:
* if got entire message, set the pmsg. * if got entire message, set the pmsg.
* @payload_size read size in this roundtrip, generally a chunk size or left message size. * @payload_size read size in this roundtrip, generally a chunk size or left message size.
*/ */
virtual int read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsMessage** pmsg); virtual int read_message_payload(SrsChunkStream* chunk, int bh_size, int mh_size, int& payload_size, SrsCommonMessage** pmsg);
}; };
/** /**
@ -222,7 +222,7 @@ public:
/** /**
* partially read message. * partially read message.
*/ */
SrsMessage* msg; SrsCommonMessage* msg;
/** /**
* decoded msg count, to identify whether the chunk stream is fresh. * decoded msg count, to identify whether the chunk stream is fresh.
*/ */
@ -274,7 +274,7 @@ public:
* common RTMP message defines in rtmp.part2.Message-Formats.pdf. * common RTMP message defines in rtmp.part2.Message-Formats.pdf.
* cannbe parse and decode. * cannbe parse and decode.
*/ */
class SrsMessage : public SrsOutputableMessage class SrsCommonMessage : public SrsOutputableMessage
{ {
private: private:
typedef SrsOutputableMessage super; typedef SrsOutputableMessage super;
@ -283,8 +283,8 @@ private:
SrsStream* stream; SrsStream* stream;
SrsPacket* packet; SrsPacket* packet;
public: public:
SrsMessage(); SrsCommonMessage();
virtual ~SrsMessage(); virtual ~SrsCommonMessage();
/** /**
* decode functions. * decode functions.
*/ */
@ -959,7 +959,7 @@ protected:
* @remark, only when success, user can use and must free the pmsg/ppacket. * @remark, only when success, user can use and must free the pmsg/ppacket.
*/ */
template<class T> template<class T>
int srs_rtmp_expect_message(SrsProtocol* protocol, SrsMessage** pmsg, T** ppacket) int srs_rtmp_expect_message(SrsProtocol* protocol, SrsCommonMessage** pmsg, T** ppacket)
{ {
*pmsg = NULL; *pmsg = NULL;
*ppacket = NULL; *ppacket = NULL;
@ -967,7 +967,7 @@ int srs_rtmp_expect_message(SrsProtocol* protocol, SrsMessage** pmsg, T** ppacke
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
while (true) { while (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) { if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv message failed. ret=%d", ret); srs_error("recv message failed. ret=%d", ret);
return ret; return ret;

66
trunk/src/core/srs_core_rtmp.cpp
View file

@ -142,7 +142,7 @@ SrsRtmp::~SrsRtmp()
srs_freep(protocol); srs_freep(protocol);
} }
int SrsRtmp::recv_message(SrsMessage** pmsg) int SrsRtmp::recv_message(SrsCommonMessage** pmsg)
{ {
return protocol->recv_message(pmsg); return protocol->recv_message(pmsg);
} }
@ -152,7 +152,7 @@ int SrsRtmp::can_read(int timeout_ms, bool& ready)
return protocol->can_read(timeout_ms, ready); return protocol->can_read(timeout_ms, ready);
} }
int SrsRtmp::send_message(SrsMessage* msg) int SrsRtmp::send_message(SrsCommonMessage* msg)
{ {
return protocol->send_message(msg); return protocol->send_message(msg);
} }
@ -207,13 +207,13 @@ int SrsRtmp::connect_app(SrsRequest* req)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
SrsConnectAppPacket* pkt = NULL; SrsConnectAppPacket* pkt = NULL;
if ((ret = srs_rtmp_expect_message<SrsConnectAppPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { if ((ret = srs_rtmp_expect_message<SrsConnectAppPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
srs_error("expect connect app message failed. ret=%d", ret); srs_error("expect connect app message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
srs_info("get connect app message"); srs_info("get connect app message");
SrsAmf0Any* prop = NULL; SrsAmf0Any* prop = NULL;
@ -246,7 +246,7 @@ int SrsRtmp::set_window_ack_size(int ack_size)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket(); SrsSetWindowAckSizePacket* pkt = new SrsSetWindowAckSizePacket();
pkt->ackowledgement_window_size = ack_size; pkt->ackowledgement_window_size = ack_size;
@ -265,7 +265,7 @@ int SrsRtmp::set_peer_bandwidth(int bandwidth, int type)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsSetPeerBandwidthPacket* pkt = new SrsSetPeerBandwidthPacket(); SrsSetPeerBandwidthPacket* pkt = new SrsSetPeerBandwidthPacket();
pkt->bandwidth = bandwidth; pkt->bandwidth = bandwidth;
@ -286,7 +286,7 @@ int SrsRtmp::response_connect_app(SrsRequest* req)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsConnectAppResPacket* pkt = new SrsConnectAppResPacket(); SrsConnectAppResPacket* pkt = new SrsConnectAppResPacket();
pkt->props->set("fmsVer", new SrsAmf0String("FMS/"RTMP_SIG_FMS_VER)); pkt->props->set("fmsVer", new SrsAmf0String("FMS/"RTMP_SIG_FMS_VER));
@ -320,7 +320,7 @@ int SrsRtmp::on_bw_done()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnBWDonePacket* pkt = new SrsOnBWDonePacket(); SrsOnBWDonePacket* pkt = new SrsOnBWDonePacket();
msg->set_packet(pkt, 0); msg->set_packet(pkt, 0);
@ -340,13 +340,13 @@ int SrsRtmp::identify_client(int stream_id, SrsClientType& type, std::string& st
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
while (true) { while (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) { if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv identify client message failed. ret=%d", ret); srs_error("recv identify client message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) { if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
srs_trace("identify ignore messages except " srs_trace("identify ignore messages except "
@ -381,7 +381,7 @@ int SrsRtmp::set_chunk_size(int chunk_size)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket(); SrsSetChunkSizePacket* pkt = new SrsSetChunkSizePacket();
pkt->chunk_size = chunk_size; pkt->chunk_size = chunk_size;
@ -402,7 +402,7 @@ int SrsRtmp::start_play(int stream_id)
// StreamBegin // StreamBegin
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsPCUC4BytesPacket* pkt = new SrsPCUC4BytesPacket(); SrsPCUC4BytesPacket* pkt = new SrsPCUC4BytesPacket();
pkt->event_type = SrcPCUCStreamBegin; pkt->event_type = SrcPCUCStreamBegin;
@ -418,7 +418,7 @@ int SrsRtmp::start_play(int stream_id)
// onStatus(NetStream.Play.Reset) // onStatus(NetStream.Play.Reset)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus)); pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus));
@ -438,7 +438,7 @@ int SrsRtmp::start_play(int stream_id)
// onStatus(NetStream.Play.Start) // onStatus(NetStream.Play.Start)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus)); pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus));
@ -458,7 +458,7 @@ int SrsRtmp::start_play(int stream_id)
// |RtmpSampleAccess(false, false) // |RtmpSampleAccess(false, false)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsSampleAccessPacket* pkt = new SrsSampleAccessPacket(); SrsSampleAccessPacket* pkt = new SrsSampleAccessPacket();
msg->set_packet(pkt, stream_id); msg->set_packet(pkt, stream_id);
@ -472,7 +472,7 @@ int SrsRtmp::start_play(int stream_id)
// onStatus(NetStream.Data.Start) // onStatus(NetStream.Data.Start)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusDataPacket* pkt = new SrsOnStatusDataPacket(); SrsOnStatusDataPacket* pkt = new SrsOnStatusDataPacket();
pkt->data->set(StatusCode, new SrsAmf0String(StatusCodeDataStart)); pkt->data->set(StatusCode, new SrsAmf0String(StatusCodeDataStart));
@ -498,7 +498,7 @@ int SrsRtmp::start_publish(int stream_id)
// FCPublish // FCPublish
double fc_publish_tid = 0; double fc_publish_tid = 0;
if (true) { if (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
SrsFMLEStartPacket* pkt = NULL; SrsFMLEStartPacket* pkt = NULL;
if ((ret = srs_rtmp_expect_message<SrsFMLEStartPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { if ((ret = srs_rtmp_expect_message<SrsFMLEStartPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
srs_error("recv FCPublish message failed. ret=%d", ret); srs_error("recv FCPublish message failed. ret=%d", ret);
@ -506,12 +506,12 @@ int SrsRtmp::start_publish(int stream_id)
} }
srs_info("recv FCPublish request message success."); srs_info("recv FCPublish request message success.");
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
fc_publish_tid = pkt->transaction_id; fc_publish_tid = pkt->transaction_id;
} }
// FCPublish response // FCPublish response
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(fc_publish_tid); SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(fc_publish_tid);
msg->set_packet(pkt, 0); msg->set_packet(pkt, 0);
@ -526,7 +526,7 @@ int SrsRtmp::start_publish(int stream_id)
// createStream // createStream
double create_stream_tid = 0; double create_stream_tid = 0;
if (true) { if (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
SrsCreateStreamPacket* pkt = NULL; SrsCreateStreamPacket* pkt = NULL;
if ((ret = srs_rtmp_expect_message<SrsCreateStreamPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { if ((ret = srs_rtmp_expect_message<SrsCreateStreamPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
srs_error("recv createStream message failed. ret=%d", ret); srs_error("recv createStream message failed. ret=%d", ret);
@ -534,12 +534,12 @@ int SrsRtmp::start_publish(int stream_id)
} }
srs_info("recv createStream request message success."); srs_info("recv createStream request message success.");
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
create_stream_tid = pkt->transaction_id; create_stream_tid = pkt->transaction_id;
} }
// createStream response // createStream response
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(create_stream_tid, stream_id); SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(create_stream_tid, stream_id);
msg->set_packet(pkt, 0); msg->set_packet(pkt, 0);
@ -553,7 +553,7 @@ int SrsRtmp::start_publish(int stream_id)
// publish // publish
if (true) { if (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
SrsPublishPacket* pkt = NULL; SrsPublishPacket* pkt = NULL;
if ((ret = srs_rtmp_expect_message<SrsPublishPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) { if ((ret = srs_rtmp_expect_message<SrsPublishPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
srs_error("recv publish message failed. ret=%d", ret); srs_error("recv publish message failed. ret=%d", ret);
@ -561,11 +561,11 @@ int SrsRtmp::start_publish(int stream_id)
} }
srs_info("recv publish request message success."); srs_info("recv publish request message success.");
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
} }
// publish response onFCPublish(NetStream.Publish.Start) // publish response onFCPublish(NetStream.Publish.Start)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->command_name = RTMP_AMF0_COMMAND_ON_FC_PUBLISH; pkt->command_name = RTMP_AMF0_COMMAND_ON_FC_PUBLISH;
@ -582,7 +582,7 @@ int SrsRtmp::start_publish(int stream_id)
} }
// publish response onStatus(NetStream.Publish.Start) // publish response onStatus(NetStream.Publish.Start)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus)); pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus));
@ -608,7 +608,7 @@ int SrsRtmp::fmle_unpublish(int stream_id, double unpublish_tid)
// publish response onFCUnpublish(NetStream.unpublish.Success) // publish response onFCUnpublish(NetStream.unpublish.Success)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->command_name = RTMP_AMF0_COMMAND_ON_FC_UNPUBLISH; pkt->command_name = RTMP_AMF0_COMMAND_ON_FC_UNPUBLISH;
@ -625,7 +625,7 @@ int SrsRtmp::fmle_unpublish(int stream_id, double unpublish_tid)
} }
// FCUnpublish response // FCUnpublish response
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(unpublish_tid); SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(unpublish_tid);
msg->set_packet(pkt, stream_id); msg->set_packet(pkt, stream_id);
@ -638,7 +638,7 @@ int SrsRtmp::fmle_unpublish(int stream_id, double unpublish_tid)
} }
// publish response onStatus(NetStream.Unpublish.Success) // publish response onStatus(NetStream.Unpublish.Success)
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket(); SrsOnStatusCallPacket* pkt = new SrsOnStatusCallPacket();
pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus)); pkt->data->set(StatusLevel, new SrsAmf0String(StatusLevelStatus));
@ -665,7 +665,7 @@ int SrsRtmp::identify_create_stream_client(SrsCreateStreamPacket* req, int strea
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(req->transaction_id, stream_id); SrsCreateStreamResPacket* pkt = new SrsCreateStreamResPacket(req->transaction_id, stream_id);
msg->set_packet(pkt, 0); msg->set_packet(pkt, 0);
@ -678,13 +678,13 @@ int SrsRtmp::identify_create_stream_client(SrsCreateStreamPacket* req, int strea
} }
while (true) { while (true) {
SrsMessage* msg = NULL; SrsCommonMessage* msg = NULL;
if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) { if ((ret = protocol->recv_message(&msg)) != ERROR_SUCCESS) {
srs_error("recv identify client message failed. ret=%d", ret); srs_error("recv identify client message failed. ret=%d", ret);
return ret; return ret;
} }
SrsAutoFree(SrsMessage, msg, false); SrsAutoFree(SrsCommonMessage, msg, false);
if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) { if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
srs_trace("identify ignore messages except " srs_trace("identify ignore messages except "
@ -721,7 +721,7 @@ int SrsRtmp::identify_fmle_publish_client(SrsFMLEStartPacket* req, SrsClientType
// releaseStream response // releaseStream response
if (true) { if (true) {
SrsMessage* msg = new SrsMessage(); SrsCommonMessage* msg = new SrsCommonMessage();
SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(req->transaction_id); SrsFMLEStartResPacket* pkt = new SrsFMLEStartResPacket(req->transaction_id);
msg->set_packet(pkt, 0); msg->set_packet(pkt, 0);

6
trunk/src/core/srs_core_rtmp.hpp
View file

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <st.h> #include <st.h>
class SrsProtocol; class SrsProtocol;
class SrsMessage; class SrsCommonMessage;
class SrsCreateStreamPacket; class SrsCreateStreamPacket;
class SrsFMLEStartPacket; class SrsFMLEStartPacket;
@ -100,9 +100,9 @@ public:
SrsRtmp(st_netfd_t client_stfd); SrsRtmp(st_netfd_t client_stfd);
virtual ~SrsRtmp(); virtual ~SrsRtmp();
public: public:
virtual int recv_message(SrsMessage** pmsg); virtual int recv_message(SrsCommonMessage** pmsg);
virtual int can_read(int timeout_ms, bool& ready); virtual int can_read(int timeout_ms, bool& ready);
virtual int send_message(SrsMessage* msg); virtual int send_message(SrsCommonMessage* msg);
public: public:
virtual int handshake(); virtual int handshake();
virtual int connect_app(SrsRequest* req); virtual int connect_app(SrsRequest* req);

8
trunk/src/core/srs_core_source.cpp
View file

@ -47,7 +47,7 @@ SrsConsumer::~SrsConsumer()
{ {
} }
int SrsConsumer::get_packets(int max_count, SrsMessage**& msgs, int& count) int SrsConsumer::get_packets(int max_count, SrsCommonMessage**& msgs, int& count)
{ {
msgs = NULL; msgs = NULL;
count = 0; count = 0;
@ -65,7 +65,7 @@ SrsSource::~SrsSource()
{ {
} }
int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata) int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
@ -75,13 +75,13 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
return ret; return ret;
} }
int SrsSource::on_audio(SrsMessage* audio) int SrsSource::on_audio(SrsCommonMessage* audio)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
return ret; return ret;
} }
int SrsSource::on_video(SrsMessage* audio) int SrsSource::on_video(SrsCommonMessage* audio)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
return ret; return ret;

10
trunk/src/core/srs_core_source.hpp
View file

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map> #include <map>
#include <string> #include <string>
class SrsMessage; class SrsCommonMessage;
class SrsOnMetaDataPacket; class SrsOnMetaDataPacket;
/** /**
@ -51,7 +51,7 @@ public:
* @count the count in array. * @count the count in array.
* @max_count the max count to dequeue, 0 to dequeue all. * @max_count the max count to dequeue, 0 to dequeue all.
*/ */
virtual int get_packets(int max_count, SrsMessage**& msgs, int& count); virtual int get_packets(int max_count, SrsCommonMessage**& msgs, int& count);
}; };
/** /**
@ -75,9 +75,9 @@ public:
SrsSource(std::string _stream_url); SrsSource(std::string _stream_url);
virtual ~SrsSource(); virtual ~SrsSource();
public: public:
virtual int on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata); virtual int on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata);
virtual int on_audio(SrsMessage* audio); virtual int on_audio(SrsCommonMessage* audio);
virtual int on_video(SrsMessage* video); virtual int on_video(SrsCommonMessage* video);
public: public:
virtual SrsConsumer* create_consumer(); virtual SrsConsumer* create_consumer();
}; };