Commit 052ac2b0 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: adaptative: fix regression if pcr is first set alone

parent 19e793f9
...@@ -276,7 +276,7 @@ void Stream::prune() ...@@ -276,7 +276,7 @@ void Stream::prune()
AbstractStreamOutput::AbstractStreamOutput(demux_t *demux, const StreamFormat &format_) AbstractStreamOutput::AbstractStreamOutput(demux_t *demux, const StreamFormat &format_)
{ {
realdemux = demux; realdemux = demux;
pcr = VLC_TS_0; pcr = VLC_TS_INVALID;
group = 0; group = 0;
format = format_; format = format_;
} }
......
...@@ -190,8 +190,9 @@ static int Demux(demux_t *p_demux) ...@@ -190,8 +190,9 @@ static int Demux(demux_t *p_demux)
{ {
return VLC_DEMUXER_EOF; return VLC_DEMUXER_EOF;
} }
mtime_t i_dts = p_sys->p_dashManager->getFirstDTS(); p_sys->i_nzpcr = p_sys->p_dashManager->getFirstDTS();
p_sys->i_nzpcr = i_dts; if(p_sys->i_nzpcr == VLC_TS_INVALID)
p_sys->i_nzpcr = p_sys->p_dashManager->getPCR();
} }
Stream::status status = Stream::status status =
......
...@@ -227,8 +227,9 @@ static int Demux(demux_t *p_demux) ...@@ -227,8 +227,9 @@ static int Demux(demux_t *p_demux)
{ {
return VLC_DEMUXER_EOF; return VLC_DEMUXER_EOF;
} }
mtime_t i_dts = p_sys->p_manager->getFirstDTS(); p_sys->i_nzpcr = p_sys->p_manager->getFirstDTS();
p_sys->i_nzpcr = i_dts; if(p_sys->i_nzpcr == VLC_TS_INVALID)
p_sys->i_nzpcr = p_sys->p_manager->getPCR();
} }
Stream::status status = Stream::status status =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment