Skip to content

Commit

Permalink
Merge pull request #63 from membraneframework/use-membrane_transcoder…
Browse files Browse the repository at this point in the history
…_plugin

Use Transcoder from membrane_transcoder_plugin
  • Loading branch information
FelonEkonom authored Feb 5, 2025
2 parents 5859bd1 + a3cd06c commit 434bef8
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 441 deletions.
4 changes: 2 additions & 2 deletions lib/boombox/elixir_stream.ex
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ defmodule Boombox.ElixirStream do
Enum.map(track_builders, fn
{:audio, builder} ->
builder
|> child(:mp4_audio_transcoder, %Boombox.Transcoder{
|> child(:mp4_audio_transcoder, %Membrane.Transcoder{
output_stream_format: Membrane.RawAudio
})
|> maybe_plug_resampler(options)
Expand All @@ -64,7 +64,7 @@ defmodule Boombox.ElixirStream do

{:video, builder} ->
builder
|> child(:elixir_stream_video_transcoder, %Boombox.Transcoder{
|> child(:elixir_stream_video_transcoder, %Membrane.Transcoder{
output_stream_format: Membrane.RawVideo
})
|> child(:elixir_stream_rgb_converter, %Membrane.FFmpeg.SWScale.Converter{
Expand Down
4 changes: 2 additions & 2 deletions lib/boombox/hls.ex
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ defmodule Boombox.HLS do
Enum.map(track_builders, fn
{:audio, builder} ->
builder
|> child(:hls_audio_transcoder, %Boombox.Transcoder{
|> child(:hls_audio_transcoder, %Membrane.Transcoder{
output_stream_format: Membrane.AAC
})
|> via_in(Pad.ref(:input, :audio),
Expand All @@ -53,7 +53,7 @@ defmodule Boombox.HLS do

{:video, builder} ->
builder
|> child(:hls_video_transcoder, %Boombox.Transcoder{
|> child(:hls_video_transcoder, %Membrane.Transcoder{
output_stream_format: %H264{alignment: :au, stream_structure: :avc3}
})
|> via_in(Pad.ref(:input, :video),
Expand Down
4 changes: 2 additions & 2 deletions lib/boombox/mp4.ex
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ defmodule Boombox.MP4 do
Enum.map(track_builders, fn
{:audio, builder} ->
builder
|> child(:mp4_audio_transcoder, %Boombox.Transcoder{
|> child(:mp4_audio_transcoder, %Membrane.Transcoder{
output_stream_format: Membrane.AAC
})
|> child(:mp4_out_aac_parser, %Membrane.AAC.Parser{
Expand All @@ -77,7 +77,7 @@ defmodule Boombox.MP4 do

{:video, builder} ->
builder
|> child(:mp4_video_transcoder, %Boombox.Transcoder{
|> child(:mp4_video_transcoder, %Membrane.Transcoder{
output_stream_format: fn
%H264{stream_structure: :annexb} = h264 ->
%H264{h264 | stream_structure: :avc3, alignment: :au}
Expand Down
2 changes: 1 addition & 1 deletion lib/boombox/rtp.ex
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ defmodule Boombox.RTP do
end

builder
|> child({:rtp_transcoder, media_type}, %Boombox.Transcoder{
|> child({:rtp_transcoder, media_type}, %Membrane.Transcoder{
output_stream_format: output_stream_format
})
|> child({:rtp_out_parser, media_type}, parser)
Expand Down
94 changes: 0 additions & 94 deletions lib/boombox/transcoder.ex

This file was deleted.

90 changes: 0 additions & 90 deletions lib/boombox/transcoder/audio.ex

This file was deleted.

117 changes: 0 additions & 117 deletions lib/boombox/transcoder/forwarding_filter.ex

This file was deleted.

Loading

0 comments on commit 434bef8

Please sign in to comment.