Specify pad codec #114
Merged
Specify pad codec #114
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
specify-pad-codec
branch
from
219c017 to
3445712
Compare
mat-hek
reviewed
Jun 25, 2024
mat-hek
requested changes
Jun 26, 2024
examples/demuxer_isom.exs
Outdated
| @@ -24,11 +24,11 @@ defmodule Example do | |||
| hackney_opts: [follow_redirect: true] | |||
| }) | |||
| |> child(:demuxer, Membrane.MP4.Demuxer.ISOM) | |||
| |> via_out(Pad.ref(:output, 1)) | |||
| |> via_out(Pad.ref(:output, 1), options: [kind: :video]) | |||
There was a problem hiding this comment.
Suggested change
| |> via_out(Pad.ref(:output, 1), options: [kind: :video]) | |
| |> via_out(:output, options: [kind: :video]) |
examples/demuxer_isom.exs
Outdated
| |> child(:parser_video, %Membrane.H264.Parser{output_stream_structure: :annexb}) | ||
| |> child(:sink_video, %Membrane.File.Sink{location: @output_video}), | ||
| get_child(:demuxer) | ||
| |> via_out(Pad.ref(:output, 2)) | ||
| |> via_out(Pad.ref(:output, 2), options: [kind: :audio]) |
There was a problem hiding this comment.
Suggested change
| |> via_out(Pad.ref(:output, 2), options: [kind: :audio]) | |
| |> via_out(:output, options: [kind: :audio]) |
lib/membrane_mp4/demuxer/isom.ex
Outdated
Comment on lines
416
to
483
| defp match_tracks_with_pads(ctx, state) do | ||
| kind_to_pads_data = | ||
| ctx.pads | ||
| |> Map.values() | ||
| |> Enum.reject(fn %{ref: pad_ref} -> pad_ref == :input end) | ||
| |> Enum.group_by(& &1.options.kind) | ||
|
|
||
| {track_to_pad_id, empty_kind_to_pads_data} = | ||
| state.samples_info.sample_tables | ||
| |> Enum.map_reduce(kind_to_pads_data, fn {track_id, table}, kind_to_pads_data -> | ||
| track_kind = sample_description_to_kind(table.sample_description) | ||
|
|
||
| case kind_to_pads_data do | ||
| %{^track_kind => [pad_data | tail]} -> | ||
| # match track with a pad with specified kind | ||
| kind_to_pads_data = Map.put(kind_to_pads_data, track_kind, tail) | ||
| Pad.ref(:output, pad_id) = pad_data.ref | ||
| {{track_id, pad_id}, kind_to_pads_data} | ||
|
|
||
| %{nil => [pad_data]} -> | ||
| # match track with the only one pad with unspecified kind | ||
| kind_to_pads_data = Map.delete(kind_to_pads_data, nil) | ||
| Pad.ref(:output, pad_id) = pad_data.ref | ||
| {{track_id, pad_id}, kind_to_pads_data} | ||
|
|
||
| %{} -> | ||
| # corresponding pad hasn't been linked yet | ||
| {{track_id, nil}, kind_to_pads_data} | ||
| end | ||
| end) | ||
|
|
||
| max_pad_id = | ||
| track_to_pad_id | ||
| |> Enum.flat_map(fn {_track, pad_id} -> if pad_id != nil, do: [pad_id], else: [] end) | ||
| |> Enum.max(&>=/2, fn -> 0 end) | ||
|
|
||
| {track_to_pad_id, _max_pad_id} = | ||
| track_to_pad_id | ||
| |> Enum.map_reduce(max_pad_id, fn | ||
| {track_id, nil}, max_pad_id -> {{track_id, max_pad_id + 1}, max_pad_id + 1} | ||
| track_pad_pair, max_pad_id -> {track_pad_pair, max_pad_id} | ||
| end) | ||
|
|
||
| raise? = | ||
| empty_kind_to_pads_data | ||
| |> Map.values() | ||
| |> Enum.any?(&(&1 != [])) | ||
|
|
||
| if raise? do | ||
| pads_kinds = | ||
| ctx.pads | ||
| |> Enum.flat_map(fn | ||
| {:input, _pad_data} -> [] | ||
| {_pad_ref, %{options: %{kind: kind}}} -> [kind] | ||
| end) | ||
|
|
||
| tracks_codecs = | ||
| state.samples_info.sample_tables | ||
| |> Enum.map(fn {_track, table} -> table.sample_description.__struct__ end) | ||
|
|
||
| raise """ | ||
| Pads kinds don't match with tracks codecs. Pads kinds are #{inspect(pads_kinds)}. \ | ||
| Tracks codecs are #{inspect(tracks_codecs)} | ||
| """ | ||
| end | ||
|
|
||
| %{state | track_to_pad_id: Map.new(track_to_pad_id)} | ||
| end |
There was a problem hiding this comment.
Why is it so long and complex? Let's simplify it
mat-hek
approved these changes
Jul 10, 2024
Co-authored-by: Mateusz Front <[email protected]>
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.
No description provided.