diff options
Diffstat (limited to 'src/audio_core/effect_context.cpp')
| -rw-r--r-- | src/audio_core/effect_context.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/audio_core/effect_context.cpp b/src/audio_core/effect_context.cpp index 4d9cdf524..f770b9608 100644 --- a/src/audio_core/effect_context.cpp +++ b/src/audio_core/effect_context.cpp | |||
| @@ -12,7 +12,7 @@ bool ValidChannelCountForEffect(s32 channel_count) { | |||
| 12 | } | 12 | } |
| 13 | } // namespace | 13 | } // namespace |
| 14 | 14 | ||
| 15 | EffectContext::EffectContext(std::size_t effect_count) : effect_count(effect_count) { | 15 | EffectContext::EffectContext(std::size_t effect_count_) : effect_count(effect_count_) { |
| 16 | effects.reserve(effect_count); | 16 | effects.reserve(effect_count); |
| 17 | std::generate_n(std::back_inserter(effects), effect_count, | 17 | std::generate_n(std::back_inserter(effects), effect_count, |
| 18 | [] { return std::make_unique<EffectStubbed>(); }); | 18 | [] { return std::make_unique<EffectStubbed>(); }); |
| @@ -61,13 +61,13 @@ const EffectBase* EffectContext::GetInfo(std::size_t i) const { | |||
| 61 | return effects.at(i).get(); | 61 | return effects.at(i).get(); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | EffectStubbed::EffectStubbed() : EffectBase::EffectBase(EffectType::Invalid) {} | 64 | EffectStubbed::EffectStubbed() : EffectBase(EffectType::Invalid) {} |
| 65 | EffectStubbed::~EffectStubbed() = default; | 65 | EffectStubbed::~EffectStubbed() = default; |
| 66 | 66 | ||
| 67 | void EffectStubbed::Update(EffectInfo::InParams& in_params) {} | 67 | void EffectStubbed::Update([[maybe_unused]] EffectInfo::InParams& in_params) {} |
| 68 | void EffectStubbed::UpdateForCommandGeneration() {} | 68 | void EffectStubbed::UpdateForCommandGeneration() {} |
| 69 | 69 | ||
| 70 | EffectBase::EffectBase(EffectType effect_type) : effect_type(effect_type) {} | 70 | EffectBase::EffectBase(EffectType effect_type_) : effect_type(effect_type_) {} |
| 71 | EffectBase::~EffectBase() = default; | 71 | EffectBase::~EffectBase() = default; |
| 72 | 72 | ||
| 73 | UsageState EffectBase::GetUsage() const { | 73 | UsageState EffectBase::GetUsage() const { |
| @@ -90,32 +90,32 @@ s32 EffectBase::GetProcessingOrder() const { | |||
| 90 | return processing_order; | 90 | return processing_order; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | EffectI3dl2Reverb::EffectI3dl2Reverb() : EffectGeneric::EffectGeneric(EffectType::I3dl2Reverb) {} | 93 | EffectI3dl2Reverb::EffectI3dl2Reverb() : EffectGeneric(EffectType::I3dl2Reverb) {} |
| 94 | EffectI3dl2Reverb::~EffectI3dl2Reverb() = default; | 94 | EffectI3dl2Reverb::~EffectI3dl2Reverb() = default; |
| 95 | 95 | ||
| 96 | void EffectI3dl2Reverb::Update(EffectInfo::InParams& in_params) { | 96 | void EffectI3dl2Reverb::Update(EffectInfo::InParams& in_params) { |
| 97 | auto& internal_params = GetParams(); | 97 | auto& params = GetParams(); |
| 98 | const auto* reverb_params = reinterpret_cast<I3dl2ReverbParams*>(in_params.raw.data()); | 98 | const auto* reverb_params = reinterpret_cast<I3dl2ReverbParams*>(in_params.raw.data()); |
| 99 | if (!ValidChannelCountForEffect(reverb_params->max_channels)) { | 99 | if (!ValidChannelCountForEffect(reverb_params->max_channels)) { |
| 100 | UNREACHABLE_MSG("Invalid reverb max channel count {}", reverb_params->max_channels); | 100 | UNREACHABLE_MSG("Invalid reverb max channel count {}", reverb_params->max_channels); |
| 101 | return; | 101 | return; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | const auto last_status = internal_params.status; | 104 | const auto last_status = params.status; |
| 105 | mix_id = in_params.mix_id; | 105 | mix_id = in_params.mix_id; |
| 106 | processing_order = in_params.processing_order; | 106 | processing_order = in_params.processing_order; |
| 107 | internal_params = *reverb_params; | 107 | params = *reverb_params; |
| 108 | if (!ValidChannelCountForEffect(reverb_params->channel_count)) { | 108 | if (!ValidChannelCountForEffect(reverb_params->channel_count)) { |
| 109 | internal_params.channel_count = internal_params.max_channels; | 109 | params.channel_count = params.max_channels; |
| 110 | } | 110 | } |
| 111 | enabled = in_params.is_enabled; | 111 | enabled = in_params.is_enabled; |
| 112 | if (last_status != ParameterStatus::Updated) { | 112 | if (last_status != ParameterStatus::Updated) { |
| 113 | internal_params.status = last_status; | 113 | params.status = last_status; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | if (in_params.is_new || skipped) { | 116 | if (in_params.is_new || skipped) { |
| 117 | usage = UsageState::Initialized; | 117 | usage = UsageState::Initialized; |
| 118 | internal_params.status = ParameterStatus::Initialized; | 118 | params.status = ParameterStatus::Initialized; |
| 119 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; | 119 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; |
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| @@ -129,15 +129,15 @@ void EffectI3dl2Reverb::UpdateForCommandGeneration() { | |||
| 129 | GetParams().status = ParameterStatus::Updated; | 129 | GetParams().status = ParameterStatus::Updated; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | EffectBiquadFilter::EffectBiquadFilter() : EffectGeneric::EffectGeneric(EffectType::BiquadFilter) {} | 132 | EffectBiquadFilter::EffectBiquadFilter() : EffectGeneric(EffectType::BiquadFilter) {} |
| 133 | EffectBiquadFilter::~EffectBiquadFilter() = default; | 133 | EffectBiquadFilter::~EffectBiquadFilter() = default; |
| 134 | 134 | ||
| 135 | void EffectBiquadFilter::Update(EffectInfo::InParams& in_params) { | 135 | void EffectBiquadFilter::Update(EffectInfo::InParams& in_params) { |
| 136 | auto& internal_params = GetParams(); | 136 | auto& params = GetParams(); |
| 137 | const auto* biquad_params = reinterpret_cast<BiquadFilterParams*>(in_params.raw.data()); | 137 | const auto* biquad_params = reinterpret_cast<BiquadFilterParams*>(in_params.raw.data()); |
| 138 | mix_id = in_params.mix_id; | 138 | mix_id = in_params.mix_id; |
| 139 | processing_order = in_params.processing_order; | 139 | processing_order = in_params.processing_order; |
| 140 | internal_params = *biquad_params; | 140 | params = *biquad_params; |
| 141 | enabled = in_params.is_enabled; | 141 | enabled = in_params.is_enabled; |
| 142 | } | 142 | } |
| 143 | 143 | ||
| @@ -150,7 +150,7 @@ void EffectBiquadFilter::UpdateForCommandGeneration() { | |||
| 150 | GetParams().status = ParameterStatus::Updated; | 150 | GetParams().status = ParameterStatus::Updated; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | EffectAuxInfo::EffectAuxInfo() : EffectGeneric::EffectGeneric(EffectType::Aux) {} | 153 | EffectAuxInfo::EffectAuxInfo() : EffectGeneric(EffectType::Aux) {} |
| 154 | EffectAuxInfo::~EffectAuxInfo() = default; | 154 | EffectAuxInfo::~EffectAuxInfo() = default; |
| 155 | 155 | ||
| 156 | void EffectAuxInfo::Update(EffectInfo::InParams& in_params) { | 156 | void EffectAuxInfo::Update(EffectInfo::InParams& in_params) { |
| @@ -200,32 +200,32 @@ VAddr EffectAuxInfo::GetRecvBuffer() const { | |||
| 200 | return recv_buffer; | 200 | return recv_buffer; |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | EffectDelay::EffectDelay() : EffectGeneric::EffectGeneric(EffectType::Delay) {} | 203 | EffectDelay::EffectDelay() : EffectGeneric(EffectType::Delay) {} |
| 204 | EffectDelay::~EffectDelay() = default; | 204 | EffectDelay::~EffectDelay() = default; |
| 205 | 205 | ||
| 206 | void EffectDelay::Update(EffectInfo::InParams& in_params) { | 206 | void EffectDelay::Update(EffectInfo::InParams& in_params) { |
| 207 | const auto* delay_params = reinterpret_cast<DelayParams*>(in_params.raw.data()); | 207 | const auto* delay_params = reinterpret_cast<DelayParams*>(in_params.raw.data()); |
| 208 | auto& internal_params = GetParams(); | 208 | auto& params = GetParams(); |
| 209 | if (!ValidChannelCountForEffect(delay_params->max_channels)) { | 209 | if (!ValidChannelCountForEffect(delay_params->max_channels)) { |
| 210 | return; | 210 | return; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | const auto last_status = internal_params.status; | 213 | const auto last_status = params.status; |
| 214 | mix_id = in_params.mix_id; | 214 | mix_id = in_params.mix_id; |
| 215 | processing_order = in_params.processing_order; | 215 | processing_order = in_params.processing_order; |
| 216 | internal_params = *delay_params; | 216 | params = *delay_params; |
| 217 | if (!ValidChannelCountForEffect(delay_params->channels)) { | 217 | if (!ValidChannelCountForEffect(delay_params->channels)) { |
| 218 | internal_params.channels = internal_params.max_channels; | 218 | params.channels = params.max_channels; |
| 219 | } | 219 | } |
| 220 | enabled = in_params.is_enabled; | 220 | enabled = in_params.is_enabled; |
| 221 | 221 | ||
| 222 | if (last_status != ParameterStatus::Updated) { | 222 | if (last_status != ParameterStatus::Updated) { |
| 223 | internal_params.status = last_status; | 223 | params.status = last_status; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | if (in_params.is_new || skipped) { | 226 | if (in_params.is_new || skipped) { |
| 227 | usage = UsageState::Initialized; | 227 | usage = UsageState::Initialized; |
| 228 | internal_params.status = ParameterStatus::Initialized; | 228 | params.status = ParameterStatus::Initialized; |
| 229 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; | 229 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; |
| 230 | } | 230 | } |
| 231 | } | 231 | } |
| @@ -239,7 +239,7 @@ void EffectDelay::UpdateForCommandGeneration() { | |||
| 239 | GetParams().status = ParameterStatus::Updated; | 239 | GetParams().status = ParameterStatus::Updated; |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | EffectBufferMixer::EffectBufferMixer() : EffectGeneric::EffectGeneric(EffectType::BufferMixer) {} | 242 | EffectBufferMixer::EffectBufferMixer() : EffectGeneric(EffectType::BufferMixer) {} |
| 243 | EffectBufferMixer::~EffectBufferMixer() = default; | 243 | EffectBufferMixer::~EffectBufferMixer() = default; |
| 244 | 244 | ||
| 245 | void EffectBufferMixer::Update(EffectInfo::InParams& in_params) { | 245 | void EffectBufferMixer::Update(EffectInfo::InParams& in_params) { |
| @@ -257,32 +257,32 @@ void EffectBufferMixer::UpdateForCommandGeneration() { | |||
| 257 | } | 257 | } |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | EffectReverb::EffectReverb() : EffectGeneric::EffectGeneric(EffectType::Reverb) {} | 260 | EffectReverb::EffectReverb() : EffectGeneric(EffectType::Reverb) {} |
| 261 | EffectReverb::~EffectReverb() = default; | 261 | EffectReverb::~EffectReverb() = default; |
| 262 | 262 | ||
| 263 | void EffectReverb::Update(EffectInfo::InParams& in_params) { | 263 | void EffectReverb::Update(EffectInfo::InParams& in_params) { |
| 264 | const auto* reverb_params = reinterpret_cast<ReverbParams*>(in_params.raw.data()); | 264 | const auto* reverb_params = reinterpret_cast<ReverbParams*>(in_params.raw.data()); |
| 265 | auto& internal_params = GetParams(); | 265 | auto& params = GetParams(); |
| 266 | if (!ValidChannelCountForEffect(reverb_params->max_channels)) { | 266 | if (!ValidChannelCountForEffect(reverb_params->max_channels)) { |
| 267 | return; | 267 | return; |
| 268 | } | 268 | } |
| 269 | 269 | ||
| 270 | const auto last_status = internal_params.status; | 270 | const auto last_status = params.status; |
| 271 | mix_id = in_params.mix_id; | 271 | mix_id = in_params.mix_id; |
| 272 | processing_order = in_params.processing_order; | 272 | processing_order = in_params.processing_order; |
| 273 | internal_params = *reverb_params; | 273 | params = *reverb_params; |
| 274 | if (!ValidChannelCountForEffect(reverb_params->channels)) { | 274 | if (!ValidChannelCountForEffect(reverb_params->channels)) { |
| 275 | internal_params.channels = internal_params.max_channels; | 275 | params.channels = params.max_channels; |
| 276 | } | 276 | } |
| 277 | enabled = in_params.is_enabled; | 277 | enabled = in_params.is_enabled; |
| 278 | 278 | ||
| 279 | if (last_status != ParameterStatus::Updated) { | 279 | if (last_status != ParameterStatus::Updated) { |
| 280 | internal_params.status = last_status; | 280 | params.status = last_status; |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | if (in_params.is_new || skipped) { | 283 | if (in_params.is_new || skipped) { |
| 284 | usage = UsageState::Initialized; | 284 | usage = UsageState::Initialized; |
| 285 | internal_params.status = ParameterStatus::Initialized; | 285 | params.status = ParameterStatus::Initialized; |
| 286 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; | 286 | skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; |
| 287 | } | 287 | } |
| 288 | } | 288 | } |