[vlc-commits] demux: adaptive: playlist is no longer abstract
Francois Cartegnie
git at videolan.org
Tue Jan 5 20:25:27 UTC 2021
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec 30 09:08:22 2020 +0100| [5b73d3b813abf257bdb9ab1fe002ce30d631270c] | committer: Francois Cartegnie
demux: adaptive: playlist is no longer abstract
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b73d3b813abf257bdb9ab1fe002ce30d631270c
---
modules/demux/Makefile.am | 4 +-
modules/demux/adaptive/PlaylistManager.cpp | 4 +-
modules/demux/adaptive/PlaylistManager.h | 6 +--
modules/demux/adaptive/SegmentTracker.cpp | 2 +-
modules/demux/adaptive/logic/BufferingLogic.cpp | 14 ++---
modules/demux/adaptive/logic/BufferingLogic.hpp | 18 +++----
modules/demux/adaptive/playlist/BasePeriod.cpp | 6 +--
modules/demux/adaptive/playlist/BasePeriod.h | 6 +--
.../{AbstractPlaylist.cpp => BasePlaylist.cpp} | 60 +++++++++++++---------
.../{AbstractPlaylist.hpp => BasePlaylist.hpp} | 24 ++++-----
.../demux/adaptive/playlist/BaseRepresentation.cpp | 2 +-
.../demux/adaptive/playlist/BaseRepresentation.h | 2 +-
modules/demux/adaptive/playlist/Segment.cpp | 2 +-
.../demux/adaptive/playlist/SegmentInformation.cpp | 6 +--
.../demux/adaptive/playlist/SegmentInformation.hpp | 6 +--
.../demux/adaptive/playlist/SegmentTemplate.cpp | 6 +--
modules/demux/dash/mpd/DASHSegment.cpp | 2 +-
modules/demux/dash/mpd/MPD.cpp | 2 +-
modules/demux/dash/mpd/MPD.h | 4 +-
modules/demux/hls/playlist/M3U8.cpp | 9 +---
modules/demux/hls/playlist/M3U8.hpp | 5 +-
modules/demux/hls/playlist/Representation.cpp | 4 +-
modules/demux/smooth/mp4/IndexReader.cpp | 2 +-
modules/demux/smooth/playlist/Manifest.cpp | 9 +---
modules/demux/smooth/playlist/Manifest.hpp | 5 +-
modules/demux/smooth/playlist/SmoothSegment.cpp | 2 +-
26 files changed, 103 insertions(+), 109 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index d87639d6ad..2fbf70b481 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -296,12 +296,12 @@ demux_LTLIBRARIES += libts_plugin.la
endif
libadaptive_plugin_la_SOURCES = \
- demux/adaptive/playlist/AbstractPlaylist.cpp \
- demux/adaptive/playlist/AbstractPlaylist.hpp \
demux/adaptive/playlist/BaseAdaptationSet.cpp \
demux/adaptive/playlist/BaseAdaptationSet.h \
demux/adaptive/playlist/BasePeriod.cpp \
demux/adaptive/playlist/BasePeriod.h \
+ demux/adaptive/playlist/BasePlaylist.cpp \
+ demux/adaptive/playlist/BasePlaylist.hpp \
demux/adaptive/playlist/BaseRepresentation.cpp \
demux/adaptive/playlist/BaseRepresentation.h \
demux/adaptive/playlist/CommonAttributesElements.cpp \
diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 0b358fe299..c8156dffa8 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -26,7 +26,7 @@
#include "PlaylistManager.h"
#include "SegmentTracker.hpp"
#include "SharedResources.hpp"
-#include "playlist/AbstractPlaylist.hpp"
+#include "playlist/BasePlaylist.hpp"
#include "playlist/BasePeriod.h"
#include "playlist/BaseAdaptationSet.h"
#include "playlist/BaseRepresentation.h"
@@ -55,7 +55,7 @@ using vlc::threads::mutex_locker;
PlaylistManager::PlaylistManager( demux_t *p_demux_,
SharedResources *res,
- AbstractPlaylist *pl,
+ BasePlaylist *pl,
AbstractStreamFactory *factory,
AbstractAdaptationLogic::LogicType type ) :
logicType ( type ),
diff --git a/modules/demux/adaptive/PlaylistManager.h b/modules/demux/adaptive/PlaylistManager.h
index d540367636..6a93b95840 100644
--- a/modules/demux/adaptive/PlaylistManager.h
+++ b/modules/demux/adaptive/PlaylistManager.h
@@ -32,7 +32,7 @@ namespace adaptive
{
namespace playlist
{
- class AbstractPlaylist;
+ class BasePlaylist;
class BasePeriod;
}
@@ -49,7 +49,7 @@ namespace adaptive
public:
PlaylistManager( demux_t *,
SharedResources *,
- AbstractPlaylist *,
+ BasePlaylist *,
AbstractStreamFactory *,
AbstractAdaptationLogic::LogicType type );
virtual ~PlaylistManager ();
@@ -99,7 +99,7 @@ namespace adaptive
AbstractAdaptationLogic::LogicType logicType;
AbstractAdaptationLogic *logic;
AbstractBufferingLogic *bufferingLogic;
- AbstractPlaylist *playlist;
+ BasePlaylist *playlist;
AbstractStreamFactory *streamFactory;
demux_t *p_demux;
std::vector<AbstractStream *> streams;
diff --git a/modules/demux/adaptive/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
index ac05c6e62c..71395e0901 100644
--- a/modules/demux/adaptive/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -23,7 +23,7 @@
#endif
#include "SegmentTracker.hpp"
-#include "playlist/AbstractPlaylist.hpp"
+#include "playlist/BasePlaylist.hpp"
#include "playlist/BaseRepresentation.h"
#include "playlist/BaseAdaptationSet.h"
#include "playlist/Segment.h"
diff --git a/modules/demux/adaptive/logic/BufferingLogic.cpp b/modules/demux/adaptive/logic/BufferingLogic.cpp
index 0622d94690..b1430ddf0b 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.cpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.cpp
@@ -24,7 +24,7 @@
#include "BufferingLogic.hpp"
#include "../playlist/BaseRepresentation.h"
#include "../playlist/BasePeriod.h"
-#include "../playlist/AbstractPlaylist.hpp"
+#include "../playlist/BasePlaylist.hpp"
#include "../playlist/SegmentTemplate.h"
#include "../playlist/SegmentTimeline.h"
#include "../playlist/SegmentList.h"
@@ -84,7 +84,7 @@ uint64_t DefaultBufferingLogic::getStartSegmentNumber(BaseRepresentation *rep) c
return profile ? profile->getStartSegmentNumber() : 0;
}
-vlc_tick_t DefaultBufferingLogic::getMinBuffering(const AbstractPlaylist *p) const
+vlc_tick_t DefaultBufferingLogic::getMinBuffering(const BasePlaylist *p) const
{
if(isLowLatency(p))
return BUFFERING_LOWEST_LIMIT;
@@ -96,7 +96,7 @@ vlc_tick_t DefaultBufferingLogic::getMinBuffering(const AbstractPlaylist *p) con
return std::max(buffering, BUFFERING_LOWEST_LIMIT);
}
-vlc_tick_t DefaultBufferingLogic::getMaxBuffering(const AbstractPlaylist *p) const
+vlc_tick_t DefaultBufferingLogic::getMaxBuffering(const BasePlaylist *p) const
{
if(isLowLatency(p))
return getMinBuffering(p);
@@ -110,7 +110,7 @@ vlc_tick_t DefaultBufferingLogic::getMaxBuffering(const AbstractPlaylist *p) con
return std::max(buffering, getMinBuffering(p));
}
-vlc_tick_t DefaultBufferingLogic::getLiveDelay(const AbstractPlaylist *p) const
+vlc_tick_t DefaultBufferingLogic::getLiveDelay(const BasePlaylist *p) const
{
if(isLowLatency(p))
return getMinBuffering(p);
@@ -125,7 +125,7 @@ vlc_tick_t DefaultBufferingLogic::getLiveDelay(const AbstractPlaylist *p) const
uint64_t DefaultBufferingLogic::getLiveStartSegmentNumber(BaseRepresentation *rep) const
{
- AbstractPlaylist *playlist = rep->getPlaylist();
+ BasePlaylist *playlist = rep->getPlaylist();
/* Get buffering offset min <= max <= live delay */
vlc_tick_t i_buffering = getBufferingOffset(playlist);
@@ -358,12 +358,12 @@ uint64_t DefaultBufferingLogic::getLiveStartSegmentNumber(BaseRepresentation *re
return std::numeric_limits<uint64_t>::max();
}
-vlc_tick_t DefaultBufferingLogic::getBufferingOffset(const AbstractPlaylist *p) const
+vlc_tick_t DefaultBufferingLogic::getBufferingOffset(const BasePlaylist *p) const
{
return p->isLive() ? getLiveDelay(p) : getMaxBuffering(p);
}
-bool DefaultBufferingLogic::isLowLatency(const AbstractPlaylist *p) const
+bool DefaultBufferingLogic::isLowLatency(const BasePlaylist *p) const
{
if(userLowLatency.isSet())
return userLowLatency.value();
diff --git a/modules/demux/adaptive/logic/BufferingLogic.hpp b/modules/demux/adaptive/logic/BufferingLogic.hpp
index 72973b9966..e46c28818d 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.hpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.hpp
@@ -29,7 +29,7 @@ namespace adaptive
namespace playlist
{
class BaseRepresentation;
- class AbstractPlaylist;
+ class BasePlaylist;
}
namespace logic
@@ -43,9 +43,9 @@ namespace adaptive
virtual ~AbstractBufferingLogic() {}
virtual uint64_t getStartSegmentNumber(BaseRepresentation *) const = 0;
- virtual vlc_tick_t getMinBuffering(const AbstractPlaylist *) const = 0;
- virtual vlc_tick_t getMaxBuffering(const AbstractPlaylist *) const = 0;
- virtual vlc_tick_t getLiveDelay(const AbstractPlaylist *) const = 0;
+ virtual vlc_tick_t getMinBuffering(const BasePlaylist *) const = 0;
+ virtual vlc_tick_t getMaxBuffering(const BasePlaylist *) const = 0;
+ virtual vlc_tick_t getLiveDelay(const BasePlaylist *) const = 0;
void setUserMinBuffering(vlc_tick_t);
void setUserMaxBuffering(vlc_tick_t);
void setUserLiveDelay(vlc_tick_t);
@@ -68,14 +68,14 @@ namespace adaptive
DefaultBufferingLogic();
virtual ~DefaultBufferingLogic() {}
virtual uint64_t getStartSegmentNumber(BaseRepresentation *) const; /* impl */
- virtual vlc_tick_t getMinBuffering(const AbstractPlaylist *) const; /* impl */
- virtual vlc_tick_t getMaxBuffering(const AbstractPlaylist *) const; /* impl */
- virtual vlc_tick_t getLiveDelay(const AbstractPlaylist *) const; /* impl */
+ virtual vlc_tick_t getMinBuffering(const BasePlaylist *) const; /* impl */
+ virtual vlc_tick_t getMaxBuffering(const BasePlaylist *) const; /* impl */
+ virtual vlc_tick_t getLiveDelay(const BasePlaylist *) const; /* impl */
protected:
- vlc_tick_t getBufferingOffset(const AbstractPlaylist *) const;
+ vlc_tick_t getBufferingOffset(const BasePlaylist *) const;
uint64_t getLiveStartSegmentNumber(BaseRepresentation *) const;
- bool isLowLatency(const AbstractPlaylist *) const;
+ bool isLowLatency(const BasePlaylist *) const;
};
}
}
diff --git a/modules/demux/adaptive/playlist/BasePeriod.cpp b/modules/demux/adaptive/playlist/BasePeriod.cpp
index 16229771e2..90f2ee110f 100644
--- a/modules/demux/adaptive/playlist/BasePeriod.cpp
+++ b/modules/demux/adaptive/playlist/BasePeriod.cpp
@@ -27,7 +27,7 @@
#endif
#include "BasePeriod.h"
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include "SegmentBaseType.hpp"
#include "../Streams.hpp"
@@ -37,7 +37,7 @@
using namespace adaptive::playlist;
-BasePeriod::BasePeriod(AbstractPlaylist *playlist_) :
+BasePeriod::BasePeriod(BasePlaylist *playlist_) :
SegmentInformation( playlist_ )
{
duration.Set(0);
@@ -51,7 +51,7 @@ BasePeriod::~BasePeriod ()
childs.clear();
}
-AbstractPlaylist *BasePeriod::getPlaylist() const
+BasePlaylist *BasePeriod::getPlaylist() const
{
return playlist;
}
diff --git a/modules/demux/adaptive/playlist/BasePeriod.h b/modules/demux/adaptive/playlist/BasePeriod.h
index 814b41db9e..b8f326ba88 100644
--- a/modules/demux/adaptive/playlist/BasePeriod.h
+++ b/modules/demux/adaptive/playlist/BasePeriod.h
@@ -37,7 +37,7 @@ namespace adaptive
class BasePeriod : public SegmentInformation
{
public:
- BasePeriod(AbstractPlaylist *);
+ BasePeriod(BasePlaylist *);
virtual ~BasePeriod ();
const std::vector<BaseAdaptationSet *>& getAdaptationSets () const;
@@ -47,14 +47,14 @@ namespace adaptive
virtual vlc_tick_t getPeriodStart() const; /* reimpl */
virtual vlc_tick_t getPeriodDuration() const;
- virtual AbstractPlaylist *getPlaylist() const; /* reimpl */
+ virtual BasePlaylist *getPlaylist() const; /* reimpl */
Property<vlc_tick_t> duration;
Property<vlc_tick_t> startTime;
private:
std::vector<BaseAdaptationSet *> adaptationSets;
- AbstractPlaylist *playlist;
+ BasePlaylist *playlist;
};
}
}
diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/BasePlaylist.cpp
similarity index 64%
rename from modules/demux/adaptive/playlist/AbstractPlaylist.cpp
rename to modules/demux/adaptive/playlist/BasePlaylist.cpp
index a1255431c7..9fffe77e8d 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/BasePlaylist.cpp
@@ -1,8 +1,8 @@
/*
- * AbstractAbstractPlaylist.cpp
+ * BasePlaylist.cpp
*****************************************************************************
* Copyright (C) 2010 - 2011 Klagenfurt University
- * Copyright (C) 2015 VideoLAN and VLC authors
+ * Copyright (C) 2015 - 2020 VideoLabs, VideoLAN and VLC authors
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
@@ -22,7 +22,7 @@
# include "config.h"
#endif
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include "../tools/Helper.h"
#include "BasePeriod.h"
#include "SegmentTimeline.h"
@@ -33,7 +33,7 @@
using namespace adaptive::playlist;
-AbstractPlaylist::AbstractPlaylist (vlc_object_t *p_object_) :
+BasePlaylist::BasePlaylist (vlc_object_t *p_object_) :
ICanonicalUrl(), AttrsNode(Type::PLAYLIST),
p_object(p_object_)
{
@@ -50,64 +50,69 @@ AbstractPlaylist::AbstractPlaylist (vlc_object_t *p_object_) :
b_needsUpdates = true;
}
-AbstractPlaylist::~AbstractPlaylist()
+BasePlaylist::~BasePlaylist()
{
for(size_t i = 0; i < this->periods.size(); i++)
delete(this->periods.at(i));
}
-const std::vector<BasePeriod *>& AbstractPlaylist::getPeriods()
+const std::vector<BasePeriod *>& BasePlaylist::getPeriods()
{
return periods;
}
-void AbstractPlaylist::addBaseUrl(const std::string &url)
+void BasePlaylist::addBaseUrl(const std::string &url)
{
baseUrls.push_back(url);
}
-void AbstractPlaylist::setPlaylistUrl(const std::string &url)
+void BasePlaylist::setPlaylistUrl(const std::string &url)
{
playlistUrl = url;
}
-void AbstractPlaylist::addPeriod(BasePeriod *period)
+void BasePlaylist::addPeriod(BasePeriod *period)
{
period->setParentNode(this);
periods.push_back(period);
}
-bool AbstractPlaylist::isLowLatency() const
+bool BasePlaylist::isLive() const
{
return false;
}
-void AbstractPlaylist::setType(const std::string &type_)
+bool BasePlaylist::isLowLatency() const
+{
+ return false;
+}
+
+void BasePlaylist::setType(const std::string &type_)
{
type = type_;
}
-void AbstractPlaylist::setMinBuffering( vlc_tick_t min )
+void BasePlaylist::setMinBuffering( vlc_tick_t min )
{
minBufferTime = min;
}
-void AbstractPlaylist::setMaxBuffering( vlc_tick_t max )
+void BasePlaylist::setMaxBuffering( vlc_tick_t max )
{
maxBufferTime = max;
}
-vlc_tick_t AbstractPlaylist::getMinBuffering() const
+vlc_tick_t BasePlaylist::getMinBuffering() const
{
return minBufferTime;
}
-vlc_tick_t AbstractPlaylist::getMaxBuffering() const
+vlc_tick_t BasePlaylist::getMaxBuffering() const
{
return maxBufferTime;
}
-Url AbstractPlaylist::getUrlSegment() const
+Url BasePlaylist::getUrlSegment() const
{
Url ret;
@@ -120,12 +125,12 @@ Url AbstractPlaylist::getUrlSegment() const
return ret;
}
-vlc_object_t * AbstractPlaylist::getVLCObject() const
+vlc_object_t * BasePlaylist::getVLCObject() const
{
return p_object;
}
-BasePeriod* AbstractPlaylist::getFirstPeriod()
+BasePeriod* BasePlaylist::getFirstPeriod()
{
std::vector<BasePeriod *> periods = getPeriods();
@@ -135,7 +140,7 @@ BasePeriod* AbstractPlaylist::getFirstPeriod()
return NULL;
}
-BasePeriod* AbstractPlaylist::getNextPeriod(BasePeriod *period)
+BasePeriod* BasePlaylist::getNextPeriod(BasePeriod *period)
{
std::vector<BasePeriod *> periods = getPeriods();
@@ -148,17 +153,22 @@ BasePeriod* AbstractPlaylist::getNextPeriod(BasePeriod *period)
return NULL;
}
-bool AbstractPlaylist::needsUpdates() const
+bool BasePlaylist::needsUpdates() const
{
return b_needsUpdates;
}
-void AbstractPlaylist::updateWith(AbstractPlaylist *updatedAbstractPlaylist)
+void BasePlaylist::updateWith(BasePlaylist *updatedPlaylist)
{
- availabilityEndTime.Set(updatedAbstractPlaylist->availabilityEndTime.Get());
+ availabilityEndTime.Set(updatedPlaylist->availabilityEndTime.Get());
- for(size_t i = 0; i < periods.size() && i < updatedAbstractPlaylist->periods.size(); i++)
- periods.at(i)->updateWith(updatedAbstractPlaylist->periods.at(i));
+ for(size_t i = 0; i < periods.size() && i < updatedPlaylist->periods.size(); i++)
+ periods.at(i)->updateWith(updatedPlaylist->periods.at(i));
}
-
+void BasePlaylist::debug() const
+{
+ std::vector<BasePeriod *>::const_iterator i;
+ for(i = periods.begin(); i != periods.end(); ++i)
+ (*i)->debug(VLC_OBJECT(p_object));
+}
diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp b/modules/demux/adaptive/playlist/BasePlaylist.hpp
similarity index 85%
rename from modules/demux/adaptive/playlist/AbstractPlaylist.hpp
rename to modules/demux/adaptive/playlist/BasePlaylist.hpp
index f8c665941d..e501767b11 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
+++ b/modules/demux/adaptive/playlist/BasePlaylist.hpp
@@ -1,8 +1,8 @@
/*
- * AbstractPlaylist.hpp
+ * BasePlaylist.hpp
*****************************************************************************
* Copyright (C) 2010 - 2011 Klagenfurt University
- * Copyright (C) 2015 VideoLAN and VLC authors
+ * Copyright (C) 2015 - 2020 VideoLabs, VideoLAN and VLC authors
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef ABSTRACTPLAYLIST_HPP_
-#define ABSTRACTPLAYLIST_HPP_
+#ifndef BASEPLAYLIST_HPP_
+#define BASEPLAYLIST_HPP_
#include <vector>
#include <string>
@@ -35,21 +35,21 @@ namespace adaptive
{
class BasePeriod;
- class AbstractPlaylist : public ICanonicalUrl,
- public AttrsNode
+ class BasePlaylist : public ICanonicalUrl,
+ public AttrsNode
{
public:
- AbstractPlaylist(vlc_object_t *);
- virtual ~AbstractPlaylist();
+ BasePlaylist(vlc_object_t *);
+ virtual ~BasePlaylist();
- virtual bool isLive() const = 0;
+ virtual bool isLive() const;
virtual bool isLowLatency() const;
void setType(const std::string &);
void setMinBuffering( vlc_tick_t );
void setMaxBuffering( vlc_tick_t );
vlc_tick_t getMinBuffering() const;
vlc_tick_t getMaxBuffering() const;
- virtual void debug() = 0;
+ void debug() const;
void addPeriod (BasePeriod *period);
void addBaseUrl (const std::string &);
@@ -63,7 +63,7 @@ namespace adaptive
virtual BasePeriod* getNextPeriod(BasePeriod *period);
bool needsUpdates() const;
- void updateWith(AbstractPlaylist *);
+ void updateWith(BasePlaylist *);
Property<vlc_tick_t> duration;
Property<time_t> playbackStart;
@@ -86,4 +86,4 @@ namespace adaptive
};
}
}
-#endif /* ABSTRACTPLAYLIST_HPP_ */
+#endif /* BASEPLAYLIST_HPP_ */
diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.cpp b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
index 787be04cdd..1f31d6b159 100644
--- a/modules/demux/adaptive/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
@@ -29,7 +29,7 @@
#include "BaseRepresentation.h"
#include "BaseAdaptationSet.h"
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include "SegmentTemplate.h"
#include "SegmentTimeline.h"
#include "SegmentList.h"
diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.h b/modules/demux/adaptive/playlist/BaseRepresentation.h
index fe86734e4f..b84a0d502c 100644
--- a/modules/demux/adaptive/playlist/BaseRepresentation.h
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.h
@@ -39,7 +39,7 @@ namespace adaptive
namespace playlist
{
class BaseAdaptationSet;
- class AbstractPlaylist;
+ class BasePlaylist;
class SegmentTemplateSegment;
class BaseRepresentation : public CommonAttributesElements,
diff --git a/modules/demux/adaptive/playlist/Segment.cpp b/modules/demux/adaptive/playlist/Segment.cpp
index 090fb9ac1b..11f76b5ee1 100644
--- a/modules/demux/adaptive/playlist/Segment.cpp
+++ b/modules/demux/adaptive/playlist/Segment.cpp
@@ -29,7 +29,7 @@
#include "Segment.h"
#include "BaseAdaptationSet.h"
#include "BaseRepresentation.h"
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include "SegmentChunk.hpp"
#include "../http/BytesRange.hpp"
#include "../http/HTTPConnectionManager.h"
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index a79b1a2602..43d3a4c008 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -28,7 +28,7 @@
#include "SegmentList.h"
#include "SegmentTemplate.h"
#include "SegmentTimeline.h"
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include "BaseRepresentation.h"
#include "../encryption/CommonEncryption.hpp"
@@ -46,7 +46,7 @@ SegmentInformation::SegmentInformation(SegmentInformation *parent_) :
init();
}
-SegmentInformation::SegmentInformation(AbstractPlaylist * parent_) :
+SegmentInformation::SegmentInformation(BasePlaylist * parent_) :
ICanonicalUrl(parent_),
AttrsNode( AbstractAttr::SEGMENTINFORMATION, NULL )
{
@@ -64,7 +64,7 @@ SegmentInformation::~SegmentInformation()
delete baseUrl.Get();
}
-AbstractPlaylist * SegmentInformation::getPlaylist() const
+BasePlaylist * SegmentInformation::getPlaylist() const
{
if(parent)
return parent->getPlaylist();
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.hpp b/modules/demux/adaptive/playlist/SegmentInformation.hpp
index 66e36d5c6f..081badb214 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.hpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.hpp
@@ -38,7 +38,7 @@ namespace adaptive
class SegmentTimeline;
class SegmentTemplate;
class SegmentTemplate;
- class AbstractPlaylist;
+ class BasePlaylist;
class ISegment;
/* common segment elements for period/adaptset/rep 5.3.9.1,
@@ -51,12 +51,12 @@ namespace adaptive
public:
SegmentInformation( SegmentInformation * = 0 );
- explicit SegmentInformation( AbstractPlaylist * );
+ explicit SegmentInformation( BasePlaylist * );
virtual ~SegmentInformation();
virtual vlc_tick_t getPeriodStart() const;
virtual vlc_tick_t getPeriodDuration() const;
- virtual AbstractPlaylist *getPlaylist() const;
+ virtual BasePlaylist *getPlaylist() const;
class SplitPoint
{
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
index ede2a5e4e1..237698982b 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -26,7 +26,7 @@
#include "SegmentTemplate.h"
#include "SegmentTimeline.h"
#include "SegmentInformation.hpp"
-#include "AbstractPlaylist.hpp"
+#include "BasePlaylist.hpp"
#include <limits>
using namespace adaptive::playlist;
@@ -164,7 +164,7 @@ Segment * SegmentTemplate::getNextMediaSegment(uint64_t i_pos,uint64_t *pi_newp
else
{
/* check template upper bound */
- const AbstractPlaylist *playlist = parentSegmentInformation->getPlaylist();
+ const BasePlaylist *playlist = parentSegmentInformation->getPlaylist();
if(!playlist->isLive())
{
const Timescale timescale = inheritTimescale();
@@ -210,7 +210,7 @@ bool SegmentTemplate::getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) con
const stime_t duration = inheritDuration();
if( duration && parent )
{
- AbstractPlaylist *playlist = parent->getPlaylist();
+ BasePlaylist *playlist = parent->getPlaylist();
if( playlist->isLive() )
{
vlc_tick_t now = vlc_tick_from_sec(::time(NULL));
diff --git a/modules/demux/dash/mpd/DASHSegment.cpp b/modules/demux/dash/mpd/DASHSegment.cpp
index 95a23575c7..c25af1cbbb 100644
--- a/modules/demux/dash/mpd/DASHSegment.cpp
+++ b/modules/demux/dash/mpd/DASHSegment.cpp
@@ -29,7 +29,7 @@
#include "DASHSegment.h"
#include "../../adaptive/playlist/BaseRepresentation.h"
#include "../mp4/IndexReader.hpp"
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
using namespace adaptive::playlist;
using namespace dash::mpd;
diff --git a/modules/demux/dash/mpd/MPD.cpp b/modules/demux/dash/mpd/MPD.cpp
index adc1147c5a..2b5d868eb6 100644
--- a/modules/demux/dash/mpd/MPD.cpp
+++ b/modules/demux/dash/mpd/MPD.cpp
@@ -38,7 +38,7 @@
using namespace dash::mpd;
MPD::MPD (vlc_object_t *p_object, Profile profile_) :
- AbstractPlaylist(p_object),
+ BasePlaylist(p_object),
profile( profile_ )
{
programInfo.Set( NULL );
diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
index f95a04a645..fa6e98c79a 100644
--- a/modules/demux/dash/mpd/MPD.h
+++ b/modules/demux/dash/mpd/MPD.h
@@ -25,7 +25,7 @@
#ifndef MPD_H_
#define MPD_H_
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
#include "../../adaptive/StreamFormat.hpp"
#include "Profile.hpp"
@@ -38,7 +38,7 @@ namespace dash
class ProgramInformation;
- class MPD : public AbstractPlaylist
+ class MPD : public BasePlaylist
{
friend class IsoffMainParser;
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 84d122b8de..e4ea89d260 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -29,7 +29,7 @@
using namespace hls::playlist;
M3U8::M3U8 (vlc_object_t *p_object) :
- AbstractPlaylist(p_object)
+ BasePlaylist(p_object)
{
minUpdatePeriod.Set( VLC_TICK_FROM_SEC(5) );
}
@@ -67,10 +67,3 @@ bool M3U8::isLive() const
return b_live;
}
-void M3U8::debug()
-{
- std::vector<BasePeriod *>::const_iterator i;
- for(i = periods.begin(); i != periods.end(); ++i)
- (*i)->debug(VLC_OBJECT(p_object));
-}
-
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index 4021e5a3cf..dea6701aa6 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -21,7 +21,7 @@
#ifndef M3U8_H_
#define M3U8_H_
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
namespace hls
{
@@ -29,14 +29,13 @@ namespace hls
{
using namespace adaptive::playlist;
- class M3U8 : public AbstractPlaylist
+ class M3U8 : public BasePlaylist
{
public:
M3U8(vlc_object_t *);
virtual ~M3U8();
virtual bool isLive() const;
- virtual void debug();
private:
std::string data;
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp
index 4103478f46..88d8bfa921 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -114,7 +114,7 @@ void Representation::scheduleNextUpdate(uint64_t, bool b_updated)
}
const vlc_tick_t now = vlc_tick_now();
- const AbstractPlaylist *playlist = getPlaylist();
+ const BasePlaylist *playlist = getPlaylist();
msg_Dbg(playlist->getVLCObject(), "Updated playlist ID %s, after %" PRId64 "s",
getID().str().c_str(),
@@ -152,7 +152,7 @@ bool Representation::needsUpdate(uint64_t number) const
bool Representation::runLocalUpdates(SharedResources *res)
{
- AbstractPlaylist *playlist = getPlaylist();
+ BasePlaylist *playlist = getPlaylist();
M3U8Parser parser(res);
if(!parser.appendSegmentsFromPlaylistURI(playlist->getVLCObject(), this))
b_failed = true;
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index 597918a9e5..48aa7d3836 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -26,7 +26,7 @@
#include "../../adaptive/playlist/BaseAdaptationSet.h"
#include "../../adaptive/playlist/SegmentTemplate.h"
#include "../../adaptive/playlist/SegmentTimeline.h"
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
using namespace adaptive::mp4;
using namespace smooth::mp4;
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index c967feb29f..1ed6655184 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -29,7 +29,7 @@
using namespace smooth::playlist;
Manifest::Manifest (vlc_object_t *p_object) :
- AbstractPlaylist(p_object)
+ BasePlaylist(p_object)
{
minUpdatePeriod.Set( VLC_TICK_FROM_SEC(5) );
addAttribute(new TimescaleAttr(Timescale(10000000))); // 100ns
@@ -45,10 +45,3 @@ bool Manifest::isLive() const
{
return b_live;
}
-
-void Manifest::debug()
-{
- std::vector<BasePeriod *>::const_iterator i;
- for(i = periods.begin(); i != periods.end(); ++i)
- (*i)->debug(VLC_OBJECT(p_object));
-}
diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp
index b0e0e6a3f7..a6d1701db5 100644
--- a/modules/demux/smooth/playlist/Manifest.hpp
+++ b/modules/demux/smooth/playlist/Manifest.hpp
@@ -20,7 +20,7 @@
#ifndef MANIFEST_HPP
#define MANIFEST_HPP
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
namespace smooth
{
@@ -28,7 +28,7 @@ namespace smooth
{
using namespace adaptive::playlist;
- class Manifest : public AbstractPlaylist
+ class Manifest : public BasePlaylist
{
friend class ManifestParser;
@@ -37,7 +37,6 @@ namespace smooth
virtual ~Manifest();
virtual bool isLive() const;
- virtual void debug();
private:
bool b_live;
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index 9371353bfc..706db863e8 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -24,7 +24,7 @@
#include "SmoothSegment.hpp"
#include "../../adaptive/playlist/BaseRepresentation.h"
-#include "../../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../../adaptive/playlist/BasePlaylist.hpp"
#include "../mp4/IndexReader.hpp"
using namespace smooth::playlist;
More information about the vlc-commits
mailing list