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

For #913, RTMP support complex error.

Browse source
This commit is contained in:
winlin 2018-01-01 09:38:22 +08:00
parent 60accb6e54
commit 70a20ffadb
4 changed files with 401 additions and 738 deletions
Download patch file Download diff file Expand all files Collapse all files

42
trunk/src/protocol/srs_protocol_utility.cpp
View file

@ -193,9 +193,9 @@ string srs_generate_vis_tc_url(string ip, string vhost, string app, int port, st
}
template<typename T>
int srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, T** ppmsg)
srs_error_t srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, T** ppmsg)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
*ppmsg = NULL;
T* msg = NULL;
@ -205,63 +205,61 @@ int srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size,
header.initialize_audio(size, timestamp, stream_id);
msg = new T();
if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
if ((err = msg->create(&header, data, size)) != srs_success) {
srs_freep(msg);
return ret;
return srs_error_wrap(err, "create message");
}
} else if (type == SrsFrameTypeVideo) {
SrsMessageHeader header;
header.initialize_video(size, timestamp, stream_id);
msg = new T();
if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
if ((err = msg->create(&header, data, size)) != srs_success) {
srs_freep(msg);
return ret;
return srs_error_wrap(err, "create message");
}
} else if (type == SrsFrameTypeScript) {
SrsMessageHeader header;
header.initialize_amf0_script(size, stream_id);
msg = new T();
if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
if ((err = msg->create(&header, data, size)) != srs_success) {
srs_freep(msg);
return ret;
return srs_error_wrap(err, "create message");
}
} else {
ret = ERROR_STREAM_CASTER_FLV_TAG;
srs_error("rtmp unknown tag type=%#x. ret=%d", type, ret);
return ret;
return srs_error_new(ERROR_STREAM_CASTER_FLV_TAG, "unknown tag=%#x", (uint8_t)type);
}
*ppmsg = msg;
return ret;
return err;
}
int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// only when failed, we must free the data.
if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
if ((err = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != srs_success) {
srs_freepa(data);
return ret;
return srs_error_wrap(err, "create message");
}
return ret;
return err;
}
int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg)
srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// only when failed, we must free the data.
if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
if ((err = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != srs_success) {
srs_freepa(data);
return ret;
return srs_error_wrap(err, "create message");
}
return ret;
return err;
}
string srs_generate_stream_url(string vhost, string app, string stream)