Commit 338846d9 authored by Ilkka Ollakka's avatar Ilkka Ollakka

livehttp: try to follow draft 11 section 6.2.2

Keep atleast 3 * seglen amount of segments in playlist if possible.
This will cause playlist to increase sometimes over i_numseg, but it
follows the draft better.
parent 1f79a984
......@@ -490,6 +490,26 @@ static void destroySegment( output_segment_t *segment )
free( segment );
}
/************************************************************************
* segmentAmountNeeded: check that playlist has atleast 3*p_sys->i_seglength of segments
* return how many segments are needed for that (max of p_sys->i_segment )
************************************************************************/
static uint32_t segmentAmountNeeded( sout_access_out_sys_t *p_sys )
{
float duration = .0f;
for( unsigned index = 1; index <= vlc_array_count( p_sys->segments_t ) ; index++ )
{
output_segment_t* segment = vlc_array_item_at_index( p_sys->segments_t, vlc_array_count( p_sys->segments_t ) - index );
duration += segment->f_seglength;
if( duration >= (float)( 3 * p_sys->i_seglen ) )
return __MAX(index, p_sys->i_numsegs);
}
return vlc_array_count( p_sys->segments_t )-1;
}
/************************************************************************
* isFirstItemRemovable: Check for draft 11 section 6.2.2
* check that the first item has been around outside playlist
......@@ -525,8 +545,9 @@ static int updateIndexAndDel( sout_access_out_t *p_access, sout_access_out_sys_t
i_firstseg = 1;
else
{
i_firstseg = ( p_sys->i_segment - p_sys->i_numsegs ) + 1;
i_index_offset = vlc_array_count( p_sys->segments_t ) - p_sys->i_numsegs;
unsigned numsegs = segmentAmountNeeded( p_sys );
i_firstseg = ( p_sys->i_segment - numsegs ) + 1;
i_index_offset = vlc_array_count( p_sys->segments_t ) - numsegs;
}
// First update index
......
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