izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip error correction when a video frame is to large, the alternative is skipping the frame itself

Browse Source
This commit is contained in:
loki
2021-05-22 23:09:53 +02:00
parent ba07fd510e
commit dcb32eaaf7
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sunshine/stream.cpp
View File

@@ -314,7 +314,7 @@ struct fec_t {
} }
}; };
fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercentage) { static fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercentage) {
auto payload_size = payload.size(); auto payload_size = payload.size();
auto pad = payload_size % blocksize != 0; auto pad = payload_size % blocksize != 0;
@@ -324,11 +324,13 @@ fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercen
auto nr_shards = data_shards + parity_shards; auto nr_shards = data_shards + parity_shards;
if(nr_shards > DATA_SHARDS_MAX) { if(nr_shards > DATA_SHARDS_MAX) {
BOOST_LOG(error) BOOST_LOG(warning)
<< "Number of fragments for reed solomon exceeds DATA_SHARDS_MAX"sv << std::endl << "Number of fragments for reed solomon exceeds DATA_SHARDS_MAX"sv << std::endl
<< nr_shards << " > "sv << DATA_SHARDS_MAX; << nr_shards << " > "sv << DATA_SHARDS_MAX
<< ", skipping error correction"sv;
return { 0 }; nr_shards = data_shards;
fecpercentage = 0;
} }
util::buffer_t<char> shards { nr_shards * blocksize }; util::buffer_t<char> shards { nr_shards * blocksize };
@@ -342,10 +344,12 @@ fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercen
shards_p[x] = (uint8_t *)&shards[x * blocksize]; shards_p[x] = (uint8_t *)&shards[x * blocksize];
} }
if(data_shards + parity_shards <= DATA_SHARDS_MAX) {
// packets = parity_shards + data_shards // packets = parity_shards + data_shards
rs_t rs { reed_solomon_new(data_shards, parity_shards) }; rs_t rs { reed_solomon_new(data_shards, parity_shards) };
reed_solomon_encode(rs.get(), shards_p.begin(), nr_shards, blocksize); reed_solomon_encode(rs.get(), shards_p.begin(), nr_shards, blocksize);
}
return { return {
data_shards, data_shards,
@@ -670,7 +674,7 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
inspect->packet.frameIndex = packet->pts; inspect->packet.frameIndex = packet->pts;
inspect->packet.fecInfo = (x << 12 | inspect->packet.fecInfo = (x << 12 |
shards.data_shards << 22 | shards.data_shards << 22 |
fecPercentage << 4); shards.percentage << 4);
inspect->rtp.header = FLAG_EXTENSION; inspect->rtp.header = FLAG_EXTENSION;
inspect->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + x); inspect->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + x);