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

Add missing (de)allocation routines for BYE/APP/SDES packets

This commit is contained in:
Aaro Altonen 2019-06-18 09:55:23 +03:00
parent 6485db2cfd
commit 6eb08dece8
2 changed files with 143 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/frame.cc
View File

@ -134,6 +134,87 @@ kvz_rtp::frame::rtcp_receiver_frame *kvz_rtp::frame::alloc_rtcp_receiver_frame(s
return frame;
}
kvz_rtp::frame::rtcp_sdes_frame *kvz_rtp::frame::alloc_rtcp_sdes_frame(size_t ssrc_count, size_t total_len)
{
if (total_len == 0) {
LOG_ERROR("Cannot allocate empty SDES packet!");
rtp_errno = RTP_INVALID_VALUE;
return nullptr;
}
size_t total_size = sizeof(rtcp_header) + total_len;
auto *frame = (kvz_rtp::frame::rtcp_sdes_frame *)new uint8_t[total_size];
if (!frame) {
LOG_ERROR("Failed to allocate memory for RTCP sender report");
rtp_errno = RTP_MEMORY_ERROR;
return nullptr;
}
frame->header.version = 2;
frame->header.padding = 0;
frame->header.pkt_type = kvz_rtp::frame::FRAME_TYPE_SDES;
frame->header.length = total_size;
frame->header.report_cnt = ssrc_count;
/* caller fills these */
memset(frame->items, 0, total_len);
return frame;
}
kvz_rtp::frame::rtcp_bye_frame *kvz_rtp::frame::alloc_rtcp_bye_frame(size_t ssrc_count)
{
if (ssrc_count == 0) {
LOG_ERROR("Cannot have 0 SSRC/CSRC!");
rtp_errno = RTP_INVALID_VALUE;
return nullptr;
}
size_t total_size = sizeof(rtcp_header) + sizeof(uint32_t) * ssrc_count;
auto *frame = (kvz_rtp::frame::rtcp_bye_frame *)new uint8_t[total_size];
if (!frame) {
LOG_ERROR("Failed to allocate memory for RTCP sender report");
rtp_errno = RTP_MEMORY_ERROR;
return nullptr;
}
frame->header.version = 2;
frame->header.padding = 0;
frame->header.pkt_type = kvz_rtp::frame::FRAME_TYPE_BYE;
frame->header.length = total_size;
frame->header.report_cnt = ssrc_count;
return frame;
}
kvz_rtp::frame::rtcp_app_frame *kvz_rtp::frame::alloc_rtcp_app_frame(std::string name, uint8_t subtype, size_t payload_len)
{
if (name == "" || payload_len == 0) {
rtp_errno = RTP_INVALID_VALUE;
return nullptr;
}
size_t total_size = sizeof(rtcp_app_frame) + payload_len;
auto *frame = (kvz_rtp::frame::rtcp_app_frame *)new uint8_t[total_size];
if (!frame) {
LOG_ERROR("Failed to allocate memory for RTCP sender report");
rtp_errno = RTP_MEMORY_ERROR;
return nullptr;
}
frame->version = 2;
frame->padding = 0;
frame->pkt_type = kvz_rtp::frame::FRAME_TYPE_APP;
frame->pkt_subtype = subtype;
frame->length = total_size;
return frame;
}
rtp_error_t kvz_rtp::frame::dealloc_frame(kvz_rtp::frame::rtcp_sender_frame *frame)
{
if (!frame)
@ -152,7 +233,33 @@ rtp_error_t kvz_rtp::frame::dealloc_frame(kvz_rtp::frame::rtcp_receiver_frame *f
return RTP_OK;
}
/* get pointer to RTP Header or nullptr if frame is invalid */
rtp_error_t kvz_rtp::frame::dealloc_frame(rtcp_sdes_frame *frame)
{
if (!frame)
return RTP_INVALID_VALUE;
delete frame;
return RTP_OK;
}
rtp_error_t kvz_rtp::frame::dealloc_frame(rtcp_bye_frame *frame)
{
if (!frame)
return RTP_INVALID_VALUE;
delete frame;
return RTP_OK;
}
rtp_error_t kvz_rtp::frame::dealloc_frame(rtcp_app_frame *frame)
{
if (!frame)
return RTP_INVALID_VALUE;
delete frame;
return RTP_OK;
}
uint8_t *kvz_rtp::frame::get_rtp_header(kvz_rtp::frame::rtp_frame *frame)
{
if (!frame) {

43
src/frame.hh
View File

@ -1,5 +1,7 @@
#pragma once
#include <string>
#include "util.hh"
#define INVALID_FRAME_TYPE(ft) (ft < FRAME_TYPE_GENERIC || ft > FRAME_TYPE_HEVC_FU)
@ -85,25 +87,50 @@ namespace kvz_rtp {
struct rtcp_report_block blocks[0];
};
struct rtcp_sdes_frame {
int value;
PACKED_STRUCT(rtcp_sdes_item) {
uint8_t type;
uint8_t length;
uint8_t data[0];
};
struct rtcp_bye_frame {
int value;
PACKED_STRUCT(rtcp_sdes_frame) {
struct rtcp_header header;
uint32_t ssrc;
struct rtcp_sdes_item items[0];
};
struct rtcp_app_frame {
int value;
PACKED_STRUCT(rtcp_bye_frame) {
struct rtcp_header header;
uint32_t ssrc[0];
};
PACKED_STRUCT(rtcp_app_frame) {
uint8_t version:2;
uint8_t padding:1;
uint8_t pkt_subtype:5;
uint8_t pkt_type;
uint16_t length;
uint32_t ssrc;
uint8_t name[4];
uint8_t payload[0];
};
rtp_frame *alloc_rtp_frame(size_t payload_len, rtp_type_t type);
rtcp_sender_frame *alloc_rtcp_sender_frame(size_t numblocks);
rtcp_receiver_frame *alloc_rtcp_receiver_frame(size_t numblocks);
rtcp_app_frame *alloc_rtcp_app_frame(std::string name, uint8_t subtype, size_t payload_len);
rtcp_sdes_frame *alloc_rtcp_sdes_frame(size_t ssrc_count, size_t total_len);
rtcp_receiver_frame *alloc_rtcp_receiver_frame(size_t nblocks);
rtcp_sender_frame *alloc_rtcp_sender_frame(size_t nblocks);
rtcp_bye_frame *alloc_rtcp_bye_frame(size_t ssrc_count);
rtp_error_t dealloc_frame(rtp_frame *frame);
/* TODO: template??? */
rtp_error_t dealloc_frame(rtcp_sender_frame *frame);
rtp_error_t dealloc_frame(rtcp_receiver_frame *frame);
rtp_error_t dealloc_frame(rtcp_sdes_frame *frame);
rtp_error_t dealloc_frame(rtcp_bye_frame *frame);
rtp_error_t dealloc_frame(rtcp_app_frame *frame);
/* get pointer to rtp header start or nullptr if frame is invalid */
uint8_t *get_rtp_header(rtp_frame *frame);