[vlc-commits] demux: adaptive: use override specifier
Francois Cartegnie
git at videolan.org
Wed Jan 6 20:27:05 UTC 2021
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jan 5 22:04:49 2021 +0100| [70dc21e257a8d06b6afdd62d25a3f5c89a6b7e2d] | committer: Francois Cartegnie
demux: adaptive: use override specifier
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70dc21e257a8d06b6afdd62d25a3f5c89a6b7e2d
---
modules/demux/adaptive/Streams.hpp | 10 ++++-----
modules/demux/adaptive/http/Chunk.h | 18 ++++++++--------
.../demux/adaptive/http/HTTPConnectionManager.h | 10 ++++-----
modules/demux/adaptive/logic/BufferingLogic.hpp | 8 ++++----
.../adaptive/logic/NearOptimalAdaptationLogic.hpp | 4 ++--
.../adaptive/logic/PredictiveAdaptationLogic.hpp | 4 ++--
.../adaptive/logic/RateBasedAdaptationLogic.h | 4 ++--
modules/demux/adaptive/playlist/BasePeriod.h | 4 ++--
modules/demux/adaptive/playlist/BasePlaylist.hpp | 2 +-
modules/demux/adaptive/playlist/Segment.h | 4 ++--
modules/demux/adaptive/playlist/SegmentBase.h | 14 ++++++-------
modules/demux/adaptive/playlist/SegmentChunk.hpp | 2 +-
.../demux/adaptive/playlist/SegmentInformation.hpp | 2 +-
modules/demux/adaptive/playlist/SegmentList.h | 16 +++++++--------
modules/demux/adaptive/playlist/SegmentTemplate.h | 20 +++++++++---------
modules/demux/adaptive/plumbing/Demuxer.hpp | 20 +++++++++---------
modules/demux/adaptive/plumbing/FakeESOut.hpp | 10 ++++-----
modules/demux/adaptive/plumbing/SourceStream.hpp | 24 +++++++++++-----------
modules/demux/dash/DASHManager.h | 8 ++++----
modules/demux/dash/DASHStream.hpp | 4 ++--
modules/demux/dash/mpd/AdaptationSet.h | 2 +-
modules/demux/dash/mpd/DASHSegment.h | 4 ++--
modules/demux/dash/mpd/Representation.h | 2 +-
modules/demux/hls/HLSStreams.hpp | 4 ++--
modules/demux/hls/playlist/HLSSegment.hpp | 4 ++--
modules/demux/hls/playlist/Representation.hpp | 12 +++++------
modules/demux/smooth/SmoothManager.hpp | 8 ++++----
modules/demux/smooth/SmoothStream.hpp | 4 ++--
.../demux/smooth/playlist/ForgedInitSegment.hpp | 2 +-
modules/demux/smooth/playlist/MemoryChunk.hpp | 6 +++---
modules/demux/smooth/playlist/Representation.hpp | 4 ++--
modules/demux/smooth/playlist/SmoothSegment.hpp | 4 ++--
32 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/modules/demux/adaptive/Streams.hpp b/modules/demux/adaptive/Streams.hpp
index 3d7f5ccfd5..b255642bb7 100644
--- a/modules/demux/adaptive/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -93,12 +93,12 @@ namespace adaptive
void runUpdates();
/* Used by demuxers fake streams */
- virtual std::string getContentType(); /* impl */
- virtual block_t *readNextBlock(); /* impl */
+ virtual std::string getContentType() override;
+ virtual block_t *readNextBlock() override;
/**/
- virtual void fillExtraFMTInfo( es_format_t * ) const; /* impl */
- virtual void trackerEvent(const SegmentTrackerEvent &); /* impl */
+ virtual void fillExtraFMTInfo( es_format_t * ) const override;
+ virtual void trackerEvent(const SegmentTrackerEvent &) override;
protected:
bool seekAble() const;
@@ -106,7 +106,7 @@ namespace adaptive
virtual block_t *checkBlock(block_t *, bool) = 0;
AbstractDemuxer * createDemux(const StreamFormat &);
virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
- es_out_t *, AbstractSourceStream *) const; /* impl */
+ es_out_t *, AbstractSourceStream *) const override;
virtual bool startDemux();
virtual bool restartDemux();
diff --git a/modules/demux/adaptive/http/Chunk.h b/modules/demux/adaptive/http/Chunk.h
index a5abfced8b..f88abfa984 100644
--- a/modules/demux/adaptive/http/Chunk.h
+++ b/modules/demux/adaptive/http/Chunk.h
@@ -94,10 +94,10 @@ namespace adaptive
const ID &, bool = false);
virtual ~HTTPChunkSource();
- virtual block_t * readBlock (); /* impl */
- virtual block_t * read (size_t); /* impl */
- virtual bool hasMoreData () const; /* impl */
- virtual std::string getContentType () const; /* reimpl */
+ virtual block_t * readBlock () override;
+ virtual block_t * read (size_t) override;
+ virtual bool hasMoreData () const override;
+ virtual std::string getContentType () const override;
static const size_t CHUNK_SIZE = 32768;
@@ -124,14 +124,14 @@ namespace adaptive
HTTPChunkBufferedSource(const std::string &url, AbstractConnectionManager *,
const ID &, bool = false);
virtual ~HTTPChunkBufferedSource();
- virtual block_t * readBlock (); /* reimpl */
- virtual block_t * read (size_t); /* reimpl */
- virtual bool hasMoreData () const; /* impl */
+ virtual block_t * readBlock () override;
+ virtual block_t * read (size_t) override;
+ virtual bool hasMoreData () const override;
void hold();
void release();
protected:
- virtual bool prepare(); /* reimpl */
+ virtual bool prepare() override;
void bufferize(size_t);
bool isDone() const;
@@ -154,7 +154,7 @@ namespace adaptive
virtual ~HTTPChunk();
protected:
- virtual void onDownload (block_t **) {} /* impl */
+ virtual void onDownload (block_t **) override {}
};
}
}
diff --git a/modules/demux/adaptive/http/HTTPConnectionManager.h b/modules/demux/adaptive/http/HTTPConnectionManager.h
index 478cf64ee5..0bc44f4054 100644
--- a/modules/demux/adaptive/http/HTTPConnectionManager.h
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.h
@@ -53,7 +53,7 @@ namespace adaptive
virtual void start(AbstractChunkSource *) = 0;
virtual void cancel(AbstractChunkSource *) = 0;
- virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t); /* impl */
+ virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t) override;
void setDownloadRateObserver(IDownloadRateObserver *);
protected:
@@ -69,11 +69,11 @@ namespace adaptive
HTTPConnectionManager (vlc_object_t *p_object);
virtual ~HTTPConnectionManager ();
- virtual void closeAllConnections () /* impl */;
- virtual AbstractConnection * getConnection(ConnectionParams &) /* impl */;
+ virtual void closeAllConnections () override;
+ virtual AbstractConnection * getConnection(ConnectionParams &) override;
- virtual void start(AbstractChunkSource *) /* impl */;
- virtual void cancel(AbstractChunkSource *) /* impl */;
+ virtual void start(AbstractChunkSource *) override;
+ virtual void cancel(AbstractChunkSource *) override;
void setLocalConnectionsAllowed();
void addFactory(AbstractConnectionFactory *);
diff --git a/modules/demux/adaptive/logic/BufferingLogic.hpp b/modules/demux/adaptive/logic/BufferingLogic.hpp
index b9d19fecf0..56d9d81232 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.hpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.hpp
@@ -67,10 +67,10 @@ namespace adaptive
public:
DefaultBufferingLogic();
virtual ~DefaultBufferingLogic() {}
- virtual uint64_t getStartSegmentNumber(BaseRepresentation *) 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 */
+ virtual uint64_t getStartSegmentNumber(BaseRepresentation *) const override;
+ virtual vlc_tick_t getMinBuffering(const BasePlaylist *) const override;
+ virtual vlc_tick_t getMaxBuffering(const BasePlaylist *) const override;
+ virtual vlc_tick_t getLiveDelay(const BasePlaylist *) const override;
static const unsigned SAFETY_BUFFERING_EDGE_OFFSET;
static const unsigned SAFETY_EXPURGING_OFFSET;
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
index 639641ab80..327ca696cf 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
@@ -51,8 +51,8 @@ namespace adaptive
virtual ~NearOptimalAdaptationLogic();
virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
- virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t); /* reimpl */
- virtual void trackerEvent (const SegmentTrackerEvent &); /* reimpl */
+ virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override;
+ virtual void trackerEvent (const SegmentTrackerEvent &) override;
private:
BaseRepresentation * getNextQualityIndex( BaseAdaptationSet *, RepresentationSelector &,
diff --git a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
index 958e25dcfe..db7ff0f94d 100644
--- a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
@@ -52,8 +52,8 @@ namespace adaptive
virtual ~PredictiveAdaptationLogic();
virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
- virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t); /* reimpl */
- virtual void trackerEvent (const SegmentTrackerEvent &); /* reimpl */
+ virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override;
+ virtual void trackerEvent (const SegmentTrackerEvent &) override;
private:
unsigned getAvailableBw(unsigned, const BaseRepresentation *) const;
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index 929226eb39..b21b29e727 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -40,8 +40,8 @@ namespace adaptive
virtual ~RateBasedAdaptationLogic ();
BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
- virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t); /* reimpl */
- virtual void trackerEvent(const SegmentTrackerEvent &); /* reimpl */
+ virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t) override;
+ virtual void trackerEvent(const SegmentTrackerEvent &) override;
private:
size_t bpsAvg;
diff --git a/modules/demux/adaptive/playlist/BasePeriod.h b/modules/demux/adaptive/playlist/BasePeriod.h
index b8f326ba88..3d9b81571f 100644
--- a/modules/demux/adaptive/playlist/BasePeriod.h
+++ b/modules/demux/adaptive/playlist/BasePeriod.h
@@ -45,9 +45,9 @@ namespace adaptive
void addAdaptationSet (BaseAdaptationSet *AdaptationSet);
void debug (vlc_object_t *,int = 0) const;
- virtual vlc_tick_t getPeriodStart() const; /* reimpl */
+ virtual vlc_tick_t getPeriodStart() const override;
virtual vlc_tick_t getPeriodDuration() const;
- virtual BasePlaylist *getPlaylist() const; /* reimpl */
+ virtual BasePlaylist *getPlaylist() const override;
Property<vlc_tick_t> duration;
Property<vlc_tick_t> startTime;
diff --git a/modules/demux/adaptive/playlist/BasePlaylist.hpp b/modules/demux/adaptive/playlist/BasePlaylist.hpp
index e501767b11..34a08e12e3 100644
--- a/modules/demux/adaptive/playlist/BasePlaylist.hpp
+++ b/modules/demux/adaptive/playlist/BasePlaylist.hpp
@@ -55,7 +55,7 @@ namespace adaptive
void addBaseUrl (const std::string &);
void setPlaylistUrl (const std::string &);
- virtual Url getUrlSegment() const; /* impl */
+ virtual Url getUrlSegment() const override;
vlc_object_t * getVLCObject() const;
virtual const std::vector<BasePeriod *>& getPeriods();
diff --git a/modules/demux/adaptive/playlist/Segment.h b/modules/demux/adaptive/playlist/Segment.h
index c35f2eec23..39166dc7ee 100644
--- a/modules/demux/adaptive/playlist/Segment.h
+++ b/modules/demux/adaptive/playlist/Segment.h
@@ -96,9 +96,9 @@ namespace adaptive
public:
Segment( ICanonicalUrl *parent );
~Segment();
- virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *); /* impl */
+ virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *) override;
virtual void setSourceUrl( const std::string &url );
- virtual Url getUrlSegment() const; /* impl */
+ virtual Url getUrlSegment() const override;
virtual const std::vector<Segment*> & subSegments() const;
virtual void debug(vlc_object_t *,int = 0) const;
virtual void addSubSegment(SubSegment *);
diff --git a/modules/demux/adaptive/playlist/SegmentBase.h b/modules/demux/adaptive/playlist/SegmentBase.h
index 5ab93704d8..1f4aaab946 100644
--- a/modules/demux/adaptive/playlist/SegmentBase.h
+++ b/modules/demux/adaptive/playlist/SegmentBase.h
@@ -43,16 +43,16 @@ namespace adaptive
SegmentBase (SegmentInformation * = nullptr);
virtual ~SegmentBase ();
- virtual vlc_tick_t getMinAheadTime(uint64_t curnum) const; /* impl */
- virtual Segment *getMediaSegment(uint64_t number) const; /* impl */
- virtual Segment *getNextMediaSegment(uint64_t, uint64_t *, bool *) const; /* impl */
- virtual uint64_t getStartSegmentNumber() const; /* impl */
+ virtual vlc_tick_t getMinAheadTime(uint64_t curnum) const override;
+ virtual Segment *getMediaSegment(uint64_t number) const override;
+ virtual Segment *getNextMediaSegment(uint64_t, uint64_t *, bool *) const override;
+ virtual uint64_t getStartSegmentNumber() const override;
- virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const; /* impl */
+ virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const override;
virtual bool getPlaybackTimeDurationBySegmentNumber(uint64_t number,
- vlc_tick_t *time, vlc_tick_t *duration) const; /* impl */
+ vlc_tick_t *time, vlc_tick_t *duration) const override;
- virtual void debug(vlc_object_t *,int = 0) const; /* reimpl */
+ virtual void debug(vlc_object_t *,int = 0) const override;
protected:
SegmentInformation *parent;
diff --git a/modules/demux/adaptive/playlist/SegmentChunk.hpp b/modules/demux/adaptive/playlist/SegmentChunk.hpp
index 2c683b098a..db1798aab8 100644
--- a/modules/demux/adaptive/playlist/SegmentChunk.hpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.hpp
@@ -50,7 +50,7 @@ namespace adaptive
protected:
bool decrypt(block_t **);
- virtual void onDownload(block_t **); /* impl */
+ virtual void onDownload(block_t **) override;
BaseRepresentation *rep;
CommonEncryptionSession *encryptionSession;
};
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.hpp b/modules/demux/adaptive/playlist/SegmentInformation.hpp
index 081badb214..ac7976b965 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.hpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.hpp
@@ -87,7 +87,7 @@ namespace adaptive
AbstractSegmentBaseType *getProfile() const;
void updateSegmentList(SegmentList *, bool = false);
void setSegmentTemplate(SegmentTemplate *);
- virtual Url getUrlSegment() const; /* impl */
+ virtual Url getUrlSegment() const override;
Property<Url *> baseUrl;
const AbstractSegmentBaseType * inheritSegmentProfile() const;
diff --git a/modules/demux/adaptive/playlist/SegmentList.h b/modules/demux/adaptive/playlist/SegmentList.h
index f3b943f5cd..4e22809bb7 100644
--- a/modules/demux/adaptive/playlist/SegmentList.h
+++ b/modules/demux/adaptive/playlist/SegmentList.h
@@ -44,20 +44,20 @@ namespace adaptive
const std::vector<Segment *>& getSegments() const;
void addSegment(Segment *seg);
virtual void updateWith(AbstractMultipleSegmentBaseType *,
- bool = false); /* reimpl */
+ bool = false) override;
void pruneBySegmentNumber(uint64_t);
void pruneByPlaybackTime(vlc_tick_t);
stime_t getTotalLength() const;
- virtual vlc_tick_t getMinAheadTime(uint64_t) const; /* impl */
- virtual Segment * getMediaSegment(uint64_t pos) const; /* impl */
- virtual Segment * getNextMediaSegment(uint64_t, uint64_t *, bool *) const; /* impl */
- virtual uint64_t getStartSegmentNumber() const; /* impl */
- virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const; /* impl */
+ virtual vlc_tick_t getMinAheadTime(uint64_t) const override;
+ virtual Segment * getMediaSegment(uint64_t pos) const override;
+ virtual Segment * getNextMediaSegment(uint64_t, uint64_t *, bool *) const override;
+ virtual uint64_t getStartSegmentNumber() const override;
+ virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const override;
virtual bool getPlaybackTimeDurationBySegmentNumber(uint64_t number,
- vlc_tick_t *time, vlc_tick_t *duration) const; /* impl */
+ vlc_tick_t *time, vlc_tick_t *duration) const override;
- virtual void debug(vlc_object_t *, int = 0) const; /* reimpl */
+ virtual void debug(vlc_object_t *, int = 0) const override;
private:
std::vector<Segment *> segments;
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.h b/modules/demux/adaptive/playlist/SegmentTemplate.h
index 63f2a107fc..536f806680 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.h
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.h
@@ -41,7 +41,7 @@ namespace adaptive
public:
SegmentTemplateSegment( ICanonicalUrl * = nullptr );
virtual ~SegmentTemplateSegment();
- virtual void setSourceUrl( const std::string &url ); /* reimpl */
+ virtual void setSourceUrl( const std::string &url ) override;
void setParentTemplate( SegmentTemplate * );
protected:
@@ -58,17 +58,17 @@ namespace adaptive
void pruneByPlaybackTime(vlc_tick_t);
size_t pruneBySequenceNumber(uint64_t);
- virtual vlc_tick_t getMinAheadTime(uint64_t curnum) const; /* impl */
- virtual Segment * getMediaSegment(uint64_t number) const; /* impl */
- virtual Segment * getNextMediaSegment(uint64_t, uint64_t *, bool *) const; /* impl */
- virtual InitSegment *getInitSegment() const;/* reimpl */
- virtual uint64_t getStartSegmentNumber() const; /* impl */
+ virtual vlc_tick_t getMinAheadTime(uint64_t curnum) const override;
+ virtual Segment * getMediaSegment(uint64_t number) const override;
+ virtual Segment * getNextMediaSegment(uint64_t, uint64_t *, bool *) const override;
+ virtual InitSegment *getInitSegment() const override;
+ virtual uint64_t getStartSegmentNumber() const override;
- virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const; /* impl */
+ virtual bool getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret) const override;
virtual bool getPlaybackTimeDurationBySegmentNumber(uint64_t number,
- vlc_tick_t *time, vlc_tick_t *duration) const; /* impl */
+ vlc_tick_t *time, vlc_tick_t *duration) const override;
- virtual void debug(vlc_object_t *, int = 0) const; /* reimpl */
+ virtual void debug(vlc_object_t *, int = 0) const override;
protected:
SegmentInformation *parentSegmentInformation;
@@ -80,7 +80,7 @@ namespace adaptive
public:
SegmentTemplateInit( SegmentTemplate *, ICanonicalUrl * = nullptr );
virtual ~SegmentTemplateInit();
- virtual void setSourceUrl( const std::string &url ); /* reimpl */
+ virtual void setSourceUrl( const std::string &url ) override;
protected:
const SegmentTemplate *templ;
diff --git a/modules/demux/adaptive/plumbing/Demuxer.hpp b/modules/demux/adaptive/plumbing/Demuxer.hpp
index b6ea1380fe..38d85300dc 100644
--- a/modules/demux/adaptive/plumbing/Demuxer.hpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.hpp
@@ -65,10 +65,10 @@ namespace adaptive
MimeDemuxer(vlc_object_t *, const DemuxerFactoryInterface *,
es_out_t *, AbstractSourceStream *);
virtual ~MimeDemuxer();
- virtual Status demux(vlc_tick_t); /* impl */
- virtual void drain(); /* impl */
- virtual bool create(); /* impl */
- virtual void destroy(); /* impl */
+ virtual Status demux(vlc_tick_t) override;
+ virtual void drain() override;
+ virtual bool create() override;
+ virtual void destroy() override;
protected:
AbstractSourceStream *sourcestream;
@@ -83,10 +83,10 @@ namespace adaptive
public:
Demuxer(vlc_object_t *, const std::string &, es_out_t *, AbstractSourceStream *);
virtual ~Demuxer();
- virtual Status demux(vlc_tick_t); /* impl */
- virtual void drain(); /* impl */
- virtual bool create(); /* impl */
- virtual void destroy(); /* impl */
+ virtual Status demux(vlc_tick_t) override;
+ virtual void drain() override;
+ virtual bool create() override;
+ virtual void destroy() override;
protected:
AbstractSourceStream *sourcestream;
@@ -102,8 +102,8 @@ namespace adaptive
public:
SlaveDemuxer(vlc_object_t *, const std::string &, es_out_t *, AbstractSourceStream *);
virtual ~SlaveDemuxer();
- virtual bool create(); /* reimpl */
- virtual Status demux(vlc_tick_t); /* reimpl */
+ virtual bool create() override;
+ virtual Status demux(vlc_tick_t) override;
private:
vlc_tick_t length;
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
index da16d29d1d..5c15843e8e 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -97,11 +97,11 @@ namespace adaptive
private:
friend class LockedFakeESOut;
vlc_mutex_t lock;
- virtual es_out_id_t *esOutAdd( const es_format_t * ); /* impl */
- virtual int esOutSend( es_out_id_t *, block_t * ); /* impl */
- virtual void esOutDel( es_out_id_t * ); /* impl */
- virtual int esOutControl( int, va_list ); /* impl */
- virtual void esOutDestroy(); /* impl */
+ virtual es_out_id_t *esOutAdd( const es_format_t * ) override;
+ virtual int esOutSend( es_out_id_t *, block_t * ) override;
+ virtual void esOutDel( es_out_id_t * ) override;
+ virtual int esOutControl( int, va_list ) override;
+ virtual void esOutDestroy() override;
es_out_t *real_es_out;
FakeESOutID * createNewID( const es_format_t * );
ExtraFMTInfoInterface *extrainfo;
diff --git a/modules/demux/adaptive/plumbing/SourceStream.hpp b/modules/demux/adaptive/plumbing/SourceStream.hpp
index a2b18a00ca..105b310fb8 100644
--- a/modules/demux/adaptive/plumbing/SourceStream.hpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.hpp
@@ -43,8 +43,8 @@ namespace adaptive
public:
AbstractChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~AbstractChunksSourceStream();
- virtual void Reset(); /* impl */
- virtual stream_t *makeStream(); /* impl */
+ virtual void Reset() override;
+ virtual stream_t *makeStream() override;
protected:
virtual ssize_t Read(uint8_t *, size_t) = 0;
@@ -66,13 +66,13 @@ namespace adaptive
public:
ChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~ChunksSourceStream();
- virtual void Reset(); /* reimpl */
+ virtual void Reset() override;
protected:
- virtual ssize_t Read(uint8_t *, size_t); /* impl */
- virtual int Seek(uint64_t); /* impl */
- virtual size_t Peek(const uint8_t **, size_t); /* impl */
- virtual std::string getContentType(); /* impl */
+ virtual ssize_t Read(uint8_t *, size_t) override;
+ virtual int Seek(uint64_t) override;
+ virtual size_t Peek(const uint8_t **, size_t) override;
+ virtual std::string getContentType() override;
private:
block_t *p_block;
@@ -83,13 +83,13 @@ namespace adaptive
public:
BufferedChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~BufferedChunksSourceStream();
- virtual void Reset(); /* reimpl */
+ virtual void Reset() override;
protected:
- virtual ssize_t Read(uint8_t *, size_t); /* impl */
- virtual int Seek(uint64_t); /* impl */
- virtual size_t Peek(const uint8_t **, size_t); /* impl */
- virtual std::string getContentType(); /* impl */
+ virtual ssize_t Read(uint8_t *, size_t) override;
+ virtual int Seek(uint64_t) override;
+ virtual size_t Peek(const uint8_t **, size_t) override;
+ virtual std::string getContentType() override;
private:
ssize_t doRead(uint8_t *, size_t);
diff --git a/modules/demux/dash/DASHManager.h b/modules/demux/dash/DASHManager.h
index 50e31329d9..e5b8805b9b 100644
--- a/modules/demux/dash/DASHManager.h
+++ b/modules/demux/dash/DASHManager.h
@@ -51,14 +51,14 @@ namespace dash
logic::AbstractAdaptationLogic::LogicType type);
virtual ~DASHManager ();
- virtual bool needsUpdate() const; /* reimpl */
- virtual bool updatePlaylist(); /* reimpl */
- virtual void scheduleNextUpdate();/* reimpl */
+ virtual bool needsUpdate() const override;
+ virtual bool updatePlaylist() override;
+ virtual void scheduleNextUpdate() override;
static bool isDASH(xml::Node *);
static bool mimeMatched(const std::string &);
protected:
- virtual int doControl(int, va_list); /* reimpl */
+ virtual int doControl(int, va_list) override;
};
}
diff --git a/modules/demux/dash/DASHStream.hpp b/modules/demux/dash/DASHStream.hpp
index 562c1447d2..6b26bea370 100644
--- a/modules/demux/dash/DASHStream.hpp
+++ b/modules/demux/dash/DASHStream.hpp
@@ -32,9 +32,9 @@ namespace dash
DASHStream(demux_t *);
protected:
- virtual block_t *checkBlock(block_t *, bool); /* impl */
+ virtual block_t *checkBlock(block_t *, bool) override;
virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
- es_out_t *, AbstractSourceStream *) const; /* reimpl */
+ es_out_t *, AbstractSourceStream *) const override;
};
class DASHStreamFactory : public AbstractStreamFactory
diff --git a/modules/demux/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h
index 0f7059a8bb..6fa3a3206e 100644
--- a/modules/demux/dash/mpd/AdaptationSet.h
+++ b/modules/demux/dash/mpd/AdaptationSet.h
@@ -48,7 +48,7 @@ namespace dash
AdaptationSet(playlist::BasePeriod *);
virtual ~AdaptationSet();
- virtual StreamFormat getStreamFormat() const; /* reimpl */
+ virtual StreamFormat getStreamFormat() const override;
bool getSubsegmentAlignmentFlag() const;
void setSubsegmentAlignmentFlag( bool alignment );
diff --git a/modules/demux/dash/mpd/DASHSegment.h b/modules/demux/dash/mpd/DASHSegment.h
index 6dca2c8d98..11d1de13c9 100644
--- a/modules/demux/dash/mpd/DASHSegment.h
+++ b/modules/demux/dash/mpd/DASHSegment.h
@@ -40,7 +40,7 @@ namespace dash
public:
DashIndexChunk(AbstractChunkSource *, BaseRepresentation *);
~DashIndexChunk();
- virtual void onDownload(block_t **); /* reimpl */
+ virtual void onDownload(block_t **) override;
};
class DashIndexSegment : public IndexSegment
@@ -48,7 +48,7 @@ namespace dash
public:
DashIndexSegment( ICanonicalUrl *parent );
~DashIndexSegment();
- virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *); /* reimpl */
+ virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *) override;
};
}
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 2d66fa5d5d..58a86d77a6 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -46,7 +46,7 @@ namespace dash
Representation( AdaptationSet * );
virtual ~Representation ();
- virtual StreamFormat getStreamFormat() const; /* reimpl */
+ virtual StreamFormat getStreamFormat() const override;
/* for segment templates */
virtual std::string contextualize(size_t, const std::string &,
diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp
index d7f554ebb1..ca21048b1f 100644
--- a/modules/demux/hls/HLSStreams.hpp
+++ b/modules/demux/hls/HLSStreams.hpp
@@ -33,9 +33,9 @@ namespace hls
virtual ~HLSStream();
protected:
- virtual block_t *checkBlock(block_t *, bool); /* reimpl */
+ virtual block_t *checkBlock(block_t *, bool) override;
virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
- es_out_t *, AbstractSourceStream *) const; /* reimpl */
+ es_out_t *, AbstractSourceStream *) const override;
virtual bool setPosition(vlc_tick_t, bool);
private:
diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp
index 90713a1288..60fa57d30d 100644
--- a/modules/demux/hls/playlist/HLSSegment.hpp
+++ b/modules/demux/hls/playlist/HLSSegment.hpp
@@ -39,12 +39,12 @@ namespace hls
HLSSegment( ICanonicalUrl *parent, uint64_t sequence );
virtual ~HLSSegment();
vlc_tick_t getUTCTime() const;
- virtual int compare(ISegment *) const; /* reimpl */
+ virtual int compare(ISegment *) const override;
protected:
vlc_tick_t utcTime;
virtual bool prepareChunk(SharedResources *, SegmentChunk *,
- BaseRepresentation *); /* reimpl */
+ BaseRepresentation *) override;
};
}
}
diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/Representation.hpp
index 0d685a3add..617f86eb5b 100644
--- a/modules/demux/hls/playlist/Representation.hpp
+++ b/modules/demux/hls/playlist/Representation.hpp
@@ -41,18 +41,18 @@ namespace hls
public:
Representation( BaseAdaptationSet * );
virtual ~Representation ();
- virtual StreamFormat getStreamFormat() const; /* reimpl */
+ virtual StreamFormat getStreamFormat() const override;
void setPlaylistUrl(const std::string &);
Url getPlaylistUrl() const;
bool isLive() const;
bool initialized() const;
- virtual void scheduleNextUpdate(uint64_t, bool); /* reimpl */
- virtual bool needsUpdate(uint64_t) const; /* reimpl */
- virtual void debug(vlc_object_t *, int) const; /* reimpl */
- virtual bool runLocalUpdates(SharedResources *); /* reimpl */
+ virtual void scheduleNextUpdate(uint64_t, bool) override;
+ virtual bool needsUpdate(uint64_t) const override;
+ virtual void debug(vlc_object_t *, int) const override;
+ virtual bool runLocalUpdates(SharedResources *) override;
- virtual uint64_t translateSegmentNumber(uint64_t, const BaseRepresentation *) const; /* reimpl */
+ virtual uint64_t translateSegmentNumber(uint64_t, const BaseRepresentation *) const override;
private:
StreamFormat streamFormat;
diff --git a/modules/demux/smooth/SmoothManager.hpp b/modules/demux/smooth/SmoothManager.hpp
index 1e32603948..488009ee9c 100644
--- a/modules/demux/smooth/SmoothManager.hpp
+++ b/modules/demux/smooth/SmoothManager.hpp
@@ -44,15 +44,15 @@ namespace smooth
logic::AbstractAdaptationLogic::LogicType type );
virtual ~SmoothManager();
- virtual bool needsUpdate() const; /* reimpl */
- virtual void scheduleNextUpdate(); /* reimpl */
- virtual bool updatePlaylist(); /* reimpl */
+ virtual bool needsUpdate() const override;
+ virtual void scheduleNextUpdate() override;
+ virtual bool updatePlaylist() override;
static bool isSmoothStreaming(xml::Node *);
static bool mimeMatched(const std::string &);
protected:
- virtual bool reactivateStream(AbstractStream *); /* reimpl */
+ virtual bool reactivateStream(AbstractStream *) override;
private:
bool updatePlaylist(bool);
diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp
index 3aaff235ee..3a0c187eee 100644
--- a/modules/demux/smooth/SmoothStream.hpp
+++ b/modules/demux/smooth/SmoothStream.hpp
@@ -32,9 +32,9 @@ namespace smooth
SmoothStream(demux_t *);
protected:
- virtual block_t *checkBlock(block_t *, bool) /* impl */;
+ virtual block_t *checkBlock(block_t *, bool) override;
virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
- es_out_t *, AbstractSourceStream *) const; /* reimpl */
+ es_out_t *, AbstractSourceStream *) const override;
};
class SmoothStreamFactory : public AbstractStreamFactory
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.hpp b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
index fd87c13c25..f2cb65d393 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.hpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
@@ -40,7 +40,7 @@ namespace smooth
uint64_t, vlc_tick_t);
virtual ~ForgedInitSegment();
virtual SegmentChunk* toChunk(SharedResources *, AbstractConnectionManager *,
- size_t, BaseRepresentation *); /* reimpl */
+ size_t, BaseRepresentation *) override;
void setWaveFormatEx(const std::string &);
void setCodecPrivateData(const std::string &);
void setChannels(uint16_t);
diff --git a/modules/demux/smooth/playlist/MemoryChunk.hpp b/modules/demux/smooth/playlist/MemoryChunk.hpp
index fd91745750..52fc8829f0 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.hpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.hpp
@@ -34,9 +34,9 @@ namespace smooth
MemoryChunkSource(block_t *);
virtual ~MemoryChunkSource();
- virtual block_t * readBlock(); /* impl */
- virtual block_t * read(size_t); /* impl */
- virtual bool hasMoreData() const; /* impl */
+ virtual block_t * readBlock() override;
+ virtual block_t * read(size_t) override;
+ virtual bool hasMoreData() const override;
private:
block_t *data;
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp
index e708fc14a8..db66cbdc47 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/Representation.hpp
@@ -45,8 +45,8 @@ namespace smooth
Representation(BaseAdaptationSet *);
virtual ~Representation ();
- virtual InitSegment * getInitSegment() const; /* reimpl */
- virtual StreamFormat getStreamFormat() const; /* reimpl */
+ virtual InitSegment * getInitSegment() const override;
+ virtual StreamFormat getStreamFormat() const override;
/* for segment templates */
virtual std::string contextualize(size_t, const std::string &,
diff --git a/modules/demux/smooth/playlist/SmoothSegment.hpp b/modules/demux/smooth/playlist/SmoothSegment.hpp
index 6eda4e7b5c..757491f8f3 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.hpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.hpp
@@ -34,7 +34,7 @@ namespace smooth
public:
SmoothSegmentChunk(AbstractChunkSource *, BaseRepresentation *);
virtual ~SmoothSegmentChunk();
- virtual void onDownload(block_t **); /* reimpl */
+ virtual void onDownload(block_t **) override;
};
class SmoothSegmentTemplateSegment : public SegmentTemplateSegment
@@ -42,7 +42,7 @@ namespace smooth
public:
SmoothSegmentTemplateSegment( ICanonicalUrl * = nullptr );
virtual ~SmoothSegmentTemplateSegment();
- virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *); /* reimpl */
+ virtual SegmentChunk* createChunk(AbstractChunkSource *, BaseRepresentation *) override;
};
}
}
More information about the vlc-commits
mailing list