mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-17 07:50:04 +00:00
LibAudio: Manage channelCount in DynamicsCompressorNode
That helps to pass more WPT tests under /webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html
This commit is contained in:
parent
f2ed59879f
commit
8ac60273a6
Notes:
github-actions[bot]
2024-10-29 13:32:50 +00:00
Author: https://github.com/shlyakpavel
Commit: 8ac60273a6
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1735
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/gmta
Reviewed-by: https://github.com/shannonbooth
4 changed files with 35 additions and 15 deletions
|
@ -21,28 +21,28 @@ AudioNode::AudioNode(JS::Realm& realm, JS::NonnullGCPtr<BaseAudioContext> contex
|
||||||
|
|
||||||
AudioNode::~AudioNode() = default;
|
AudioNode::~AudioNode() = default;
|
||||||
|
|
||||||
WebIDL::ExceptionOr<void> AudioNode::initialize_audio_node_options(JS::NonnullGCPtr<BaseAudioContext> context, AudioNodeOptions const& given_options, AudioNodeOptions const& default_options)
|
WebIDL::ExceptionOr<void> AudioNode::initialize_audio_node_options(AudioNodeOptions const& given_options, AudioNodeDefaultOptions const& default_options)
|
||||||
{
|
{
|
||||||
// FIXME: Context will be used in the future implementation.
|
|
||||||
(void)context; // Cast to void to avoid unused parameter warning.
|
|
||||||
|
|
||||||
// Set channel count, fallback to default if not provided
|
// Set channel count, fallback to default if not provided
|
||||||
if (given_options.channel_count.has_value()) {
|
if (given_options.channel_count.has_value()) {
|
||||||
TRY(set_channel_count(given_options.channel_count.value()));
|
TRY(set_channel_count(given_options.channel_count.value()));
|
||||||
} else if (default_options.channel_count.has_value()) {
|
} else {
|
||||||
TRY(set_channel_count(default_options.channel_count.value()));
|
TRY(set_channel_count(default_options.channel_count));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set channel count mode, fallback to default if not provided
|
// Set channel count mode, fallback to default if not provided
|
||||||
if (given_options.channel_count_mode.has_value()) {
|
if (given_options.channel_count_mode.has_value()) {
|
||||||
TRY(set_channel_count_mode(given_options.channel_count_mode.value()));
|
TRY(set_channel_count_mode(given_options.channel_count_mode.value()));
|
||||||
} else if (default_options.channel_count_mode.has_value()) {
|
} else {
|
||||||
TRY(set_channel_count_mode(default_options.channel_count_mode.value()));
|
TRY(set_channel_count_mode(default_options.channel_count_mode));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set channel interpretation, fallback to default if not provided
|
// Set channel interpretation, fallback to default if not provided
|
||||||
Bindings::ChannelInterpretation channel_interpretation_to_set = given_options.channel_interpretation.value_or(default_options.channel_interpretation.value_or(Bindings::ChannelInterpretation::Speakers));
|
if (given_options.channel_interpretation.has_value()) {
|
||||||
TRY(set_channel_interpretation(channel_interpretation_to_set));
|
TRY(set_channel_interpretation(given_options.channel_interpretation.value()));
|
||||||
|
} else {
|
||||||
|
TRY(set_channel_interpretation(default_options.channel_interpretation));
|
||||||
|
}
|
||||||
|
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,12 @@ struct AudioNodeOptions {
|
||||||
Optional<Bindings::ChannelInterpretation> channel_interpretation;
|
Optional<Bindings::ChannelInterpretation> channel_interpretation;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct AudioNodeDefaultOptions {
|
||||||
|
WebIDL::UnsignedLong channel_count;
|
||||||
|
Bindings::ChannelCountMode channel_count_mode;
|
||||||
|
Bindings::ChannelInterpretation channel_interpretation;
|
||||||
|
};
|
||||||
|
|
||||||
// https://webaudio.github.io/web-audio-api/#AudioNode
|
// https://webaudio.github.io/web-audio-api/#AudioNode
|
||||||
class AudioNode : public DOM::EventTarget {
|
class AudioNode : public DOM::EventTarget {
|
||||||
WEB_PLATFORM_OBJECT(AudioNode, DOM::EventTarget);
|
WEB_PLATFORM_OBJECT(AudioNode, DOM::EventTarget);
|
||||||
|
@ -62,7 +68,7 @@ public:
|
||||||
WebIDL::ExceptionOr<void> set_channel_interpretation(Bindings::ChannelInterpretation);
|
WebIDL::ExceptionOr<void> set_channel_interpretation(Bindings::ChannelInterpretation);
|
||||||
Bindings::ChannelInterpretation channel_interpretation();
|
Bindings::ChannelInterpretation channel_interpretation();
|
||||||
|
|
||||||
WebIDL::ExceptionOr<void> initialize_audio_node_options(JS::NonnullGCPtr<BaseAudioContext> context, AudioNodeOptions const& given_options, AudioNodeOptions const& default_options);
|
WebIDL::ExceptionOr<void> initialize_audio_node_options(AudioNodeOptions const& given_options, AudioNodeDefaultOptions const& default_options);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
AudioNode(JS::Realm&, JS::NonnullGCPtr<BaseAudioContext>);
|
AudioNode(JS::Realm&, JS::NonnullGCPtr<BaseAudioContext>);
|
||||||
|
|
|
@ -27,17 +27,18 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<DynamicsCompressorNode>> DynamicsCompressor
|
||||||
auto node = realm.vm().heap().allocate<DynamicsCompressorNode>(realm, realm, context, options);
|
auto node = realm.vm().heap().allocate<DynamicsCompressorNode>(realm, realm, context, options);
|
||||||
|
|
||||||
// Default options for channel count and interpretation
|
// Default options for channel count and interpretation
|
||||||
AudioNodeOptions default_options;
|
// https://webaudio.github.io/web-audio-api/#DynamicsCompressorNode
|
||||||
|
AudioNodeDefaultOptions default_options;
|
||||||
default_options.channel_count_mode = Bindings::ChannelCountMode::ClampedMax;
|
default_options.channel_count_mode = Bindings::ChannelCountMode::ClampedMax;
|
||||||
default_options.channel_interpretation = Bindings::ChannelInterpretation::Speakers;
|
default_options.channel_interpretation = Bindings::ChannelInterpretation::Speakers;
|
||||||
|
default_options.channel_count = 2;
|
||||||
|
// FIXME: Set tail-time to yes
|
||||||
|
|
||||||
// Initialize the AudioNode with the given options, default options, and context
|
TRY(node->initialize_audio_node_options(options, default_options));
|
||||||
TRY(node->initialize_audio_node_options(context, options, default_options));
|
|
||||||
|
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
DynamicsCompressorNode::DynamicsCompressorNode(JS::Realm& realm, JS::NonnullGCPtr<BaseAudioContext> context, DynamicsCompressorOptions const& options)
|
DynamicsCompressorNode::DynamicsCompressorNode(JS::Realm& realm, JS::NonnullGCPtr<BaseAudioContext> context, DynamicsCompressorOptions const& options)
|
||||||
: AudioNode(realm, context)
|
: AudioNode(realm, context)
|
||||||
, m_threshold(AudioParam::create(realm, options.threshold, -100, 0, Bindings::AutomationRate::KRate))
|
, m_threshold(AudioParam::create(realm, options.threshold, -100, 0, Bindings::AutomationRate::KRate))
|
||||||
|
@ -76,4 +77,16 @@ WebIDL::ExceptionOr<void> DynamicsCompressorNode::set_channel_count_mode(Binding
|
||||||
return AudioNode::set_channel_count_mode(mode);
|
return AudioNode::set_channel_count_mode(mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://webaudio.github.io/web-audio-api/#dom-audionode-channelcount
|
||||||
|
WebIDL::ExceptionOr<void> DynamicsCompressorNode::set_channel_count(WebIDL::UnsignedLong channel_count)
|
||||||
|
{
|
||||||
|
if (channel_count > 2) {
|
||||||
|
// Return a NotSupportedError if 'max' is used
|
||||||
|
return WebIDL::NotSupportedError::create(realm(), "DynamicsCompressorNode does not support channel count greater than 2"_string);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the mode is valid, call the base class implementation
|
||||||
|
return AudioNode::set_channel_count(channel_count);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ public:
|
||||||
float reduction() const { return m_reduction; }
|
float reduction() const { return m_reduction; }
|
||||||
|
|
||||||
WebIDL::ExceptionOr<void> set_channel_count_mode(Bindings::ChannelCountMode) override;
|
WebIDL::ExceptionOr<void> set_channel_count_mode(Bindings::ChannelCountMode) override;
|
||||||
|
WebIDL::ExceptionOr<void> set_channel_count(WebIDL::UnsignedLong) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DynamicsCompressorNode(JS::Realm&, JS::NonnullGCPtr<BaseAudioContext>, DynamicsCompressorOptions const& = {});
|
DynamicsCompressorNode(JS::Realm&, JS::NonnullGCPtr<BaseAudioContext>, DynamicsCompressorOptions const& = {});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue