Upgrade queue mechanism, to return more buffers #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4a08198 to
970b60b
Compare
970b60b to
deb504e
Compare
1ac3cdf to
2c01685
Compare
mat-hek
requested changes
Apr 9, 2024
lib/membrane/timestamp_queue.ex
Outdated
Comment on lines
282
to
283
| An item that is not a buffer is considered available if all buffers from the same pad, | ||
| which are newer than the item are available. |
There was a problem hiding this comment.
Suggested change
| An item that is not a buffer is considered available if all buffers from the same pad, | |
| which are newer than the item are available. | |
| An item other than a buffer is considered available if all newer buffers on the same pad are available. |
lib/membrane/timestamp_queue.ex
Outdated
| {actions, timestamp_queue} = actions_after_popping_buffer(timestamp_queue, pad_ref) | ||
| {actions ++ actions_acc, timestamp_queue} | ||
| end) | ||
| defp do_pop_batch(%__MODULE__{} = timestamp_queue, actions_acc \\ [], items_acc \\ []) do |
There was a problem hiding this comment.
I'd avoid default values in recursive functions, as it's easy to reset an accumulator by accident
lib/membrane/timestamp_queue.ex
Outdated
| |> do_pop() | ||
| end | ||
| end | ||
| |> do_pop_batch(actions_acc, items_acc) |
There was a problem hiding this comment.
This makes the flow harder to follow, can we return the accumulators here to do_pop_batch instead, so that each function only calls itself recursively?
lib/membrane/timestamp_queue.ex
Outdated
Comment on lines
208
to
214
| first_item_on_awaiting_pad_qex? = | ||
| pad_ref in timestamp_queue.awaiting_pads and pad_queue != nil and pad_queue.qex == Qex.new() | ||
|
|
||
| timestamp_queue | ||
| |> put_in([:pad_queues, pad_ref], new_pad_queue()) | ||
| |> Map.update!(:pads_heap, &Heap.push(&1, {priority, pad_ref})) | ||
| if first_item_on_awaiting_pad_qex? or not is_map_key(timestamp_queue.pad_queues, pad_ref) do | ||
| priority = | ||
| case item do | ||
| {:buffer, buffer} when first_item_on_awaiting_pad_qex? -> |
There was a problem hiding this comment.
These conditions are hard to read, can you try to refactor that?
mat-hek
approved these changes
Apr 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relates to membraneframework/membrane_core#734