Allow selecting synchronization strategy #5
Merged
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
FelonEkonom
force-pushed
the
synchronization-strategies
branch
from
a4ae20a to
be774a0
Compare
FelonEkonom
changed the title
mat-hek
requested changes
Apr 22, 2024
lib/membrane/timestamp_queue.ex
Outdated
Comment on lines
332
to
343
| {{:buffer, buffer}, nil} -> | ||
| priority = | ||
| case timestamp_queue.synchronization_strategy do | ||
| :synchronize_on_arrival -> | ||
| -timestamp_queue.current_queue_time | ||
|
|
||
| :explicit_offsets -> | ||
| offset = Map.get(timestamp_queue.registered_pads_offsets, pad_ref, 0) | ||
| offset - (buffer.dts || buffer.pts) | ||
| end | ||
|
|
||
| push_pad_on_heap(timestamp_queue, pad_ref, priority) |
There was a problem hiding this comment.
As we spoke, let's move that to push_buffer
lib/membrane/timestamp_queue.ex
Outdated
Comment on lines
202
to
209
| nil when timestamp_queue.synchronization_strategy == :synchronize_on_arrival -> | ||
| (buffer.dts || buffer.pts) - timestamp_queue.current_queue_time | ||
|
|
||
| nil when timestamp_queue.synchronization_strategy == :explicit_offsets -> | ||
| Map.get(timestamp_queue.registered_pads_offsets, pad_ref, 0) | ||
|
|
||
| valid_offset -> | ||
| valid_offset |
There was a problem hiding this comment.
let's handle the first buffer separately
FelonEkonom
force-pushed
the
synchronization-strategies
branch
from
3053c4e to
6e10e05
Compare
mat-hek
reviewed
Apr 23, 2024
| @@ -38,7 +38,7 @@ defmodule Membrane.TimestampQueue.Mixfile do | |||
| defp deps do | |||
| [ | |||
| {:membrane_core, "~> 1.0"}, | |||
| {:heap, "~> 3.0"}, | |||
| {:heap, "~> 2.0"}, | |||
There was a problem hiding this comment.
Because 3.0 has weird licence
mat-hek
approved these changes
Apr 23, 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