Dash: major warnings cleanup

All of them should be gone, except one.

diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
index 55798c5471cd76a3477c2ee72da8f4cd45002e55..c9708a9ce0f69f903dd0c20377d8ff2da0041967 100644 (file)
--- a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
@@ -51,7 +51,7 @@ Chunk*  AlwaysBestAdaptationLogic::getNextChunk () throw(EOFException)
     if(this->count == this->schedule.size())
         throw EOFException();
 
-    for(int i = 0; i < this->schedule.size(); i++)
+    for(size_t i = 0; i < this->schedule.size(); i++)
     {
         if(this->count == i)
         {
@@ -69,14 +69,14 @@ void    AlwaysBestAdaptationLogic::initSchedule ()
     {
         std::vector<Period *> periods = this->mpdManager->getPeriods();
 
-        for(int i = 0; i < periods.size(); i++)
+        for(size_t i = 0; i < periods.size(); i++)
         {
             Representation *best = this->mpdManager->getBestRepresentation(periods.at(i));
 
             if(best != NULL)
             {
                 std::vector<ISegment *> segments = this->mpdManager->getSegments(best);
-                for(int j = 0; j < segments.size(); j++)
+                for(size_t j = 0; j < segments.size(); j++)
                 {
                     this->schedule.push_back(segments.at(j));
                 }

diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
index 9c8273f1c1d13ee3e75e3c64d9a563b839a0e7e4..6c07d05e79e70e18e9d2145ee25a73dc2db87c7b 100644 (file)
--- a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
@@ -51,7 +51,7 @@ namespace dash
             private:
                 std::vector<dash::mpd::ISegment *>  schedule;
                 dash::mpd::IMPDManager              *mpdManager;
-                int                                 count;
+                size_t                              count;
 
                 void initSchedule();
         };

diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
index 0e57965204342a71ce2702b4b319e7c473799a21..498c7dfd909f1d211d64cd8ff816fe4517a6d7a6 100644 (file)
--- a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
@@ -67,7 +67,7 @@ Chunk*  RateBasedAdaptationLogic::getNextChunk () throw(EOFException)
         return this->getNextChunk();
     }
 
-    for(int i = 0; i < segments.size(); i++)
+    for(size_t i = 0; i < segments.size(); i++)
     {
         if(i == this->count)
         {
@@ -77,4 +77,5 @@ Chunk*  RateBasedAdaptationLogic::getNextChunk () throw(EOFException)
             return chunk;
         }
     }
+    return NULL;
 }

diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
index 2db342adb5a52e2ac23f365a38a350c74f0937a7..83379227c14842f5dea6f173e8ac1c1c3044ea54 100644 (file)
--- a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
@@ -46,7 +46,7 @@ namespace dash
 
             private:
                 dash::mpd::IMPDManager  *mpdManager;
-                int                     count;
+                size_t                  count;
                 dash::mpd::Period       *currentPeriod;
         };
     }

