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

add rtp shared packet

Browse source
This commit is contained in:
xiaozhihong 2020-03-13 20:34:40 +08:00
parent 6decdc7838
commit 027d34bbd3
8 changed files with 51 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -322,6 +322,7 @@
#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.

39
trunk/src/kernel/srs_kernel_flv.cpp
View file

@ -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>
@ -203,8 +204,6 @@ SrsSharedPtrMessage::SrsSharedPtrPayload::SrsSharedPtrPayload()
{
payload = NULL;
size = 0;
rtp_fragments = NULL;
nb_rtp_fragments = 0;
shared_count = 0;
}
@ -214,17 +213,9 @@ SrsSharedPtrMessage::SrsSharedPtrPayload::~SrsSharedPtrPayload()
srs_memory_unwatch(payload);
#endif
srs_freepa(payload);
for (int i = 0; i < nb_rtp_fragments; ++i) {
srs_freepa(rtp_fragments[i].bytes);
}
if (rtp_fragments != NULL && nb_rtp_fragments > 0) {
srs_freepa(rtp_fragments);
}
}
SrsSharedPtrMessage::SrsSharedPtrMessage() : timestamp(0), stream_id(0), size(0), payload(NULL), rtp_fragments(NULL), nb_rtp_fragments(0)
SrsSharedPtrMessage::SrsSharedPtrMessage() : timestamp(0), stream_id(0), size(0), payload(NULL)
{
ptr = NULL;
}
@ -238,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)
@ -315,15 +310,6 @@ bool SrsSharedPtrMessage::check(int stream_id)
return false;
}
void SrsSharedPtrMessage::set_rtp_fragments(SrsSample* samples, int nb_samples)
{
ptr->rtp_fragments = samples;
ptr->nb_rtp_fragments = nb_samples;
rtp_fragments = samples;
nb_rtp_fragments = nb_samples;
}
bool SrsSharedPtrMessage::is_av()
{
return ptr->header.message_type == RTMP_MSG_AudioMessage
@ -364,12 +350,19 @@ SrsSharedPtrMessage* SrsSharedPtrMessage::copy()
copy->stream_id = stream_id;
copy->payload = ptr->payload;
copy->size = ptr->size;
copy->rtp_fragments = ptr->rtp_fragments;
copy->nb_rtp_fragments = ptr->nb_rtp_fragments;
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;

11
trunk/src/kernel/srs_kernel_flv.hpp
View file

@ -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
@ -39,6 +40,7 @@ class ISrsReader;
class SrsFileReader;
class SrsPacket;
class SrsSample;
class SrsRtpSharedPacket;
#define SRS_FLV_TAG_HEADER_SIZE 11
#define SRS_FLV_PREVIOUS_TAG_SIZE 4
@ -287,8 +289,7 @@ public:
// video/audio packet use raw bytes, no video/audio packet.
char* payload;
SrsSample* rtp_fragments;
int nb_rtp_fragments;
std::vector<SrsRtpSharedPacket*> rtp_packets;
private:
class SrsSharedPtrPayload
{
@ -302,8 +303,6 @@ private:
int size;
// The reference count
int shared_count;
SrsSample* rtp_fragments;
int nb_rtp_fragments;
public:
SrsSharedPtrPayload();
virtual ~SrsSharedPtrPayload();
@ -333,8 +332,6 @@ public:
// check perfer cid and stream id.
// @return whether stream id already set.
virtual bool check(int stream_id);
virtual void set_rtp_fragments(SrsSample* samples, int nb_samples);
public:
virtual bool is_av();
virtual bool is_audio();
@ -347,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.