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

fix bug #72, also need stream_id for send_and_free_message. 0.9.101

Browse source
This commit is contained in:
winlin 2014-05-17 17:53:27 +08:00
parent 952abbee03
commit 2c059d3a80
10 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -385,9 +385,9 @@ int SrsRtmpClient::decode_message(SrsMessage* msg, SrsPacket** ppacket)
return protocol->decode_message(msg, ppacket);
}
int SrsRtmpClient::send_and_free_message(SrsMessage* msg)
int SrsRtmpClient::send_and_free_message(SrsMessage* msg, int stream_id)
{
return protocol->send_and_free_message(msg);
return protocol->send_and_free_message(msg, stream_id);
}
int SrsRtmpClient::send_and_free_packet(SrsPacket* packet, int stream_id)
@ -730,9 +730,9 @@ int SrsRtmpServer::decode_message(SrsMessage* msg, SrsPacket** ppacket)
return protocol->decode_message(msg, ppacket);
}
int SrsRtmpServer::send_and_free_message(SrsMessage* msg)
int SrsRtmpServer::send_and_free_message(SrsMessage* msg, int stream_id)
{
return protocol->send_and_free_message(msg);
return protocol->send_and_free_message(msg, stream_id);
}
int SrsRtmpServer::send_and_free_packet(SrsPacket* packet, int stream_id)

4
trunk/src/rtmp/srs_protocol_rtmp.hpp
View file

@ -164,7 +164,7 @@ public:
virtual int64_t get_send_bytes();
virtual int recv_message(SrsMessage** pmsg);
virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
virtual int send_and_free_message(SrsMessage* msg);
virtual int send_and_free_message(SrsMessage* msg, int stream_id);
virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
public:
// try complex, then simple handshake.
@ -209,7 +209,7 @@ public:
virtual int64_t get_send_bytes();
virtual int recv_message(SrsMessage** pmsg);
virtual int decode_message(SrsMessage* msg, SrsPacket** ppacket);
virtual int send_and_free_message(SrsMessage* msg);
virtual int send_and_free_message(SrsMessage* msg, int stream_id);
virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
public:
virtual int handshake();

5
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
View file

@ -725,8 +725,11 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
return ret;
}
int SrsProtocol::send_and_free_message(SrsMessage* msg)
int SrsProtocol::send_and_free_message(SrsMessage* msg, int stream_id)
{
if (msg) {
msg->header.stream_id = stream_id;
}
return do_send_and_free_message(msg, NULL);
}

3
trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
View file

@ -161,8 +161,9 @@ public:
* user must never free or use the msg after this method,
* for it will always free the msg.
* @param msg, the msg to send out, never be NULL.
* @param stream_id, the stream id of packet to send over, 0 for control message.
*/
virtual int send_and_free_message(SrsMessage* msg);
virtual int send_and_free_message(SrsMessage* msg, int stream_id);
/**
* send the RTMP packet and always free it.
* user must never free or use the packet after this method,