[vlc-commits] [Git][videolan/vlc][master] demux: hls: do not track explicit time offset at stream level

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
fb836a93 by François Cartegnie at 2024-04-04T03:49:46+00:00
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

- - - - -


2 changed files:

- modules/demux/hls/HLSStreams.cpp
- modules/demux/hls/HLSStreams.hpp


Changes:

=====================================
modules/demux/hls/HLSStreams.cpp
=====================================
@@ -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);


=====================================
modules/demux/hls/HLSStreams.hpp
=====================================
@@ -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;
     };



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

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


VideoLAN code repository instance