Format files

lib/membrane_mp4/demuxer/cmaf.ex

@@ -63,7 +63,8 @@ defmodule Membrane.MP4.Demuxer.CMAF do
       last_timescales: %{},
       how_many_segment_bytes_read: 0,
       tracks_info: nil,
-      tracks_notification_sent?: false
+      tracks_notification_sent?: false,
+      incomplete_mdat_header: nil
     }
 
     {[], state}
@@ -76,13 +77,28 @@ defmodule Membrane.MP4.Demuxer.CMAF do
 
   @impl true
   def handle_buffer(:input, buffer, ctx, state) do
-    {new_boxes, rest} = Container.parse!(state.unprocessed_binary <> buffer.payload)
+    {new_boxes, rest} =
+      if state.incomplete_mdat_header? do
+      else
+        Container.parse!(state.unprocessed_binary <> buffer.payload)
+      end
 
-    state = %{
-      state
-      | unprocessed_boxes: state.unprocessed_boxes ++ new_boxes,
-        unprocessed_binary: rest
-    }
+    maybe_header = parse_header(rest)
+
+    if maybe_header and maybe_header.name == :mdat do
+      %{
+        state
+        | unprocessed_boxes: state.unprocessed_boxes ++ new_boxes ++ [],
+          unprocessed_binary: <<>>,
+          incomplete_mdat_header: maybe_header
+      }
+    else
+      %{
+        state
+        | unprocessed_boxes: state.unprocessed_boxes ++ new_boxes,
+          unprocessed_binary: rest
+      }
+    end
 
     handle_boxes(ctx, state)
   end
@@ -174,7 +190,10 @@ defmodule Membrane.MP4.Demuxer.CMAF do
       :mdat ->
         state = Map.update!(state, :how_many_segment_bytes_read, &(&1 + box.header_size))
         {actions, state} = read_mdat(box, state)
-        new_fsm_state = if state.samples_info == [], do: :reading_fragment_header, else: :reading_fragment_data
+
+        new_fsm_state =
+          if state.samples_info == [], do: :reading_fragment_header, else: :reading_fragment_data
+
         {actions, %{state | fsm_state: new_fsm_state}}
 
       _other ->
@@ -220,12 +239,12 @@ defmodule Membrane.MP4.Demuxer.CMAF do
     end
   end
 
-  # defp parse_header(data) do
-  # case Container.Header.parse(data) do
-  # {:ok, header, _rest} -> header
-  # {:error, :not_enough_data} -> nil
-  # end
-  # end
+  defp parse_header(data) do
+    case Container.Header.parse(data) do
+      {:ok, header, _rest} -> header
+      {:error, :not_enough_data} -> nil
+    end
+  end
 
   defp match_tracks_with_pads(ctx, tracks_info) do
     output_pads_data =