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

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
blazpie committed May 23, 2023
1 parent e07fa0a commit ac4fb1c
Show file tree
Hide file tree
Showing 28 changed files with 14 additions and 18 deletions.
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ defmodule Membrane.RTC.Engine.MixProject do

defp deps do
[
{:membrane_core, "~> 0.11.2"},
{:membrane_core, "~> 0.11.3"},
{:membrane_webrtc_plugin, "~> 0.14.4"},
{:membrane_rtp_plugin, "~> 0.22.0"},
{:membrane_rtp_format, "~> 0.6.0"},
Expand Down Expand Up @@ -93,7 +93,7 @@ defmodule Membrane.RTC.Engine.MixProject do
{:membrane_h264_plugin, "~> 0.2.0", optional: true},
{:membrane_audio_filler_plugin, "~> 0.1.0", optional: true},
{:membrane_video_compositor_plugin, "~> 0.3.1", optional: true},
{:membrane_http_adaptive_stream_plugin, "~> 0.13.0", optional: true},
{:membrane_http_adaptive_stream_plugin, "~> 0.14.0", optional: true},

# Optional deps for RTSP endpoint
{:connection, "~> 1.1", optional: true},
Expand Down
6 changes: 3 additions & 3 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
"membrane_cmaf_format": {:hex, :membrane_cmaf_format, "0.6.1", "89d130b5f8786d4285d395697b0f7763a2c82a02de1658cdeb4f8e37e6a6c85c", [:mix], [], "hexpm", "e916e3c8216f3bf999b069ffda94da48c9bdbe3181ce7155a458d1ccf1a97b3d"},
"membrane_common_c": {:hex, :membrane_common_c, "0.14.0", "35621d9736829bf675062dc0af66e931b0d82ff8361c2088576d63d4d002692e", [:mix], [{:membrane_core, "~> 0.11.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", "262b06e93fe3f1be57a111fa19f5cba4f26000a442ac32a59f3678e83cbb001f"},
"membrane_core": {:hex, :membrane_core, "0.11.3", "c7cedbbc5af216ce00f173b1e30cbb2ed686b0a86cac9d90bc9cff3c02f938fd", [:mix], [{:bunch, "~> 1.5", [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", "de878caa5c5043ccd244f716a31afc9496f626013728881756cacaede72b4649"},
"membrane_file_plugin": {:hex, :membrane_file_plugin, "0.13.2", "220aa341b8d707b65c93cf8d42700a4c67340717ee4fbce3f8fc6503d182b0f8", [:mix], [{:membrane_core, "~> 0.11", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "d04159943f4f07fa45156487d9e7c19b9975678c1cda7957a6b0cca59442fae3"},
"membrane_file_plugin": {:hex, :membrane_file_plugin, "0.13.3", "aaf40a72e5fccf6da47ec85ef525234acbec828425f1300f74c464bca1487f40", [:mix], [{:membrane_core, "~> 0.11", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "1c1acf610d4fc0279b7fd65a5db06c8bc3ef6a276bf40fb033c2c735c25839ba"},
"membrane_framerate_converter_plugin": {:hex, :membrane_framerate_converter_plugin, "0.6.1", "bcfa2c7fda2b3fa285a8eb6949b85a4223551037300e726de7e88c4c5683c1e0", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.2", [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", "0113f56f8fa47b6c2b68c6c4cb38c00833dc7df692ec6edf26e94202b0f6b715"},
"membrane_funnel_plugin": {:hex, :membrane_funnel_plugin, "0.7.0", "f633a32a7549923a5b15f9afe8aede111b51f1ff9a03e8bb134f5cd54a6a2237", [:mix], [{:membrane_core, "~> 0.11.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "8f08686cef36ea71cd2bf820163db729a821d5c10f6441c02b24476d6ed639d4"},
"membrane_generator_plugin": {:hex, :membrane_generator_plugin, "0.8.1", "ec335b98c921b45b81d05bd9ee15a727695c2951fa0bf2dd252a138447c31d00", [: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.3", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}], "hexpm", "d4a8173d458cb01a78ee6397121c0accaddd210beee2986479c103939ed92270"},
"membrane_h264_ffmpeg_plugin": {:hex, :membrane_h264_ffmpeg_plugin, "0.26.2", "ec916f86f059ca32a626153cf19ab024990d4aeb86122235c6c75a18a9dd5f10", [:mix], [{:bunch, "~> 1.6", [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.5.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.3.0", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}, {:ratio, "~> 2.4.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:unifex, "~> 1.1", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "7a7e5511bc7f2de03e861d8c068e67d83c400986be4e2f6655f508de35f6bec9"},
"membrane_h264_format": {:hex, :membrane_h264_format, "0.5.0", "95c1cc00896dab6de322cee3be0c9b0b0840537b4cc49e82a34e901b4e4763f9", [:mix], [], "hexpm", "7b44e0b02d86b45d24699de3c970186dffbca6d51aca80bbed2f6a3fe5c9eba1"},
"membrane_h264_plugin": {:hex, :membrane_h264_plugin, "0.2.1", "d1643644afd45e45f5bd9b47e52fa02c6e17a6371d3045417096f6a2dea69a13", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.5.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}], "hexpm", "875f9ccbee6cada3181b7b54ee2e89a22816e6372dfa9ea190725dc7908a57fe"},
"membrane_http_adaptive_stream_plugin": {:hex, :membrane_http_adaptive_stream_plugin, "0.13.0", "19d8eb6cc148d8dae84683561d9dcc4889706463ca6fe596ba44538595efb415", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.6.1", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.2", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_mp4_plugin, "~> 0.19.0", [hex: :membrane_mp4_plugin, repo: "hexpm", optional: false]}, {:membrane_tee_plugin, "~> 0.10.1", [hex: :membrane_tee_plugin, repo: "hexpm", optional: false]}], "hexpm", "4fc1c703c70bbabd014b955be56e5cb713f2232f30c512f1edb4b060f55d6b98"},
"membrane_http_adaptive_stream_plugin": {:hex, :membrane_http_adaptive_stream_plugin, "0.14.0", "431d053b772aa306dd452865fcc6593c8dfe58694d8e3e6fef2552f5f4f77c28", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_cmaf_format, "~> 0.6.1", [hex: :membrane_cmaf_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 0.11.3", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_mp4_plugin, "~> 0.21.0", [hex: :membrane_mp4_plugin, repo: "hexpm", optional: false]}, {:membrane_tee_plugin, "~> 0.10.1", [hex: :membrane_tee_plugin, repo: "hexpm", optional: false]}], "hexpm", "5c538065b1ee749146ea811c06805fb317c2c32f2966284683c56e6b8a13d2b8"},
"membrane_ice_plugin": {:hex, :membrane_ice_plugin, "0.14.3", "188e1955cdb6498596affff66185c9e2f88d92ebbf8b4ed29a027cb08c32f251", [: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", "8532da2724ca3532e95d3eb0f3fee1a10c77d2d346de03e732e04e08b8e847ee"},
"membrane_mp4_format": {:hex, :membrane_mp4_format, "0.7.0", "0cc33f21dc571b43b4d2db66a056e2b7eecdc7ada71a9e0e923ab7a1554f15f2", [:mix], [], "hexpm", "7653a20e7b0c048ea05ffad6df88249abf4c1b63772c14dee843acffcad6b038"},
"membrane_mp4_plugin": {:hex, :membrane_mp4_plugin, "0.19.0", "83ea8d0734d1be638c21c5e5a774c33c8ea6afcaa9cc2b77d6b13d38eb414de0", [: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.5.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", "19bc8663348a204dc1489493c571372775e52a1afecb869fc0fe7faa918917bc"},
"membrane_mp4_plugin": {:hex, :membrane_mp4_plugin, "0.21.0", "d20516cad6152e92ff55b340f3b98f0f26c7a62e1a97d1ce770d6298eb8019d1", [: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.5.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", "d63934b1c8c038668454985797025d4149be825850ecda178624b5dc71b85f78"},
"membrane_opentelemetry": {:hex, :membrane_opentelemetry, "0.1.0", "af774bc5b9bad3a822e9a26d8530819b0291b569a282c65a7dd51cc498e6e9cd", [:mix], [{:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "2e4072a5f14eb95514701e242a7667a7178dfc6afd313d4643ec0726391c243b"},
"membrane_opus_format": {:hex, :membrane_opus_format, "0.3.0", "3804d9916058b7cfa2baa0131a644d8186198d64f52d592ae09e0942513cb4c2", [:mix], [], "hexpm", "8fc89c97be50de23ded15f2050fe603dcce732566fe6fdd15a2de01cb6b81afe"},
"membrane_opus_plugin": {:hex, :membrane_opus_plugin, "0.16.0", "f84b1644410848c336e8598415589c65e4f8a58c09559a3a7998470de4af4fe2", [: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_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.10.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "f049376cc98c188b70674dea33f7e37224cbd2c39f803cd35393e7074f0c0cca"},
Expand Down
Binary file modified test/hls_reference/audio_mixer/audio_segment_0_g2QABWF1ZGlv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/audio_segment_1_g2QABWF1ZGlv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/audio_segment_2_g2QABWF1ZGlv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/audio_segment_3_g2QABWF1ZGlv.m4s
Binary file not shown.
2 changes: 1 addition & 1 deletion test/hls_reference/audio_mixer/index.m3u8
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
#EXT-X-VERSION:7
#EXT-X-INDEPENDENT-SEGMENTS
#EXT-X-MEDIA:TYPE=AUDIO,NAME="audio_default_name",GROUP-ID="audio_default_id",AUTOSELECT=YES,DEFAULT=YES,URI="g2QABWF1ZGlv.m3u8"
#EXT-X-STREAM-INF:BANDWIDTH=57536,CODECS="avc1.42e00a",AUDIO="audio_default_id"
#EXT-X-STREAM-INF:BANDWIDTH=48752,CODECS="avc1.42e00a",AUDIO="audio_default_id"
g2QABXZpZGVv.m3u8
Binary file modified test/hls_reference/audio_mixer/video_segment_0_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/video_segment_1_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/video_segment_2_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file modified test/hls_reference/audio_mixer/video_segment_3_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#EXTM3U
#EXT-X-VERSION:7
#EXT-X-TARGETDURATION:5
#EXT-X-TARGETDURATION:9
#EXT-X-MEDIA-SEQUENCE:0
#EXT-X-DISCONTINUITY-SEQUENCE:0
#EXT-X-MAP:URI="video_header_g2gCZAAFdmlkZW9tAAAAEHRlc3QtdmlkZW8tdHJhY2s_part_0.mp4"
#EXTINF:4.15,
#EXTINF:8.316666666,
video_segment_0_g2gCZAAFdmlkZW9tAAAAEHRlc3QtdmlkZW8tdHJhY2s.m4s
#EXTINF:4.166666666,
video_segment_1_g2gCZAAFdmlkZW9tAAAAEHRlc3QtdmlkZW8tdHJhY2s.m4s
#EXTINF:1.683333334,
video_segment_2_g2gCZAAFdmlkZW9tAAAAEHRlc3QtdmlkZW8tdHJhY2s.m4s
video_segment_1_g2gCZAAFdmlkZW9tAAAAEHRlc3QtdmlkZW8tdHJhY2s.m4s
#EXT-X-ENDLIST
Binary file not shown.
2 changes: 1 addition & 1 deletion test/hls_reference/muxed-segments/index.m3u8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#EXTM3U
#EXT-X-VERSION:7
#EXT-X-INDEPENDENT-SEGMENTS
#EXT-X-STREAM-INF:BANDWIDTH=3231148,CODECS="avc1.42e00a"
#EXT-X-STREAM-INF:BANDWIDTH=3224503,CODECS="avc1.42e00a"
g2QABXZpZGVv.m3u8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#EXTM3U
#EXT-X-VERSION:7
#EXT-X-TARGETDURATION:5
#EXT-X-TARGETDURATION:9
#EXT-X-MEDIA-SEQUENCE:0
#EXT-X-DISCONTINUITY-SEQUENCE:0
#EXT-X-MAP:URI="video_header_g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ_part_0.mp4"
#EXTINF:4.15,
#EXTINF:8.316666666,
video_segment_0_g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ.m4s
#EXTINF:4.166666666,
video_segment_1_g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ.m4s
#EXTINF:1.683333334,
video_segment_2_g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ.m4s
video_segment_1_g2gCZAAFdmlkZW9tAAAADXRlc3QtdHJhY2staWQ.m4s
#EXT-X-ENDLIST
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion test/hls_reference/video_mixer/index.m3u8
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
#EXT-X-VERSION:7
#EXT-X-INDEPENDENT-SEGMENTS
#EXT-X-MEDIA:TYPE=AUDIO,NAME="audio_default_name",GROUP-ID="audio_default_id",AUTOSELECT=YES,DEFAULT=YES,URI="g2QABWF1ZGlv.m3u8"
#EXT-X-STREAM-INF:BANDWIDTH=3196078,CODECS="avc1.42e00a",AUDIO="audio_default_id"
#EXT-X-STREAM-INF:BANDWIDTH=3196806,CODECS="avc1.42e00a",AUDIO="audio_default_id"
g2QABXZpZGVv.m3u8
Binary file modified test/hls_reference/video_mixer/video_segment_0_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file modified test/hls_reference/video_mixer/video_segment_1_g2QABXZpZGVv.m4s
Binary file not shown.
Binary file modified test/hls_reference/video_mixer/video_segment_2_g2QABXZpZGVv.m4s
Binary file not shown.

0 comments on commit ac4fb1c

Please sign in to comment.