[vlc-commits] demux: adaptive: add missing override specifiers
Francois Cartegnie
git at videolan.org
Fri Jan 8 13:20:32 UTC 2021
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jan 7 13:04:48 2021 +0100| [b1aad929d4e15d01d9badd60a6c08e69ffe339b6] | committer: Francois Cartegnie
demux: adaptive: add missing override specifiers
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1aad929d4e15d01d9badd60a6c08e69ffe339b6
---
modules/demux/adaptive/http/HTTPConnection.hpp | 20 ++++++++++----------
.../demux/adaptive/logic/AlwaysBestAdaptationLogic.h | 3 ++-
.../adaptive/logic/AlwaysLowestAdaptationLogic.hpp | 3 ++-
.../adaptive/logic/NearOptimalAdaptationLogic.hpp | 3 ++-
.../adaptive/logic/PredictiveAdaptationLogic.hpp | 3 ++-
.../demux/adaptive/logic/RateBasedAdaptationLogic.h | 6 ++++--
modules/demux/adaptive/logic/RoundRobinLogic.hpp | 2 +-
modules/demux/adaptive/playlist/BaseRepresentation.h | 2 +-
modules/demux/dash/DASHStream.hpp | 2 +-
modules/demux/dash/mpd/MPD.h | 4 ++--
modules/demux/dash/mpd/Representation.h | 2 +-
modules/demux/hls/HLSStreams.hpp | 4 ++--
modules/demux/hls/playlist/M3U8.hpp | 2 +-
modules/demux/hls/playlist/Tags.hpp | 2 +-
modules/demux/smooth/SmoothStream.hpp | 2 +-
modules/demux/smooth/playlist/Manifest.hpp | 2 +-
modules/demux/smooth/playlist/Representation.hpp | 2 +-
17 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/modules/demux/adaptive/http/HTTPConnection.hpp b/modules/demux/adaptive/http/HTTPConnection.hpp
index 7ea76db180..7af6871fb9 100644
--- a/modules/demux/adaptive/http/HTTPConnection.hpp
+++ b/modules/demux/adaptive/http/HTTPConnection.hpp
@@ -71,12 +71,12 @@ namespace adaptive
const ConnectionParams &, bool = false);
virtual ~HTTPConnection();
- virtual bool canReuse (const ConnectionParams &) const;
+ virtual bool canReuse (const ConnectionParams &) const override;
virtual RequestStatus request(const std::string& path,
- const BytesRange & = BytesRange());
- virtual ssize_t read (void *p_buffer, size_t len);
+ const BytesRange & = BytesRange()) override;
+ virtual ssize_t read (void *p_buffer, size_t len) override;
- void setUsed( bool );
+ void setUsed( bool ) override;
const ConnectionParams &getRedirection() const;
static const unsigned MAX_REDIRECTS = 3;
@@ -119,13 +119,13 @@ namespace adaptive
StreamUrlConnection(vlc_object_t *);
virtual ~StreamUrlConnection();
- virtual bool canReuse (const ConnectionParams &) const;
+ virtual bool canReuse (const ConnectionParams &) const override;
virtual RequestStatus request(const std::string& path,
- const BytesRange & = BytesRange());
- virtual ssize_t read (void *p_buffer, size_t len);
+ const BytesRange & = BytesRange()) override;
+ virtual ssize_t read (void *p_buffer, size_t len) override;
- virtual void setUsed( bool );
+ virtual void setUsed( bool ) override;
protected:
void reset();
@@ -145,7 +145,7 @@ namespace adaptive
public:
NativeConnectionFactory( AuthStorage * );
virtual ~NativeConnectionFactory();
- virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &);
+ virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &) override;
private:
AuthStorage *authStorage;
};
@@ -155,7 +155,7 @@ namespace adaptive
public:
StreamUrlConnectionFactory();
virtual ~StreamUrlConnectionFactory() {}
- virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &);
+ virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &) override;
};
}
}
diff --git a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
index a841936fce..4934913fa3 100644
--- a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
@@ -36,7 +36,8 @@ namespace adaptive
public:
AlwaysBestAdaptationLogic (vlc_object_t *);
- virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
};
}
}
diff --git a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
index 435cb03b9a..c0ffcf9085 100644
--- a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
@@ -31,7 +31,8 @@ namespace adaptive
public:
AlwaysLowestAdaptationLogic(vlc_object_t *);
- virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
};
}
}
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
index 327ca696cf..022b42badf 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
@@ -50,7 +50,8 @@ namespace adaptive
NearOptimalAdaptationLogic(vlc_object_t *);
virtual ~NearOptimalAdaptationLogic();
- virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override;
virtual void trackerEvent (const SegmentTrackerEvent &) override;
diff --git a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
index db7ff0f94d..c69e47fa16 100644
--- a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
@@ -51,7 +51,8 @@ namespace adaptive
PredictiveAdaptationLogic(vlc_object_t *);
virtual ~PredictiveAdaptationLogic();
- virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override;
virtual void trackerEvent (const SegmentTrackerEvent &) override;
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index b21b29e727..33b9a2b680 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -39,7 +39,8 @@ namespace adaptive
RateBasedAdaptationLogic (vlc_object_t *);
virtual ~RateBasedAdaptationLogic ();
- BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ BaseRepresentation *getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t) override;
virtual void trackerEvent(const SegmentTrackerEvent &) override;
@@ -61,7 +62,8 @@ namespace adaptive
public:
FixedRateAdaptationLogic(vlc_object_t *, size_t);
- BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
+ BaseRepresentation *getNextRepresentation(BaseAdaptationSet *,
+ BaseRepresentation *) override;
private:
size_t currentBps;
diff --git a/modules/demux/adaptive/logic/RoundRobinLogic.hpp b/modules/demux/adaptive/logic/RoundRobinLogic.hpp
index ccd890b19f..bbc96d8674 100644
--- a/modules/demux/adaptive/logic/RoundRobinLogic.hpp
+++ b/modules/demux/adaptive/logic/RoundRobinLogic.hpp
@@ -16,7 +16,7 @@ namespace adaptive
RoundRobinLogic(vlc_object_t *);
virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *,
- BaseRepresentation *);
+ BaseRepresentation *) override;
static const unsigned QUANTUM = 2;
private:
size_t index;
diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.h b/modules/demux/adaptive/playlist/BaseRepresentation.h
index b84a0d502c..e6b639fe62 100644
--- a/modules/demux/adaptive/playlist/BaseRepresentation.h
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.h
@@ -62,7 +62,7 @@ namespace adaptive
const std::list<std::string> & getCodecs () const;
void addCodecs (const std::string &);
bool consistentSegmentNumber () const;
- virtual void pruneByPlaybackTime (vlc_tick_t);
+ virtual void pruneByPlaybackTime (vlc_tick_t) override;
virtual vlc_tick_t getMinAheadTime (uint64_t) const;
virtual bool needsUpdate (uint64_t) const;
diff --git a/modules/demux/dash/DASHStream.hpp b/modules/demux/dash/DASHStream.hpp
index 6b26bea370..9a0bd7e243 100644
--- a/modules/demux/dash/DASHStream.hpp
+++ b/modules/demux/dash/DASHStream.hpp
@@ -41,7 +41,7 @@ namespace dash
{
public:
virtual AbstractStream *create(demux_t*, const StreamFormat &,
- SegmentTracker *, AbstractConnectionManager *) const;
+ SegmentTracker *, AbstractConnectionManager *) const override;
};
}
diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
index fa6e98c79a..f0f677cc16 100644
--- a/modules/demux/dash/mpd/MPD.h
+++ b/modules/demux/dash/mpd/MPD.h
@@ -47,8 +47,8 @@ namespace dash
virtual ~MPD();
Profile getProfile() const;
- virtual bool isLive() const;
- virtual bool isLowLatency() const;
+ virtual bool isLive() const override;
+ virtual bool isLowLatency() const override;
void setLowLatency(bool);
virtual void debug();
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 58a86d77a6..ddaf160d8f 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -50,7 +50,7 @@ namespace dash
/* for segment templates */
virtual std::string contextualize(size_t, const std::string &,
- const SegmentTemplate *) const; // reimpl
+ const SegmentTemplate *) const override;
private:
diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp
index ca21048b1f..d1edb5a1d4 100644
--- a/modules/demux/hls/HLSStreams.hpp
+++ b/modules/demux/hls/HLSStreams.hpp
@@ -36,7 +36,7 @@ namespace hls
virtual block_t *checkBlock(block_t *, bool) override;
virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
es_out_t *, AbstractSourceStream *) const override;
- virtual bool setPosition(vlc_tick_t, bool);
+ virtual bool setPosition(vlc_tick_t, bool) override;
private:
static int ID3TAG_Parse_Handler(uint32_t, const uint8_t *, size_t, void *);
@@ -52,7 +52,7 @@ namespace hls
{
public:
virtual AbstractStream *create(demux_t *, const StreamFormat &,
- SegmentTracker *, AbstractConnectionManager *) const;
+ SegmentTracker *, AbstractConnectionManager *) const override;
};
}
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index 5194fd4190..3f6d1b17ec 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -35,7 +35,7 @@ namespace hls
M3U8(vlc_object_t *);
virtual ~M3U8();
- virtual bool isLive() const;
+ virtual bool isLive() const override;
};
}
}
diff --git a/modules/demux/hls/playlist/Tags.hpp b/modules/demux/hls/playlist/Tags.hpp
index 7cdbcb20b6..57658c559c 100644
--- a/modules/demux/hls/playlist/Tags.hpp
+++ b/modules/demux/hls/playlist/Tags.hpp
@@ -121,7 +121,7 @@ namespace hls
virtual ~ValuesListTag();
protected:
- virtual void parseAttributes(const std::string &);
+ virtual void parseAttributes(const std::string &) override;
};
class TagFactory
diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp
index 3a0c187eee..d80268782b 100644
--- a/modules/demux/smooth/SmoothStream.hpp
+++ b/modules/demux/smooth/SmoothStream.hpp
@@ -41,7 +41,7 @@ namespace smooth
{
public:
virtual AbstractStream *create(demux_t*, const StreamFormat &,
- SegmentTracker *, AbstractConnectionManager *) const;
+ SegmentTracker *, AbstractConnectionManager *) const override;
};
}
diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp
index a6d1701db5..9f299ab1f4 100644
--- a/modules/demux/smooth/playlist/Manifest.hpp
+++ b/modules/demux/smooth/playlist/Manifest.hpp
@@ -36,7 +36,7 @@ namespace smooth
Manifest(vlc_object_t *);
virtual ~Manifest();
- virtual bool isLive() const;
+ virtual bool isLive() const override;
private:
bool b_live;
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp
index db66cbdc47..c39eaf3a72 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/Representation.hpp
@@ -50,7 +50,7 @@ namespace smooth
/* for segment templates */
virtual std::string contextualize(size_t, const std::string &,
- const SegmentTemplate *) const; // reimpl
+ const SegmentTemplate *) const override;
};
}
}
More information about the vlc-commits
mailing list