Skip to content

Audio buffer views #7945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
messmerd merged 9 commits into from
Jun 9, 2025
Merged

Audio buffer views #7945

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
175d616
Add audio buffer views
messmerd Jun 7, 2025
69ddff3
Fix some issues
messmerd Jun 8, 2025
74acb31
Fix `PlanarBufferView` constructors
messmerd Jun 8, 2025
9f5197c
Use noexcept
messmerd Jun 8, 2025
7af9eae
Remove SamplePtrT
messmerd Jun 8, 2025
16fe13f
Require static channel counts for templated buffer()
messmerd Jun 8, 2025
a4d47e0
Doxygen style comments with @return command
messmerd Jun 8, 2025
1445413
Add operator[]
messmerd Jun 8, 2025
7a2c764
Tidy up LmmsTypes.h a little
messmerd Jun 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use noexcept
  • Loading branch information
@messmerd
messmerd committed Jun 8, 2025
commit 9f5197c47edfc3b4455a9c44ae2e96ef7d66536f
46 changes: 23 additions & 23 deletions include/AudioBufferView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ class BufferViewData
constexpr BufferViewData() = default;
constexpr BufferViewData(const BufferViewData&) = default;

constexpr BufferViewData(SampleT* data, proc_ch_t channels, f_cnt_t frames)
constexpr BufferViewData(SampleT* data, proc_ch_t channels, f_cnt_t frames) noexcept
: m_data{data}
, m_frames{frames}
{
assert(channels == channelCount);
}

constexpr BufferViewData(SampleT* data, f_cnt_t frames)
constexpr BufferViewData(SampleT* data, f_cnt_t frames) noexcept
: m_data{data}
, m_frames{frames}
{
}

constexpr auto data() const -> SampleT* { return m_data; }
constexpr auto channels() const -> proc_ch_t { return channelCount; }
constexpr auto frames() const -> f_cnt_t { return m_frames; }
constexpr auto data() const noexcept -> SampleT* { return m_data; }
constexpr auto channels() const noexcept -> proc_ch_t { return channelCount; }
constexpr auto frames() const noexcept -> f_cnt_t { return m_frames; }

protected:
SampleT* m_data = nullptr;
Expand All @@ -79,17 +79,17 @@ class BufferViewData<SampleT, DynamicChannelCount>
constexpr BufferViewData() = default;
constexpr BufferViewData(const BufferViewData&) = default;

constexpr BufferViewData(SampleT* data, proc_ch_t channels, f_cnt_t frames)
constexpr BufferViewData(SampleT* data, proc_ch_t channels, f_cnt_t frames) noexcept
: m_data{data}
, m_channels{channels}
, m_frames{frames}
{
assert(channels != DynamicChannelCount);
}

constexpr auto data() const -> SampleT* { return m_data; }
constexpr auto channels() const -> proc_ch_t { return m_channels; }
constexpr auto frames() const -> f_cnt_t { return m_frames; }
constexpr auto data() const noexcept -> SampleT* { return m_data; }
constexpr auto channels() const noexcept -> proc_ch_t { return m_channels; }
constexpr auto frames() const noexcept -> f_cnt_t { return m_frames; }

protected:
SampleT* m_data = nullptr;
Expand All @@ -115,33 +115,33 @@ class InterleavedBufferView : public detail::BufferViewData<SampleT, channelCoun

//! Contruct const from mutable (static channel count)
template<typename T = SampleT> requires (std::is_const_v<T> && channelCount != DynamicChannelCount)
constexpr InterleavedBufferView(InterleavedBufferView<std::remove_const_t<T>, channelCount> other)
constexpr InterleavedBufferView(InterleavedBufferView<std::remove_const_t<T>, channelCount> other) noexcept
: Base{other.data(), other.frames()}
{
}

//! Contruct const from mutable (dynamic channel count)
template<typename T = SampleT> requires (std::is_const_v<T> && channelCount == DynamicChannelCount)
constexpr InterleavedBufferView(InterleavedBufferView<std::remove_const_t<T>, channelCount> other)
constexpr InterleavedBufferView(InterleavedBufferView<std::remove_const_t<T>, channelCount> other) noexcept
: Base{other.data(), other.channels(), other.frames()}
{
}

