Skip to content
Snippets Groups Projects
Commit fb836a93 authored by François Cartegnie's avatar François Cartegnie :fingers_crossed: Committed by Steve Lhomme
Browse files

demux: hls: do not track explicit time offset at stream level

refs #28579

Did not update on switch and is applied once at ESOut level
parent 2cb6980d
No related branches found
No related tags found
1 merge request!5164demux: hls: do not track explicit time offset at stream level
Pipeline #456000 passed with warnings with stages
in 41 minutes and 25 seconds
......@@ -41,7 +41,6 @@ using namespace hls;
HLSStream::HLSStream(demux_t *demux)
: AbstractStream(demux)
{
b_id3_timestamps_offset_set = false;
p_meta = vlc_meta_New();
b_meta_updated = false;
}
......@@ -55,16 +54,9 @@ HLSStream::~HLSStream()
void HLSStream::setMetadataTimeOffset(vlc_tick_t i_offset)
{
if(i_offset >= 0)
{
if(!b_id3_timestamps_offset_set)
fakeEsOut()->setAssociatedTimestamp(i_offset);
b_id3_timestamps_offset_set = true;
}
fakeEsOut()->setAssociatedTimestamp(i_offset);
else
{
fakeEsOut()->setAssociatedTimestamp(-1);
b_id3_timestamps_offset_set = false;
}
}
void HLSStream::setMetadataTimeMapping(vlc_tick_t mpegts, vlc_tick_t muxed)
......@@ -72,14 +64,6 @@ void HLSStream::setMetadataTimeMapping(vlc_tick_t mpegts, vlc_tick_t muxed)
fakeEsOut()->setAssociatedTimestamp(mpegts, muxed);
}
bool HLSStream::setPosition(const StreamPosition &pos, bool b)
{
bool ok = AbstractStream::setPosition(pos, b);
if(b && ok)
b_id3_timestamps_offset_set = false;
return ok;
}
void HLSStream::trackerEvent(const TrackerEvent &e)
{
AbstractStream::trackerEvent(e);
......
......@@ -36,7 +36,6 @@ namespace hls
block_t *checkBlock(block_t *, bool) override;
AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &,
es_out_t *, AbstractSourceStream *) const override;
bool setPosition(const StreamPosition &, bool) override;
void trackerEvent(const TrackerEvent &) override;
private:
......@@ -45,7 +44,6 @@ namespace hls
int ParseID3PrivTag(const uint8_t *, size_t);
void setMetadataTimeOffset(vlc_tick_t);
void setMetadataTimeMapping(vlc_tick_t, vlc_tick_t);
bool b_id3_timestamps_offset_set;
vlc_meta_t *p_meta;
bool b_meta_updated;
};
......
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