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

Initial auto demand #929

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

Initial auto demand #929

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b758d4
Implement initial auto demand WiP
FelonEkonom Jan 2, 2025
386eeaa
Mix format
FelonEkonom Jan 2, 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
49 changes: 31 additions & 18 deletions lib/membrane/core/element/auto_flow_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ defmodule Membrane.Core.Element.AutoFlowController do
require Membrane.Pad, as: Pad

@empty_map_set MapSet.new()
@initial_auto_demand 20

# Description of the auto flow control queueing mechanism

Expand Down Expand Up @@ -177,35 +178,47 @@ defmodule Membrane.Core.Element.AutoFlowController do
end

defp do_auto_adjust_atomic_demand(pad_data, state) when is_input_auto_pad_data(pad_data) do
if increase_atomic_demand?(pad_data, state) do
%{
ref: ref,
auto_demand_size: auto_demand_size,
demand: demand,
atomic_demand: atomic_demand,
stalker_metrics: stalker_metrics
} = pad_data
case atomic_demand_target_value(pad_data, state) do
target_value when is_number(target_value) ->
%{
ref: ref,
demand: demand,
atomic_demand: atomic_demand,
stalker_metrics: stalker_metrics
} = pad_data

diff = auto_demand_size - demand
:ok = AtomicDemand.increase(atomic_demand, diff)
diff = target_value - demand
:ok = AtomicDemand.increase(atomic_demand, diff)

:atomics.put(stalker_metrics.demand, 1, auto_demand_size)
:atomics.put(stalker_metrics.demand, 1, target_value)

PadModel.set_data!(state, ref, :demand, auto_demand_size)
else
state
state
|> PadModel.set_data!(ref, :demand, target_value)

:pass ->
state
end
end

defp do_auto_adjust_atomic_demand(%{ref: ref}, _state) do
raise "#{__MODULE__}.auto_adjust_atomic_demand/2 can be called only for auto input pads, while #{inspect(ref)} is not such a pad."
end

defp increase_atomic_demand?(pad_data, state) do
state.effective_flow_control == :pull and
not pad_data.auto_demand_paused? and
defp atomic_demand_target_value(pad_data, state) do
cond do
state.effective_flow_control == :push or pad_data.auto_demand_paused? ->
:pass

pad_data.demand < pad_data.auto_demand_size / 2 and
state.satisfied_auto_output_pads == @empty_map_set
state.satisfied_auto_output_pads == @empty_map_set ->
pad_data.auto_demand_size

not pad_data.start_of_stream? and pad_data.demand == 0 ->
pad_data.auto_demand_size |> min(@initial_auto_demand)

true ->
:pass
end
end

@spec pop_queues_and_bump_demand(State.t()) :: State.t()
Expand Down
Loading