Skip to content

Commit

Permalink
Merge pull request #275 from membraneframework/demos_update_deps
Browse files Browse the repository at this point in the history
Update dependencies in demos
  • Loading branch information
bartkrak authored May 20, 2024
2 parents de572e8 + cbe5a6a commit 35b6e7c
Show file tree
Hide file tree
Showing 16 changed files with 127 additions and 126 deletions.
8 changes: 4 additions & 4 deletions camera_to_hls/camera_to_hls.exs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Logger.configure(level: :info)

Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_camera_capture_plugin, "~> 0.7.1"},
{:membrane_ffmpeg_swscale_plugin, "~> 0.15.0"},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.0"},
{:membrane_http_adaptive_stream_plugin, "~> 0.18.0"}
{:membrane_camera_capture_plugin, "~> 0.7.2"},
{:membrane_ffmpeg_swscale_plugin, "~> 0.15.1"},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.6"},
{:membrane_http_adaptive_stream_plugin, "~> 0.18.4"}
])

defmodule CameraToHls do
Expand Down
8 changes: 4 additions & 4 deletions livebooks/audio_mixer/audio_mixer.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Logger.configure(level: :error)
Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_audio_mix_plugin, "~> 0.16.0"},
{:membrane_file_plugin, "~> 0.16.0"},
{:membrane_file_plugin, "~> 0.17.0"},
{:membrane_mp3_mad_plugin, "~> 0.18.2"},
{:membrane_ffmpeg_swresample_plugin, "~> 0.19.1"},
{:membrane_aac_fdk_plugin, "~> 0.18.5"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.1"},
{:membrane_ffmpeg_swresample_plugin, "~> 0.20.2"},
{:membrane_aac_fdk_plugin, "~> 0.18.8"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.2"},
{:membrane_tee_plugin, "~> 0.12.0"}
])
```
Expand Down
27 changes: 16 additions & 11 deletions livebooks/messages_source_and_sink/messages_source_and_sink.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ defmodule MessageSource do

require Membrane.Logger

def_output_pad :output,
def_output_pad(:output,
flow_control: :push,
accepted_format: _any
)

def_options register_name: [
description: "The name under which the element's process will be registered",
spec: atom()
]

def_options(
register_name: [
description: "The name under which the element's process will be registered",
spec: atom()
]
)

@impl true
def handle_init(_ctx, opts) do
Expand Down Expand Up @@ -73,14 +75,17 @@ end
defmodule MessageSink do
use Membrane.Sink

def_input_pad :input,
def_input_pad(:input,
flow_control: :push,
accepted_format: _any
)

def_options receiver: [
description: "PID of the process that will receive messages from the sink",
spec: pid()
]
def_options(
receiver: [
description: "PID of the process that will receive messages from the sink",
spec: pid()
]
)

@impl true
def handle_init(_ctx, opts) do
Expand Down
10 changes: 5 additions & 5 deletions livebooks/playing_mp3_file/playing_mp3_file.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Logger.configure(level: :error)

Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_file_plugin, "~> 0.16.0"},
{:membrane_mp3_mad_plugin, "~> 0.18.2"},
{:membrane_ffmpeg_swresample_plugin, "~> 0.19.1"},
{:membrane_aac_fdk_plugin, "~> 0.18.5"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.1"}
{:membrane_file_plugin, "~> 0.17.0"},
{:membrane_mp3_mad_plugin, "~> 0.18.3"},
{:membrane_ffmpeg_swresample_plugin, "~> 0.20.2"},
{:membrane_aac_fdk_plugin, "~> 0.18.8"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.2"}
])
```

Expand Down
4 changes: 2 additions & 2 deletions livebooks/rtmp/rtmp_receiver.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Logger.configure(level: :error)
Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_realtimer_plugin, "~> 0.9.0"},
{:membrane_rtmp_plugin, "~> 0.21.0"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.1"}
{:membrane_rtmp_plugin, "~> 0.23.3"},
{:membrane_kino_plugin, github: "membraneframework-labs/membrane_kino_plugin", tag: "v0.3.2"}
])
```

Expand Down
2 changes: 1 addition & 1 deletion livebooks/rtmp/rtmp_sender.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_realtimer_plugin, "~> 0.9.0"},
{:membrane_hackney_plugin, "~> 0.11.0"},
{:membrane_rtmp_plugin, "~> 0.21.0"}
{:membrane_rtmp_plugin, "~> 0.23.3"}
])
```

