Merge pull request #6 from membraneframework/ice-restart

Add ICE restart

Author: mickel8

c_src/ex_libnice/native.c

@@ -256,6 +256,20 @@ UNIFEX_TERM set_remote_candidate(UnifexEnv *env, State *state,
   return set_remote_candidate_result_ok(env, state);
 }
 
+UNIFEX_TERM restart(UnifexEnv *env, State *state) {
+  if(nice_agent_restart(state->agent)) {
+    return restart_result_ok(env, state);
+  }
+  return restart_result_error_failed_to_restart(env);
+}
+
+UNIFEX_TERM restart_stream(UnifexEnv *env, State *state, unsigned int stream_id) {
+  if(nice_agent_restart_stream(state->agent, stream_id)) {
+    return restart_stream_result_ok(env, state);
+  }
+  return restart_stream_result_error_failed_to_restart(env);
+}
+
 UNIFEX_TERM send_payload(UnifexEnv *env, State *state, unsigned int stream_id,
                          unsigned int component_id, UnifexPayload *payload) {
   if(nice_agent_send(state->agent, stream_id, component_id, payload->size, (char *)payload->data) < 0) {

c_src/ex_libnice/native.spec.exs

@@ -36,6 +36,12 @@ spec set_remote_candidate(state, candidate :: string, stream_id :: unsigned, com
        | {:error :: label, :failed_to_parse_sdp_string :: label}
        | {:error :: label, :failed_to_set :: label}
 
+spec restart(state) :: {:ok :: label, state}
+       | {:error :: label, :failed_to_restart :: label}
+
+spec restart_stream(state, stream_id :: unsigned) :: {:ok :: label, state}
+       | {:error :: label, :failed_to_restart :: label}
+
 spec send_payload(state, stream_id :: unsigned, component_id :: unsigned, data :: payload) :: {:ok :: label, state}
        | {:error :: label, :failed_to_send :: label}
 

lib/ex_libnice.ex

@@ -161,6 +161,22 @@ defmodule ExLibnice do
     GenServer.call(pid, {:set_remote_candidate, candidate, stream_id, component_id})
   end
 
+  @doc """
+  Restarts all streams.
+  """
+  @spec restart(pid :: pid()) :: :ok | {:error, :failed_to_restart}
+  def restart(pid) do
+    GenServer.call(pid, :restart)
+  end
+
+  @doc """
+  Restarts stream with id `stream_id`.
+  """
+  @spec restart_stream(pid :: pid(), stream_id :: integer()) :: :ok | {:error, :failed_to_restart}
+  def restart_stream(pid, stream_id) do
+    GenServer.call(pid, {:restart_stream, stream_id})
+  end
+
   @doc """
   Sends payload on component with id `component_id` in stream with id `stream_id`. Payload has to
   be in a binary format.
@@ -317,6 +333,32 @@ defmodule ExLibnice do
     end
   end
 
+  @impl true
+  def handle_call(:restart, _from, %{cnode: cnode} = state) do
+    case Unifex.CNode.call(cnode, :restart) do
+      :ok ->
+        Logger.debug("ICE restarted")
+        {:reply, :ok, state}
+
+      {:error, cause} ->
+        Logger.warn("Couldn't restart ICE")
+        {:reply, {:error, cause}, state}
+    end
+  end
+
+  @impl true
+  def handle_call({:restart_stream, stream_id}, _from, %{cnode: cnode} = state) do
+    case Unifex.CNode.call(cnode, :restart_stream, [stream_id]) do
+      :ok ->
+        Logger.debug("Stream #{inspect(stream_id)} restarted")
+        {:reply, :ok, state}
+
+      {:error, cause} ->
+        Logger.warn("Couldn't restart stream #{inspect(stream_id)}")
+        {:reply, {:error, cause}, state}
+    end
+  end
+
   @impl true
   def handle_call(
         {:send_payload, stream_id, component_id, payload},

test/ex_libnice_test.exs

@@ -74,7 +74,7 @@ defmodule ExLibniceTest do
     {:ok, stream_id} = ExLibnice.add_stream(pid, 1)
     :ok = ExLibnice.gather_candidates(pid, stream_id)
     assert_receive {:new_candidate_full, _candidate}
-    assert_receive({:candidate_gathering_done, ^stream_id}, 2000)
+    assert_receive({:candidate_gathering_done, ^stream_id}, 5000)
     {:error, :invalid_stream_or_allocation} = ExLibnice.gather_candidates(pid, 2000)
   end