Skip to content
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

sai.h - constexpr GetSampleRate() #642

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

sai.h - constexpr GetSampleRate() #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4329eaa
sai.h - constexpr `GetSampleRate()`
HeckHeckHeckHeck Sep 23, 2024
4869fa3
Merge remote-tracking branch 'upstream/master' into constexpr_getsamp…
HeckHeckHeckHeck Sep 24, 2024
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
14 changes: 3 additions & 11 deletions src/per/sai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SaiHandle::Impl
SaiHandle::Result StopDmaTransfer();

// Utility functions
float GetSampleRate();
constexpr float GetSampleRate();
size_t GetBlockSize();
float GetBlockRate();

Expand Down Expand Up @@ -333,17 +333,9 @@ SaiHandle::Result SaiHandle::Impl::StopDmaTransfer()
return Result::OK;
}

float SaiHandle::Impl::GetSampleRate()
constexpr float SaiHandle::Impl::GetSampleRate()
{
switch(config_.sr)
{
case Config::SampleRate::SAI_8KHZ: return 8000.f;
case Config::SampleRate::SAI_16KHZ: return 16000.f;
case Config::SampleRate::SAI_32KHZ: return 32000.f;
case Config::SampleRate::SAI_48KHZ: return 48000.f;
case Config::SampleRate::SAI_96KHZ: return 96000.f;
default: return 48000.f;
}
return config_.sr;
}
size_t SaiHandle::Impl::GetBlockSize()
{
Expand Down
12 changes: 6 additions & 6 deletions src/per/sai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ class SaiHandle
};

/** Rate at which samples will be streaming to/from the device. */
enum class SampleRate
enum SampleRate : int
{
SAI_8KHZ,
SAI_16KHZ,
SAI_32KHZ,
SAI_48KHZ,
SAI_96KHZ,
SAI_8KHZ = 8000,
SAI_16KHZ = 16000,
SAI_32KHZ = 32000,
SAI_48KHZ = 48000,
SAI_96KHZ = 96000,
};

/** Bit Depth that the hardware expects to be transferred to/from the device. */
Expand Down