From eed98dd85b95a32828d9d5be1f98e815e37364f0 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 28 Feb 2021 10:06:52 +0800
Subject: [PATCH] RTC: Refine code, remove the reset for header

---
 trunk/src/kernel/srs_kernel_rtc_rtp.cpp | 58 ++++++-------------------
 trunk/src/kernel/srs_kernel_rtc_rtp.hpp | 12 -----
 2 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp
index 2098d44eb..3d150d03f 100644
--- a/trunk/src/kernel/srs_kernel_rtc_rtp.cpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp
@@ -204,20 +204,15 @@ SrsRtpExtensionType SrsRtpExtensionTypes::get_type(int id) const
 
 SrsRtpExtensionTwcc::SrsRtpExtensionTwcc()
 {
-    reset();
+    has_twcc_ = false;
+    id_ = 0;
+    sn_ = 0;
 }
 
 SrsRtpExtensionTwcc::~SrsRtpExtensionTwcc()
 {
 }
 
-void SrsRtpExtensionTwcc::reset()
-{
-    has_twcc_ = false;
-    id_ = 0;
-    sn_ = 0;
-}
-
 srs_error_t SrsRtpExtensionTwcc::decode(SrsBuffer* buf)
 {
     srs_error_t err = srs_success;
@@ -292,20 +287,15 @@ void SrsRtpExtensionTwcc::set_sn(uint16_t sn)
 
 SrsRtpExtensionOneByte::SrsRtpExtensionOneByte()
 {
-    reset();
+    has_ext_ = false;
+    id_ = 0;
+    value_ = 0;
 }
 
 SrsRtpExtensionOneByte::~SrsRtpExtensionOneByte()
 {
 }
 
-void SrsRtpExtensionOneByte::reset()
-{
-    has_ext_ = false;
-    id_ = 0;
-    value_ = 0;
-}
-
 void SrsRtpExtensionOneByte::set_id(int id)
 {
     id_ = id;
@@ -356,21 +346,14 @@ srs_error_t SrsRtpExtensionOneByte::encode(SrsBuffer* buf)
 
 SrsRtpExtensions::SrsRtpExtensions()
 {
-    reset();
+    types_ = NULL;
+    has_ext_ = false;
 }
 
 SrsRtpExtensions::~SrsRtpExtensions()
 {
 }
 
-void SrsRtpExtensions::reset()
-{
-    types_ = NULL;
-    twcc_.reset();
-    audio_level_.reset();
-    has_ext_ = false;
-}
-
 srs_error_t SrsRtpExtensions::decode(SrsBuffer* buf)
 {
     srs_error_t err = srs_success;
@@ -547,34 +530,19 @@ srs_error_t SrsRtpExtensions::set_audio_level(int id, uint8_t level)
 
 SrsRtpHeader::SrsRtpHeader()
 {
-    reset();
-
-    memset(csrc, 0, sizeof(csrc));
-}
-
-SrsRtpHeader::~SrsRtpHeader()
-{
-}
-
-void SrsRtpHeader::reset()
-{
-    // Reset the fields in protocol.
     cc               = 0;
     marker           = false;
     payload_type     = 0;
     sequence         = 0;
     timestamp        = 0;
     ssrc             = 0;
-
-    // Reset the parsed fields.
     padding_length   = 0;
-    extensions_.reset();
-
-    // Reset other fields.
     ignore_padding_  = false;
+    memset(csrc, 0, sizeof(csrc));
+}
 
-    // The CSRC is not used yet, so we never reset it.
-    //memset(csrc, 0, sizeof(csrc));
+SrsRtpHeader::~SrsRtpHeader()
+{
 }
 
 srs_error_t SrsRtpHeader::decode(SrsBuffer* buf)
@@ -822,7 +790,7 @@ void SrsRtpPacket2::reset()
     decode_handler = NULL;
 
     // It's important to reset the header.
-    header.reset();
+    header = SrsRtpHeader();
 
     // Recyle the payload again, to ensure the packet is new one.
     recycle_payload();
diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp
index ae403bc65..967462903 100644
--- a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp
@@ -137,9 +137,6 @@ class SrsRtpExtensionTwcc// : public ISrsCodec
 public:
     SrsRtpExtensionTwcc();
     virtual ~SrsRtpExtensionTwcc();
-public:
-    // Reset the object to reuse it.
-    void reset();
 public:
     inline bool exists() { return has_twcc_; } // SrsRtpExtensionTwcc::exists
     uint8_t get_id();
@@ -162,9 +159,6 @@ class SrsRtpExtensionOneByte// : public ISrsCodec
 public:
     SrsRtpExtensionOneByte();
     virtual ~SrsRtpExtensionOneByte();
-public:
-    // Reset the object to reuse it.
-    void reset();
 public:
     inline bool exists() { return has_ext_; } // SrsRtpExtensionOneByte::exists
     int get_id() { return id_; }
@@ -193,9 +187,6 @@ private:
 public:
     SrsRtpExtensions();
     virtual ~SrsRtpExtensions();
-public:
-    // Reset the object to reuse it.
-    void reset();
 public:
     inline bool exists() { return has_ext_; } // SrsRtpExtensions::exists
     void set_types_(SrsRtpExtensionTypes* types);
@@ -230,9 +221,6 @@ private:
 public:
     SrsRtpHeader();
     virtual ~SrsRtpHeader();
-public:
-    // Reset the object to reuse it.
-    void reset();
 public:
     virtual srs_error_t decode(SrsBuffer* buf);
 private: