qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtcp: Separate SDES and APP packet creation to a separate file

This commit is contained in:
Joni Räsänen 2022-07-07 18:56:58 +03:00
parent 4adcce32fe
commit f2b98b4963
4 changed files with 86 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -38,16 +38,19 @@ target_sources(${PROJECT_NAME} PRIVATE
src/frame_queue.cc
src/random.cc
src/rtcp.cc
src/rtcp_packets.cc
src/rtp.cc
src/session.cc
src/socket.cc
src/zrtp.cc
src/holepuncher.cc
src/formats/media.cc
src/formats/h26x.cc
src/formats/h264.cc
src/formats/h265.cc
src/formats/h266.cc
src/zrtp/zrtp_receiver.cc
src/zrtp/hello.cc
src/zrtp/hello_ack.cc
@ -78,6 +81,7 @@ target_sources(${PROJECT_NAME} PRIVATE
src/reception_flow.hh
src/poll.hh
src/rtp.hh
src/rtcp_packets.hh
src/zrtp.hh
src/frame_queue.hh

46
src/rtcp.cc
View File

@ -4,6 +4,7 @@
#include "poll.hh"
#include "rtp.hh"
#include "srtp/srtcp.hh"
#include "rtcp_packets.hh"
#include "uvgrtp/debug.hh"
#include "uvgrtp/util.hh"
@ -18,11 +19,6 @@
#include <cstring>
#include <iostream>
const uint16_t RTCP_HEADER_SIZE = 4;
const uint16_t SSRC_CSRC_SIZE = 4;
const uint16_t SENDER_INFO_SIZE = 20;
const uint16_t REPORT_BLOCK_SIZE = 24;
const uint16_t APP_NAME_SIZE = 4;
/* TODO: explain these constants */
const uint32_t RTP_SEQ_MOD = 1 << 16;
@ -1514,39 +1510,12 @@ rtp_error_t uvgrtp::rtcp::send_sdes_packet(const std::vector<uvgrtp::frame::rtcp
uint8_t* frame = nullptr;
rtp_error_t ret = RTP_OK;
size_t frame_size = 0;
/* We currently only support having one source. If uvgRTP is used in a mixer, multiple sources
* should be supported in SDES packet. */
// calculate SDES packet size
frame_size = RTCP_HEADER_SIZE + SSRC_CSRC_SIZE; // our csrc
frame_size += items.size() * 2; /* sdes item type + length, both take one byte */
for (auto& item : items)
{
if (item.length <= 255)
{
frame_size += item.length;
}
else
{
LOG_ERROR("SDES item text must not be longer than 255 characters");
}
}
// this already adds our ssrc
construct_rtcp_header(frame_size, frame, num_receivers_, uvgrtp::frame::RTCP_FT_SDES, true);
int ptr = RTCP_HEADER_SIZE + SSRC_CSRC_SIZE;
for (auto& item : items)
{
if (item.length <= 255)
{
frame[ptr++] = item.type;
frame[ptr++] = item.length;
memcpy(frame + ptr, item.data, item.length);
ptr += item.length;
}
}
construct_sdes_packet(frame, ptr, items);
if (srtcp_ && (ret = srtcp_->handle_rtcp_encryption(flags_, rtcp_pkt_sent_count_,
ssrc_, frame, frame_size)) != RTP_OK)
@ -1589,16 +1558,17 @@ rtp_error_t uvgrtp::rtcp::send_app_packet(const char* name, uint8_t subtype,
{
rtp_error_t ret = RTP_OK;
uint8_t* frame = nullptr;
size_t frame_size = RTCP_HEADER_SIZE + SSRC_CSRC_SIZE + APP_NAME_SIZE + payload_len;
size_t frame_size = get_app_packet_size(payload_len);
if ((ret = construct_rtcp_header(frame_size, frame, (subtype & 0x1f),
uvgrtp::frame::RTCP_FT_APP, true)) != RTP_OK)
{
return ret;
}
memcpy(&frame[RTCP_HEADER_SIZE + SSRC_CSRC_SIZE], name, APP_NAME_SIZE);
memcpy(&frame[RTCP_HEADER_SIZE + SSRC_CSRC_SIZE + APP_NAME_SIZE], payload, payload_len);
int ptr = RTCP_HEADER_SIZE + SSRC_CSRC_SIZE;
construct_app_packet(frame, ptr, name, payload, payload_len);
if (srtcp_ && (ret = srtcp_->handle_rtcp_encryption(flags_, rtcp_pkt_sent_count_, ssrc_, frame, frame_size)) != RTP_OK)
{

54
src/rtcp_packets.cc Normal file
View File

@ -0,0 +1,54 @@
#include "rtcp_packets.hh"
#include "uvgrtp/debug.hh"
size_t get_sdes_packet_size(const std::vector<uvgrtp::frame::rtcp_sdes_item>& items) {
size_t frame_size = 0;
/* We currently only support having one source. If uvgRTP is used in a mixer, multiple sources
* should be supported in SDES packet. */
// calculate SDES packet size
frame_size = RTCP_HEADER_SIZE + SSRC_CSRC_SIZE; // our csrc
frame_size += items.size() * 2; /* sdes item type + length, both take one byte */
for (auto& item : items)
{
if (item.length <= 255)
{
frame_size += item.length;
}
else
{
LOG_ERROR("SDES item text must not be longer than 255 characters");
}
}
return frame_size;
}
size_t get_app_packet_size(size_t payload_len)
{
return RTCP_HEADER_SIZE + SSRC_CSRC_SIZE + APP_NAME_SIZE + payload_len;
}
void construct_sdes_packet(uint8_t* frame, int& ptr,
const std::vector<uvgrtp::frame::rtcp_sdes_item>& items) {
for (auto& item : items)
{
if (item.length <= 255)
{
frame[ptr++] = item.type;
frame[ptr++] = item.length;
memcpy(frame + ptr, item.data, item.length);
ptr += item.length;
}
}
}
void construct_app_packet(uint8_t* frame, int& ptr,
const char* name, const uint8_t* payload, size_t payload_len)
{
memcpy(&frame[RTCP_HEADER_SIZE + SSRC_CSRC_SIZE], name, APP_NAME_SIZE);
memcpy(&frame[RTCP_HEADER_SIZE + SSRC_CSRC_SIZE + APP_NAME_SIZE], payload, payload_len);
}

20
src/rtcp_packets.hh Normal file
View File

@ -0,0 +1,20 @@
#pragma once
#include "uvgrtp/frame.hh"
#include <vector>
const uint16_t RTCP_HEADER_SIZE = 4;
const uint16_t SSRC_CSRC_SIZE = 4;
const uint16_t SENDER_INFO_SIZE = 20;
const uint16_t REPORT_BLOCK_SIZE = 24;
const uint16_t APP_NAME_SIZE = 4;
size_t get_sdes_packet_size(const std::vector<uvgrtp::frame::rtcp_sdes_item>& items);
size_t get_app_packet_size(size_t payload_len);
void construct_sdes_packet(uint8_t* frame, int& ptr,
const std::vector<uvgrtp::frame::rtcp_sdes_item>& items);
void construct_app_packet(uint8_t* frame, int& ptr,
const char* name, const uint8_t* payload, size_t payload_len);