Skip to content

Commit 19eaeff

Browse files
committed
Fix connector
1 parent 8012af8 commit 19eaeff

File tree

4 files changed

+4
-126
lines changed

4 files changed

+4
-126
lines changed

lib/transcoder.ex

+1-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ defmodule Membrane.Transcoder do
2222
require __MODULE__.Video
2323
require Membrane.Logger
2424

25-
alias __MODULE__.{Audio, ForwardingFilter, Video}
25+
alias __MODULE__.{Audio, Video}
2626
alias Membrane.{AAC, Funnel, H264, H265, Opus, RawAudio, RawVideo, RemoteStream, VP8}
2727

2828
@typedoc """
@@ -101,12 +101,6 @@ defmodule Membrane.Transcoder do
101101
{[spec: spec], state}
102102
end
103103

104-
@impl true
105-
def handle_playing(_ctx, state) do
106-
IO.inspect(PLAYING)
107-
{[], state}
108-
end
109-
110104
@impl true
111105
def handle_child_notification({:stream_format, _pad, format}, :connector, _ctx, state)
112106
when state.input_stream_format == nil do

lib/transcoder/forwarding_filter.ex

-117
This file was deleted.

mix.exs

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ defmodule Membrane.Transcoder.Plugin.Mixfile do
3838
defp deps do
3939
[
4040
# {:membrane_core, "~> 1.2"},
41-
{:membrane_core, path: "../membrane_core", override: true},
41+
{:membrane_core,
42+
github: "membraneframework/membrane_core", branch: "changes-in-connector", override: true},
4243
{:membrane_opus_plugin, "~> 0.20.3"},
4344
{:membrane_aac_plugin, "~> 0.19.0"},
4445
{:membrane_aac_fdk_plugin, "~> 0.18.0"},

mix.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"membrane_aac_format": {:hex, :membrane_aac_format, "0.8.0", "515631eabd6e584e0e9af2cea80471fee6246484dbbefc4726c1d93ece8e0838", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}], "hexpm", "a30176a94491033ed32be45e51d509fc70a5ee6e751f12fd6c0d60bd637013f6"},
2525
"membrane_aac_plugin": {:hex, :membrane_aac_plugin, "0.19.0", "58a15efaaa4f2cc91b968464cfd269244e035efdd983aac2e3ddeb176fcf0585", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_aac_format, "~> 0.8.0", [hex: :membrane_aac_format, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "eb7e786e650608ee205f4eebff4c1df3677e545acf09802458f77f64f9942fe9"},
2626
"membrane_common_c": {:hex, :membrane_common_c, "0.16.0", "caf3f29d2f5a1d32d8c2c122866110775866db2726e4272be58e66dfdf4bce40", [:mix], [{:membrane_core, "~> 1.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", "a3c7e91de1ce1f8b23b9823188a5d13654d317235ea0ca781c05353ed3be9b1c"},
27-
"membrane_core": {:hex, :membrane_core, "1.2.0", "c74ef043791e11d149a01e344d9973de34d6dd2e3b8a6bdc79ff5b183a74b243", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 3.0 or ~> 4.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0133e3478af608b1749729d82bc747a0357e207f5819a6bd4d31614ce7d0a463"},
27+
"membrane_core": {:git, "https://github.com/membraneframework/membrane_core.git", "d9417ea2463eef4086658d6b776084f5571009b0", [branch: "changes-in-connector"]},
2828
"membrane_ffmpeg_swresample_plugin": {:hex, :membrane_ffmpeg_swresample_plugin, "0.20.2", "2e669f0b25418d10b51a73bc52d2e12e4a3a26b416c5c1199d852c3f781a18b3", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:bundlex, "~> 1.2", [hex: :bundlex, repo: "hexpm", optional: false]}, {:membrane_common_c, "~> 0.16.0", [hex: :membrane_common_c, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_precompiled_dependency_provider, "~> 0.1.0", [hex: :membrane_precompiled_dependency_provider, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.12.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:mockery, "~> 2.1", [hex: :mockery, repo: "hexpm", optional: false]}, {:unifex, "~> 1.1", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "6c8d3bcd61d568dd94cabb9b45f29e8926e0076e4432d8f419378e004e02147c"},
2929
"membrane_file_plugin": {:hex, :membrane_file_plugin, "0.17.2", "650e134c2345d946f930082fac8bac9f5aba785a7817d38a9a9da41ffc56fa92", [:mix], [{:logger_backends, "~> 1.0", [hex: :logger_backends, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "df50c6040004cd7b901cf057bd7e99c875bbbd6ae574efc93b2c753c96f43b9d"},
3030
"membrane_funnel_plugin": {:hex, :membrane_funnel_plugin, "0.9.1", "9e108f4ef9d905ebff2da3ba5e58a5b756b58812f4fa68bd576add68fda310a0", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "39fdef1bf29eac949f65a37ea941f997c22ed042c55af044d27a781b63e82f6b"},

0 commit comments

Comments
 (0)