Support various video codecs in source #11
Merged
Conversation
This file contains hidden or 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
mat-hek
requested changes
Oct 30, 2024
lib/membrane_webrtc/source.ex
Outdated
| By default only `:vp8`. | ||
| """ | ||
| ], | ||
| suggested_video_codec: [ |
There was a problem hiding this comment.
Suggested change
| suggested_video_codec: [ | |
| preferred_video_codec: [ |
lib/membrane_webrtc/source.ex
Outdated
| spec: :vp8 | :h264 | [:vp8 | :h264], | ||
| default: :vp8, | ||
| description: """ | ||
| Specyfies, which video codecs can be accepted by source during the SDP |
There was a problem hiding this comment.
Suggested change
| Specyfies, which video codecs can be accepted by source during the SDP | |
| Specifies, which video codecs can be accepted by the source during the SDP |
lib/membrane_webrtc/source.ex
Outdated
Comment on lines
65
to
66
| Usage of this option makes sense only if option `:allowed_video_codecs` | ||
| is set to `[:vp8, :h264]` or `[:h264, :vp8]`. |
There was a problem hiding this comment.
Suggested change
| Usage of this option makes sense only if option `:allowed_video_codecs` | |
| is set to `[:vp8, :h264]` or `[:h264, :vp8]`. | |
| Usage of this option makes sense only if there are at least 2 codecs | |
| specified in the `:allowed_video_codecs` option. |
Comment on lines
204
to
227
| video_codecs_in_sdp = ExWebRTCUtils.get_video_codecs_from_sdp(sdp) | ||
|
|
||
| negotiated_video_codecs = | ||
| state.allowed_video_codecs | ||
| |> Enum.filter(&(&1 in video_codecs_in_sdp)) | ||
| |> case do | ||
| [] -> [] | ||
| [codec] -> [codec] | ||
| _both -> [state.suggested_video_codec] | ||
| end | ||
|
|
||
| video_params = ExWebRTCUtils.codec_params(negotiated_video_codecs) | ||
|
|
||
| {:ok, pc} = | ||
| PeerConnection.start( | ||
| ice_servers: state.ice_servers, | ||
| video_codecs: video_params, | ||
| audio_codecs: state.audio_params | ||
| ) | ||
|
|
||
| Process.monitor(pc) | ||
|
|
||
| notify_parent = [notify_parent: {:negotiated_video_codecs, negotiated_video_codecs}] | ||
| {notify_parent, %{state | pc: pc, video_params: video_params}} |
There was a problem hiding this comment.
this function is now quite long, let's extract this to a private one
…eo-codecs-in-source
FelonEkonom
force-pushed
the
support-various-video-codecs-in-source
branch
from
77d97ff to
90e7f31
Compare
mat-hek
reviewed
Nov 8, 2024
| use ExUnit.Case, async: true | ||
|
|
||
| use ExUnit.Case, async: true | ||
|
|
There was a problem hiding this comment.
All the added assertions only test one case, I don't think it helps much. I meant to add a separate test and check a few possibilities
mat-hek
reviewed
Nov 18, 2024
lib/membrane_webrtc/source.ex
Outdated
Comment on lines
213
to
214
| def handle_child_notification(_notification, {ff, _ref}, _ctx, state) | ||
| when ff in [:first_ff, :second_ff] do |
There was a problem hiding this comment.
Suggested change
| def handle_child_notification(_notification, {ff, _ref}, _ctx, state) | |
| when ff in [:first_ff, :second_ff] do | |
| def handle_child_notification(_notification, _child, _ctx, state) do |
lib/membrane_webrtc/source.ex
Outdated
Comment on lines
181
to
183
| if kind == :video and state.negotiated_video_codecs == nil, | ||
| do: state |> Map.update!(:awaiting_pads, &MapSet.put(&1, pad_ref)), | ||
| else: state |
There was a problem hiding this comment.
let's move it into the cond and return {actions, state} from there
mat-hek
approved these changes
Nov 21, 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.
Continuation #9 but in source