From 1302b8a046161a30e84f7f494aa8679313189565 Mon Sep 17 00:00:00 2001 From: Jakub Pisarek <99591440+sgfn@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:00:24 +0200 Subject: [PATCH] Upgrade RTC Engine to v0.16.0 (#61) --- mix.exs | 19 +++++-------------- mix.lock | 7 +++++-- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mix.exs b/mix.exs index 61e98ddb..c74823d4 100644 --- a/mix.exs +++ b/mix.exs @@ -40,7 +40,7 @@ defmodule Jellyfish.MixProject do # Specifies which paths to compile per environment. defp elixirc_paths(:test), do: ["lib", "test/support"] - defp elixirc_paths(_), do: ["lib"] + defp elixirc_paths(_env), do: ["lib"] defp deps do [ @@ -59,25 +59,16 @@ defmodule Jellyfish.MixProject do {:protobuf, "~> 0.12.0"}, # Membrane deps - {:membrane_rtc_engine, "~> 0.15.0"}, + {:membrane_rtc_engine, "~> 0.16.0"}, + {:membrane_rtc_engine_webrtc, "~> 0.1.0"}, + {:membrane_rtc_engine_hls, "~> 0.1.0"}, + {:membrane_rtc_engine_rtsp, "~> 0.1.0"}, {:membrane_ice_plugin, "~> 0.16.0"}, {:membrane_telemetry_metrics, "~> 0.1.0"}, # HLS endpoints deps - {:membrane_aac_plugin, "~> 0.15.0"}, - {:membrane_opus_plugin, "~> 0.17.1"}, - {:membrane_aac_fdk_plugin, "~> 0.15.1"}, {:membrane_audio_mix_plugin, "~> 0.15.2"}, - {:membrane_raw_audio_format, "~> 0.11.0"}, - {:membrane_h264_ffmpeg_plugin, "~> 0.27.0"}, - {:membrane_h264_plugin, "~> 0.4.0"}, {:membrane_video_compositor_plugin, "~> 0.5.1"}, - {:membrane_http_adaptive_stream_plugin, "~> 0.15.0"}, - - # RTSP endpoints deps - {:connection, "~> 1.1"}, - {:membrane_rtsp, "~> 0.5.0"}, - {:membrane_udp_plugin, "~> 0.10.0"}, # Dialyzer and credo {:dialyxir, ">= 0.0.0", only: :dev, runtime: false}, diff --git a/mix.lock b/mix.lock index 3ed360c0..c50b97e2 100644 --- a/mix.lock +++ b/mix.lock @@ -34,7 +34,7 @@ "membrane_audio_mix_plugin": {:hex, :membrane_audio_mix_plugin, "0.15.2", "6f52ccf1a052115f509520fe24261b547121e87a4c5e55b7245c0aabbfcb5ddc", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_common_c, "~> 0.15.0", [hex: :membrane_common_c, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.1", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.11.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "06c29679b2ec997597519665d5f2c621800003fe8f0069b2e478a4771b3e44ba"}, "membrane_cmaf_format": {:hex, :membrane_cmaf_format, "0.6.1", "89d130b5f8786d4285d395697b0f7763a2c82a02de1658cdeb4f8e37e6a6c85c", [:mix], [], "hexpm", "e916e3c8216f3bf999b069ffda94da48c9bdbe3181ce7155a458d1ccf1a97b3d"}, "membrane_common_c": {:hex, :membrane_common_c, "0.15.0", "4b6005c562bf025e4a53c95a9646a9f5fa993ac440dd44c1a4d1ea210ec53793", [:mix], [{:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:shmex, "~> 0.5.0", [hex: :shmex, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "f9584cca9865ed754b8333e362d49d6c449c708d7c87be6c5f7bd5a1d978d6bf"}, - "membrane_core": {:hex, :membrane_core, "0.12.5", "098733b1677bd9235a74fc3dabcdff5459d879466c7dc4b862e485c161153947", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 2.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "59ecef38a9c184a41810d23dfc77b899717538dd0a177bdbd57383c199f7675b"}, + "membrane_core": {:hex, :membrane_core, "0.12.7", "9d3dd564e32768919c1105b4579bd2eef12df7473da5d789185544ae22610e2d", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 2.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "321e4009b7068ca04b65daf5c79b8c3772d4286c27d05e50939ec6d9b4d50e59"}, "membrane_file_plugin": {:hex, :membrane_file_plugin, "0.14.0", "87f19f5f5afbfbaf2219b8f1d8496534cb9ad01fca74687910bf3f7aa866e244", [:mix], [{:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "28956f8d5d87735d499c57f1c24f62aeab71e0211863759e7e695ead966eb433"}, "membrane_framerate_converter_plugin": {:hex, :membrane_framerate_converter_plugin, "0.7.0", "f1a12b914dde380f43ca83363431ed3c743cf20320afe6011f0f77e97d1d867f", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.3.0", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}, {:ratio, "~> 2.4.2", [hex: :ratio, repo: "hexpm", optional: false]}], "hexpm", "6c552f839f047d392adec7ce06ee6c720ef0561d6a766ff7087df7950501b835"}, "membrane_funnel_plugin": {:hex, :membrane_funnel_plugin, "0.8.0", "fe735a88e4ac815041f3aba0bbfa25297769c4cb8b501f3875809698fe3f8fbf", [:mix], [{:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "61776c7e5b87eaa33eb314d06440cd124246a794482bf0c1b8cd2b796714f420"}, @@ -50,7 +50,10 @@ "membrane_opus_plugin": {:hex, :membrane_opus_plugin, "0.17.1", "533d694d8c6f38fbf7f09a514e16037e8980d167899d4c35cb5017b088122ce9", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_common_c, "~> 0.15.0", [hex: :membrane_common_c, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.11.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "8d2bf3d97651f136fd393ce80c099a4f282bbe1dfafde887f8ab18668fd349aa"}, "membrane_raw_audio_format": {:hex, :membrane_raw_audio_format, "0.11.0", "9b7e8c77f321a3fa1cac2ef157c897938084b704a90ac5450d9f5c87a249b613", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}, {:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "89e0d46893b7cd63d1ab76467d3aae95bd8081e487b18ab0d1679c70d75f7bd8"}, "membrane_raw_video_format": {:hex, :membrane_raw_video_format, "0.3.0", "ba10f475e0814a6fe79602a74536b796047577c7ef5b0e33def27cd344229699", [:mix], [], "hexpm", "2f08760061c8a5386ecf04273480f10e48d25a1a40aa99476302b0bcd34ccb1c"}, - "membrane_rtc_engine": {:hex, :membrane_rtc_engine, "0.15.0", "6638f5b955046865c6831feb155c488f5572a4aecea67f62d89838f107b08268", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: true]}, {:ex_sdp, "~> 0.11.0", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:membrane_aac_fdk_plugin, "~> 0.15.1", [hex: :membrane_aac_fdk_plugin, repo: "hexpm", optional: true]}, {:membrane_aac_plugin, "~> 0.15.0", [hex: :membrane_aac_plugin, repo: "hexpm", optional: true]}, {:membrane_audio_mix_plugin, "~> 0.15.2", [hex: :membrane_audio_mix_plugin, repo: "hexpm", optional: true]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.14.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_ffmpeg_plugin, "~> 0.27.0", [hex: :membrane_h264_ffmpeg_plugin, repo: "hexpm", optional: true]}, {:membrane_h264_plugin, "~> 0.4.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: true]}, {:membrane_http_adaptive_stream_plugin, "~> 0.15.0", [hex: :membrane_http_adaptive_stream_plugin, repo: "hexpm", optional: true]}, {:membrane_ice_plugin, "~> 0.16.0", [hex: :membrane_ice_plugin, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_opus_plugin, "~> 0.17.1", [hex: :membrane_opus_plugin, repo: "hexpm", optional: true]}, {:membrane_raw_audio_format, "~> 0.11.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: true]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_h264_plugin, "~> 0.16.0", [hex: :membrane_rtp_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_opus_plugin, "~> 0.8.0", [hex: :membrane_rtp_opus_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.23.0", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_vp8_plugin, "~> 0.8.0", [hex: :membrane_rtp_vp8_plugin, repo: "hexpm", optional: false]}, {:membrane_rtsp, "~> 0.5.0", [hex: :membrane_rtsp, repo: "hexpm", optional: true]}, {:membrane_tee_plugin, "~> 0.11.0", [hex: :membrane_tee_plugin, repo: "hexpm", optional: false]}, {:membrane_telemetry_metrics, "~> 0.1.0", [hex: :membrane_telemetry_metrics, repo: "hexpm", optional: false]}, {:membrane_udp_plugin, "~> 0.10.0", [hex: :membrane_udp_plugin, repo: "hexpm", optional: true]}, {:membrane_video_compositor_plugin, "~> 0.5.1", [hex: :membrane_video_compositor_plugin, repo: "hexpm", optional: true]}, {:membrane_webrtc_plugin, "~> 0.15.0", [hex: :membrane_webrtc_plugin, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0.0", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:qex, "~> 0.5", [hex: :qex, repo: "hexpm", optional: false]}, {:statistics, "~> 0.6.0", [hex: :statistics, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}, {:uuid, "~> 1.1", [hex: :uuid, repo: "hexpm", optional: false]}], "hexpm", "f699ca6db89ab3b9cd989a4bb1f24d7c971c17c94e53fcc3ebbb40215efad1f6"}, + "membrane_rtc_engine": {:hex, :membrane_rtc_engine, "0.16.0", "f7b37b82c72ff7d36817980a5b593ec02726b000fc173b806d0d2c25b3effdfb", [:mix], [{:ex_sdp, "~> 0.11.0", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_ice_plugin, "~> 0.16.0", [hex: :membrane_ice_plugin, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.23.0", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_telemetry_metrics, "~> 0.1.0", [hex: :membrane_telemetry_metrics, repo: "hexpm", optional: false]}, {:membrane_webrtc_plugin, "~> 0.15.0", [hex: :membrane_webrtc_plugin, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0.0", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:statistics, "~> 0.6.0", [hex: :statistics, repo: "hexpm", optional: false]}, {:uuid, "~> 1.1", [hex: :uuid, repo: "hexpm", optional: false]}], "hexpm", "f7043c29a3bac6570a7333eea8435f6b8c91634653967b1fa50622404bac927a"}, + "membrane_rtc_engine_hls": {:hex, :membrane_rtc_engine_hls, "0.1.0", "8e9e7e0c76adf8744baccc5670d9484cbe614ba1f2f1354dc0d79245903fa91b", [:mix], [{:membrane_aac_fdk_plugin, "~> 0.15.1", [hex: :membrane_aac_fdk_plugin, repo: "hexpm", optional: false]}, {:membrane_aac_plugin, "~> 0.15.0", [hex: :membrane_aac_plugin, repo: "hexpm", optional: false]}, {:membrane_audio_mix_plugin, "~> 0.15.2", [hex: :membrane_audio_mix_plugin, repo: "hexpm", optional: true]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.14.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_ffmpeg_plugin, "~> 0.27.0", [hex: :membrane_h264_ffmpeg_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_plugin, "~> 0.4.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_http_adaptive_stream_plugin, "~> 0.15.0", [hex: :membrane_http_adaptive_stream_plugin, repo: "hexpm", optional: false]}, {:membrane_opus_plugin, "~> 0.17.1", [hex: :membrane_opus_plugin, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.11.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.3.0", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.16.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtc_engine_webrtc, "~> 0.1.0", [hex: :membrane_rtc_engine_webrtc, repo: "hexpm", optional: false]}, {:membrane_video_compositor_plugin, "~> 0.5.1", [hex: :membrane_video_compositor_plugin, repo: "hexpm", optional: true]}], "hexpm", "330f3ec13d77f6381e2e5bae0a0536cbc6abb16bbbb285589396e27a095868c9"}, + "membrane_rtc_engine_rtsp": {:hex, :membrane_rtc_engine_rtsp, "0.1.0", "92415f11f00fb4489a5f21919c46da593ad45521175a7576bcaedf2316f41be2", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:ex_sdp, "~> 0.11.0", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.16.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtc_engine_webrtc, "~> 0.1.0", [hex: :membrane_rtc_engine_webrtc, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_h264_plugin, "~> 0.16.0", [hex: :membrane_rtp_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.23.0", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_rtsp, "~> 0.5.0", [hex: :membrane_rtsp, repo: "hexpm", optional: false]}, {:membrane_udp_plugin, "~> 0.10.0", [hex: :membrane_udp_plugin, repo: "hexpm", optional: false]}], "hexpm", "b24f9f48e8528b3a19813169237eeda090fb87be9dca4ed42c9ba6b84f1786b6"}, + "membrane_rtc_engine_webrtc": {:hex, :membrane_rtc_engine_webrtc, "0.1.0", "76876e764ac87f42e08ac6bf1cdbc0988f64c1027078b365b4f79250be933a14", [:mix], [{:ex_sdp, "~> 0.11.0", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.14.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_ice_plugin, "~> 0.16.0", [hex: :membrane_ice_plugin, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.16.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_h264_plugin, "~> 0.16.0", [hex: :membrane_rtp_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.23.0", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_vp8_plugin, "~> 0.8.0", [hex: :membrane_rtp_vp8_plugin, repo: "hexpm", optional: false]}, {:membrane_telemetry_metrics, "~> 0.1.0", [hex: :membrane_telemetry_metrics, repo: "hexpm", optional: false]}, {:membrane_webrtc_plugin, "~> 0.15.0", [hex: :membrane_webrtc_plugin, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:qex, "~> 0.5", [hex: :qex, repo: "hexpm", optional: false]}], "hexpm", "96904c2b6dfcc7046d4c205728fb7acfe86becd8a47106ed42e29f4669cf4aff"}, "membrane_rtp_format": {:hex, :membrane_rtp_format, "0.7.0", "c07cca86d420732663b55a9ca046f327737ca87354508c3df829d240c477df25", [:mix], [{:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "2cead4d2c4f9f5c7669677c2cd3921f9f99ec29c06a871f9dffdb97840a1a279"}, "membrane_rtp_h264_plugin": {:hex, :membrane_rtp_h264_plugin, "0.16.0", "c5781793b1c866335e409f97443f27347d54e1507fb84b5f13dadf0dddaa5f86", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.5.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "61893b28a02ef62f22abd84628e5d530a76a782e8cedcd6ae8cb8ad4e71d9691"}, "membrane_rtp_opus_plugin": {:hex, :membrane_rtp_opus_plugin, "0.8.0", "bf53c9135b555fccc70e16cfb2583a858b1fbafe7f2e595e6a7d233c8b78682c", [:mix], [{:membrane_core, "~> 0.12.1", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.7.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "3098224986aff8c22f6f93ccb39a10e774391cf2fccaa4f9635000dbd3212635"},