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

formats: Develop solution to H26x aggregation when there are multiple non-consecutive small NAL units

This commit is contained in:
Heikki Tampio 2024-02-20 13:00:48 +02:00
parent 516df571a8
commit c91910351f
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/formats/h26x.cc
View File

@ -356,6 +356,7 @@ rtp_error_t uvgrtp::formats::h26x::push_media_frame(sockaddr_in& addr, sockaddr_
nal.prefix_len = 0;
nal.size = data_len;
nal.aggregate = false;
nal.was_aggregated = false;
nals.push_back(nal);
}
@ -381,6 +382,7 @@ rtp_error_t uvgrtp::formats::h26x::push_media_frame(sockaddr_in& addr, sockaddr_
{
if (nal.aggregate)
{
nal.was_aggregated = true;
if ((ret = add_aggregate_packet(data + nal.offset, nal.size)) != RTP_OK)
{
clear_aggregation_info();
@ -388,6 +390,9 @@ rtp_error_t uvgrtp::formats::h26x::push_media_frame(sockaddr_in& addr, sockaddr_
return ret;
}
}
else {
break;
}
}
(void)finalize_aggregation_pkt();
@ -398,8 +403,7 @@ rtp_error_t uvgrtp::formats::h26x::push_media_frame(sockaddr_in& addr, sockaddr_
for (auto& nal : nals) // non-aggregatable NAL units
{
//UVG_LOG_DEBUG("NAL size %u", nal.size);
if (do_not_aggr || !nal.aggregate || !should_aggregate)
if (do_not_aggr || !nal.was_aggregated || !should_aggregate)
{
if ((ret = fqueue_->init_transaction(data + nal.offset, true)) != RTP_OK) {
UVG_LOG_ERROR("Invalid frame queue or failed to initialize transaction!");
@ -816,7 +820,7 @@ rtp_error_t uvgrtp::formats::h26x::packet_handler(void* args, int rce_flags, uin
if (e && continuous) {
size_t nal_size = 0; // Find size of the complete reconstructed NAL unit
for (auto p : reconstructed_fragments.at(start).seqs) {
nal_size += fragments_[p]->payload_len;
nal_size += (fragments_[p]->payload_len - sizeof_fu_headers);
au.fragments_info[p].reconstructed = true;
}
/* Work in progress feature: here we discard inter frames if their references were not received correctly */

1
src/formats/h26x.hh
View File

@ -74,6 +74,7 @@ namespace uvgrtp {
size_t prefix_len = 0;
size_t size = 0;
bool aggregate = false;
bool was_aggregated = false;
};
class h26x : public media {

7
test/test_4_formats.cpp
View File

@ -708,7 +708,7 @@ TEST(FormatTests, h265_aggregation)
uvgrtp::media_stream* receiver = nullptr;
aggr_received = 0;
int expected = 3;
int expected = 5;
if (sess)
{
@ -721,10 +721,10 @@ TEST(FormatTests, h265_aggregation)
rtp_format_t format = RTP_FORMAT_H265;
int test_runs = 1;
std::vector<size_t> test_sizes = { 100, 200, 300 };
std::vector<size_t> test_sizes = { 100, 200, 1700, 300, 400};
size_t total_size = 0;
std::unique_ptr<uint8_t[]> test_frame = std::unique_ptr<uint8_t[]>(new uint8_t[700]);
std::unique_ptr<uint8_t[]> test_frame = std::unique_ptr<uint8_t[]>(new uint8_t[2700]);
for (auto& size : test_sizes)
{
@ -841,6 +841,7 @@ TEST(FormatTests, h265_disable_aggr)
inline void aggr_receive_hook(void* arg, uvgrtp::frame::rtp_frame* frame)
{
std::cout << "Rec frame size " << frame->payload_len << std::endl;
aggr_received++;
(void)uvgrtp::frame::dealloc_frame(frame);
}