SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket.

trunk/src/kernel/srs_kernel_rtc_rtp.cpp

@@ -760,18 +760,18 @@ ISrsRtpPayloader::~ISrsRtpPayloader()
 {
 }
 
-ISrsRtpPacketDecodeHandler::ISrsRtpPacketDecodeHandler()
+ISrsRtspPacketDecodeHandler::ISrsRtspPacketDecodeHandler()
 {
 }
 
-ISrsRtpPacketDecodeHandler::~ISrsRtpPacketDecodeHandler()
+ISrsRtspPacketDecodeHandler::~ISrsRtspPacketDecodeHandler()
 {
 }
 
-SrsRtpPacket2::SrsRtpPacket2()
+SrsRtpPacket::SrsRtpPacket()
 {
     payload_ = NULL;
-    payload_type_ = SrsRtpPacketPayloadTypeUnknown;
+    payload_type_ = SrsRtspPacketPayloadTypeUnknown;
     shared_buffer_ = NULL;
     actual_buffer_size_ = 0;
 
@@ -783,13 +783,13 @@ SrsRtpPacket2::SrsRtpPacket2()
     ++_srs_pps_objs_rtps->sugar;
 }
 
-SrsRtpPacket2::~SrsRtpPacket2()
+SrsRtpPacket::~SrsRtpPacket()
 {
     srs_freep(payload_);
     srs_freep(shared_buffer_);
 }
 
-char* SrsRtpPacket2::wrap(int size)
+char* SrsRtpPacket::wrap(int size)
 {
     // The buffer size is larger or equals to the size of packet.
     actual_buffer_size_ = size;
@@ -814,14 +814,14 @@ char* SrsRtpPacket2::wrap(int size)
     return shared_buffer_->payload;
 }
 
-char* SrsRtpPacket2::wrap(char* data, int size)
+char* SrsRtpPacket::wrap(char* data, int size)
 {
     char* buf = wrap(size);
     memcpy(buf, data, size);
     return buf;
 }
 
-char* SrsRtpPacket2::wrap(SrsSharedPtrMessage* msg)
+char* SrsRtpPacket::wrap(SrsSharedPtrMessage* msg)
 {
     // Generally, the wrap(msg) is used for RTMP to RTC, which is not generated by RTC,
     // so we do not recycle the msg. It's ok to directly free the msg, event the msg is
@@ -836,9 +836,9 @@ char* SrsRtpPacket2::wrap(SrsSharedPtrMessage* msg)
     return msg->payload;
 }
 
-SrsRtpPacket2* SrsRtpPacket2::copy()
+SrsRtpPacket* SrsRtpPacket::copy()
 {
-    SrsRtpPacket2* cp = new SrsRtpPacket2();
+    SrsRtpPacket* cp = new SrsRtpPacket();
 
     // We got packet from cache, the payload and message MUST be NULL,
     // because we had clear it in recycle.
@@ -861,7 +861,7 @@ SrsRtpPacket2* SrsRtpPacket2::copy()
     return cp;
 }
 
-void SrsRtpPacket2::set_padding(int size)
+void SrsRtpPacket::set_padding(int size)
 {
     header.set_padding(size);
     if (cached_payload_size) {
@@ -869,7 +869,7 @@ void SrsRtpPacket2::set_padding(int size)
     }
 }
 
-void SrsRtpPacket2::add_padding(int size)
+void SrsRtpPacket::add_padding(int size)
 {
     header.set_padding(header.get_padding() + size);
     if (cached_payload_size) {
@@ -877,22 +877,22 @@ void SrsRtpPacket2::add_padding(int size)
     }
 }
 
-void SrsRtpPacket2::set_decode_handler(ISrsRtpPacketDecodeHandler* h)
+void SrsRtpPacket::set_decode_handler(ISrsRtspPacketDecodeHandler* h)
 {
     decode_handler = h;
 }
 
-bool SrsRtpPacket2::is_audio()
+bool SrsRtpPacket::is_audio()
 {
     return frame_type == SrsFrameTypeAudio;
 }
 
-void SrsRtpPacket2::set_extension_types(SrsRtpExtensionTypes* v)
+void SrsRtpPacket::set_extension_types(SrsRtpExtensionTypes* v)
 {
     return header.set_extensions(v);
 }
 
-uint64_t SrsRtpPacket2::nb_bytes()
+uint64_t SrsRtpPacket::nb_bytes()
 {
     if (!cached_payload_size) {
         int nn_payload = (payload_? payload_->nb_bytes():0);
@@ -901,7 +901,7 @@ uint64_t SrsRtpPacket2::nb_bytes()
     return cached_payload_size;
 }
 
-srs_error_t SrsRtpPacket2::encode(SrsBuffer* buf)
+srs_error_t SrsRtpPacket::encode(SrsBuffer* buf)
 {
     srs_error_t err = srs_success;
 
@@ -925,7 +925,7 @@ srs_error_t SrsRtpPacket2::encode(SrsBuffer* buf)
     return err;
 }
 
-srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf)
+srs_error_t SrsRtpPacket::decode(SrsBuffer* buf)
 {
     srs_error_t err = srs_success;
 
@@ -949,7 +949,7 @@ srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf)
     // By default, we always use the RAW payload.
     if (!payload_) {
         payload_ = new SrsRtpRawPayload();
-        payload_type_ = SrsRtpPacketPayloadTypeRaw;
+        payload_type_ = SrsRtspPacketPayloadTypeRaw;
     }
 
     if ((err = payload_->decode(buf)) != srs_success) {
@@ -959,7 +959,7 @@ srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf)
     return err;
 }
 
