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

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-05-15 08:51:51 +08:00
commit 596686f7b7
17 changed files with 191 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ std::string srs_generate_rtsp_method_str(SrsRtspMethod method)
}
}
SrsRtpPacket::SrsRtpPacket()
SrsRtspPacket::SrsRtspPacket()
{
version = 2;
padding = 0;
@ -139,13 +139,13 @@ SrsRtpPacket::SrsRtpPacket()
completed = false;
}
SrsRtpPacket::~SrsRtpPacket()
SrsRtspPacket::~SrsRtspPacket()
{
srs_freep(payload);
srs_freep(audio);
}
void SrsRtpPacket::copy(SrsRtpPacket* src)
void SrsRtspPacket::copy(SrsRtspPacket* src)
{
version = src->version;
padding = src->padding;
@ -164,7 +164,7 @@ void SrsRtpPacket::copy(SrsRtpPacket* src)
audio = new SrsAudioFrame();
}
void SrsRtpPacket::reap(SrsRtpPacket* src)
void SrsRtspPacket::reap(SrsRtspPacket* src)
{
copy(src);
@ -177,7 +177,7 @@ void SrsRtpPacket::reap(SrsRtpPacket* src)
src->audio = NULL;
}
srs_error_t SrsRtpPacket::decode(SrsBuffer* stream)
srs_error_t SrsRtspPacket::decode(SrsBuffer* stream)
{
srs_error_t err = srs_success;
@ -212,7 +212,7 @@ srs_error_t SrsRtpPacket::decode(SrsBuffer* stream)
return err;
}
srs_error_t SrsRtpPacket::decode_97(SrsBuffer* stream)
srs_error_t SrsRtspPacket::decode_97(SrsBuffer* stream)
{
srs_error_t err = srs_success;
@ -264,7 +264,7 @@ srs_error_t SrsRtpPacket::decode_97(SrsBuffer* stream)
return err;
}
srs_error_t SrsRtpPacket::decode_96(SrsBuffer* stream)
srs_error_t SrsRtspPacket::decode_96(SrsBuffer* stream)
{
srs_error_t err = srs_success;

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

@ -128,7 +128,7 @@ enum SrsRtspTokenState
// The rtp packet.
// 5. RTP Data Transfer Protocol, @see rfc3550-2003-rtp.pdf, page 12
class SrsRtpPacket
class SrsRtspPacket
{
public:
// The version (V): 2 bits
@ -255,13 +255,13 @@ public:
// The audio samples, one rtp packets may contains multiple audio samples.
SrsAudioFrame* audio;
public:
SrsRtpPacket();
virtual ~SrsRtpPacket();
SrsRtspPacket();
virtual ~SrsRtspPacket();
public:
// copy the header from src.
virtual void copy(SrsRtpPacket* src);
virtual void copy(SrsRtspPacket* src);
// reap the src to this packet, reap the payload.
virtual void reap(SrsRtpPacket* src);
virtual void reap(SrsRtspPacket* src);
// decode rtp packet from stream.
virtual srs_error_t decode(SrsBuffer* stream);
private: