diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index ee1f81cef..bf5fa6dc7 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -525,7 +525,6 @@ public: virtual bool get_rtc_server_ecdsa(); virtual int get_rtc_server_sendmmsg(); virtual bool get_rtc_server_encrypt(); - virtual bool get_rtc_server_encrypt(); SrsConfDirective* get_rtc(std::string vhost); bool get_rtc_enabled(std::string vhost); diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp index 4cfbae405..8424216ce 100644 --- a/trunk/src/app/srs_app_rtc.cpp +++ b/trunk/src/app/srs_app_rtc.cpp @@ -160,7 +160,7 @@ srs_error_t SrsRtpH264Muxer::frame_to_packet(SrsSharedPtrMessage* shared_frame, if (! rtp_packet_vec.empty()) { // At the end of the frame, set marker bit. // One frame may have multi nals. Set the marker bit in the last nal end, no the end of the nal. - if ((err = rtp_packet_vec.back()->set_marker(true)) != srs_success) { + if ((err = rtp_packet_vec.back()->modify_rtp_header_marker(true)) != srs_success) { return srs_error_wrap(err, "set marker"); } } @@ -187,23 +187,12 @@ srs_error_t SrsRtpH264Muxer::packet_fu_a(SrsSharedPtrMessage* shared_frame, SrsF int num_of_packet = (sample->size - 1 + kRtpMaxPayloadSize) / kRtpMaxPayloadSize; for (int i = 0; i < num_of_packet; ++i) { - char* buf = new char[kRtpPacketSize]; + char buf[kRtpPacketSize]; SrsBuffer* stream = new SrsBuffer(buf, kRtpPacketSize); SrsAutoFree(SrsBuffer, stream); int packet_size = min(nb_left, kRtpMaxPayloadSize); - // v=2,p=0,x=0,cc=0 - stream->write_1bytes(0x80); - // marker payloadtype - stream->write_1bytes(kH264PayloadType); - // sequence - stream->write_2bytes(sequence); - // timestamp - stream->write_4bytes(int32_t(shared_frame->timestamp * 90)); - // ssrc - stream->write_4bytes(int32_t(kVideoSSRC)); - // fu-indicate uint8_t fu_indicate = kFuA; fu_indicate |= (header & (~kNalTypeMask)); @@ -223,7 +212,9 @@ srs_error_t SrsRtpH264Muxer::packet_fu_a(SrsSharedPtrMessage* shared_frame, SrsF srs_verbose("rtp fu-a nalu, size=%u, seq=%u, timestamp=%lu", sample->size, sequence, (shared_frame->timestamp * 90)); SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); - rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, stream->data(), stream->pos()); + if ((err = rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, stream->data(), stream->pos())) != srs_success) { + return srs_error_wrap(err, "rtp packet encode"); + } rtp_packet_vec.push_back(rtp_shared_pkt); } @@ -238,9 +229,6 @@ srs_error_t SrsRtpH264Muxer::packet_single_nalu(SrsSharedPtrMessage* shared_fram uint8_t header = sample->bytes[0]; uint8_t nal_type = header & kNalTypeMask; - char* buf = new char[kRtpPacketSize]; - SrsBuffer* stream = new SrsBuffer(buf, kRtpPacketSize); - SrsAutoFree(SrsBuffer, stream); if (nal_type == SrsAvcNaluTypeIDR) { if ((err = packet_stap_a(sps, pps, shared_frame, rtp_packet_vec)) != srs_success) { @@ -248,23 +236,12 @@ srs_error_t SrsRtpH264Muxer::packet_single_nalu(SrsSharedPtrMessage* shared_fram } } - // v=2,p=0,x=0,cc=0 - stream->write_1bytes(0x80); - // marker payloadtype - stream->write_1bytes(kH264PayloadType); - // sequenct - stream->write_2bytes(sequence); - // timestamp - stream->write_4bytes(int32_t(shared_frame->timestamp * 90)); - // ssrc - stream->write_4bytes(int32_t(kVideoSSRC)); - - stream->write_bytes(sample->bytes, sample->size); - srs_verbose("rtp single nalu, size=%u, seq=%u, timestamp=%lu", sample->size, sequence, (shared_frame->timestamp * 90)); SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); - rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, stream->data(), stream->pos()); + if ((err = rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, sample->bytes, sample->size)) != srs_success) { + return srs_error_wrap(err, "rtp packet encode"); + } rtp_packet_vec.push_back(rtp_shared_pkt); @@ -282,21 +259,10 @@ srs_error_t SrsRtpH264Muxer::packet_stap_a(const string &sps, const string& pps, uint8_t header = sps[0]; uint8_t nal_type = header & kNalTypeMask; - char* buf = new char[kRtpPacketSize]; + char buf[kRtpPacketSize]; SrsBuffer* stream = new SrsBuffer(buf, kRtpPacketSize); SrsAutoFree(SrsBuffer, stream); - // v=2,p=0,x=0,cc=0 - stream->write_1bytes(0x80); - // marker payloadtype - stream->write_1bytes(kH264PayloadType); - // sequenct - stream->write_2bytes(sequence); - // timestamp - stream->write_4bytes(int32_t(shared_frame->timestamp * 90)); - // ssrc - stream->write_4bytes(int32_t(kVideoSSRC)); - // stap-a header uint8_t stap_a_header = kStapA; stap_a_header |= (nal_type & (~kNalTypeMask)); @@ -311,7 +277,9 @@ srs_error_t SrsRtpH264Muxer::packet_stap_a(const string &sps, const string& pps, srs_verbose("rtp stap-a nalu, size=%u, seq=%u, timestamp=%lu", (sps.size() + pps.size()), sequence, (shared_frame->timestamp * 90)); SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); - rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, stream->data(), stream->pos()); + if ((err = rtp_shared_pkt->create((shared_frame->timestamp * 90), sequence++, kVideoSSRC, kH264PayloadType, stream->data(), stream->pos())) != srs_success) { + return srs_error_wrap(err, "rtp packet encode"); + } rtp_packet_vec.push_back(rtp_shared_pkt); @@ -385,28 +353,14 @@ srs_error_t SrsRtpOpusMuxer::packet_opus(SrsSharedPtrMessage* shared_frame, SrsS { srs_error_t err = srs_success; - char* buf = new char[kRtpPacketSize]; - SrsBuffer* stream = new SrsBuffer(buf, kRtpPacketSize); - SrsAutoFree(SrsBuffer, stream); + SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); + rtp_shared_pkt->rtp_header.set_marker(true); + if ((err = rtp_shared_pkt->create(timestamp, sequence++, kAudioSSRC, kOpusPayloadType, sample->bytes, sample->size)) != srs_success) { + return srs_error_wrap(err, "rtp packet encode"); + } - // v=2,p=0,x=0,cc=0 - stream->write_1bytes(0x80); - // marker payloadtype - stream->write_1bytes(kOpusPayloadType); - // sequenct - stream->write_2bytes(sequence); - // timestamp - stream->write_4bytes(int32_t(timestamp)); // TODO: FIXME: Why 960? Need Refactoring? timestamp += 960; - // ssrc - stream->write_4bytes(int32_t(kAudioSSRC)); - - stream->write_bytes(sample->bytes, sample->size); - - SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); - rtp_shared_pkt->create(timestamp, sequence++, kAudioSSRC, kOpusPayloadType, stream->data(), stream->pos()); - rtp_shared_pkt->set_marker(true); rtp_packet_vec.push_back(rtp_shared_pkt); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index bc1cf3b30..18d3a2dba 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -577,14 +577,14 @@ void SrsRtcSenderThread::send_and_free_messages(SrsSharedPtrMessage** msgs, int SrsRtpSharedPacket* pkt = msg->rtp_packets[i]; if (msg->is_video()) { - pkt->set_payload_type(video_payload_type); - pkt->set_ssrc(video_ssrc); - srs_verbose("send video, ssrc=%u, seq=%u, timestamp=%u", video_ssrc, pkt->sequence, pkt->timestamp); + pkt->modify_rtp_header_payload_type(video_payload_type); + pkt->modify_rtp_header_ssrc(video_ssrc); + srs_verbose("send video, ssrc=%u, seq=%u, timestamp=%u", video_ssrc, pkt->rtp_header.get_sequence(), pkt->rtp_header.get_timestamp()); } if (msg->is_audio()) { - pkt->set_payload_type(audio_payload_type); - pkt->set_ssrc(audio_ssrc); + pkt->modify_rtp_header_payload_type(audio_payload_type); + pkt->modify_rtp_header_ssrc(audio_ssrc); } int length = pkt->size; @@ -826,7 +826,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock char protected_buf[kRtpPacketSize]; int nb_protected_buf = resend_pkts[i]->size; - srs_verbose("resend pkt sequence=%u", resend_pkts[i]->sequence); + srs_verbose("resend pkt sequence=%u", resend_pkts[i]->rtp_header.get_sequence()); dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); udp_mux_skt->sendto(protected_buf, nb_protected_buf, 0); diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 94d24e250..cb7d1b505 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -840,13 +840,14 @@ void SrsRtpPacketQueue::clear() void SrsRtpPacketQueue::push(std::vector& pkts) { for (int i = 0; i < (int)pkts.size(); ++i) { - insert(pkts[i]->sequence, pkts[i]); + insert(pkts[i]->rtp_header.get_sequence(), pkts[i]); } } void SrsRtpPacketQueue::insert(const uint16_t& sequence, SrsRtpSharedPacket* pkt) { pkt_queue.insert(make_pair(sequence, pkt->copy())); + // TODO: 3000 is magic number. if (pkt_queue.size() >= 3000) { srs_freep(pkt_queue.begin()->second); pkt_queue.erase(pkt_queue.begin()); diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index d43e19aea..59ad7ca93 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -32,6 +32,117 @@ using namespace std; #include #include + +SrsRtpHeader::SrsRtpHeader() +{ + padding = false; + extension = false; + cc = 0; + marker = false; + payload_type = 0; + sequence = 0; + timestamp = 0; + ssrc = 0; + extension_length = 0; +} + +SrsRtpHeader::SrsRtpHeader(const SrsRtpHeader& rhs) +{ + operator=(rhs); +} + +SrsRtpHeader& SrsRtpHeader::operator=(const SrsRtpHeader& rhs) +{ + padding = rhs.padding; + extension = rhs.extension; + cc = rhs.cc; + marker = rhs.marker; + payload_type = rhs.payload_type; + sequence = rhs.sequence; + timestamp = rhs.timestamp; + ssrc = rhs.ssrc; + for (size_t i = 0; i < cc; ++i) { + csrc[i] = rhs.csrc[i]; + } + extension_length = rhs.extension_length; + + return *this; +} + +SrsRtpHeader::~SrsRtpHeader() +{ +} + +srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) +{ + srs_error_t err = srs_success; + + // TODO: + + return err; +} + +srs_error_t SrsRtpHeader::encode(SrsBuffer* stream) +{ + srs_error_t err = srs_success; + + uint8_t first = 0x80 | cc; + if (padding) { + first |= 0x40; + } + if (extension) { + first |= 0x10; + } + stream->write_1bytes(first); + uint8_t second = payload_type; + if (marker) { + payload_type |= kRtpMarker; + } + stream->write_1bytes(second); + stream->write_2bytes(sequence); + stream->write_4bytes(timestamp); + stream->write_4bytes(ssrc); + for (size_t i = 0; i < cc; ++i) { + stream->write_4bytes(csrc[i]); + } + + // TODO: Write exteinsion field. + if (extension) { + } + + return err; +} + +size_t SrsRtpHeader::header_size() +{ + return kRtpHeaderFixedSize + cc * 4 + (extension ? (extension_length + 1) * 4 : 0); +} + +void SrsRtpHeader::set_marker(bool marker) +{ + this->marker = marker; +} + +void SrsRtpHeader::set_payload_type(uint8_t payload_type) +{ + this->payload_type = payload_type; +} + +void SrsRtpHeader::set_sequence(uint16_t sequence) +{ + this->sequence = sequence; +} + +void SrsRtpHeader::set_timestamp(int64_t timestamp) +{ + this->timestamp = timestamp; +} + +void SrsRtpHeader::set_ssrc(uint32_t ssrc) +{ + this->ssrc = ssrc; +} + SrsRtpSharedPacket::SrsRtpSharedPacketPayload::SrsRtpSharedPacketPayload() { payload = NULL; @@ -50,11 +161,6 @@ SrsRtpSharedPacket::SrsRtpSharedPacket() payload = NULL; size = 0; - - timestamp = -1; - sequence = 0; - ssrc = 0; - payload_type = 0; } SrsRtpSharedPacket::~SrsRtpSharedPacket() @@ -68,27 +174,38 @@ SrsRtpSharedPacket::~SrsRtpSharedPacket() } } -srs_error_t SrsRtpSharedPacket::create(int64_t t, uint16_t seq, uint32_t sc, uint16_t pt, char* p, int s) +srs_error_t SrsRtpSharedPacket::create(int64_t timestamp, uint16_t sequence, uint32_t ssrc, uint16_t payload_type, 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); + if (s < 0) { + return srs_error_new(ERROR_RTP_PACKET_CREATE, "create packet size=%d", s); } srs_assert(!payload_ptr); - timestamp = t; - sequence = seq; - ssrc = sc; - payload_type = pt; + rtp_header.set_timestamp(timestamp); + rtp_header.set_sequence(sequence); + rtp_header.set_ssrc(ssrc); + rtp_header.set_payload_type(payload_type); + // TODO: rtp header padding. + size_t buffer_size = rtp_header.header_size() + s; + + char* buffer = new char[buffer_size]; + SrsBuffer stream(buffer, buffer_size); + if ((err = rtp_header.encode(&stream)) != srs_success) { + srs_freepa(buffer); + return srs_error_wrap(err, "rtp header encode"); + } + + stream.write_bytes(p, s); payload_ptr = new SrsRtpSharedPacketPayload(); - payload_ptr->payload = p; - payload_ptr->size = s; + payload_ptr->payload = buffer; + payload_ptr->size = buffer_size; - payload = payload_ptr->payload; - size = payload_ptr->size; + this->payload = payload_ptr->payload; + this->size = payload_ptr->size; return err; } @@ -100,56 +217,57 @@ SrsRtpSharedPacket* SrsRtpSharedPacket::copy() copy->payload_ptr = payload_ptr; payload_ptr->shared_count++; + copy->rtp_header = rtp_header; + copy->payload = payload; copy->size = size; - copy->timestamp = timestamp; - copy->sequence = sequence; - copy->ssrc = ssrc; - copy->payload_type = payload_type; - return copy; } -srs_error_t SrsRtpSharedPacket::set_marker(bool marker) +srs_error_t SrsRtpSharedPacket::modify_rtp_header_marker(bool marker) { srs_error_t err = srs_success; - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < 1) { + if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } + rtp_header.set_marker(marker); if (marker) { - payload_ptr->payload[1] |= kMarker; + payload_ptr->payload[1] |= kRtpMarker; } else { - payload_ptr->payload[1] &= (~kMarker); + payload_ptr->payload[1] &= (~kRtpMarker); } return err; } -srs_error_t SrsRtpSharedPacket::set_ssrc(uint32_t ssrc) +srs_error_t SrsRtpSharedPacket::modify_rtp_header_ssrc(uint32_t ssrc) { srs_error_t err = srs_success; - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < 12) { + if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } + rtp_header.set_ssrc(ssrc); + SrsBuffer stream(payload_ptr->payload + 8, 4); stream.write_4bytes(ssrc); return err; } -srs_error_t SrsRtpSharedPacket::set_payload_type(uint8_t pt) +srs_error_t SrsRtpSharedPacket::modify_rtp_header_payload_type(uint8_t payload_type) { srs_error_t err = srs_success; - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < 2) { + if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } - payload_ptr->payload[1] = (payload_ptr->payload[1] & 0x80) | pt; + rtp_header.set_payload_type(payload_type); + payload_ptr->payload[1] = (payload_ptr->payload[1] & 0x80) | payload_type; return err; } diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index f5720af49..396cb2687 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -28,42 +28,79 @@ #include -const uint8_t kMarker = 0x80; +const int kRtpHeaderFixedSize = 12; +const uint8_t kRtpMarker = 0x80; + +class SrsBuffer; + +class SrsRtpHeader +{ +private: + bool padding; + bool extension; + uint8_t cc; + bool marker; + uint8_t payload_type; + uint16_t sequence; + int64_t timestamp; + uint32_t ssrc; + uint32_t csrc[15]; + uint16_t extension_length; + // TODO:extension field. +public: + SrsRtpHeader(); + virtual ~SrsRtpHeader(); + SrsRtpHeader(const SrsRtpHeader& rhs); + SrsRtpHeader& operator=(const SrsRtpHeader& rhs); +public: + srs_error_t decode(SrsBuffer* stream); + srs_error_t encode(SrsBuffer* stream); +public: + size_t header_size(); +public: + void set_marker(bool marker); + bool get_marker() const { return marker; } + void set_payload_type(uint8_t payload_type); + uint8_t get_payload_type() const { return payload_type; } + void set_sequence(uint16_t sequence); + uint16_t get_sequence() const { return sequence; } + void set_timestamp(int64_t timestamp); + int64_t get_timestamp() const { return timestamp; } + void set_ssrc(uint32_t ssrc); + uint32_t get_ssrc() const { return ssrc; } +}; class SrsRtpSharedPacket { private: - class SrsRtpSharedPacketPayload - { - public: - char* payload; - int size; - int shared_count; - public: - SrsRtpSharedPacketPayload(); - virtual ~SrsRtpSharedPacketPayload(); - }; + class SrsRtpSharedPacketPayload + { + public: + // Rtp packet buffer, include rtp header and payload. + char* payload; + int size; + int shared_count; + public: + SrsRtpSharedPacketPayload(); + virtual ~SrsRtpSharedPacketPayload(); + }; private: - SrsRtpSharedPacketPayload* payload_ptr; + SrsRtpSharedPacketPayload* payload_ptr; public: - char* payload; - int size; -public: - int64_t timestamp; - uint16_t sequence; - uint32_t ssrc; - uint16_t payload_type; + SrsRtpHeader rtp_header; + char* payload; + int size; 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); + srs_error_t create(int64_t timestamp, uint16_t sequence, uint32_t ssrc, uint16_t payload_type, char* payload, int size); SrsRtpSharedPacket* copy(); -// interface to modify rtp header +// Interface to modify rtp header public: - srs_error_t set_marker(bool marker); - srs_error_t set_ssrc(uint32_t ssrc); - srs_error_t set_payload_type(uint8_t pt); + srs_error_t modify_rtp_header_marker(bool marker); + srs_error_t modify_rtp_header_ssrc(uint32_t ssrc); + srs_error_t modify_rtp_header_payload_type(uint8_t payload_type); }; #endif