Fix short videos with length below 1 second

fishjam-dev · May 15, 2024 · e606a7f · e606a7f
1 parent 79081d5
commit e606a7f
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 19 deletions.
diff --git a/lib/compositor_utils.ex b/lib/compositor_utils.ex
@@ -14,6 +14,11 @@ defmodule RecordingConverter.Compositor do
 
   @avatar_threshold_ns 1_000_000_000
 
+  @spec avatar_threshold_ns() :: non_neg_integer()
+  def avatar_threshold_ns() do
+    @avatar_threshold_ns
+  end
+
   @spec server_setup(binary) :: :start_locally | {:start_locally, String.t()}
   def server_setup(compositor_path) do
     compositor_path = compositor_path

diff --git a/lib/report_parser.ex b/lib/report_parser.ex
@@ -13,6 +13,9 @@ defmodule RecordingConverter.ReportParser do
     bucket_name
     |> get_report(report_path)
     |> Map.fetch!("tracks")
+    |> Enum.reject(fn {_key, track} ->
+      calculate_duration_in_ns(track) < Compositor.avatar_threshold_ns()
+    end)
     |> Enum.map(fn {key, value} -> Map.put(value, :id, key) end)
   end
 
@@ -31,24 +34,7 @@ defmodule RecordingConverter.ReportParser do
 
   @spec calculate_track_end(map(), non_neg_integer()) :: non_neg_integer()
   def calculate_track_end(track, offset) do
-    clock_rate_ms = div(track["clock_rate"], 1_000)
-
-    end_timestamp = track["end_timestamp"]
-    start_timestamp = track["start_timestamp"]
-
-    timestamp_difference =
-      if end_timestamp < start_timestamp do
-        end_timestamp + @max_timestamp_value - start_timestamp
-      else
-        end_timestamp - start_timestamp
-      end
-
-    difference_in_milliseconds = div(timestamp_difference, clock_rate_ms)
-
-    duration =
-      (difference_in_milliseconds - @delta_timestamp_milliseconds)
-      |> Membrane.Time.milliseconds()
-      |> Membrane.Time.as_nanoseconds(:round)
+    duration = calculate_duration_in_ns(track)
 
     offset + duration
   end
@@ -139,6 +125,26 @@ defmodule RecordingConverter.ReportParser do
     {audio_end_timestamp, video_end_timestamp}
   end
 
+  defp calculate_duration_in_ns(track) do
+    clock_rate_ms = div(track["clock_rate"], 1_000)
+
+    end_timestamp = track["end_timestamp"]
+    start_timestamp = track["start_timestamp"]
+
+    timestamp_difference =
+      if end_timestamp < start_timestamp do
+        end_timestamp + @max_timestamp_value - start_timestamp
+      else
+        end_timestamp - start_timestamp
+      end
+
+    difference_in_milliseconds = div(timestamp_difference, clock_rate_ms)
+
+    (difference_in_milliseconds - @delta_timestamp_milliseconds)
+    |> Membrane.Time.milliseconds()
+    |> Membrane.Time.as_nanoseconds(:round)
+  end
+
   defp calculate_end_timestamp(tracks) do
     if Enum.count(tracks) > 0 do
       {_atom, _video_track, timestamp} = Enum.at(tracks, -1)

diff --git a/test/fixtures/short_videos/853ec649-88a9-4629-991d-f8e2b17f93f7.msr b/test/fixtures/short_videos/853ec649-88a9-4629-991d-f8e2b17f93f7.msr
diff --git a/test/fixtures/short_videos/87b2a39e-b62a-48b4-bc37-135da9c4d0d1.msr b/test/fixtures/short_videos/87b2a39e-b62a-48b4-bc37-135da9c4d0d1.msr
diff --git a/test/fixtures/short_videos/8d49170b-d6d3-497d-ba5c-ba2837247b3c.msr b/test/fixtures/short_videos/8d49170b-d6d3-497d-ba5c-ba2837247b3c.msr
diff --git a/test/fixtures/short_videos/9cfd9266-2256-406b-b9a1-03383243d1d8.msr b/test/fixtures/short_videos/9cfd9266-2256-406b-b9a1-03383243d1d8.msr
diff --git a/test/fixtures/short_videos/report.json b/test/fixtures/short_videos/report.json
@@ -0,0 +1,45 @@
+{
+  "tracks": {
+    "853ec649-88a9-4629-991d-f8e2b17f93f7.msr": {
+      "offset": 0,
+      "type": "video",
+      "encoding": "H264",
+      "metadata": null,
+      "clock_rate": 90000,
+      "start_timestamp": 2620484184,
+      "end_timestamp": 2620691744,
+      "origin": 1
+    },
+    "87b2a39e-b62a-48b4-bc37-135da9c4d0d1.msr": {
+      "offset": 10000000000,
+      "type": "video",
+      "encoding": "H264",
+      "metadata": null,
+      "clock_rate": 90000,
+      "start_timestamp": 493739605,
+      "end_timestamp": 493951365,
+      "origin": 1
+    },
+    "8d49170b-d6d3-497d-ba5c-ba2837247b3c.msr": {
+      "offset": 100000000,
+      "type": "video",
+      "encoding": "H264",
+      "metadata": null,
+      "clock_rate": 90000,
+      "start_timestamp": 2356366771,
+      "end_timestamp": 2356455401,
+      "origin": 1
+    },
+    "9cfd9266-2256-406b-b9a1-03383243d1d8.msr": {
+      "offset": 1000000,
+      "type": "video",
+      "encoding": "H264",
+      "metadata": null,
+      "clock_rate": 90000,
+      "start_timestamp": 3020099711,
+      "end_timestamp": 3020120681,
+      "origin": 1
+    }
+  },
+  "recording_id": "74"
+}
diff --git a/test/pipeline_test.exs b/test/pipeline_test.exs
@@ -60,7 +60,8 @@ defmodule RecordingConverter.PipelineTest do
       requests: 16,
       factor: 1
     },
-    %{type: "peers-before-recording-started", requests: 15, factor: 1}
+    %{type: "peers-before-recording-started", requests: 15, factor: 1},
+    %{type: "short_videos", requests: 6, factor: 1}
   ]
 
   for test <- tests do