videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-03 01:31:53 +02:00
Code Releases Activity

demux: adaptive: remove now unused random access times

Browse Source
This commit is contained in:
Francois Cartegnie 2022-01-11 17:37:43 +01:00 committed by Jean-Baptiste Kempf
parent fbfb934900
commit b0e2256615
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/demux/adaptive/PlaylistManager.cpp
View File

@ -746,15 +746,12 @@ void PlaylistManager::updateControlsPosition()
return;
cached.lastupdate = now;
vlc_tick_t rapPlaylistStart = 0;
vlc_tick_t rapDemuxStart = 0;
for(AbstractStream* st : streams)
{
if(st->isValid() && !st->isDisabled() && st->isSelected())
{
if(st->getMediaPlaybackTimes(&cached.playlistStart, &cached.playlistEnd,
&cached.playlistLength,
&rapPlaylistStart, &rapDemuxStart))
&cached.playlistLength))
break;
}
}
@ -780,7 +777,7 @@ void PlaylistManager::updateControlsPosition()
SeekDebug(msg_Dbg(p_demux, "playlist Start/End %ld/%ld len %ld"
"rap pl/demux (%ld/%ld)",
cached.playlistStart, cached.playlistEnd, cached.playlistEnd,
rapPlaylistStart, rapDemuxStart));
startTimes.segment.media, startTimes.segment.demux));
if(cached.b_live)
{
@ -826,8 +823,9 @@ void PlaylistManager::updateControlsPosition()
}
}
SeekDebug(msg_Dbg(p_demux, "cached.i_time (%ld) cur %ld rap start (pl %ld/dmx %ld)",
cached.i_time, currentTimes.continuous, rapPlaylistStart, rapDemuxStart));
SeekDebug(msg_Dbg(p_demux, "cached.i_time (%ld) cur %ld rap start (pl %ld/dmx %ld) pos %f",
cached.i_time, currentTimes.continuous, startTimes.segment.media,
startTimes.segment.demux, cached.f_position));
}
AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::LogicType type, AbstractConnectionManager *conn)

7
modules/demux/adaptive/Streams.cpp
View File

@ -581,12 +581,9 @@ bool AbstractStream::setPosition(vlc_tick_t time, bool tryonly)
}
bool AbstractStream::getMediaPlaybackTimes(vlc_tick_t *start, vlc_tick_t *end,
vlc_tick_t *length,
vlc_tick_t *mediaStart,
vlc_tick_t *demuxStart) const
vlc_tick_t *length) const
{
return (segmentTracker->getMediaPlaybackRange(start, end, length) &&
fakeEsOut()->getStartTimestamps(mediaStart, demuxStart));
return segmentTracker->getMediaPlaybackRange(start, end, length);
}
void AbstractStream::runUpdates()

3
modules/demux/adaptive/Streams.hpp
View File

@ -92,8 +92,7 @@ namespace adaptive
Status dequeue(Times, Times *);
bool decodersDrained();
virtual bool setPosition(vlc_tick_t, bool);
bool getMediaPlaybackTimes(vlc_tick_t *, vlc_tick_t *, vlc_tick_t *,
vlc_tick_t *, vlc_tick_t *) const;
bool getMediaPlaybackTimes(vlc_tick_t *, vlc_tick_t *, vlc_tick_t *) const;
void runUpdates();
/* Used by demuxers fake streams */

9
modules/demux/adaptive/plumbing/FakeESOut.cpp
View File

@ -182,15 +182,6 @@ void FakeESOut::resetTimestamps()
startTimes = SegmentTimes();
}
bool FakeESOut::getStartTimestamps( vlc_tick_t *pi_mediats, vlc_tick_t *pi_demuxts )
{
if(!expected.b_timestamp_set)
return false;
*pi_demuxts = startTimes.demux;
*pi_mediats = startTimes.media;
return true;
}
void FakeESOut::setExpectedTimestamp(vlc_tick_t ts)
{
if(ts < 0)

1
modules/demux/adaptive/plumbing/FakeESOut.hpp
View File

@ -85,7 +85,6 @@ namespace adaptive
void setAssociatedTimestamp( vlc_tick_t );
void setExpectedTimestamp( vlc_tick_t );
void resetTimestamps();
bool getStartTimestamps( vlc_tick_t *, vlc_tick_t * );
size_t esCount() const;
bool hasSelectedEs() const;
bool decodersDrained();