diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-15 14:13:53 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-17 23:13:34 +0200 |
commit | 745bd14f36eb5dfa5d8f7c603c2b41494c84bd00 (patch) | |
tree | 5ed8a7fcc5792f27c4a98080e1cd47e439328826 | |
parent | af1182b5e29afa0cd69f929d54da224019707214 (diff) |
Fix parameter naming after API review
microseconds is a lot clearer than duration.
Change-Id: I9e3aa5b60cac8c16cb7466ed68bd98d4e6f1bc9f
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
-rw-r--r-- | src/multimedia/audio/qaudioformat.cpp | 16 | ||||
-rw-r--r-- | src/multimedia/audio/qaudioformat.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp index 2de431dc9..c29c82914 100644 --- a/src/multimedia/audio/qaudioformat.cpp +++ b/src/multimedia/audio/qaudioformat.cpp @@ -170,18 +170,18 @@ QT_BEGIN_NAMESPACE */ /*! - Returns the number of bytes required for this audio format for \a duration microseconds. + Returns the number of bytes required for this audio format for \a microseconds. Returns 0 if this format is not valid. - Note that some rounding may occur if \a duration is not an exact fraction of the + Note that some rounding may occur if \a microseconds is not an exact fraction of the sampleRate(). \sa durationForBytes() */ -qint32 QAudioFormat::bytesForDuration(qint64 duration) const +qint32 QAudioFormat::bytesForDuration(qint64 microseconds) const { - return bytesPerFrame() * framesForDuration(duration); + return bytesPerFrame() * framesForDuration(microseconds); } /*! @@ -239,17 +239,17 @@ qint32 QAudioFormat::framesForBytes(qint32 byteCount) const } /*! - Returns the number of frames required to represent \a duration microseconds in this format. + Returns the number of frames required to represent \a microseconds in this format. - Note that some rounding may occur if \a duration is not an exact fraction of the + Note that some rounding may occur if \a microseconds is not an exact fraction of the \l sampleRate(). */ -qint32 QAudioFormat::framesForDuration(qint64 duration) const +qint32 QAudioFormat::framesForDuration(qint64 microseconds) const { if (!isValid()) return 0; - return qint32((duration * sampleRate()) / 1000000LL); + return qint32((microseconds * sampleRate()) / 1000000LL); } /*! diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index ca0e9a6f6..c5580e7f2 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -77,13 +77,13 @@ public: constexpr SampleFormat sampleFormat() const noexcept { return m_sampleFormat; } // Helper functions - Q_MULTIMEDIA_EXPORT qint32 bytesForDuration(qint64 duration) const; + Q_MULTIMEDIA_EXPORT qint32 bytesForDuration(qint64 microseconds) const; Q_MULTIMEDIA_EXPORT qint64 durationForBytes(qint32 byteCount) const; Q_MULTIMEDIA_EXPORT qint32 bytesForFrames(qint32 frameCount) const; Q_MULTIMEDIA_EXPORT qint32 framesForBytes(qint32 byteCount) const; - Q_MULTIMEDIA_EXPORT qint32 framesForDuration(qint64 duration) const; + Q_MULTIMEDIA_EXPORT qint32 framesForDuration(qint64 microseconds) const; Q_MULTIMEDIA_EXPORT qint64 durationForFrames(qint32 frameCount) const; constexpr int bytesPerFrame() const { return bytesPerSample()*channelCount(); } |