Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update transport to main branch and fix fragment ooo handling #159

Merged
merged 1 commit into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies/transport
17 changes: 3 additions & 14 deletions src/quicr_client_raw_session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -759,19 +759,12 @@ ClientRawSession::notify_pub_fragment(
}

reassembled.insert(reassembled.end(),
std::make_move_iterator(data.begin()),
std::make_move_iterator(data.end()));
data.begin(),
data.end());
TimEvens marked this conversation as resolved.
Show resolved Hide resolved

seq_bytes += data.size();
}

const auto duration_ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - fragment.start_time).count();
if (duration_ms > 22) {
logger->debug << "Fragment complete name: " << datagram.header.name
<< " duration_ms: " << duration_ms
<< std::flush;
}

delegate->onSubscribedObject(
datagram.header.name, 0x0, std::move(reassembled));

Expand Down Expand Up @@ -823,11 +816,7 @@ ClientRawSession::handle_pub_fragment(
std::move(datagram.media_data));
if (notify_pub_fragment(datagram, delegate, msg_fragments)) {
buffer.erase(name);
} /*else {
logger->info << "Fragments name: " << datagram.header.name
<< " offset: " << (datagram.header.offset_and_fin >> 1U)
<< std::flush;
}*/
}
}

void
Expand Down
1 change: 0 additions & 1 deletion src/quicr_client_raw_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ class ClientRawSession
protected:
struct MsgFragment {
std::map<uint32_t, bytes> data;
const std::chrono::time_point<std::chrono::steady_clock> start_time { std::chrono::steady_clock::now() };
};

void on_connection_status(const qtransport::TransportConnId& conn_id,
Expand Down
Loading