From 156bd305037a456d4f34050ab7a33e9ec527dfc0 Mon Sep 17 00:00:00 2001 From: FelonEkonom <38541925+FelonEkonom@users.noreply.github.com> Date: Tue, 31 May 2022 14:45:24 +0200 Subject: [PATCH] Add frame detector to PayloadFormat (#12) * Add frame detector to PayloadFormat --- lib/membrane_rtp_opus/plugin_app.ex | 3 ++- mix.exs | 2 +- mix.lock | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/membrane_rtp_opus/plugin_app.ex b/lib/membrane_rtp_opus/plugin_app.ex index 7dbadfb..ae20594 100644 --- a/lib/membrane_rtp_opus/plugin_app.ex +++ b/lib/membrane_rtp_opus/plugin_app.ex @@ -8,7 +8,8 @@ defmodule Membrane.RTP.Opus.Plugin.App do encoding_name: :OPUS, payload_type: 120, payloader: Opus.Payloader, - depayloader: Opus.Depayloader + depayloader: Opus.Depayloader, + frame_detector: fn _payload -> true end }) PayloadFormat.register_payload_type_mapping(120, :OPUS, 48_000) diff --git a/mix.exs b/mix.exs index 0bcdd0c..4876d9a 100644 --- a/mix.exs +++ b/mix.exs @@ -38,7 +38,7 @@ defmodule Membrane.RTP.Opus.Mixfile do defp deps do [ {:membrane_core, "~> 0.10.0"}, - {:membrane_rtp_format, "~> 0.4.0"}, + {:membrane_rtp_format, github: "membraneframework/membrane_rtp_format"}, {:membrane_opus_format, "~> 0.3.0"}, {:ex_doc, "~> 0.24.0", only: :dev, runtime: false}, {:dialyxir, "~> 1.0", only: :dev, runtime: false} diff --git a/mix.lock b/mix.lock index d9aae17..694e81a 100644 --- a/mix.lock +++ b/mix.lock @@ -10,10 +10,10 @@ "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"}, "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, "membrane_caps_rtp": {:hex, :membrane_caps_rtp, "0.1.0", "a6fcdac65d81c4a59d068c7b18fa90a0dc27b2ca21261e279c97dd3fea80ce55", [:mix], [], "hexpm", "5a15745ae9521ec241e138bcc0790e90bba62cf63d8f8373a1f08568e9d66fe7"}, - "membrane_core": {:hex, :membrane_core, "0.10.0", "1d010bc632f6abb575c60e37607a0cb56fbf88bbb9d0d78a4b5410611563239a", [:mix], [{:bunch, "~> 1.3", [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", "64d63514aabf71c93136ee86093b7ca60cf4317a09b137e0c08e064caa34636f"}, + "membrane_core": {:hex, :membrane_core, "0.10.1", "b4fb68d9e541888b60ebbf4e22c4913a84f35c955846b7df26154cb7c5ce0f78", [:mix], [{:bunch, "~> 1.3", [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", "d039f67d00cb1c1608b1e4f03cea8a9b5a88ff0fef3f61f54dc65e515b9dc286"}, "membrane_opus_format": {:hex, :membrane_opus_format, "0.3.0", "3804d9916058b7cfa2baa0131a644d8186198d64f52d592ae09e0942513cb4c2", [:mix], [], "hexpm", "8fc89c97be50de23ded15f2050fe603dcce732566fe6fdd15a2de01cb6b81afe"}, "membrane_remote_stream_format": {:hex, :membrane_remote_stream_format, "0.1.0", "2cedb6facd7f4185fc7c0e7c83a614483f98ef1e8d36f4ed5939c935768eb95d", [:mix], [], "hexpm", "a6f01aa51766fe92e12d2cb720176fcff6d2485fb563e51002d8f9ef9a90f894"}, - "membrane_rtp_format": {:hex, :membrane_rtp_format, "0.4.0", "be84e88206c6a91363660eeb7cbf03330cd9a00486fb4bce4a7b86a4172d3a4b", [:mix], [{:membrane_core, "~> 0.10.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "44944956c1031f49269b7d447525b7c3d1026120b100b4f0dfaca5dc228c65e0"}, + "membrane_rtp_format": {:git, "https://github.com/membraneframework/membrane_rtp_format.git", "7f135ad0168324970d214d04c6a46b90a59e1c3c", []}, "membrane_stream_format": {:git, "https://github.com/membraneframework/membrane_stream_format.git", "69e180a89f613daf6804039b3254fe8b2b86f0c7", [branch: :develop]}, "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"}, "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"},