Commit 0c90daf6 authored by Jean-Paul Saman's avatar Jean-Paul Saman

stream_filter/httplive.c: quiet down playback stalling warning.

The playback stalling warning was printed too often. Only print this message when
playback is in real danger and check only on segment boundaries.
parent 6b152c69
...@@ -1719,10 +1719,19 @@ static segment_t *GetSegment(stream_t *s) ...@@ -1719,10 +1719,19 @@ static segment_t *GetSegment(stream_t *s)
check: check:
/* sanity check */ /* sanity check */
if (p_sys->download.segment - p_sys->playback.segment == 0) if (segment->data->i_buffer == 0)
msg_Err(s, "playback will stall"); {
else if (p_sys->download.segment - p_sys->playback.segment < 3) vlc_mutex_lock(&hls->lock);
msg_Warn(s, "playback in danger of stalling"); int count = vlc_array_count(hls->segments);
vlc_mutex_unlock(&hls->lock);
if ((p_sys->download.segment - p_sys->playback.segment == 0) &&
((count != p_sys->download.segment) || p_sys->b_live))
msg_Err(s, "playback will stall");
else if ((p_sys->download.segment - p_sys->playback.segment < 3) &&
((count != p_sys->download.segment) || p_sys->b_live))
msg_Warn(s, "playback in danger of stalling");
}
return segment; return segment;
} }
......
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