[vlc-commits] dash: Use a const Representation to extract segments.

Hugo Beauzée-Luyssen git at videolan.org
Thu Feb 2 14:40:25 CET 2012


vlc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Wed Feb  1 18:58:04 2012 +0100| [5299df74641c9f20a2009798e16363f5f1d12b4b] | committer: Hugo Beauzée-Luyssen

dash: Use a const Representation to extract segments.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5299df74641c9f20a2009798e16363f5f1d12b4b
---

 modules/stream_filter/dash/mpd/BasicCMManager.cpp  |    3 ++-
 modules/stream_filter/dash/mpd/BasicCMManager.h    |    2 +-
 modules/stream_filter/dash/mpd/IMPDManager.h       |    2 +-
 .../stream_filter/dash/mpd/IsoffMainManager.cpp    |    2 +-
 modules/stream_filter/dash/mpd/IsoffMainManager.h  |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/stream_filter/dash/mpd/BasicCMManager.cpp b/modules/stream_filter/dash/mpd/BasicCMManager.cpp
index 8b3c519..855dc50 100644
--- a/modules/stream_filter/dash/mpd/BasicCMManager.cpp
+++ b/modules/stream_filter/dash/mpd/BasicCMManager.cpp
@@ -40,7 +40,7 @@ BasicCMManager::~BasicCMManager ()
     delete this->mpd;
 }
 
-std::vector<Segment*>   BasicCMManager::getSegments( Representation *rep )
+std::vector<Segment*>   BasicCMManager::getSegments( const Representation *rep )
 {
     std::vector<Segment *>          retSegments;
     SegmentInfo*                    info = rep->getSegmentInfo();
@@ -134,3 +134,4 @@ const MPD*      BasicCMManager::getMPD() const
 {
     return this->mpd;
 }
+
diff --git a/modules/stream_filter/dash/mpd/BasicCMManager.h b/modules/stream_filter/dash/mpd/BasicCMManager.h
index fec5cec..98fb832 100644
--- a/modules/stream_filter/dash/mpd/BasicCMManager.h
+++ b/modules/stream_filter/dash/mpd/BasicCMManager.h
@@ -51,7 +51,7 @@ namespace dash
                 Period*                         getFirstPeriod();
                 Period*                         getNextPeriod( Period *period );
                 Representation*                 getBestRepresentation( Period *period );
-                std::vector<Segment *>          getSegments( Representation *rep );
+                std::vector<Segment *>          getSegments( const Representation *rep );
                 Representation*                 getRepresentation( Period *period, int bitrate );
                 const MPD*                      getMPD() const;
 
diff --git a/modules/stream_filter/dash/mpd/IMPDManager.h b/modules/stream_filter/dash/mpd/IMPDManager.h
index bb4bdc8..eb51b6c 100644
--- a/modules/stream_filter/dash/mpd/IMPDManager.h
+++ b/modules/stream_filter/dash/mpd/IMPDManager.h
@@ -49,7 +49,7 @@ namespace dash
                 virtual Period*                 getFirstPeriod          ()                              = 0;
                 virtual Period*                 getNextPeriod           (Period *period)                = 0;
                 virtual Representation*         getBestRepresentation   (Period *period)                = 0;
-                virtual std::vector<Segment *>  getSegments(Representation *rep ) = 0;
+                virtual std::vector<Segment *>  getSegments( const Representation *rep ) = 0;
                 virtual Representation*         getRepresentation       (Period *period, int bitrate)   = 0;
                 virtual const MPD*              getMPD                  () const = 0;
                 virtual ~IMPDManager(){}
diff --git a/modules/stream_filter/dash/mpd/IsoffMainManager.cpp b/modules/stream_filter/dash/mpd/IsoffMainManager.cpp
index 6f70001..e8bfea8 100644
--- a/modules/stream_filter/dash/mpd/IsoffMainManager.cpp
+++ b/modules/stream_filter/dash/mpd/IsoffMainManager.cpp
@@ -39,7 +39,7 @@ IsoffMainManager::~IsoffMainManager ()
     delete this->mpd;
 }
 
-std::vector<Segment*>       IsoffMainManager::getSegments           (Representation *rep)
+std::vector<Segment*>       IsoffMainManager::getSegments           (const Representation *rep)
 {
     std::vector<Segment *>  retSegments;
     SegmentList*            list= rep->getSegmentList();
diff --git a/modules/stream_filter/dash/mpd/IsoffMainManager.h b/modules/stream_filter/dash/mpd/IsoffMainManager.h
index 6b17795..933e9f1 100644
--- a/modules/stream_filter/dash/mpd/IsoffMainManager.h
+++ b/modules/stream_filter/dash/mpd/IsoffMainManager.h
@@ -51,7 +51,7 @@ namespace dash
                 Period*                         getFirstPeriod          ();
                 Period*                         getNextPeriod           (Period *period);
                 Representation*                 getBestRepresentation   (Period *period);
-                std::vector<Segment *>          getSegments             (Representation *rep);
+                std::vector<Segment *>          getSegments             (const Representation *rep);
                 Representation*                 getRepresentation       (Period *period, int bitrate);
                 const MPD*                      getMPD                  () const;
 



More information about the vlc-commits mailing list