Reinstating adaptation logics that require downloading time

Change-Id: I772c67fb7cde42c5a21673fbd7c450e3b51a9959
Signed-off-by: Jacques Samain <[email protected]>

diff --git a/Input/ICNConnectionConsumerApi.cpp b/Input/ICNConnectionConsumerApi.cpp
index d5048cb..e6715e6 100644 (file)
--- a/Input/ICNConnectionConsumerApi.cpp
+++ b/Input/ICNConnectionConsumerApi.cpp
@@ -182,6 +182,12 @@ void ICNConnectionConsumerApi::notifyStats(double winSize)
     Debug("ICNConnection:\tNotificationICPDL\t%f\t%f\n", winSize, speed);
 }
 
+void ICNConnectionConsumerApi::notifyDownloadTime(double downloadingTime)
+{
+    //downloadingTime is in microseconds, dnltime should be in seconds
+    this->dnltime = downloadingTime / 1000000; 
+}
+
 void ICNConnectionConsumerApi::SetBeta(float beta)
 {
     this->beta = beta;

diff --git a/Input/ICNConnectionConsumerApi.h b/Input/ICNConnectionConsumerApi.h
index 240ebca..9a5f8a4 100644 (file)
--- a/Input/ICNConnectionConsumerApi.h
+++ b/Input/ICNConnectionConsumerApi.h
@@ -80,7 +80,10 @@ public:
     const std::vector<dash::metrics::IHTTPTransaction *> &GetHTTPTransactionList() const;
     virtual void SetBeta(float beta);
     virtual void SetDrop(float drop);
+
+    //libl4::transport::IcnObserver
     virtual void notifyStats(double throughput);
+    virtual void notifyDownloadTime(double downloadingTime);
 
 private:
     libl4::http::HTTPClientConnection *hTTPClientConnection;

diff --git a/libdash/source/xml/Node.cpp b/libdash/source/xml/Node.cpp
index 0747a8e..5319320 100644 (file)
--- a/libdash/source/xml/Node.cpp
+++ b/libdash/source/xml/Node.cpp
@@ -209,7 +209,6 @@ dash::mpd::Timeline*                        Node::ToTimeline            ()  cons
 
     if (this->HasAttribute("t"))
     {
-        uint64_t yolo = strtoul(this->GetAttributeValue("t").c_str(), NULL, 10);
         timeline->SetStartTime(strtoul(this->GetAttributeValue("t").c_str(), NULL, 10));
     }
     if (this->HasAttribute("d"))