//! Construct dynamic channel count from static
template<proc_ch_t otherChannels>
requires (channelCount == DynamicChannelCount && otherChannels != DynamicChannelCount)
constexpr InterleavedBufferView(InterleavedBufferView<SampleT, otherChannels> other)
constexpr InterleavedBufferView(InterleavedBufferView<SampleT, otherChannels> other) noexcept
: Base{other.data(), otherChannels, other.frames()}
{
}

constexpr auto empty() const -> bool
constexpr auto empty() const noexcept -> bool
{
return !this->m_data || this->channels() == 0 || this->m_frames == 0;
}

//! Returns the frame at the given index
constexpr auto frame(f_cnt_t index) const
constexpr auto frame(f_cnt_t index) const noexcept
{
if constexpr (channelCount == DynamicChannelCount)
{
Expand All @@ -154,7 +154,7 @@ class InterleavedBufferView : public detail::BufferViewData<SampleT, channelCoun
}

//! Returns the frame at the given index
constexpr auto framePtr(f_cnt_t index) const -> SampleT*
constexpr auto framePtr(f_cnt_t index) const noexcept -> SampleT*
{
assert(index < this->m_frames);
return this->m_data + index * this->channels();
Expand Down Expand Up @@ -185,40 +185,40 @@ class PlanarBufferView : public detail::BufferViewData<SampleT* const, channelCo

//! Contruct const from mutable (static channel count)
template<typename T = SampleT> requires (std::is_const_v<T> && channelCount != DynamicChannelCount)
constexpr PlanarBufferView(PlanarBufferView<std::remove_const_t<T>, channelCount> other)
constexpr PlanarBufferView(PlanarBufferView<std::remove_const_t<T>, channelCount> other) noexcept
: Base{other.data(), other.frames()}
{
}

//! Contruct const from mutable (dynamic channel count)
template<typename T = SampleT> requires (std::is_const_v<T> && channelCount == DynamicChannelCount)
constexpr PlanarBufferView(PlanarBufferView<std::remove_const_t<T>, channelCount> other)
constexpr PlanarBufferView(PlanarBufferView<std::remove_const_t<T>, channelCount> other) noexcept
: Base{other.data(), other.channels(), other.frames()}
{
}

//! Construct dynamic channel count from static
template<proc_ch_t otherChannels>
requires (channelCount == DynamicChannelCount && otherChannels != DynamicChannelCount)
constexpr PlanarBufferView(PlanarBufferView<SampleT, otherChannels> other)
constexpr PlanarBufferView(PlanarBufferView<SampleT, otherChannels> other) noexcept
: Base{other.data(), otherChannels, other.frames()}
{
}

constexpr auto empty() const -> bool
constexpr auto empty() const noexcept -> bool
{
return !this->m_data || this->channels() == 0 || this->m_frames == 0;
}

//! Returns the buffer of a given channel
constexpr auto buffer(proc_ch_t channel) const -> std::span<SampleT>
constexpr auto buffer(proc_ch_t channel) const noexcept -> std::span<SampleT>
{
return {bufferPtr(channel), this->m_frames};
}

//! Returns the buffer of a given channel
template<proc_ch_t channel>
constexpr auto buffer() const -> std::span<SampleT>
constexpr auto buffer() const noexcept -> std::span<SampleT>
{
return {bufferPtr<channel>(), this->m_frames};
}
Expand All @@ -227,7 +227,7 @@ class PlanarBufferView : public detail::BufferViewData<SampleT* const, channelCo
* Returns pointer to the buffer of a given channel.
* The size of the buffer is `frames()`.
*/
constexpr auto bufferPtr(proc_ch_t channel) const -> SampleT*
constexpr auto bufferPtr(proc_ch_t channel) const noexcept -> SampleT*
{
assert(channel < this->channels());
assert(this->m_data != nullptr);
Expand All @@ -239,7 +239,7 @@ class PlanarBufferView : public detail::BufferViewData<SampleT* const, channelCo
* The size of the buffer is `frames()`.
*/
template<proc_ch_t channel>
constexpr auto bufferPtr() const -> SampleT*
constexpr auto bufferPtr() const noexcept -> SampleT*
{
static_assert(channel != DynamicChannelCount);
static_assert(channel < channelCount);
Expand Down
Loading