[vlc-commits] demux:adaptive: fix some paramaters type

Steve Lhomme git at videolan.org
Tue Sep 18 14:08:11 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 11 15:01:02 2018 +0200| [3f065057ae7c87f26e2e680768e87f7f38110034] | committer: Steve Lhomme

demux:adaptive: fix some paramaters type

They are vlc_tick_t divided by vlc_tick_t so a ratio in float (and processed as such).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3f065057ae7c87f26e2e680768e87f7f38110034
---

 modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp | 2 +-
 modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
index a311d4cece..1c99538375 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
@@ -65,7 +65,7 @@ NearOptimalAdaptationLogic::~NearOptimalAdaptationLogic()
 
 BaseRepresentation *
 NearOptimalAdaptationLogic::getNextQualityIndex( BaseAdaptationSet *adaptSet, RepresentationSelector &selector,
-                                                 float gammaP, vlc_tick_t VD, vlc_tick_t Q )
+                                                 float gammaP, float VD, float Q )
 {
     BaseRepresentation *ret = NULL;
     BaseRepresentation *prev = NULL;
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
index 1a3f4ef2be..27ec175541 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
@@ -56,8 +56,8 @@ namespace adaptive
 
             private:
                 BaseRepresentation *        getNextQualityIndex( BaseAdaptationSet *, RepresentationSelector &,
-                                                                 float gammaP, vlc_tick_t VD,
-                                                                 vlc_tick_t Q /*current buffer level*/);
+                                                                 float gammaP, float VD,
+                                                                 float Q /*current buffer level*/);
                 float                       getUtility(const BaseRepresentation *);
                 unsigned                    getAvailableBw(unsigned, const BaseRepresentation *) const;
                 unsigned                    getMaxCurrentBw() const;



More information about the vlc-commits mailing list