diff --git a/native/obs_stem_source/mimir_obs_muninn_source.cpp b/native/obs_stem_source/mimir_obs_muninn_source.cpp index 5d9e10e..f5d73a3 100644 --- a/native/obs_stem_source/mimir_obs_muninn_source.cpp +++ b/native/obs_stem_source/mimir_obs_muninn_source.cpp @@ -7,6 +7,7 @@ #include #include "muninn_media_wire.h" +#include "muninn_rudp_ack.h" #include "muninn_rudp_url.h" #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -598,9 +598,8 @@ private: if (packet_type == 1) { pending_payloads_.clear(); video_assemblies_.clear(); - received_sequences_.clear(); - highest_received_sequence_.reset(); - remember_received_sequence(sequence); + ack_tracker_.reset(); + ack_tracker_.remember(sequence); gap_wait_started_.reset(); next_data_sequence_ = sequence + 1; packets_forwarded_ = 0; @@ -609,14 +608,14 @@ private: video_assemblies_expired_ = 0; video_forward_failures_ = 0; audio_forward_failures_ = 0; - const auto [ack, ack_mask] = ack_state(); + const auto [ack, ack_mask] = ack_tracker_.state(); send_control_packet(2, 0x03, bridge_sequence++, ack, ack_mask, remote); blog(LOG_INFO, "Muninn RUDP bridge accepted media connection sequence %u", sequence); return; } if (packet_type == 3 && fragment_count == 0) { - remember_received_sequence(sequence); + ack_tracker_.remember(sequence); if (!next_data_sequence_) { next_data_sequence_ = sequence; } @@ -624,7 +623,7 @@ private: pending_payloads_[sequence] = std::vector(packet + payload_offset, packet + payload_offset + payload_len); flush_forward_payloads(video_socket, video_addr, audio_socket, audio_addr, bridge_sequence); } - const auto [ack, ack_mask] = ack_state(); + const auto [ack, ack_mask] = ack_tracker_.state(); send_control_packet(4, 0x00, bridge_sequence++, ack, ack_mask, remote); } } @@ -829,37 +828,6 @@ private: } } - void remember_received_sequence(uint32_t sequence) - { - received_sequences_.insert(sequence); - if (!highest_received_sequence_ || sequence > *highest_received_sequence_) { - highest_received_sequence_ = sequence; - } - if (!highest_received_sequence_) { - return; - } - const uint32_t highest = *highest_received_sequence_; - for (auto iterator = received_sequences_.begin(); iterator != received_sequences_.end();) { - if (*iterator + 32 < highest) { - iterator = received_sequences_.erase(iterator); - } else { - ++iterator; - } - } - } - - std::pair ack_state() const - { - const uint32_t ack = highest_received_sequence_.value_or(0); - uint32_t ack_mask = 0; - for (uint32_t bit = 0; bit < 32; ++bit) { - if (ack > bit && received_sequences_.find(ack - bit - 1) != received_sequences_.end()) { - ack_mask |= 1u << bit; - } - } - return {ack, ack_mask}; - } - void send_control_packet(uint8_t packet_type, uint8_t flags, uint32_t sequence, uint32_t ack, uint32_t ack_mask, const sockaddr_in &remote) { const std::string channel = "control"; @@ -901,7 +869,7 @@ private: response[7] = static_cast(36 + channel.size()); write_be32(response, 8, parts_.connection_id); write_be32(response, 12, sequence); - const auto [ack, ack_mask] = ack_state(); + const auto [ack, ack_mask] = ack_tracker_.state(); write_be32(response, 16, ack); write_be32(response, 20, ack_mask); write_be16(response, 24, 0); @@ -924,9 +892,8 @@ private: muninn_rudp_url::RudpUrlParts parts_; std::map> pending_payloads_; std::map video_assemblies_; - std::set received_sequences_; + muninn_rudp_ack::AckTracker ack_tracker_; std::optional next_data_sequence_; - std::optional highest_received_sequence_; std::optional gap_wait_started_; uint64_t packets_forwarded_ = 0; uint64_t bytes_forwarded_ = 0; diff --git a/native/obs_stem_source/muninn_rudp_ack.h b/native/obs_stem_source/muninn_rudp_ack.h new file mode 100644 index 0000000..ca80d41 --- /dev/null +++ b/native/obs_stem_source/muninn_rudp_ack.h @@ -0,0 +1,54 @@ +#pragma once + +#include +#include +#include +#include + +namespace muninn_rudp_ack { + +class AckTracker { +public: + void reset() + { + received_sequences_.clear(); + highest_received_sequence_.reset(); + } + + void remember(uint32_t sequence) + { + received_sequences_.insert(sequence); + if (!highest_received_sequence_ || sequence > *highest_received_sequence_) { + highest_received_sequence_ = sequence; + } + if (!highest_received_sequence_) { + return; + } + const uint32_t highest = *highest_received_sequence_; + for (auto iterator = received_sequences_.begin(); iterator != received_sequences_.end();) { + if (*iterator + 32 < highest) { + iterator = received_sequences_.erase(iterator); + } else { + ++iterator; + } + } + } + + std::pair state() const + { + const uint32_t ack = highest_received_sequence_.value_or(0); + uint32_t ack_mask = 0; + for (uint32_t bit = 0; bit < 32; ++bit) { + if (ack > bit && received_sequences_.find(ack - bit - 1) != received_sequences_.end()) { + ack_mask |= 1u << bit; + } + } + return {ack, ack_mask}; + } + +private: + std::set received_sequences_; + std::optional highest_received_sequence_; +}; + +} // namespace muninn_rudp_ack diff --git a/tools/muninn_media_decoder_probe.cpp b/tools/muninn_media_decoder_probe.cpp index df407e9..6337098 100644 --- a/tools/muninn_media_decoder_probe.cpp +++ b/tools/muninn_media_decoder_probe.cpp @@ -9,6 +9,7 @@ #include #include "muninn_media_wire.h" +#include "muninn_rudp_ack.h" #include "muninn_rudp_url.h" struct MuninnMediaPayload { @@ -372,6 +373,7 @@ int main(int argc, char **argv) std::cerr << "usage: muninn_media_decoder_probe [more-wire.bin ...]\n" << " muninn_media_decoder_probe --feedback-fixture\n" << " muninn_media_decoder_probe --feedback-fixture-hex\n" + << " muninn_media_decoder_probe --ack-fixture\n" << " muninn_media_decoder_probe --rudp-url \n"; return 2; } @@ -383,6 +385,16 @@ int main(int argc, char **argv) if (std::string(argv[index]) == "--feedback-fixture") { bytes = muninn_media_wire::encode_receiver_feedback_payload( "muninn.raven.av.rudp", "raven:test:video", 42, {"42:1", "42:3"}); + } else if (std::string(argv[index]) == "--ack-fixture") { + muninn_rudp_ack::AckTracker tracker; + tracker.remember(10); + tracker.remember(12); + tracker.remember(11); + const auto [ack, ack_mask] = tracker.state(); + std::cout << "ack ack=" << ack + << " mask=0x" << std::hex << ack_mask << std::dec << "\n"; + decoded_any = true; + continue; } else if (std::string(argv[index]) == "--feedback-fixture-hex") { bytes = muninn_media_wire::encode_receiver_feedback_payload( "muninn.raven.av.rudp", "raven:test:video", 42, {"42:1", "42:3"}, "unix-ms:1000");