From 775cb69b9b7b76305b97ac70a07975625e91d7f2 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 14 Jun 2019 14:19:54 +0300
Subject: [PATCH] Corrections to tx counters
---
components/rgbd-sources/src/net.cpp | 4 ++--
components/rgbd-sources/src/streamer.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/rgbd-sources/src/net.cpp b/components/rgbd-sources/src/net.cpp
index ee89beca2..2e89c8617 100644
--- a/components/rgbd-sources/src/net.cpp
+++ b/components/rgbd-sources/src/net.cpp
@@ -135,8 +135,8 @@ void NetSource::_updateURI() {
}
bool NetSource::grab() {
- if (N_ == 1) {
- N_ += 10;
+ if (N_ <= 1) {
+ N_ = 10;
if (!host_->getNet()->send(peer_, "get_stream", *host_->get<string>("uri"), 10, 0, host_->getNet()->id(), *host_->get<string>("uri"))) {
active_ = false;
}
diff --git a/components/rgbd-sources/src/streamer.cpp b/components/rgbd-sources/src/streamer.cpp
index 4c1051397..ef0fdaae6 100644
--- a/components/rgbd-sources/src/streamer.cpp
+++ b/components/rgbd-sources/src/streamer.cpp
@@ -119,7 +119,7 @@ void Streamer::_addClient(const string &source, int N, int rate, const ftl::UUID
if (s->clients[rate][i].peerid == peer) {
StreamClient &c = s->clients[rate][i];
c.txmax = N;
- c.txcount -= N;
+ c.txcount = 0;
return;
}
}
--
GitLab