Skip to content
Snippets Groups Projects
Commit ed4948a2 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'bug/netstream-dbg3' into 'main'

Remove locks and debug buffers

See merge request beyondaka/beyond-protocol!64
parents d8e116e0 6da6f86f
No related branches found
No related tags found
No related merge requests found
......@@ -339,7 +339,10 @@ void Net::_run() {
int64_t ats = 0;
if (state->buffer.size() > 0) {
size_t size = state->buffer.size();
lk2.unlock();
if (size > 0) {
// LOG(INFO) << "Buffer size = " << state->buffer.size();
auto &front = state->buffer.front();
......@@ -354,15 +357,18 @@ void Net::_run() {
if (pts <= cts) {
LOG(INFO) << "Presentation error = " << (cts - pts);
ats = pts;
} else {
LOG(INFO) << "Next presentation in: " << (pts - cts);
}
}
if (ats == 0) {
if (size == 0) {
LOG(WARNING) << "No packets to present: " << cts;
continue;
}
auto current = state->buffer.begin();
while (current != state->buffer.end()) {
for (size_t i = 0; i < size; ++i) {
// lk2.unlock();
int64_t pts = current->packets.first.timestamp - state->base_pkt_ts_ + buffering_;
......@@ -448,6 +454,7 @@ bool Net::begin() {
buf.packets.first = spkt_raw;
buf.packets.second = std::move(pkt);
buf.peer = &p;
buf.done = false;
} else {
_processPacket(&p, ttimeoff, spkt_raw, pkt);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment