Merge pull request #600 from EsupPortail/dev

Dev #2.9.1.2
EsupPortail · Mar 10, 2022 · 9978cfa · 9978cfa
2 parents be3dd3d + 704edc2
commit 9978cfa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 31 deletions.
diff --git a/pod/video/encode.py b/pod/video/encode.py
@@ -1318,23 +1318,15 @@ def get_sub_cmd(height_presentation_video, height_presenter_video, presenter):
         )
     if presenter == "mid":
         height = min_height if (min_height % 2) == 0 else min_height + 1
-        if height_presentation_video > height_presenter_video:
-            # ffmpeg -i presentation.webm -i presenter.webm \
-            # -c:v libx264 -filter_complex "[0:v]scale=-2:720[left];[left][1:v]hstack" \
-            # outputVideo.mp4
-            subcmd = (
-                " -filter_complex "
-                + '"[0:v]scale=-2:%(height)s[left];[0:v]scale=-2:%(height)s[right];'
-                % {"height": height}
-                + '[left][right]hstack" -vsync 0 '
-            )
-        else:
-            subcmd = (
-                " -filter_complex "
-                + '"[0:v]scale=-2:%(height)s[left];[1:v]scale=-2:%(height)s[right];'
-                % {"height": height}
-                + '[left][right]hstack" -vsync 0 '
-            )
+        # ffmpeg -i presentation.webm -i presenter.webm \
+        # -c:v libx264 -filter_complex "[0:v]scale=-2:720[left];[left][1:v]hstack" \
+        # outputVideo.mp4
+        subcmd = (
+            " -filter_complex "
+            + '"[0:v]scale=-2:%(height)s[left];[1:v]scale=-2:%(height)s[right];'
+            % {"height": height}
+            + '[left][right]hstack" -vsync 0 '
+        )
 
     return subcmd
 

diff --git a/pod/video/recording_gpu.py b/pod/video/recording_gpu.py
@@ -100,20 +100,12 @@ def get_sub_cmd(height_presentation_video, height_presenter_video, presenter):
         )
     if presenter == "mid":
         height = min_height if (min_height % 2) == 0 else min_height + 1
-        if height_presentation_video > height_presenter_video:
-            subcmd = (
-                " -filter_complex "
-                + '"[0:v]scale=-2:%(height)s[left];[0:v]scale=-2:%(height)s[right];'
-                % {"height": height}
-                + '[left][right]hstack" -vsync 0 '
-            )
-        else:
-            subcmd = (
-                " -filter_complex "
-                + '"[0:v]scale=-2:%(height)s[left];[1:v]scale=-2:%(height)s[right];'
-                % {"height": height}
-                + '[left][right]hstack" -vsync 0 '
-            )
+        subcmd = (
+            " -filter_complex "
+            + '"[0:v]scale=-2:%(height)s[left];[1:v]scale=-2:%(height)s[right];'
+            % {"height": height}
+            + '[left][right]hstack" -vsync 0 '
+        )
 
     return subcmd