-bool SrsRtpPacket2::is_keyframe()
+bool SrsRtpPacket::is_keyframe()
 {
     // False if audio packet
     if(SrsFrameTypeAudio == frame_type) {

trunk/src/kernel/srs_kernel_rtc_rtp.hpp

@@ -33,7 +33,7 @@
 #include <list>
 #include <vector>
 
-class SrsRtpPacket2;
+class SrsRtpPacket;
 
 // The RTP packet max size, should never exceed this size.
 const int kRtpPacketSize        = 1500;
@@ -262,35 +262,35 @@ public:
 };
 
 // The payload type, for performance to avoid dynamic cast.
-enum SrsRtpPacketPayloadType
+enum SrsRtspPacketPayloadType
 {
-    SrsRtpPacketPayloadTypeRaw,
-    SrsRtpPacketPayloadTypeFUA2,
-    SrsRtpPacketPayloadTypeFUA,
-    SrsRtpPacketPayloadTypeNALU,
-    SrsRtpPacketPayloadTypeSTAP,
-    SrsRtpPacketPayloadTypeUnknown,
+    SrsRtspPacketPayloadTypeRaw,
+    SrsRtspPacketPayloadTypeFUA2,
+    SrsRtspPacketPayloadTypeFUA,
+    SrsRtspPacketPayloadTypeNALU,
+    SrsRtspPacketPayloadTypeSTAP,
+    SrsRtspPacketPayloadTypeUnknown,
 };
 
-class ISrsRtpPacketDecodeHandler
+class ISrsRtspPacketDecodeHandler
 {
 public:
-    ISrsRtpPacketDecodeHandler();
-    virtual ~ISrsRtpPacketDecodeHandler();
+    ISrsRtspPacketDecodeHandler();
+    virtual ~ISrsRtspPacketDecodeHandler();
 public:
     // We don't know the actual payload, so we depends on external handler.
-    virtual void on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsRtpPayloader** ppayload, SrsRtpPacketPayloadType* ppt) = 0;
+    virtual void on_before_decode_payload(SrsRtpPacket* pkt, SrsBuffer* buf, ISrsRtpPayloader** ppayload, SrsRtspPacketPayloadType* ppt) = 0;
 };
 
 // The RTP packet with cached shared message.
-class SrsRtpPacket2
+class SrsRtpPacket
 {
 // RTP packet fields.
 public:
     SrsRtpHeader header;
 private:
     ISrsRtpPayloader* payload_;
-    SrsRtpPacketPayloadType payload_type_;
+    SrsRtspPacketPayloadType payload_type_;
 private:
     // The original shared message, all RTP packets can refer to its data.
     // Note that the size of shared msg, is not the packet size, it's a larger aligned buffer.
@@ -310,10 +310,10 @@ private:
     // The cached payload size for packet.
     int cached_payload_size;
     // The helper handler for decoder, use RAW payload if NULL.
-    ISrsRtpPacketDecodeHandler* decode_handler;
+    ISrsRtspPacketDecodeHandler* decode_handler;
 public:
-    SrsRtpPacket2();
-    virtual ~SrsRtpPacket2();
+    SrsRtpPacket();
+    virtual ~SrsRtpPacket();
 public:
     // Wrap buffer to shared_message, which is managed by us.
     char* wrap(int size);
@@ -321,20 +321,20 @@ public:
     // Wrap the shared message, we copy it.
     char* wrap(SrsSharedPtrMessage* msg);
     // Copy the RTP packet.
-    virtual SrsRtpPacket2* copy();
+    virtual SrsRtpPacket* copy();
 public:
     // Parse the TWCC extension, ignore by default.
-    void enable_twcc_decode() { header.enable_twcc_decode(); } // SrsRtpPacket2::enable_twcc_decode
+    void enable_twcc_decode() { header.enable_twcc_decode(); } // SrsRtpPacket::enable_twcc_decode
     // Get and set the payload of packet.
     // @remark Note that return NULL if no payload.
-    void set_payload(ISrsRtpPayloader* p, SrsRtpPacketPayloadType pt) { payload_ = p; payload_type_ = pt; }
+    void set_payload(ISrsRtpPayloader* p, SrsRtspPacketPayloadType pt) { payload_ = p; payload_type_ = pt; }
     ISrsRtpPayloader* payload() { return payload_; }
     // Set the padding of RTP packet.
     void set_padding(int size);
     // Increase the padding of RTP packet.
     void add_padding(int size);
     // Set the decode handler.
-    void set_decode_handler(ISrsRtpPacketDecodeHandler* h);
+    void set_decode_handler(ISrsRtspPacketDecodeHandler* h);
     // Whether the packet is Audio packet.
     bool is_audio();
     // Set RTP header extensions for encoding or decoding header extension