Expand Down
4 changes: 2 additions & 2 deletions livebooks/soundwave/soundwave.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Logger.configure(level: :error)
Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_raw_audio_parser_plugin, "~> 0.4.0"},
{:membrane_portaudio_plugin, "~> 0.18.3"},
{:vega_lite, "~> 0.1.8"},
{:membrane_portaudio_plugin, "~> 0.19.2"},
{:vega_lite, "~> 0.1.9"},
{:kino_vega_lite, "~> 0.1.11"}
])
```
Expand Down
6 changes: 3 additions & 3 deletions livebooks/speech_to_text/speech_to_text.livemd
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Logger.configure(level: :info)

Mix.install(
[
{:bumblebee, "~> 0.4.2"},
{:exla, "~> 0.6.4"},
{:bumblebee, "~> 0.5.3"},
{:exla, "~> 0.7.1"},
{:membrane_core, "~> 1.0"},
{:membrane_portaudio_plugin, "~> 0.18.3"}
{:membrane_portaudio_plugin, "~> 0.19.2"}
],
config: [
nx: [default_backend: EXLA.Backend]
Expand Down
6 changes: 3 additions & 3 deletions mix_audio/mix_audio.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ Logger.configure(level: :info)

Mix.install([
{:membrane_core, "~> 1.0"},
{:membrane_file_plugin, "~> 0.16.0"},
{:membrane_wav_plugin, "~> 0.10.0"},
{:membrane_file_plugin, "~> 0.17.0"},
{:membrane_wav_plugin, "~> 0.10.1"},
{:membrane_audio_mix_plugin, "~> 0.16.0"},
{:membrane_aac_fdk_plugin, "~> 0.18.0"}
{:membrane_aac_fdk_plugin, "0.18.8"}
])

defmodule MixAudio do
Expand Down
6 changes: 5 additions & 1 deletion rtp/lib/membrane_demo_rtp/send_pipeline.ex
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ defmodule Membrane.Demo.RTP.SendPipeline do
child(:audio_src, %File.Source{
location: "samples/audio.opus"
})
|> child(:audio_parser, %Opus.Parser{input_delimitted?: true, delimitation: :undelimit})
|> child(:audio_parser, %Opus.Parser{
input_delimitted?: true,
delimitation: :undelimit,
generate_best_effort_timestamps?: true
})
|> via_in(Pad.ref(:input, audio_ssrc), options: [payloader: RTP.Opus.Payloader])
|> get_child(:rtp)
|> via_out(Pad.ref(:rtp_output, audio_ssrc), options: [encoding: :OPUS])
Expand Down
20 changes: 10 additions & 10 deletions rtp/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ defmodule Membrane.Demo.RTP.MixProject do
defp deps do
[
{:membrane_core, "~> 1.0"},
{:membrane_rtp_plugin, "~> 0.24.0"},
{:membrane_udp_plugin, "~> 0.12.0"},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.1"},
{:membrane_h264_plugin, "~> 0.9.0"},
{:membrane_rtp_h264_plugin, "~> 0.19.0"},
{:membrane_opus_plugin, "~> 0.19.0"},
{:membrane_rtp_plugin, "~> 0.27.1"},
{:membrane_udp_plugin, "~> 0.13.0"},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.6"},
{:membrane_h26x_plugin, "~> 0.10.1"},
{:membrane_rtp_h264_plugin, "~> 0.19.1"},
{:membrane_opus_plugin, "~> 0.20.1"},
{:membrane_rtp_opus_plugin, "~> 0.9.0"},
{:membrane_sdl_plugin, "~> 0.18.0"},
{:membrane_portaudio_plugin, "~> 0.18.1"},
{:membrane_file_plugin, "~> 0.16.0"},
{:membrane_sdl_plugin, "~> 0.18.2"},
{:membrane_portaudio_plugin, "~> 0.19.2"},
{:membrane_file_plugin, "~> 0.17.0"},
{:membrane_realtimer_plugin, "~> 0.9.0"},
{:ex_libsrtp, "~> 0.7"}
{:ex_libsrtp, "~> 0.7.2"}
]
end
end
Loading

0 comments on commit 35b6e7c

Please sign in to comment.