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

adaptive: use secf from vlc_tick_t functions for conversion

Browse Source
This commit is contained in:
Steve Lhomme 2018-06-15 09:37:53 +02:00
parent e22fabb350
commit 82c8d6c909
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
View File

@ -106,7 +106,7 @@ BaseRepresentation *NearOptimalAdaptationLogic::getNextRepresentation(BaseAdapta
vlc_mutex_unlock(&lock);
const float gammaP = 1.0 + (umax - umin) / ((float)ctxcopy.buffering_target / ctxcopy.buffering_min - 1.0);
const float Vd = ((float)ctxcopy.buffering_min / CLOCK_FREQ - 1.0) / (umin + gammaP);
const float Vd = (secf_from_vlc_tick(ctxcopy.buffering_min) - 1.0) / (umin + gammaP);
BaseRepresentation *m;
if(prevRep == NULL) /* Starting */
@ -117,7 +117,7 @@ BaseRepresentation *NearOptimalAdaptationLogic::getNextRepresentation(BaseAdapta
{
/* noted m* */
m = getNextQualityIndex(adaptSet, selector, gammaP - umin /* umin == Sm, utility = std::log(S/Sm) */,
Vd, (float)ctxcopy.buffering_level / CLOCK_FREQ);
Vd, secf_from_vlc_tick(ctxcopy.buffering_level));
if(m->getBandwidth() < prevRep->getBandwidth()) /* m*[n] < m*[n-1] */
{
BaseRepresentation *mp = selector.select(adaptSet, bps); /* m' */