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

Commit 17ec55f

Browse files
authored
Merge pull request #247 from jellyfish-dev/http_dependency
Update membrane_http_adaptive_streaming_plugin dependency.
2 parents b99d493 + 4f07043 commit 17ec55f

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,7 @@ priv/static/*
3939
!priv/static/.gitkeep
4040
test/output
4141
test/hls_output
42-
tmp/
42+
tmp/
43+
44+
# asdf
45+
.tool-versions

mix.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ defmodule Membrane.RTC.Engine.MixProject do
8888
{:membrane_h264_ffmpeg_plugin, "~> 0.25.2", optional: true},
8989
{:membrane_audio_filler_plugin, "~> 0.1.0", optional: true},
9090
{:membrane_video_compositor_plugin, "~> 0.1.0", optional: true},
91-
{:membrane_http_adaptive_stream_plugin, "~> 0.10.0", optional: true},
91+
{:membrane_http_adaptive_stream_plugin, "~> 0.11.0", optional: true},
9292

9393
# Test deps
9494
{:membrane_file_plugin, "~> 0.13.0"},

mix.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"membrane_generator_plugin": {:hex, :membrane_generator_plugin, "0.8.0", "5518440b4376be4b726b40b322899d18ea3a75b1a74107a7ea565699567e5871", [:mix], [{:membrane_core, "~> 0.11.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.10.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.2", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}], "hexpm", "6d64fd39c5b27c3b52c90151e8091557eb1453a86f403404b0afe133074b7b2e"},
4242
"membrane_h264_ffmpeg_plugin": {:hex, :membrane_h264_ffmpeg_plugin, "0.25.2", "0e8224eb1f5a8c9f43ef3b12d6e9306d49565af13f313f539a0aa0724666064a", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_common_c, "~> 0.14.0", [hex: :membrane_common_c, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.4.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.2.0", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}, {:ratio, "~> 2.4.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "1659114011de3572954fcbb99623b7213bb00e1d17026c25be41f8c6528eb5bf"},
4343
"membrane_h264_format": {:hex, :membrane_h264_format, "0.4.0", "7103376864f0c0ef525ab31fc16684fd1aa8453f47fb060f1940125d8956dd5d", [:mix], [], "hexpm", "0a46ffa7a3f0da4da65134c7ef0feb64eb9eea3e55c2f0cf261969ab40f7bdd5"},
44-
"membrane_http_adaptive_stream_plugin": {:hex, :membrane_http_adaptive_stream_plugin, "0.10.1", "44c12efbe41d88dcef99e07c18ca8f6a5b66c3c4b6f293f18809ae005952786f", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.6.0", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.2", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_mp4_plugin, "~> 0.18.0", [hex: :membrane_mp4_plugin, repo: "hexpm", optional: false]}, {:membrane_tee_plugin, "~> 0.10.1", [hex: :membrane_tee_plugin, repo: "hexpm", optional: false]}], "hexpm", "4f7f5245bdd448bcafe6b6085d01988032425b9bd888a7fb1d27fd8168828279"},
44+
"membrane_http_adaptive_stream_plugin": {:hex, :membrane_http_adaptive_stream_plugin, "0.11.0", "5b4cdf51d34288ff33fed7f6b550133e8cd1825f912d88f7f3195e5c1618f1bf", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.6.0", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.2", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_mp4_plugin, "~> 0.18.0", [hex: :membrane_mp4_plugin, repo: "hexpm", optional: false]}, {:membrane_tee_plugin, "~> 0.10.1", [hex: :membrane_tee_plugin, repo: "hexpm", optional: false]}], "hexpm", "4957d4b3d3b47d03db6c8a11352a44236347f283296064a6fc843295cf686d17"},
4545
"membrane_ice_plugin": {:hex, :membrane_ice_plugin, "0.14.2", "9229e1f90ef028a3555cc7ab9227f123d17881b028ec0f510b2e5abc4f717c26", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:ex_dtls, "~> 0.11.1", [hex: :ex_dtls, repo: "hexpm", optional: false]}, {:fake_turn, "~> 0.3.0", [hex: :fake_turn, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_funnel_plugin, "~> 0.7.0", [hex: :membrane_funnel_plugin, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.6.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_telemetry_metrics, "~> 0.1.0", [hex: :membrane_telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "67bea98f523bef8eeb820f730527685eb18074c48052ea3fb4a485b62c6d8797"},
4646
"membrane_mp4_format": {:hex, :membrane_mp4_format, "0.7.0", "0cc33f21dc571b43b4d2db66a056e2b7eecdc7ada71a9e0e923ab7a1554f15f2", [:mix], [], "hexpm", "7653a20e7b0c048ea05ffad6df88249abf4c1b63772c14dee843acffcad6b038"},
4747
"membrane_mp4_plugin": {:hex, :membrane_mp4_plugin, "0.18.1", "3a8e451aace9a6c5cd39c30a46f037b9bcbd62e12050d3b603d03239c25c3024", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.7.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.6.0", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.2", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.13.2", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.4.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_mp4_format, "~> 0.7.0", [hex: :membrane_mp4_format, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}], "hexpm", "d7550c12631f1450c174d89d943f3e8d8ae8a76e97c57aa95e9ceac29e8f625e"},
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#EXTM3U
22
#EXT-X-VERSION:7
33
#EXT-X-INDEPENDENT-SEGMENTS
4-
#EXT-X-STREAM-INF:BANDWIDTH=2996615,CODECS="avc1.42e00a"
4+
#EXT-X-STREAM-INF:BANDWIDTH=4063898,CODECS="avc1.42e00a"
55
g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ.m3u8

0 commit comments

Comments
 (0)