From 15955b6cdd6a94f5e8539e9297b1c5ef27819aca Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 4 May 2020 07:40:02 +0800
Subject: [PATCH] Refactor the RTP packet.

---
 trunk/src/app/srs_app_dtls.cpp      | 4 ++--
 trunk/src/app/srs_app_rtc_conn.cpp  | 2 +-
 trunk/src/kernel/srs_kernel_rtp.cpp | 7 -------
 trunk/src/kernel/srs_kernel_rtp.hpp | 6 +-----
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/trunk/src/app/srs_app_dtls.cpp b/trunk/src/app/srs_app_dtls.cpp
index 2eb32ef6e..0b8767851 100644
--- a/trunk/src/app/srs_app_dtls.cpp
+++ b/trunk/src/app/srs_app_dtls.cpp
@@ -81,8 +81,8 @@ srs_error_t SrsDtls::init(SrsRequest* r)
 #if OPENSSL_VERSION_NUMBER < 0x10002000L // v1.0.2
     dtls_ctx = SSL_CTX_new(DTLSv1_method());
 #else
-    //dtls_ctx = SSL_CTX_new(DTLS_method());
-    dtls_ctx = SSL_CTX_new(DTLSv1_method());
+    dtls_ctx = SSL_CTX_new(DTLS_method());
+    //dtls_ctx = SSL_CTX_new(DTLSv1_method());
     //dtls_ctx = SSL_CTX_new(DTLSv1_2_method());
 #endif
 
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index 35ae6fef1..ff5fc051d 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -1882,7 +1882,7 @@ srs_error_t SrsRtcPublisher::on_rtp(char* buf, int nb_buf)
     SrsRtpPacket2* pkt = new SrsRtpPacket2();
 
     pkt->set_decode_handler(this);
-    pkt->set_original_bytes(buf, nb_buf);
+    pkt->original_bytes = buf;
 
     SrsBuffer b(buf, nb_buf);
     if ((err = pkt->decode(&b)) != srs_success) {
diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp
index a27b2cdd4..8e175ab89 100644
--- a/trunk/src/kernel/srs_kernel_rtp.cpp
+++ b/trunk/src/kernel/srs_kernel_rtp.cpp
@@ -287,7 +287,6 @@ SrsRtpPacket2::SrsRtpPacket2()
     cache_payload = 0;
 
     original_bytes = NULL;
-    nn_original_bytes = 0;
     nn_original_payload = 0;
 }
 
@@ -355,12 +354,6 @@ void SrsRtpPacket2::set_decode_handler(ISrsRtpPacketDecodeHandler* h)
     decode_handler = h;
 }
 
-void SrsRtpPacket2::set_original_bytes(char* buf, int nn_buf)
-{
-    original_bytes = buf;
-    nn_original_bytes = nn_buf;
-}
-
 int SrsRtpPacket2::nb_bytes()
 {
     if (!cache_payload) {
diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp
index baaeb0281..5fbd759da 100644
--- a/trunk/src/kernel/srs_kernel_rtp.hpp
+++ b/trunk/src/kernel/srs_kernel_rtp.hpp
@@ -114,6 +114,7 @@ public:
     int padding;
 // Decoder helper.
 public:
+    // TODO: FIXME: Move to video decoder queue SrsRtpVideoQueue.
     // Helper information for video decoder only.
     bool video_is_first_packet;
     bool video_is_last_packet;
@@ -122,11 +123,8 @@ public:
     SrsAvcNaluType nalu_type;
     // The original payload bytes length.
     int nn_original_payload;
-// Decoder helper.
-private:
     // The original bytes for decoder only, we will free it.
     char* original_bytes;
-    int nn_original_bytes;
 // Fast cache for performance.
 private:
     // Cache frequently used payload for performance.
@@ -151,8 +149,6 @@ public:
     SrsRtpFUAPayload2* reuse_fua();
     // Set the decode handler.
     void set_decode_handler(ISrsRtpPacketDecodeHandler* h);
-    // Set the original bytes.
-    void set_original_bytes(char* buf, int nn_buf);
 // interface ISrsEncoder
 public:
     virtual int nb_bytes();