Merge pull request #311 from voc/cropping

voctocore: cropping in lecture mode
voc · Apr 11, 2024 · 423884d · 423884d
2 parents b0bf8ef + b896fd6
commit 423884d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/vocto/transitions.py b/vocto/transitions.py
@@ -183,7 +183,7 @@ def hidden( x, hidden ):
         result = "\t%s = %s -> %s:\n" % (self.name(),
                                       self.begin().name, self.end().name)
         # add table title
-        result += "\tNo. %s\n" % Composite.str_title()
+        result += "\tNo. %s\n" % Composite.str_title(self)
         # add composites until flipping point
         for i in range(self.frames()):
             if (not logKeyFramesOnly) or self.A(i).key:

diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py
@@ -90,7 +90,7 @@ def __init__(self):
         for idx, name in enumerate(self.sources):
             self.bin += """
                 video-{name}.
-                ! queue
+                ! videobox
                     name=cropper-{name}
                 ! queue
                     max-size-time=3000000000
@@ -114,7 +114,7 @@ def attach(self, pipeline):
         self.log.debug('Initializing Mixer-State')
         # initialize pipeline bindings for all sources
         self.bgScene = Scene(self.bgSources, pipeline, self.transitions.fps, 0, cropping=False)
-        self.scene = Scene(self.sources, pipeline, self.transitions.fps, len(self.bgSources), cropping=False)
+        self.scene = Scene(self.sources, pipeline, self.transitions.fps, len(self.bgSources))
         self.compositeMode = None
         self.sourceA = None
         self.sourceB = None