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

refine RTMP protocol completed, to 0.9.81

Browse source
This commit is contained in:
winlin 2014-04-29 14:44:07 +08:00
parent be4c182d11
commit 80ddddf823
20 changed files with 343 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/app/srs_app_forward.cpp
View file

@ -148,7 +148,7 @@ void SrsForwarder::on_unpublish()
srs_freep(io);
}
int SrsForwarder::on_meta_data(__SrsSharedPtrMessage* metadata)
int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
{
int ret = ERROR_SUCCESS;
@ -164,7 +164,7 @@ int SrsForwarder::on_meta_data(__SrsSharedPtrMessage* metadata)
return ret;
}
int SrsForwarder::on_audio(__SrsSharedPtrMessage* msg)
int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
{
int ret = ERROR_SUCCESS;
@ -180,7 +180,7 @@ int SrsForwarder::on_audio(__SrsSharedPtrMessage* msg)
return ret;
}
int SrsForwarder::on_video(__SrsSharedPtrMessage* msg)
int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
{
int ret = ERROR_SUCCESS;
@ -315,8 +315,8 @@ int SrsForwarder::forward()
// read from client.
if (true) {
__SrsMessage* msg = NULL;
ret = client->__recv_message(&msg);
SrsMessage* msg = NULL;
ret = client->recv_message(&msg);
srs_verbose("play loop recv message. ret=%d", ret);
if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@ -329,7 +329,7 @@ int SrsForwarder::forward()
// forward all messages.
int count = 0;
__SrsSharedPtrMessage** msgs = NULL;
SrsSharedPtrMessage** msgs = NULL;
if ((ret = queue->get_packets(0, msgs, count)) != ERROR_SUCCESS) {
srs_error("get message to forward failed. ret=%d", ret);
return ret;
@ -348,16 +348,16 @@ int SrsForwarder::forward()
srs_verbose("no packets to forward.");
continue;
}
SrsAutoFree(__SrsSharedPtrMessage*, msgs, true);
SrsAutoFree(SrsSharedPtrMessage*, msgs, true);
// all msgs to forward.
for (int i = 0; i < count; i++) {
__SrsSharedPtrMessage* msg = msgs[i];
SrsSharedPtrMessage* msg = msgs[i];
srs_assert(msg);
msgs[i] = NULL;
if ((ret = client->__send_and_free_message(msg)) != ERROR_SUCCESS) {
if ((ret = client->send_and_free_message(msg)) != ERROR_SUCCESS) {
srs_error("forwarder send message to server failed. ret=%d", ret);
return ret;
}