From cd1bcd4ac2f9fa02762798f1debf1949cbc79f96 Mon Sep 17 00:00:00 2001 From: Billal Ghilas <84322223+gBillal@users.noreply.github.com> Date: Sat, 16 Sep 2023 22:38:09 +0100 Subject: [PATCH] Update stream format (#6) --- README.md | 2 +- lib/depayloader.ex | 5 ++--- lib/payloader.ex | 2 +- mix.exs | 5 ++--- mix.lock | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2717d36..38e3e1f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The package can be installed by adding `membrane_rtp_h265_plugin` to your list o ```elixir def deps do [ - {:membrane_rtp_h265_plugin, "~> 0.3.0"} + {:membrane_rtp_h265_plugin, "~> 0.4.0"} ] end ``` diff --git a/lib/depayloader.ex b/lib/depayloader.ex index b27efd0..f4b51db 100644 --- a/lib/depayloader.ex +++ b/lib/depayloader.ex @@ -21,7 +21,7 @@ defmodule Membrane.RTP.H265.Depayloader do def_input_pad :input, accepted_format: RTP, demand_mode: :auto def_output_pad :output, - accepted_format: %H265.RemoteStream{alignment: :nalu}, + accepted_format: %H265{alignment: :nalu, stream_structure: :annexb}, demand_mode: :auto def_options sprop_max_don_diff: [ @@ -50,8 +50,7 @@ defmodule Membrane.RTP.H265.Depayloader do @impl true def handle_stream_format(:input, _stream_format, _context, state) do - stream_format = %H265.RemoteStream{alignment: :nalu} - {[stream_format: {:output, stream_format}], state} + {[stream_format: {:output, %H265{alignment: :nalu}}], state} end @impl true diff --git a/lib/payloader.ex b/lib/payloader.ex index 8156bd1..b8c1b30 100644 --- a/lib/payloader.ex +++ b/lib/payloader.ex @@ -34,7 +34,7 @@ defmodule Membrane.RTP.H265.Payloader do ] def_input_pad :input, - accepted_format: %H265{alignment: :nalu}, + accepted_format: %H265{alignment: :nalu, stream_structure: :annexb}, demand_mode: :auto def_output_pad :output, diff --git a/mix.exs b/mix.exs index 294e76e..e3bde70 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Membrane.RTP.H265.Mixfile do use Mix.Project - @version "0.3.0" + @version "0.4.0" @github_url "https://github.com/gBillal/membrane_rtp_h265_plugin" def project do @@ -38,8 +38,7 @@ defmodule Membrane.RTP.H265.Mixfile do [ {:membrane_core, "~> 0.12.0"}, {:membrane_rtp_format, "~> 0.7.0"}, - {:membrane_h265_format, "~> 0.1.0"}, - # Dev + {:membrane_h265_format, "~> 0.2.0"}, {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}, {:dialyxir, ">= 0.0.0", only: :dev, runtime: false}, {:credo, ">= 0.0.0", only: :dev, runtime: false} diff --git a/mix.lock b/mix.lock index 91d0ea8..aad6eab 100644 --- a/mix.lock +++ b/mix.lock @@ -13,7 +13,7 @@ "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"}, "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, "membrane_core": {:hex, :membrane_core, "0.12.7", "9d3dd564e32768919c1105b4579bd2eef12df7473da5d789185544ae22610e2d", [:mix], [{:bunch, "~> 1.6", [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", "321e4009b7068ca04b65daf5c79b8c3772d4286c27d05e50939ec6d9b4d50e59"}, - "membrane_h265_format": {:hex, :membrane_h265_format, "0.1.0", "59d1e5546d6c4817389cd71904a4afc7ae4e073fd5eda3bf13a0708a736fe6a5", [:mix], [], "hexpm", "d39baa7ccff65f93c0b5126c48226217dd83753ac712207e9be8c67e3c367a4c"}, + "membrane_h265_format": {:hex, :membrane_h265_format, "0.2.0", "1903c072cf7b0980c4d0c117ab61a2cd33e88782b696290de29570a7fab34819", [:mix], [], "hexpm", "6df418bdf242c0d9f7dbf2e5aea4c2d182e34ac9ad5a8b8cef2610c290002e83"}, "membrane_rtp_format": {:hex, :membrane_rtp_format, "0.7.0", "c07cca86d420732663b55a9ca046f327737ca87354508c3df829d240c477df25", [:mix], [{:membrane_core, "~> 0.12.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "2cead4d2c4f9f5c7669677c2cd3921f9f99ec29c06a871f9dffdb97840a1a279"}, "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"}, "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"},