diff --git a/modules/stream_filter/dash/http/HTTPConnection.cpp b/modules/stream_filter/dash/http/HTTPConnection.cpp
index 07a4be24d4150de6113ada117757215e99edbbb3..8ca551d0d18ba86f03276ced9268abe9ac4a781f 100644 (file)
--- a/modules/stream_filter/dash/http/HTTPConnection.cpp
+++ b/modules/stream_filter/dash/http/HTTPConnection.cpp
@@ -109,13 +109,12 @@ std::string     HTTPConnection::readLine        ()
 }
 bool            HTTPConnection::sendData        (std::string data)
 {
-    size_t size = 0;
-    size = net_Write(this->stream, this->httpSocket, NULL, data.c_str(), data.size());
+    ssize_t size = net_Write(this->stream, this->httpSocket, NULL, data.c_str(), data.size());
     if (size == -1)
     {
         return false;
     }
-    if (size != data.length())
+    if ((size_t)size != data.length())
     {
         this->sendData(data.substr(size, data.size()));
     }

diff --git a/modules/stream_filter/dash/http/HTTPConnectionManager.cpp b/modules/stream_filter/dash/http/HTTPConnectionManager.cpp
index fb71f303cdc0504fbbf341f65ddb817c79e39e02..93c97e4c8b50c86df9ff36ff3a9dea657e4b6e91 100644 (file)
--- a/modules/stream_filter/dash/http/HTTPConnectionManager.cpp
+++ b/modules/stream_filter/dash/http/HTTPConnectionManager.cpp
@@ -75,7 +75,7 @@ bool                HTTPConnectionManager::closeConnection          (Chunk *chun
     delete(chunk);
     return ret;
 }
-bool                HTTPConnectionManager::closeAllConnections      ()
+void                HTTPConnectionManager::closeAllConnections      ()
 {
     for(std::vector<HTTPConnection *>::iterator it = this->connections.begin(); it != this->connections.end(); ++it)
     {
@@ -134,7 +134,7 @@ int                 HTTPConnectionManager::read                     (Chunk *chun
         this->bytesReadChunk    = 0;
         this->timeSecChunk      = 0;
 
-        HTTPConnection *con = this->initConnection(chunk);
+        this->initConnection(chunk);
         return this->read(chunk, p_buffer, len);
     }
 }
@@ -143,7 +143,7 @@ int                 HTTPConnectionManager::peek                     (Chunk *chun
     if(this->chunkMap.find(chunk) != this->chunkMap.end())
         return this->chunkMap[chunk]->peek(pp_peek, i_peek);
 
-    HTTPConnection *con = this->initConnection(chunk);
+    this->initConnection(chunk);
     return this->peek(chunk, pp_peek, i_peek);
 }
 HTTPConnection*     HTTPConnectionManager::initConnection           (Chunk *chunk)
@@ -161,6 +161,6 @@ void                HTTPConnectionManager::attach                   (IDownloadRa
 }
 void                HTTPConnectionManager::notify                   ()
 {
-    for(int i = 0; i < this->rateObservers.size(); i++)
+    for(size_t i = 0; i < this->rateObservers.size(); i++)
         this->rateObservers.at(i)->downloadRateChanged(this->bpsAvg, this->bpsLastChunk);
 }

diff --git a/modules/stream_filter/dash/http/HTTPConnectionManager.h b/modules/stream_filter/dash/http/HTTPConnectionManager.h
index 64f3bbea51ec0ed1c0de0bc9257d88cd9ea5a046..11487ed004432b5b5e6b0057f346d68eeb40b312 100644 (file)
--- a/modules/stream_filter/dash/http/HTTPConnectionManager.h
+++ b/modules/stream_filter/dash/http/HTTPConnectionManager.h
@@ -48,7 +48,7 @@ namespace dash
                 HTTPConnectionManager           (stream_t *stream);
                 virtual ~HTTPConnectionManager  ();
 
-                bool                closeAllConnections ();
+                void                closeAllConnections ();
                 bool                closeConnection     (IHTTPConnection *con);
                 IHTTPConnection*    getConnection       (std::string url);
                 int                 read                (Chunk *chunk, void *p_buffer, size_t len);

diff --git a/modules/stream_filter/dash/mpd/BasicCMManager.cpp b/modules/stream_filter/dash/mpd/BasicCMManager.cpp
index f982b0ac0bbd0f4b86e5af865fb922e0d68c9a04..7f224952dd9a35f610062ecdcbc52ba1cbdfeef4 100644 (file)
--- a/modules/stream_filter/dash/mpd/BasicCMManager.cpp
+++ b/modules/stream_filter/dash/mpd/BasicCMManager.cpp
@@ -50,7 +50,7 @@ std::vector<ISegment*>  BasicCMManager::getSegments             (Representation
 
         std::vector<Segment *> segments = info->getSegments();
 
-        for(int i = 0; i < segments.size(); i++)
+        for(size_t i = 0; i < segments.size(); i++)
             retSegments.push_back(segments.at(i));
     }
     catch(ElementNotPresentException &e)
@@ -71,10 +71,10 @@ Representation*         BasicCMManager::getBestRepresentation   (Period *period)
     long            bitrate  = 0;
     Representation  *best    = NULL;
 
-    for(int i = 0; i < groups.size(); i++)
+    for(size_t i = 0; i < groups.size(); i++)
     {
         std::vector<Representation *> reps = groups.at(i)->getRepresentations();
-        for(int j = 0; j < reps.size(); j++)
+        for(size_t j = 0; j < reps.size(); j++)
         {
             try
             {
@@ -110,10 +110,10 @@ Representation*         BasicCMManager::getRepresentation       (Period *period,
     Representation  *best       = NULL;
     long            bestDif  = -1;
 
-    for(int i = 0; i < groups.size(); i++)
+    for(size_t i = 0; i < groups.size(); i++)
     {
         std::vector<Representation *> reps = groups.at(i)->getRepresentations();
-        for(int j = 0; j < reps.size(); j++)
+        for(size_t j = 0; j < reps.size(); j++)
         {
             try
             {
@@ -148,7 +148,7 @@ Period*                 BasicCMManager::getNextPeriod           (Period *period)
 {
     std::vector<Period *> periods = this->mpd->getPeriods();
 
-    for(int i = 0; i < periods.size(); i++)
+    for(size_t i = 0; i < periods.size(); i++)
     {
         if(periods.at(i) == period && (i + 1) < periods.size())
             return periods.at(i + 1);

diff --git a/modules/stream_filter/dash/mpd/BasicCMParser.cpp b/modules/stream_filter/dash/mpd/BasicCMParser.cpp
index e508baf0105c09fdebca4ca67e8b1e876f5b2745..ab58f56062c0691e82393ac801a849b0a3d7480a 100644 (file)
--- a/modules/stream_filter/dash/mpd/BasicCMParser.cpp
+++ b/modules/stream_filter/dash/mpd/BasicCMParser.cpp
@@ -53,7 +53,7 @@ void    BasicCMParser::setMPDBaseUrl        (Node *root)
 {
     std::vector<Node *> baseUrls = DOMHelper::getChildElementByTagName(root, "BaseURL");
 
-    for(int i = 0; i < baseUrls.size(); i++)
+    for(size_t i = 0; i < baseUrls.size(); i++)
     {
         BaseUrl *url = new BaseUrl(baseUrls.at(i)->getText());
         this->mpd->addBaseUrl(url);
@@ -63,7 +63,7 @@ void    BasicCMParser::setPeriods           (Node *root)
 {
     std::vector<Node *> periods = DOMHelper::getElementByTagName(root, "Period", false);
 
-    for(int i = 0; i < periods.size(); i++)
+    for(size_t i = 0; i < periods.size(); i++)
     {
         Period *period = new Period(periods.at(i)->getAttributes());
         this->setGroups(periods.at(i), period);
@@ -74,7 +74,7 @@ void    BasicCMParser::setGroups            (Node *root, Period *period)
 {
     std::vector<Node *> groups = DOMHelper::getElementByTagName(root, "Group", false);
 
-    for(int i = 0; i < groups.size(); i++)
+    for(size_t i = 0; i < groups.size(); i++)
     {
         Group *group = new Group(groups.at(i)->getAttributes());
         this->setRepresentations(groups.at(i), group);
@@ -85,7 +85,7 @@ void    BasicCMParser::setRepresentations   (Node *root, Group *group)
 {
     std::vector<Node *> representations = DOMHelper::getElementByTagName(root, "Representation", false);
 
-    for(int i = 0; i < representations.size(); i++)
+    for(size_t i = 0; i < representations.size(); i++)
     {
         Representation *rep = new Representation(representations.at(i)->getAttributes());
         this->setSegmentInfo(representations.at(i), rep);
@@ -96,7 +96,7 @@ void    BasicCMParser::setSegmentInfo       (Node *root, Representation *rep)
 {
     std::vector<Node *> segmentInfo = DOMHelper::getChildElementByTagName(root, "SegmentInfo");
 
-    for(int i = 0; i < segmentInfo.size(); i++)
+    for(size_t i = 0; i < segmentInfo.size(); i++)
     {
         SegmentInfo *info = new SegmentInfo(segmentInfo.at(i)->getAttributes());
         this->setInitSegment(segmentInfo.at(i), info);
@@ -109,7 +109,7 @@ void    BasicCMParser::setInitSegment       (Node *root, SegmentInfo *info)
 {
     std::vector<Node *> initSeg = DOMHelper::getChildElementByTagName(root, "InitialisationSegmentURL");
 
-    for(int i = 0; i < initSeg.size(); i++)
+    for(size_t i = 0; i < initSeg.size(); i++)
     {
         InitSegment *seg = new InitSegment(initSeg.at(i)->getAttributes());
         info->setInitSegment(seg);
@@ -120,7 +120,7 @@ void    BasicCMParser::setSegments          (Node *root, SegmentInfo *info)
 {
     std::vector<Node *> segments = DOMHelper::getElementByTagName(root, "Url", false);
 
-    for(int i = 0; i < segments.size(); i++)
+    for(size_t i = 0; i < segments.size(); i++)
     {
         Segment *seg = new Segment(segments.at(i)->getAttributes());
         info->addSegment(seg);

diff --git a/modules/stream_filter/dash/mpd/Group.cpp b/modules/stream_filter/dash/mpd/Group.cpp
index 1807f048508ba94f6cf6b9dc5952f0cbb87b433b..5178ddf9059c2346b694cd2aff0274e634b3d92f 100644 (file)
--- a/modules/stream_filter/dash/mpd/Group.cpp
+++ b/modules/stream_filter/dash/mpd/Group.cpp
@@ -37,7 +37,7 @@ Group::Group    (std::map<std::string, std::string>  attributes)
 }
 Group::~Group   ()
 {
-    for(int i = 0; i < this->representations.size(); i++)
+    for(size_t i = 1; i < this->representations.size(); i++)
         delete(this->representations.at(i));
 
     delete(this->contentProtection);

diff --git a/modules/stream_filter/dash/mpd/MPD.cpp b/modules/stream_filter/dash/mpd/MPD.cpp
index 1157f65d90af4f950d1093acd7a6855d035d169a..69b4c05f17433c05e1bb2e4a933a6a4e410fa307 100644 (file)
--- a/modules/stream_filter/dash/mpd/MPD.cpp
+++ b/modules/stream_filter/dash/mpd/MPD.cpp
@@ -41,10 +41,10 @@ MPD::MPD    ()
 }
 MPD::~MPD   ()
 {
-    for(int i = 0; i < this->periods.size(); i++)
+    for(size_t i = 0; i < this->periods.size(); i++)
         delete(this->periods.at(i));
 
-    for(int i = 0; i < this->baseUrls.size(); i++)
+    for(size_t i = 0; i < this->baseUrls.size(); i++)
         delete(this->baseUrls.at(i));
 
     delete(this->programInfo);

diff --git a/modules/stream_filter/dash/mpd/NullManager.cpp b/modules/stream_filter/dash/mpd/NullManager.cpp
index 4568b832351f38e2330873339e77526e1b4f5079..ff1262ec452cac7cbffe382b3b59d5af32c7a68e 100644 (file)
--- a/modules/stream_filter/dash/mpd/NullManager.cpp
+++ b/modules/stream_filter/dash/mpd/NullManager.cpp
@@ -45,19 +45,19 @@ Period*                 NullManager::getFirstPeriod          ()
 {
     return NULL;
 }
-Period*                 NullManager::getNextPeriod           (Period *period)
+Period*                 NullManager::getNextPeriod           (Period *)
 {
     return NULL;
 }
-Representation*         NullManager::getBestRepresentation   (Period *period)
+Representation*         NullManager::getBestRepresentation   (Period *)
 {
     return NULL;
 }
-std::vector<ISegment *> NullManager::getSegments             (Representation *rep)
+std::vector<ISegment *> NullManager::getSegments             (Representation *)
 {
     return std::vector<ISegment *>();
 }
-Representation*         NullManager::getRepresentation       (Period *period, long bitrate)
+Representation*         NullManager::getRepresentation       (Period *, long )
 {
     return NULL;
 }

diff --git a/modules/stream_filter/dash/mpd/Period.cpp b/modules/stream_filter/dash/mpd/Period.cpp
index 4a795be4a145f0fe27afe2e071c320045d46e4f0..98b2c74f8125c3d52853fdc49ffaed565d301e31 100644 (file)
--- a/modules/stream_filter/dash/mpd/Period.cpp
+++ b/modules/stream_filter/dash/mpd/Period.cpp
@@ -35,7 +35,7 @@ Period::Period  (std::map<std::string, std::string> attributes)
 }
 Period::~Period ()
 {
-    for(int i = 0; i < this->groups.size(); i++)
+    for(size_t i = 0; i < this->groups.size(); i++)
         delete(this->groups.at(i));
 }
 

diff --git a/modules/stream_filter/dash/mpd/SegmentInfo.cpp b/modules/stream_filter/dash/mpd/SegmentInfo.cpp
index cf66359e89e3ffd178f7b62e20dbe1a3c7f8011f..703a54b311649051ee6b6f80bd7098853d9ddfd3 100644 (file)
--- a/modules/stream_filter/dash/mpd/SegmentInfo.cpp
+++ b/modules/stream_filter/dash/mpd/SegmentInfo.cpp
@@ -37,7 +37,7 @@ SegmentInfo::SegmentInfo(std::map<std::string,std::string> attr)
 }
 SegmentInfo::~SegmentInfo   ()
 {
-    for(int i = 0; i < this->segments.size(); i++)
+    for(size_t i = 0; i < this->segments.size(); i++)
         delete(this->segments.at(i));
 
     delete(this->initSeg);

diff --git a/modules/stream_filter/dash/xml/DOMHelper.cpp b/modules/stream_filter/dash/xml/DOMHelper.cpp
index a053237f7232e9d667eed7f9972b64989b7cd2c5..581bda59fbb93ab74a7f61ddd565bbf083cfd0f4 100644 (file)
--- a/modules/stream_filter/dash/xml/DOMHelper.cpp
+++ b/modules/stream_filter/dash/xml/DOMHelper.cpp
@@ -33,7 +33,7 @@ std::vector<Node *> DOMHelper::getElementByTagName      (Node *root, std::string
 {
     std::vector<Node *> elements;
 
-    for(int i = 0; i < root->getSubNodes().size(); i++)
+    for(size_t i = 0; i < root->getSubNodes().size(); i++)
     {
         getElementsByTagName(root->getSubNodes().at(i), name, &elements, selfContain);
     }
@@ -44,7 +44,7 @@ std::vector<Node *> DOMHelper::getChildElementByTagName (Node *root, std::string
 {
     std::vector<Node *> elements;
 
-    for(int i = 0; i < root->getSubNodes().size(); i++)
+    for(size_t i = 0; i < root->getSubNodes().size(); i++)
     {
         if(!root->getSubNodes().at(i)->getName().compare(name))
             elements.push_back(root->getSubNodes().at(i));
@@ -63,7 +63,7 @@ void                DOMHelper::getElementsByTagName     (Node *root, std::string
     if(!root->getName().compare(name))
         elements->push_back(root);
 
-    for(int i = 0; i < root->getSubNodes().size(); i++)
+    for(size_t i = 0; i < root->getSubNodes().size(); i++)
     {
         getElementsByTagName(root->getSubNodes().at(i), name, elements, selfContain);
     }

diff --git a/modules/stream_filter/dash/xml/DOMParser.cpp b/modules/stream_filter/dash/xml/DOMParser.cpp
index 0cd74d696acfdb6a8325686da1eb1dd925e0792e..9ed486d41355c8c054f1222e44d2adcf13c81ed9 100644 (file)
--- a/modules/stream_filter/dash/xml/DOMParser.cpp
+++ b/modules/stream_filter/dash/xml/DOMParser.cpp
@@ -109,14 +109,14 @@ void    DOMParser::print                    (Node *node, int offset)
 
     std::vector<std::string> keys = node->getAttributeKeys();
 
-    for(int i = 0; i < keys.size(); i++)
+    for(size_t i = 0; i < keys.size(); i++)
         msg_Dbg(this->stream, " %s=%s", keys.at(i).c_str(), node->getAttributeValue(keys.at(i)).c_str());
 
     msg_Dbg(this->stream, "\n");
 
     offset++;
 
-    for(int i = 0; i < node->getSubNodes().size(); i++)
+    for(size_t i = 0; i < node->getSubNodes().size(); i++)
     {
         this->print(node->getSubNodes().at(i), offset);
     }

diff --git a/modules/stream_filter/dash/xml/Node.cpp b/modules/stream_filter/dash/xml/Node.cpp
index 20914a85f508e8b4fbd44f3210b7492dc24e97d8..3f2b5493f183083b66e72f73d0d30a0108341d79 100644 (file)
--- a/modules/stream_filter/dash/xml/Node.cpp
+++ b/modules/stream_filter/dash/xml/Node.cpp
@@ -34,7 +34,7 @@ Node::Node  ()
 }
 Node::~Node ()
 {
-    for(int i = 0; i < this->subNodes.size(); i++)
+    for(size_t i = 0; i < this->subNodes.size(); i++)
         delete(this->subNodes.at(i));
 }