Fix integer overflow in several audio plugins.
Task-number: QTBUG-40804 Change-Id: If006cb7db319bb6fda4ce7eb4f907e897b5d9efa Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
@@ -768,7 +768,7 @@ qint64 QAlsaAudioInput::elapsedUSecs() const
|
||||
if (deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return clockStamp.elapsed()*1000;
|
||||
return clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QAlsaAudioInput::reset()
|
||||
|
||||
@@ -782,7 +782,7 @@ qint64 QAlsaAudioOutput::elapsedUSecs() const
|
||||
if (deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return clockStamp.elapsed()*1000;
|
||||
return clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QAlsaAudioOutput::reset()
|
||||
|
||||
@@ -482,7 +482,7 @@ qint64 QOpenSLESAudioInput::elapsedUSecs() const
|
||||
if (m_deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return m_clockStamp.elapsed() * 1000;
|
||||
return m_clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QOpenSLESAudioInput::setVolume(qreal vol)
|
||||
|
||||
@@ -290,7 +290,7 @@ qint64 QOpenSLESAudioOutput::elapsedUSecs() const
|
||||
if (m_state == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return m_clockStamp.elapsed() * 1000;
|
||||
return m_clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QOpenSLESAudioOutput::reset()
|
||||
|
||||
@@ -692,7 +692,7 @@ qint64 QPulseAudioInput::elapsedUSecs() const
|
||||
if (m_deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return m_clockStamp.elapsed() * 1000;
|
||||
return m_clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QPulseAudioInput::reset()
|
||||
|
||||
@@ -591,7 +591,7 @@ qint64 QPulseAudioOutput::elapsedUSecs() const
|
||||
if (m_deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return m_clockStamp.elapsed() * 1000;
|
||||
return m_clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QPulseAudioOutput::reset()
|
||||
|
||||
@@ -194,7 +194,7 @@ qint64 QnxAudioInput::elapsedUSecs() const
|
||||
if (m_state == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return m_clockStamp.elapsed() * 1000;
|
||||
return m_clockStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
QAudio::Error QnxAudioInput::error() const
|
||||
|
||||
@@ -180,7 +180,7 @@ qint64 QnxAudioOutput::elapsedUSecs() const
|
||||
if (m_state == QAudio::StoppedState)
|
||||
return 0;
|
||||
else
|
||||
return m_startTimeStamp.elapsed() * 1000;
|
||||
return m_startTimeStamp.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
QAudio::Error QnxAudioOutput::error() const
|
||||
|
||||
@@ -706,7 +706,7 @@ qint64 QWindowsAudioInput::elapsedUSecs() const
|
||||
if (deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return timeStampOpened.elapsed()*1000;
|
||||
return timeStampOpened.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
void QWindowsAudioInput::reset()
|
||||
|
||||
@@ -682,7 +682,7 @@ qint64 QWindowsAudioOutput::elapsedUSecs() const
|
||||
if (deviceState == QAudio::StoppedState)
|
||||
return 0;
|
||||
|
||||
return timeStampOpened.elapsed()*1000;
|
||||
return timeStampOpened.elapsed() * qint64(1000);
|
||||
}
|
||||
|
||||
QAudio::Error QWindowsAudioOutput::error() const
|
||||
|
||||
Reference in New Issue
Block a user