Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc

trunk/src/kernel/srs_kernel_error.hpp

@@ -324,6 +324,8 @@
 #define ERROR_HTTP_302_INVALID              4038
 #define ERROR_BASE64_DECODE                 4039
 #define ERROR_HTTP_STREAM_EOF               4040
+#define ERROR_RTC_PORT                      4041
+#define ERROR_RTP_PACKET_CREATE             4042
 
 ///////////////////////////////////////////////////////
 // HTTP API error.

trunk/src/kernel/srs_kernel_flv.cpp

@@ -36,6 +36,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_file.hpp>
+#include <srs_kernel_rtp.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_core_mem_watch.hpp>
@@ -228,6 +229,10 @@ SrsSharedPtrMessage::~SrsSharedPtrMessage()
             ptr->shared_count--;
         }
     }
+
+    for (int i = 0; i < rtp_packets.size(); ++i) {
+        srs_freep(rtp_packets[i]);
+    }
 }
 
 srs_error_t SrsSharedPtrMessage::create(SrsCommonMessage* msg)
@@ -345,10 +350,19 @@ SrsSharedPtrMessage* SrsSharedPtrMessage::copy()
     copy->stream_id = stream_id;
     copy->payload = ptr->payload;
     copy->size = ptr->size;
-    
+
+    for (int i = 0; i < rtp_packets.size(); ++i) {
+        copy->rtp_packets.push_back(rtp_packets[i]->copy());
+    }
+
     return copy;
 }
 
+void SrsSharedPtrMessage::set_rtp_packets(const std::vector<SrsRtpSharedPacket*>& pkts)
+{
+    rtp_packets = pkts;
+}
+
 SrsFlvTransmuxer::SrsFlvTransmuxer()
 {
     writer = NULL;

trunk/src/kernel/srs_kernel_flv.hpp

@@ -27,6 +27,7 @@
 #include <srs_core.hpp>
 
 #include <string>
+#include <vector>
 
 // For srs-librtmp, @see https://github.com/ossrs/srs/issues/213
 #ifndef _WIN32
@@ -38,6 +39,8 @@ class ISrsWriter;
 class ISrsReader;
 class SrsFileReader;
 class SrsPacket;
+class SrsSample;
+class SrsRtpSharedPacket;
 
 #define SRS_FLV_TAG_HEADER_SIZE 11
 #define SRS_FLV_PREVIOUS_TAG_SIZE 4
@@ -285,6 +288,8 @@ public:
     // @remark, not all message payload can be decoded to packet. for example,
     //       video/audio packet use raw bytes, no video/audio packet.
     char* payload;
+
+    std::vector<SrsRtpSharedPacket*> rtp_packets;
 private:
     class SrsSharedPtrPayload
     {
@@ -339,6 +344,8 @@ public:
     // copy current shared ptr message, use ref-count.
     // @remark, assert object is created.
     virtual SrsSharedPtrMessage* copy();
+public:
+    virtual void set_rtp_packets(const std::vector<SrsRtpSharedPacket*>& pkts);
 };
 
 // Transmux RTMP packets to FLV stream.

trunk/src/kernel/srs_kernel_rtp.cpp

@@ -0,0 +1,112 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2020 Winlin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <srs_kernel_rtp.hpp>
+
+#include <fcntl.h>
+#include <sstream>
+using namespace std;
+
+#include <srs_kernel_log.hpp>
+#include <srs_kernel_error.hpp>
+#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_utility.hpp>
+
+SrsRtpSharedPacket::SrsRtpSharedPacketPayload::SrsRtpSharedPacketPayload()
+{
+    payload = NULL;
+    size = 0;
+    shared_count = 0;
+}
+
+SrsRtpSharedPacket::SrsRtpSharedPacketPayload::~SrsRtpSharedPacketPayload()
+{
+    srs_freepa(payload);
+}
+
+SrsRtpSharedPacket::SrsRtpSharedPacket()
+{
+    payload_ptr = NULL;
+
+    payload = NULL;
+    size = 0;
+
+    timestamp = -1;
+    sequence = 0;
+    ssrc = 0;
+    payload_type = 0;
+}
+
+SrsRtpSharedPacket::~SrsRtpSharedPacket()
+{
+    if (payload_ptr) {
+        if (payload_ptr->shared_count == 0) {
+            srs_freep(payload_ptr);
+        } else {
+            --payload_ptr->shared_count;
+        }
+    }
+}
+
+srs_error_t SrsRtpSharedPacket::create(int64_t t, uint16_t seq, uint32_t sc, uint16_t pt, char* p, int s)
+{
+    srs_error_t err = srs_success;
+
+    if (size < 0) {
+        return srs_error_new(ERROR_RTP_PACKET_CREATE, "create packet size=%d", size);
+    }   
+
+    srs_assert(!payload_ptr);
+
+    timestamp = t;
+    sequence = seq;
+    ssrc = sc;
+    payload_type = pt;
+
+    payload_ptr = new SrsRtpSharedPacketPayload();
+    payload_ptr->payload = p;
+    payload_ptr->size = s;
+
+    payload = payload_ptr->payload;
+    size = payload_ptr->size;
+
+    return err;
+}
+
+SrsRtpSharedPacket* SrsRtpSharedPacket::copy()
+{
+    SrsRtpSharedPacket* copy = new SrsRtpSharedPacket();
+
+    copy->payload_ptr = payload_ptr;
+    payload_ptr->shared_count++;
+
+    copy->payload = payload;
+    copy->size = size;
+
+    copy->timestamp = timestamp;
+    copy->sequence = sequence;
+    copy->ssrc = ssrc;
+    copy->payload_type = payload_type;
+
+    return copy;
+}

trunk/src/kernel/srs_kernel_rtp.hpp

@@ -0,0 +1,62 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2020 Winlin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef SRS_KERNEL_RTP_HPP
+#define SRS_KERNEL_RTP_HPP
+
+#include <srs_core.hpp>
+
+#include <string>
+
+class SrsRtpSharedPacket
+{
+private:
+     class SrsRtpSharedPacketPayload 
+     {   
+     public:
+         char* payload;
+         int size;
+         int shared_count;
+     public:
+         SrsRtpSharedPacketPayload();
+         virtual ~SrsRtpSharedPacketPayload();
+     };  
+private:
+     SrsRtpSharedPacketPayload* payload_ptr;
+public:
+     char* payload;
+     int size;
+public:
+     int64_t timestamp;
+     uint16_t sequence;
+     uint32_t ssrc;
+     uint16_t payload_type;
+public:
+    SrsRtpSharedPacket();
+    virtual ~SrsRtpSharedPacket();
+public:
+    srs_error_t create(int64_t t, uint16_t seq, uint32_t sc, uint16_t pt, char* p, int s);
+    SrsRtpSharedPacket* copy();
+};
+
+#endif