[vlc-commits] demux: adaptive: rename libtool conflicting objects
Francois Cartegnie
git at videolan.org
Fri Jan 22 22:10:31 UTC 2021
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jan 22 18:24:59 2021 +0100| [42dd2b06d87034a944f732768f1319d4e1e2f5dc] | committer: Francois Cartegnie
demux: adaptive: rename libtool conflicting objects
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42dd2b06d87034a944f732768f1319d4e1e2f5dc
---
modules/demux/Makefile.am | 16 ++++++-------
modules/demux/adaptive/adaptive.cpp | 2 +-
.../{Representation.cpp => HLSRepresentation.cpp} | 28 +++++++++++-----------
.../{Representation.hpp => HLSRepresentation.hpp} | 8 +++----
modules/demux/hls/playlist/M3U8.cpp | 4 ++--
modules/demux/hls/playlist/Parser.cpp | 16 ++++++-------
modules/demux/hls/playlist/Parser.hpp | 8 +++----
modules/demux/smooth/SmoothManager.cpp | 2 +-
.../mp4/{IndexReader.cpp => SmoothIndexReader.cpp} | 8 +++----
.../mp4/{IndexReader.hpp => SmoothIndexReader.hpp} | 6 ++---
.../{Representation.cpp => QualityLevel.cpp} | 12 +++++-----
.../{Representation.hpp => QualityLevel.hpp} | 14 +++++------
.../playlist/{Parser.cpp => SmoothParser.cpp} | 8 +++----
.../playlist/{Parser.hpp => SmoothParser.hpp} | 0
modules/demux/smooth/playlist/SmoothSegment.cpp | 4 ++--
15 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index a6e4d6d5f3..1b4760be6e 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -450,8 +450,8 @@ libadaptive_hls_SOURCES = \
demux/hls/playlist/M3U8.cpp \
demux/hls/playlist/Parser.hpp \
demux/hls/playlist/Parser.cpp \
- demux/hls/playlist/Representation.hpp \
- demux/hls/playlist/Representation.cpp \
+ demux/hls/playlist/HLSRepresentation.hpp \
+ demux/hls/playlist/HLSRepresentation.cpp \
demux/hls/playlist/HLSSegment.hpp \
demux/hls/playlist/HLSSegment.cpp \
demux/hls/playlist/Tags.hpp \
@@ -464,18 +464,18 @@ libadaptive_hls_SOURCES = \
libadaptive_hls_SOURCES += meta_engine/ID3Meta.h
libadaptive_smooth_SOURCES = \
- demux/smooth/mp4/IndexReader.cpp \
- demux/smooth/mp4/IndexReader.hpp \
+ demux/smooth/mp4/SmoothIndexReader.cpp \
+ demux/smooth/mp4/SmoothIndexReader.hpp \
demux/smooth/playlist/ForgedInitSegment.hpp \
demux/smooth/playlist/ForgedInitSegment.cpp \
demux/smooth/playlist/Manifest.hpp \
demux/smooth/playlist/Manifest.cpp \
demux/smooth/playlist/MemoryChunk.hpp \
demux/smooth/playlist/MemoryChunk.cpp \
- demux/smooth/playlist/Parser.hpp \
- demux/smooth/playlist/Parser.cpp \
- demux/smooth/playlist/Representation.hpp \
- demux/smooth/playlist/Representation.cpp \
+ demux/smooth/playlist/SmoothParser.hpp \
+ demux/smooth/playlist/SmoothParser.cpp \
+ demux/smooth/playlist/QualityLevel.cpp \
+ demux/smooth/playlist/QualityLevel.hpp \
demux/smooth/playlist/SmoothSegment.hpp \
demux/smooth/playlist/SmoothSegment.cpp \
demux/smooth/SmoothManager.hpp \
diff --git a/modules/demux/adaptive/adaptive.cpp b/modules/demux/adaptive/adaptive.cpp
index b58d2021a8..53eaff9529 100644
--- a/modules/demux/adaptive/adaptive.cpp
+++ b/modules/demux/adaptive/adaptive.cpp
@@ -47,7 +47,7 @@
#include "../hls/playlist/M3U8.hpp"
#include "../smooth/SmoothManager.hpp"
#include "../smooth/SmoothStream.hpp"
-#include "../smooth/playlist/Parser.hpp"
+#include "../smooth/playlist/SmoothParser.hpp"
using namespace adaptive::http;
using namespace adaptive::logic;
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/HLSRepresentation.cpp
similarity index 85%
rename from modules/demux/hls/playlist/Representation.cpp
rename to modules/demux/hls/playlist/HLSRepresentation.cpp
index 88d8bfa921..af62a60197 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/HLSRepresentation.cpp
@@ -1,5 +1,5 @@
/*
- * Representation.cpp
+ * HLSRepresentation.cpp
*****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors
*
@@ -24,7 +24,7 @@
#include <vlc_fixups.h>
#include <cinttypes>
-#include "Representation.hpp"
+#include "HLSRepresentation.hpp"
#include "M3U8.hpp"
#include "Parser.hpp"
#include "HLSSegment.hpp"
@@ -39,7 +39,7 @@
using namespace hls;
using namespace hls::playlist;
-Representation::Representation ( BaseAdaptationSet *set ) :
+HLSRepresentation::HLSRepresentation ( BaseAdaptationSet *set ) :
BaseRepresentation( set )
{
b_live = true;
@@ -50,31 +50,31 @@ Representation::Representation ( BaseAdaptationSet *set ) :
streamFormat = StreamFormat::UNKNOWN;
}
-Representation::~Representation ()
+HLSRepresentation::~HLSRepresentation ()
{
}
-StreamFormat Representation::getStreamFormat() const
+StreamFormat HLSRepresentation::getStreamFormat() const
{
return streamFormat;
}
-bool Representation::isLive() const
+bool HLSRepresentation::isLive() const
{
return b_live;
}
-bool Representation::initialized() const
+bool HLSRepresentation::initialized() const
{
return b_loaded;
}
-void Representation::setPlaylistUrl(const std::string &uri)
+void HLSRepresentation::setPlaylistUrl(const std::string &uri)
{
playlistUrl = Url(uri);
}
-Url Representation::getPlaylistUrl() const
+Url HLSRepresentation::getPlaylistUrl() const
{
if(playlistUrl.hasScheme())
{
@@ -89,7 +89,7 @@ Url Representation::getPlaylistUrl() const
}
}
-void Representation::debug(vlc_object_t *obj, int indent) const
+void HLSRepresentation::debug(vlc_object_t *obj, int indent) const
{
BaseRepresentation::debug(obj, indent);
if(!b_loaded)
@@ -101,7 +101,7 @@ void Representation::debug(vlc_object_t *obj, int indent) const
}
}
-void Representation::scheduleNextUpdate(uint64_t, bool b_updated)
+void HLSRepresentation::scheduleNextUpdate(uint64_t, bool b_updated)
{
if(!isLive())
return;
@@ -125,7 +125,7 @@ void Representation::scheduleNextUpdate(uint64_t, bool b_updated)
debug(playlist->getVLCObject(), 0);
}
-bool Representation::needsUpdate(uint64_t number) const
+bool HLSRepresentation::needsUpdate(uint64_t number) const
{
if(b_failed)
return false;
@@ -150,7 +150,7 @@ bool Representation::needsUpdate(uint64_t number) const
return false;
}
-bool Representation::runLocalUpdates(SharedResources *res)
+bool HLSRepresentation::runLocalUpdates(SharedResources *res)
{
BasePlaylist *playlist = getPlaylist();
M3U8Parser parser(res);
@@ -161,7 +161,7 @@ bool Representation::runLocalUpdates(SharedResources *res)
return true;
}
-uint64_t Representation::translateSegmentNumber(uint64_t num, const BaseRepresentation *from) const
+uint64_t HLSRepresentation::translateSegmentNumber(uint64_t num, const BaseRepresentation *from) const
{
if(consistentSegmentNumber())
return num;
diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/HLSRepresentation.hpp
similarity index 92%
rename from modules/demux/hls/playlist/Representation.hpp
rename to modules/demux/hls/playlist/HLSRepresentation.hpp
index 617f86eb5b..ae24c0fe6e 100644
--- a/modules/demux/hls/playlist/Representation.hpp
+++ b/modules/demux/hls/playlist/HLSRepresentation.hpp
@@ -1,5 +1,5 @@
/*
- * Representation.hpp
+ * HLSRepresentation.hpp
*****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors
*
@@ -34,13 +34,13 @@ namespace hls
using namespace adaptive;
using namespace adaptive::playlist;
- class Representation : public BaseRepresentation
+ class HLSRepresentation : public BaseRepresentation
{
friend class M3U8Parser;
public:
- Representation( BaseAdaptationSet * );
- virtual ~Representation ();
+ HLSRepresentation( BaseAdaptationSet * );
+ virtual ~HLSRepresentation ();
virtual StreamFormat getStreamFormat() const override;
void setPlaylistUrl(const std::string &);
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index e4ea89d260..35531205a7 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -22,7 +22,7 @@
#endif
#include "M3U8.hpp"
-#include "Representation.hpp"
+#include "HLSRepresentation.hpp"
#include "../../adaptive/playlist/BasePeriod.h"
#include "../../adaptive/playlist/BaseAdaptationSet.h"
@@ -52,7 +52,7 @@ bool M3U8::isLive() const
std::vector<BaseRepresentation *>::iterator itr;
for(itr = adaptSet->getRepresentations().begin(); itr != adaptSet->getRepresentations().end(); ++itr)
{
- const Representation *rep = dynamic_cast<const Representation *>(*itr);
+ const HLSRepresentation *rep = dynamic_cast<const HLSRepresentation *>(*itr);
if(rep->initialized())
{
if(rep->isLive())
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index 53024e3400..4ac76cbda3 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -23,7 +23,7 @@
#include "Parser.hpp"
#include "HLSSegment.hpp"
-#include "Representation.hpp"
+#include "HLSRepresentation.hpp"
#include "../../adaptive/SharedResources.hpp"
#include "../../adaptive/playlist/BasePeriod.h"
#include "../../adaptive/playlist/BaseAdaptationSet.h"
@@ -88,13 +88,13 @@ static void releaseTagsList(std::list<Tag *> &list)
list.clear();
}
-Representation * M3U8Parser::createRepresentation(BaseAdaptationSet *adaptSet, const AttributesTag * tag)
+HLSRepresentation * M3U8Parser::createRepresentation(BaseAdaptationSet *adaptSet, const AttributesTag * tag)
{
const Attribute *uriAttr = tag->getAttributeByName("URI");
const Attribute *bwAttr = tag->getAttributeByName("BANDWIDTH");
const Attribute *resAttr = tag->getAttributeByName("RESOLUTION");
- Representation *rep = new (std::nothrow) Representation(adaptSet);
+ HLSRepresentation *rep = new (std::nothrow) HLSRepresentation(adaptSet);
if(rep)
{
if(uriAttr)
@@ -142,7 +142,7 @@ void M3U8Parser::createAndFillRepresentation(vlc_object_t *p_obj, BaseAdaptation
const AttributesTag *tag,
const std::list<Tag *> &tagslist)
{
- Representation *rep = createRepresentation(adaptSet, tag);
+ HLSRepresentation *rep = createRepresentation(adaptSet, tag);
if(rep)
{
parseSegments(p_obj, rep, tagslist);
@@ -150,7 +150,7 @@ void M3U8Parser::createAndFillRepresentation(vlc_object_t *p_obj, BaseAdaptation
}
}
-bool M3U8Parser::appendSegmentsFromPlaylistURI(vlc_object_t *p_obj, Representation *rep)
+bool M3U8Parser::appendSegmentsFromPlaylistURI(vlc_object_t *p_obj, HLSRepresentation *rep)
{
block_t *p_block = Retrieve::HTTP(resources, rep->getPlaylistUrl().toString());
if(p_block)
@@ -206,7 +206,7 @@ static bool parseEncryption(const AttributesTag *keytag, const Url &playlistUrl,
}
}
-void M3U8Parser::parseSegments(vlc_object_t *, Representation *rep, const std::list<Tag *> &tagslist)
+void M3U8Parser::parseSegments(vlc_object_t *, HLSRepresentation *rep, const std::list<Tag *> &tagslist)
{
SegmentList *segmentList = new (std::nothrow) SegmentList(rep);
@@ -437,7 +437,7 @@ M3U8 * M3U8Parser::parse(vlc_object_t *p_object, stream_t *p_stream, const std::
if(groupsmap.find(tag->getAttributeByName("URI")->value) == groupsmap.end())
{
/* not a group, belong to default adaptation set */
- Representation *rep = createRepresentation(adaptSet, tag);
+ HLSRepresentation *rep = createRepresentation(adaptSet, tag);
if(rep)
{
adaptSet->addRepresentation(rep);
@@ -469,7 +469,7 @@ M3U8 * M3U8Parser::parse(vlc_object_t *p_object, stream_t *p_stream, const std::
BaseAdaptationSet *altAdaptSet = new (std::nothrow) BaseAdaptationSet(period);
if(altAdaptSet)
{
- Representation *rep = createRepresentation(altAdaptSet, pair.second);
+ HLSRepresentation *rep = createRepresentation(altAdaptSet, pair.second);
if(rep)
{
altAdaptSet->addRepresentation(rep);
diff --git a/modules/demux/hls/playlist/Parser.hpp b/modules/demux/hls/playlist/Parser.hpp
index 6bcc1b6d04..8f18054f24 100644
--- a/modules/demux/hls/playlist/Parser.hpp
+++ b/modules/demux/hls/playlist/Parser.hpp
@@ -50,7 +50,7 @@ namespace hls
class M3U8;
class AttributesTag;
class Tag;
- class Representation;
+ class HLSRepresentation;
class M3U8Parser
{
@@ -59,13 +59,13 @@ namespace hls
virtual ~M3U8Parser ();
M3U8 * parse (vlc_object_t *p_obj, stream_t *p_stream, const std::string &);
- bool appendSegmentsFromPlaylistURI(vlc_object_t *, Representation *);
+ bool appendSegmentsFromPlaylistURI(vlc_object_t *, HLSRepresentation *);
private:
- Representation * createRepresentation(BaseAdaptationSet *, const AttributesTag *);
+ HLSRepresentation * createRepresentation(BaseAdaptationSet *, const AttributesTag *);
void createAndFillRepresentation(vlc_object_t *, BaseAdaptationSet *,
const AttributesTag *, const std::list<Tag *>&);
- void parseSegments(vlc_object_t *, Representation *, const std::list<Tag *>&);
+ void parseSegments(vlc_object_t *, HLSRepresentation *, const std::list<Tag *>&);
std::list<Tag *> parseEntries(stream_t *);
adaptive::SharedResources *resources;
};
diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp
index 90bc6481fd..3a12fdf142 100644
--- a/modules/demux/smooth/SmoothManager.cpp
+++ b/modules/demux/smooth/SmoothManager.cpp
@@ -28,7 +28,7 @@
#include "../adaptive/SharedResources.hpp"
#include "../adaptive/tools/Retrieve.hpp"
-#include "playlist/Parser.hpp"
+#include "playlist/SmoothParser.hpp"
#include "../adaptive/xml/DOMParser.h"
#include <vlc_stream.h>
#include <vlc_demux.h>
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/SmoothIndexReader.cpp
similarity index 93%
rename from modules/demux/smooth/mp4/IndexReader.cpp
rename to modules/demux/smooth/mp4/SmoothIndexReader.cpp
index fe7c5402ce..7b12f3a679 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/SmoothIndexReader.cpp
@@ -1,5 +1,5 @@
/*
- * IndexReader.cpp
+ * SmoothIndexReader.cpp
*****************************************************************************
* Copyright (C) 2015 - VideoLAN and VLC authors
*
@@ -21,7 +21,7 @@
# include "config.h"
#endif
-#include "IndexReader.hpp"
+#include "SmoothIndexReader.hpp"
#include "../../adaptive/playlist/BaseRepresentation.h"
#include "../../adaptive/playlist/BaseAdaptationSet.h"
#include "../../adaptive/playlist/SegmentTemplate.h"
@@ -31,12 +31,12 @@
using namespace adaptive::mp4;
using namespace smooth::mp4;
-IndexReader::IndexReader(vlc_object_t *obj)
+SmoothIndexReader::SmoothIndexReader(vlc_object_t *obj)
: AtomsReader(obj)
{
}
-bool IndexReader::parseIndex(block_t *p_block, BaseRepresentation *rep, uint64_t sequence)
+bool SmoothIndexReader::parseIndex(block_t *p_block, BaseRepresentation *rep, uint64_t sequence)
{
if(!rep || !parseBlock(p_block))
return false;
diff --git a/modules/demux/smooth/mp4/IndexReader.hpp b/modules/demux/smooth/mp4/SmoothIndexReader.hpp
similarity index 91%
rename from modules/demux/smooth/mp4/IndexReader.hpp
rename to modules/demux/smooth/mp4/SmoothIndexReader.hpp
index 94b20e4f18..52da2b79d2 100644
--- a/modules/demux/smooth/mp4/IndexReader.hpp
+++ b/modules/demux/smooth/mp4/SmoothIndexReader.hpp
@@ -1,5 +1,5 @@
/*
- * IndexReader.hpp
+ * SmoothIndexReader.hpp
*****************************************************************************
* Copyright (C) 2015 - VideoLAN and VLC authors
*
@@ -37,10 +37,10 @@ namespace smooth
using namespace adaptive::mp4;
using namespace adaptive::playlist;
- class IndexReader : public AtomsReader
+ class SmoothIndexReader : public AtomsReader
{
public:
- IndexReader(vlc_object_t *);
+ SmoothIndexReader(vlc_object_t *);
bool parseIndex(block_t *, BaseRepresentation *, uint64_t);
};
}
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/QualityLevel.cpp
similarity index 88%
rename from modules/demux/smooth/playlist/Representation.cpp
rename to modules/demux/smooth/playlist/QualityLevel.cpp
index 91c57182dd..83d08c5664 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/QualityLevel.cpp
@@ -21,7 +21,7 @@
# include "config.h"
#endif
-#include "Representation.hpp"
+#include "QualityLevel.hpp"
#include "Manifest.hpp"
#include "../../adaptive/playlist/SegmentTemplate.h"
#include "../../adaptive/playlist/SegmentTimeline.h"
@@ -29,21 +29,21 @@
using namespace smooth::playlist;
-Representation::Representation ( BaseAdaptationSet *set ) :
+QualityLevel::QualityLevel ( BaseAdaptationSet *set ) :
BaseRepresentation( set )
{
}
-Representation::~Representation ()
+QualityLevel::~QualityLevel ()
{
}
-StreamFormat Representation::getStreamFormat() const
+StreamFormat QualityLevel::getStreamFormat() const
{
return StreamFormat(StreamFormat::MP4);
}
-InitSegment * Representation::getInitSegment() const
+InitSegment * QualityLevel::getInitSegment() const
{
if(initialisationSegment.Get())
return initialisationSegment.Get();
@@ -51,7 +51,7 @@ InitSegment * Representation::getInitSegment() const
return BaseRepresentation::getInitSegment();
}
-std::string Representation::contextualize(size_t number, const std::string &component,
+std::string QualityLevel::contextualize(size_t number, const std::string &component,
const SegmentTemplate *templ) const
{
std::string ret(component);
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/QualityLevel.hpp
similarity index 86%
rename from modules/demux/smooth/playlist/Representation.hpp
rename to modules/demux/smooth/playlist/QualityLevel.hpp
index c39eaf3a72..6e9c3d4623 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/QualityLevel.hpp
@@ -1,5 +1,5 @@
/*
- * Representation.hpp
+ * QualityLevel.hpp
*****************************************************************************
* Copyright (C) 2015 - VideoLAN Authors
*
@@ -17,8 +17,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 SMOOTHREPRESENTATION_HPP
-#define SMOOTHREPRESENTATION_HPP
+#ifndef SMOOTHQUALITYLEVEL_HPP
+#define SMOOTHQUALITYLEVEL_HPP
#include "../../adaptive/playlist/SegmentBaseType.hpp"
#include "../../adaptive/playlist/BaseRepresentation.h"
@@ -38,12 +38,12 @@ namespace smooth
using namespace adaptive;
using namespace adaptive::playlist;
- class Representation : public BaseRepresentation,
+ class QualityLevel : public BaseRepresentation,
public Initializable<InitSegment>
{
public:
- Representation(BaseAdaptationSet *);
- virtual ~Representation ();
+ QualityLevel(BaseAdaptationSet *);
+ virtual ~QualityLevel ();
virtual InitSegment * getInitSegment() const override;
virtual StreamFormat getStreamFormat() const override;
@@ -54,4 +54,4 @@ namespace smooth
};
}
}
-#endif // SMOOTHREPRESENTATION_HPP
+#endif // SMOOTHQUALITYLEVEL_HPP
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/SmoothParser.cpp
similarity index 98%
rename from modules/demux/smooth/playlist/Parser.cpp
rename to modules/demux/smooth/playlist/SmoothParser.cpp
index 387fe8a9bc..8e1af33332 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/SmoothParser.cpp
@@ -1,5 +1,5 @@
/*
- * Parser.cpp
+ * SmoothParser.cpp
*****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors
*
@@ -21,10 +21,10 @@
# include "config.h"
#endif
-#include "Parser.hpp"
+#include "SmoothParser.hpp"
#include "Manifest.hpp"
-#include "Representation.hpp"
+#include "QualityLevel.hpp"
#include "ForgedInitSegment.hpp"
#include "SmoothSegment.hpp"
#include "../../adaptive/playlist/BasePeriod.h"
@@ -146,7 +146,7 @@ static SegmentTimeline *createTimeline(Node *streamIndexNode)
static void ParseQualityLevel(BaseAdaptationSet *adaptSet, Node *qualNode, const std::string &type,
unsigned id, unsigned trackid, const Timescale ×cale)
{
- Representation *rep = new (std::nothrow) Representation(adaptSet);
+ QualityLevel *rep = new (std::nothrow) QualityLevel(adaptSet);
if(rep)
{
rep->setID(ID(id));
diff --git a/modules/demux/smooth/playlist/Parser.hpp b/modules/demux/smooth/playlist/SmoothParser.hpp
similarity index 100%
rename from modules/demux/smooth/playlist/Parser.hpp
rename to modules/demux/smooth/playlist/SmoothParser.hpp
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index 273d86ef16..fffc77fb97 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -25,7 +25,7 @@
#include "../../adaptive/playlist/BaseRepresentation.h"
#include "../../adaptive/playlist/BasePlaylist.hpp"
-#include "../mp4/IndexReader.hpp"
+#include "../mp4/SmoothIndexReader.hpp"
using namespace smooth::playlist;
using namespace smooth::mp4;
@@ -48,7 +48,7 @@ void SmoothSegmentChunk::onDownload(block_t **pp_block)
if(!rep || ((*pp_block)->i_flags & BLOCK_FLAG_HEADER) == 0)
return;
- IndexReader br(rep->getPlaylist()->getVLCObject());
+ SmoothIndexReader br(rep->getPlaylist()->getVLCObject());
br.parseIndex(*pp_block, rep, sequence);
/* If timeshift depth is present, we use it for expiring segments
More information about the vlc-commits
mailing list