Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Fix HLSEndpoint framerate #74

Merged
merged 1 commit into from
Jan 17, 2022
Merged

Fix HLSEndpoint framerate #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/membrane_rtc_engine/endpoints/hls_endpoint.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ if Enum.all?(
do: %ParentSpec{
children: %{
{:video_parser, track_id} => %Membrane.H264.FFmpeg.Parser{
framerate: {framerate, 1},
framerate: framerate,
alignment: :au,
attach_nalus?: true
}
Expand Down
3 changes: 2 additions & 1 deletion lib/membrane_rtc_engine/endpoints/webrtc_endpoint.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,8 @@ if Code.ensure_loaded?(Membrane.WebRTC.EndpointBin) do
WebRTC.Track.new(track.type, track.stream_id, to_keyword_list(track))
end

defp to_keyword_list(%_{} = struct), do: Map.from_struct(struct) |> to_keyword_list()
defp to_keyword_list(%Engine.Track{} = struct),
do: Map.from_struct(struct) |> to_keyword_list()

defp to_keyword_list(%{} = map), do: Enum.map(map, fn {key, value} -> {key, value} end)
end
Expand Down
8 changes: 4 additions & 4 deletions mix.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
"coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},
"crc": {:hex, :crc, "0.10.3", "6b69dc861a5cd3b7e1b255a7867d5b3787567a27915baf620f1dc94245fb4ba7", [:mix, :rebar3], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "bee74e827a937f8ab838e1b5899672ebf4b293ef49212f1ce4967afd2acec49d"},
"credo": {:hex, :credo, "1.6.1", "7dc76dcdb764a4316c1596804c48eada9fff44bd4b733a91ccbf0c0f368be61e", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "698607fb5993720c7e93d2d8e76f2175bba024de964e160e2f7151ef3ab82ac5"},
"credo": {:hex, :credo, "1.6.2", "2f82b29a47c0bb7b72f023bf3a34d151624f1cbe1e6c4e52303b05a11166a701", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "ae9dc112bc368e7b145c547bec2ed257ef88955851c15057c7835251a17211c6"},
"decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
"dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
"dns": {:hex, :dns, "2.3.0", "3e750cf3e229898628a091fa7dca29524294db2962d0fc15696ac3a5cfff2315", [:mix], [{:socket, "~> 0.3.13", [hex: :socket, repo: "hexpm", optional: false]}], "hexpm", "f3f1074409b4ecf6f93379a49fb0aef30a898f3093ea22b5c64a85e9f99ca6f8"},
"earmark_parser": {:hex, :earmark_parser, "1.4.18", "e1b2be73eb08a49fb032a0208bf647380682374a725dfb5b9e510def8397f6f2", [:mix], [], "hexpm", "114a0e85ec3cf9e04b811009e73c206394ffecfcc313e0b346de0d557774ee97"},
"earmark_parser": {:hex, :earmark_parser, "1.4.19", "de0d033d5ff9fc396a24eadc2fcf2afa3d120841eb3f1004d138cbf9273210e8", [:mix], [], "hexpm", "527ab6630b5c75c3a3960b75844c314ec305c76d9899bb30f71cb85952a9dc45"},
"elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
"ex_doc": {:hex, :ex_doc, "0.24.2", "e4c26603830c1a2286dae45f4412a4d1980e1e89dc779fcd0181ed1d5a05c8d9", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "e134e1d9e821b8d9e4244687fb2ace58d479b67b282de5158333b0d57c6fb7da"},
Expand All @@ -30,7 +30,7 @@
"membrane_aac_fdk_plugin": {:hex, :membrane_aac_fdk_plugin, "0.9.1", "7abff5caaebb3c9fac5536975e406a03f27e5c47174cbc73922d67c338da4110", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_caps_audio_raw, "~> 0.5.0", [hex: :membrane_caps_audio_raw, repo: "hexpm", optional: false]}, {:membrane_common_c, "~> 0.10.0", [hex: :membrane_common_c, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:unifex, "~> 0.7.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "10bf50b4e80a50743d59db7b009095a5aa7c468fb5fd63b07241eff835620db2"},
"membrane_aac_format": {:hex, :membrane_aac_format, "0.6.0", "b60ab9cedc8686a532ca8e5e3d88f0217cebedf1fe5516c0d4ba321fa01b6c40", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "0127d9592d8776d0f29e6d25ca9d28eb2d83c48c39acf1ee55d481028e347c88"},
"membrane_aac_plugin": {:hex, :membrane_aac_plugin, "0.11.1", "9513c87612d6d07fb6878c57fe9b31561c531981026de66517914ffc5a363d77", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:crc, "~> 0.10.2", [hex: :crc, repo: "hexpm", optional: false]}, {:credo, "~> 1.5", [hex: :credo, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.6.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "0a61139d5422ffd865c70f8aea610f35769770de31753ee7a5925919e4c20d90"},
"membrane_caps_audio_raw": {:hex, :membrane_caps_audio_raw, "0.5.0", "b30696d81018717327510a2da87bce423c41618098a92ce26d8f16f3ded36716", [:mix], [{:bimap, "~> 1.0", [hex: :bimap, repo: "hexpm", optional: false]}, {:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "c6f310f100b55ab8214e01c8512329bbda7176ef7209a46bda5eb333518426b6"},
"membrane_caps_audio_raw": {:hex, :membrane_caps_audio_raw, "0.5.1", "bab2bfe3465d6e2a313b584da50ef63ac1fb5a6c93a700c6a8c9a5621fde61e6", [:mix], [{:bimap, "~> 1.0", [hex: :bimap, repo: "hexpm", optional: false]}, {:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "523070f05431c7fda1b8d4d7e62b61e5014cab1b32b1b17138f503446eb9ca89"},
"membrane_caps_video_h264": {:hex, :membrane_caps_video_h264, "0.2.1", "8545074299dc48d8afe106b0be1ecf3097e997f0e9f32557f435c123135050fe", [:mix], [], "hexpm", "a14a8dcd0d2c205ca2cdbe5c7df24ec3e34a027e1caf511a71ca4c72b371b200"},
"membrane_caps_video_raw": {:hex, :membrane_caps_video_raw, "0.1.0", "6aa751b0c338ea6672540b7ec7ad2be0d23bad931b8a8776757da9b279070a3b", [:mix], [], "hexpm", "3f60d65189bd9e3b0ab77e0ebf2e0c1b04d0fd6f67c546fc1d54d9958c362ce4"},
"membrane_cmaf_format": {:hex, :membrane_cmaf_format, "0.5.0", "c40a7d3b023b4cad40638d3dbafb06926ff5723c4a3b8a0d9f90abad6a4e437f", [:mix], [{:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "2631e02cb74409349639bebaae7a93232bc54ed5965cf7844f35d8ec1170e8e7"},
Expand All @@ -55,7 +55,7 @@
"membrane_rtp_vp8_plugin": {:hex, :membrane_rtp_vp8_plugin, "0.2.0", "6babe58152930bab321076b435068985957c7b0b309d0743c037245e2442558a", [:mix], [{:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.3.1", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_vp8_format, "~> 0.3.0", [hex: :membrane_vp8_format, repo: "hexpm", optional: false]}], "hexpm", "a5e1c8c11827c32af0c7ae3f9bd0a5878b8b0ae0940bc5978a2cfa9deb030c30"},
"membrane_tee_plugin": {:hex, :membrane_tee_plugin, "0.7.0", "b4705938a388fba8ce973dbdce8a5e95c963c0370bcc48311c0a40c2ea5b0ad8", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "f029fb95ca4e2178559629691715a042252fd756914c5929cc054690205f391d"},
"membrane_vp8_format": {:hex, :membrane_vp8_format, "0.3.0", "97b7a62bfd62462d331f246118aa3230a1c7c10942c067c8552d691b5e03dff5", [:mix], [{:membrane_core, "~> 0.8.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "9b8d688314e6551680e87ae36ef9df9408e4213cde6d55f180be7a55be98db40"},
"membrane_webrtc_plugin": {:git, "https://github.com/membraneframework/membrane_webrtc_plugin.git", "db2cced642d2db49170f83ce1b3fbdc59b656a39", []},
"membrane_webrtc_plugin": {:git, "https://github.com/membraneframework/membrane_webrtc_plugin.git", "ed3d29dc4d4c019aa405f135aa4ac0a7e27215a5", []},
"nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"},
"numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"},
"open_telemetry_decorator": {:hex, :open_telemetry_decorator, "0.5.4", "69d325d9f7fbb4fef032ce62830f42165fd60fb41a27e465f7cb9788403f0e46", [:mix], [{:decorator, "~> 1.4.0", [hex: :decorator, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 0.6.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "a6a96ea27c5033838b006fa94c9befb58b003bd0b9c47f5d764dfb81b7fd0dd2"},
Expand Down