[vlc-commits] [Git][videolan/vlc][master] demux: adaptive: provide default impl for checkBlock

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
98db4670 by Francois Cartegnie at 2022-08-12T08:58:04+00:00
demux: adaptive: provide default impl for checkBlock

- - - - -


6 changed files:

- modules/demux/adaptive/Streams.cpp
- modules/demux/adaptive/Streams.hpp
- modules/demux/dash/DASHStream.cpp
- modules/demux/dash/DASHStream.hpp
- modules/demux/smooth/SmoothStream.cpp
- modules/demux/smooth/SmoothStream.hpp


Changes:

=====================================
modules/demux/adaptive/Streams.cpp
=====================================
@@ -743,6 +743,11 @@ void AbstractStream::fillExtraFMTInfo( es_format_t *p_fmt ) const
     }
 }
 
+block_t *AbstractStream::checkBlock(block_t *p_block, bool)
+{
+    return p_block;
+}
+
 AbstractDemuxer * AbstractStream::createDemux(const StreamFormat &format)
 {
     AbstractDemuxer *ret = newDemux( VLC_OBJECT(p_realdemux), format,


=====================================
modules/demux/adaptive/Streams.hpp
=====================================
@@ -114,7 +114,7 @@ namespace adaptive
     protected:
         bool seekAble() const;
         void setDisabled(bool);
-        virtual block_t *checkBlock(block_t *, bool) = 0;
+        virtual block_t *checkBlock(block_t *, bool);
         AbstractDemuxer * createDemux(const StreamFormat &);
         virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
                                            es_out_t *, AbstractSourceStream *) const  override;


=====================================
modules/demux/dash/DASHStream.cpp
=====================================
@@ -30,11 +30,6 @@ DASHStream::DASHStream(demux_t *demux)
 {
 }
 
-block_t * DASHStream::checkBlock(block_t *p_block, bool)
-{
-    return p_block;
-}
-
 AbstractDemuxer *DASHStream::newDemux(vlc_object_t *p_obj, const StreamFormat &format,
                                       es_out_t *out, AbstractSourceStream *source) const
 {


=====================================
modules/demux/dash/DASHStream.hpp
=====================================
@@ -32,7 +32,6 @@ namespace dash
             DASHStream(demux_t *);
 
         protected:
-            virtual block_t *checkBlock(block_t *, bool) override;
             virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
                                                es_out_t *, AbstractSourceStream *) const override;
     };


=====================================
modules/demux/smooth/SmoothStream.cpp
=====================================
@@ -40,11 +40,6 @@ AbstractDemuxer *SmoothStream::newDemux(vlc_object_t *p_obj, const StreamFormat
     return AbstractStream::newDemux(p_obj, format, out, source);
 }
 
-block_t * SmoothStream::checkBlock(block_t *p_block, bool)
-{
-    return p_block;
-}
-
 AbstractStream * SmoothStreamFactory::create(demux_t *realdemux, const StreamFormat &format,
                                              SegmentTracker *tracker) const
 {


=====================================
modules/demux/smooth/SmoothStream.hpp
=====================================
@@ -32,7 +32,6 @@ namespace smooth
             SmoothStream(demux_t *);
 
         protected:
-            virtual block_t *checkBlock(block_t *, bool) override;
             virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
                                                es_out_t *, AbstractSourceStream *) const override;
     };



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/98db4670a33ad3a99edb5f9efcf8638445601fef

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/98db4670a33ad3a99edb5f9efcf8638445601fef
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance