Skip to content
Snippets Groups Projects
Commit 98db4670 authored by François Cartegnie's avatar François Cartegnie :fingers_crossed: Committed by Hugo Beauzée-Luyssen
Browse files

demux: adaptive: provide default impl for checkBlock

parent 839dee68
No related branches found
No related tags found
1 merge request!2365demux: adaptive: provide default impl for checkBlock
Pipeline #251275 passed with stage
in 13 minutes and 42 seconds
......@@ -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,
......
......@@ -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;
......
......@@ -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
{
......
......@@ -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;
};
......
......@@ -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
{
......
......@@ -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;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment