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, source support complex error

Browse source
This commit is contained in:
winlin 2017-09-23 22:12:33 +08:00
parent abcaba33ee
commit 9802dc326e
24 changed files with 1029 additions and 1437 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/protocol/srs_protocol_format.cpp
View file

@ -38,16 +38,13 @@ SrsRtmpFormat::~SrsRtmpFormat()
{
}
int SrsRtmpFormat::on_metadata(SrsOnMetaDataPacket* meta)
srs_error_t SrsRtmpFormat::on_metadata(SrsOnMetaDataPacket* meta)
{
int ret = ERROR_SUCCESS;
// TODO: FIXME: Try to initialize format from metadata.
return ret;
return srs_success;
}
int SrsRtmpFormat::on_audio(SrsSharedPtrMessage* shared_audio)
srs_error_t SrsRtmpFormat::on_audio(SrsSharedPtrMessage* shared_audio)
{
SrsSharedPtrMessage* msg = shared_audio;
char* data = msg->payload;
@ -56,12 +53,12 @@ int SrsRtmpFormat::on_audio(SrsSharedPtrMessage* shared_audio)
return SrsFormat::on_audio(msg->timestamp, data, size);
}
int SrsRtmpFormat::on_audio(int64_t timestamp, char* data, int size)
srs_error_t SrsRtmpFormat::on_audio(int64_t timestamp, char* data, int size)
{
return SrsFormat::on_audio(timestamp, data, size);
}
int SrsRtmpFormat::on_video(SrsSharedPtrMessage* shared_video)
srs_error_t SrsRtmpFormat::on_video(SrsSharedPtrMessage* shared_video)
{
SrsSharedPtrMessage* msg = shared_video;
char* data = msg->payload;
@ -70,7 +67,7 @@ int SrsRtmpFormat::on_video(SrsSharedPtrMessage* shared_video)
return SrsFormat::on_video(msg->timestamp, data, size);
}
int SrsRtmpFormat::on_video(int64_t timestamp, char* data, int size)
srs_error_t SrsRtmpFormat::on_video(int64_t timestamp, char* data, int size)
{
return SrsFormat::on_video(timestamp, data, size);
}

10
trunk/src/protocol/srs_protocol_format.hpp
View file

@ -41,13 +41,13 @@ public:
virtual ~SrsRtmpFormat();
public:
// Initialize the format from metadata, optional.
virtual int on_metadata(SrsOnMetaDataPacket* meta);
virtual srs_error_t on_metadata(SrsOnMetaDataPacket* meta);
// When got a parsed audio packet.
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
virtual int on_audio(int64_t timestamp, char* data, int size);
virtual srs_error_t on_audio(SrsSharedPtrMessage* shared_audio);
virtual srs_error_t on_audio(int64_t timestamp, char* data, int size);
// When got a parsed video packet.
virtual int on_video(SrsSharedPtrMessage* shared_video);
virtual int on_video(int64_t timestamp, char* data, int size);
virtual srs_error_t on_video(SrsSharedPtrMessage* shared_video);
virtual srs_error_t on_video(int64_t timestamp, char* data, int size);
};
#endif

6
trunk/src/protocol/srs_rtsp_stack.cpp
View file

@ -219,6 +219,7 @@ int SrsRtpPacket::decode(SrsBuffer* stream)
int SrsRtpPacket::decode_97(SrsBuffer* stream)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// atleast 2bytes content.
if (!stream->require(2)) {
@ -265,7 +266,10 @@ int SrsRtpPacket::decode_97(SrsBuffer* stream)
return ret;
}
if ((ret = audio->add_sample(sample, sample_size)) != ERROR_SUCCESS) {
if ((err = audio->add_sample(sample, sample_size)) != srs_success) {
// TODO: FIXME: Use error
ret = srs_error_code(err);
srs_freep(err);
srs_error("rtsp: rtp type97 add sample failed. ret=%d", ret);
return ret;
}