diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-02-10 14:24:20 +0100 |
|---|---|---|
| committer | Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-02-10 14:40:21 +0100 |
| commit | d1f1d938930b6b473bedf3736fc675d5c4c3ee9a (patch) | |
| tree | 8695f5d9105fad8f08f39ecb7ce7046d8e85ccb9 /Input | |
| parent | 0b2f5c75cfeb33b233c02866e848e3d94de48ee7 (diff) | |
Correction adaptech and minor corrections + remove memory leak libdash
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
Change-Id: I83161f19385a5ed739e9fd280925abca8009dc71
Change-Id: If394f999b7325a6b07ddff57201f7657e58a493c
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
Diffstat (limited to 'Input')
| -rw-r--r-- | Input/DASHManager.cpp | 2 | ||||
| -rw-r--r-- | Input/DASHReceiver.cpp | 6 | ||||
| -rw-r--r-- | Input/ICNConnectionConsumerApi.cpp | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Input/DASHManager.cpp b/Input/DASHManager.cpp index 5317b207..5985dfed 100644 --- a/Input/DASHManager.cpp +++ b/Input/DASHManager.cpp @@ -54,7 +54,7 @@ bool DASHManager::isICN() void DASHManager::shouldAbort() { - Debug("DASH MANAGER: ABORT REQUEST\n"); + qDebug("DASH MANAGER: ABORT REQUEST"); this->receiver->ShouldAbort(); } diff --git a/Input/DASHReceiver.cpp b/Input/DASHReceiver.cpp index c5769b16..97819720 100644 --- a/Input/DASHReceiver.cpp +++ b/Input/DASHReceiver.cpp @@ -313,7 +313,7 @@ void* DASHReceiver::DoBuffering (void *recei if(dashReceiver->isScheduledPaced) { double delay = std::chrono::duration_cast<duration_in_seconds>(std::chrono::system_clock::now() - m_start_time).count(); - Debug("delay: %f, target: %f\n", delay, dashReceiver->targetDownload); + qDebug("delay: %f, target: %f", delay, dashReceiver->targetDownload); if(delay < dashReceiver->targetDownload) { sleep(dashReceiver->targetDownload - delay); @@ -372,9 +372,9 @@ bool DASHReceiver::CanPush () } void DASHReceiver::ShouldAbort () { - Debug("DASH RECEIVER SEGMENT --\n"); + qDebug("DASH RECEIVER SEGMENT --"); this->segmentNumber--; - Debug("DASH RECEIVER ABORT REQUEST\n"); + qDebug("DASH RECEIVER ABORT REQUEST"); } void DASHReceiver::SetTargetDownloadingTime (double target) diff --git a/Input/ICNConnectionConsumerApi.cpp b/Input/ICNConnectionConsumerApi.cpp index 59330852..362c849c 100644 --- a/Input/ICNConnectionConsumerApi.cpp +++ b/Input/ICNConnectionConsumerApi.cpp @@ -94,7 +94,7 @@ ICNConnectionConsumerApi::ICNConnectionConsumerApi(double alpha, float beta, flo #else this->icnRateBased = true; #endif - Debug("ICN class created\n"); + qDebug("ICN class created"); } @@ -110,15 +110,15 @@ ICNConnectionConsumerApi::~ICNConnectionConsumerApi() { } void ICNConnectionConsumerApi::Init(IChunk *chunk) { - Debug("ICN Connection: STARTING\n"); + qDebug("ICN Connection: STARTING"); m_first = 1; sizeDownloaded = 0; m_name = chunk->AbsoluteURI().c_str(); m_isFinished = false; res = false; - Debug("ICN_Connection:\tINTIATED_to_name %s\n", m_name.c_str()); - Debug("ICN_Connection:\tSTARTING DOWNLOAD %s\n", m_name.c_str()); + qDebug("ICN_Connection:\tINTIATED_to_name %s", m_name.c_str()); + qDebug("ICN_Connection:\tSTARTING DOWNLOAD %s", m_name.c_str()); } void ICNConnectionConsumerApi::InitForMPD(const std::string& url) @@ -131,7 +131,7 @@ void ICNConnectionConsumerApi::InitForMPD(const std::string& url) res = false; dataPos = 0; datSize = 0; - Debug("ICN_Connection:\tINTIATED_for_mpd %s\n", m_name.c_str()); + qDebug("ICN_Connection:\tINTIATED_for_mpd %s", m_name.c_str()); } int ICNConnectionConsumerApi::Read(uint8_t* data, size_t len, IChunk *chunk) @@ -177,13 +177,13 @@ int ICNConnectionConsumerApi::Peek(uint8_t *data, size_t len, IChunk double ICNConnectionConsumerApi::GetAverageDownloadingSpeed() { - Debug("ICNConnection: DL speed is %f\n", this->speed); + qDebug("ICNConnection: DL speed is %f", this->speed); return this->speed; } double ICNConnectionConsumerApi::GetDownloadingTime() { - Debug("ICNConnection: DL time is %f\n", this->dnltime); + qDebug("ICNConnection: DL time is %f", this->dnltime); return this->dnltime; } @@ -198,7 +198,7 @@ const std::vector<IHTTPTransaction *> &ICNConnectionConsumerApi::GetHTTPTransact void ICNConnectionConsumerApi::notifyStats(double winSize) { this->speed = (winSize); // * 1000000 * 1400 * 8; - Debug("ICNConnection:\tNotificationICPDL\t%f\t%f\n", winSize, speed); + qDebug("ICNConnection:\tNotificationICPDL\t%f\t%f", winSize, speed); } void ICNConnectionConsumerApi::notifyDownloadTime(double downloadingTime) |