opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-30 17:58:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clamp float values possibly representing infinity to integer size

Browse Source 
Casting a floating point type to an integer type has undefined behaviour
if the value does not fit into the destination type.

As the volume meter is initialized with floats values representing +inf
(as makes sense for a dB meter), values should be explicitly clamped
to integer boundaries.
This commit is contained in:
PatTheMav
2022-10-08 23:56:53 +02:00
committed by Jim
parent 992d18b66c
commit 8f362fe508
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/volume-control.cpp
+23 -10
View File
@@ -1070,6 +1070,19 @@ void VolumeMeter::ClipEnding()
clipping = false;
}
inline int VolumeMeter::convertToInt(float number)
{
constexpr int min = std::numeric_limits<int>::min();
constexpr int max = std::numeric_limits<int>::max();
if (number > max)
return max;
else if (number < min)
return min;
else
return int(number);
}
void VolumeMeter::paintHMeter(QPainter &painter, int x, int y, int width,
int height, float magnitude, float peak,
float peakHold)
@@ -1079,11 +1092,11 @@ void VolumeMeter::paintHMeter(QPainter &painter, int x, int y, int width,
QMutexLocker locker(&dataMutex);
int minimumPosition = x + 0;
int maximumPosition = x + width;
int magnitudePosition = int(x + width - (magnitude * scale));
int peakPosition = int(x + width - (peak * scale));
int peakHoldPosition = int(x + width - (peakHold * scale));
int warningPosition = int(x + width - (warningLevel * scale));
int errorPosition = int(x + width - (errorLevel * scale));
int magnitudePosition = x + width - convertToInt(magnitude * scale);
int peakPosition = x + width - convertToInt(peak * scale);
int peakHoldPosition = x + width - convertToInt(peakHold * scale);
int warningPosition = x + width - convertToInt(warningLevel * scale);
int errorPosition = x + width - convertToInt(errorLevel * scale);
int nominalLength = warningPosition - minimumPosition;
int warningLength = errorPosition - warningPosition;
@@ -1191,11 +1204,11 @@ void VolumeMeter::paintVMeter(QPainter &painter, int x, int y, int width,
QMutexLocker locker(&dataMutex);
int minimumPosition = y + 0;
int maximumPosition = y + height;
int magnitudePosition = int(y + height - (magnitude * scale));
int peakPosition = int(y + height - (peak * scale));
int peakHoldPosition = int(y + height - (peakHold * scale));
int warningPosition = int(y + height - (warningLevel * scale));
int errorPosition = int(y + height - (errorLevel * scale));
int magnitudePosition = y + height - convertToInt(magnitude * scale);
int peakPosition = y + height - convertToInt(peak * scale);
int peakHoldPosition = y + height - convertToInt(peakHold * scale);
int warningPosition = y + height - convertToInt(warningLevel * scale);
int errorPosition = y + height - convertToInt(errorLevel * scale);
int nominalLength = warningPosition - minimumPosition;
int warningLength = errorPosition - warningPosition;
UI/volume-control.hpp
+1
View File
@@ -110,6 +110,7 @@ private:
inline void calculateBallisticsForChannel(int channelNr, uint64_t ts,
qreal timeSinceLastRedraw);
inline int convertToInt(float number);
void paintInputMeter(QPainter &painter, int x, int y, int width,
int height, float peakHold);
void paintHMeter(QPainter &painter, int x, int y, int width, int height,