3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-18 19:46:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2163 from alicevision/dev/keyframeVideoOutput

Browse source 
KeyframeSelection: Flag `outputExtension` attribute when it is set to "none" for video inputs
This commit is contained in:
Loïc Vital 2023-08-28 14:13:06 +02:00 • committed by GitHub
commit 2bea35d00d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
meshroom/core/attribute.py
View file

@ -196,6 +196,7 @@ class Attribute(BaseObject):
self.requestNodeUpdate() self.requestNodeUpdate()
self.valueChanged.emit() self.valueChanged.emit()
self.validValueChanged.emit()
def upgradeValue(self, exportedValue): def upgradeValue(self, exportedValue):
self._set_value(exportedValue) self._set_value(exportedValue)

6
meshroom/core/desc.py
View file

@ -303,13 +303,15 @@ class FloatParam(Param):
class ChoiceParam(Param): class ChoiceParam(Param):
""" """
""" """
def __init__(self, name, label, description, value, values, exclusive, uid, group='allParams', joinChar=' ', advanced=False, semantic='', enabled=True): def __init__(self, name, label, description, value, values, exclusive, uid, group='allParams', joinChar=' ', advanced=False, semantic='',
enabled=True, validValue=True, errorMessage=""):
assert values assert values
self._values = values self._values = values
self._exclusive = exclusive self._exclusive = exclusive
self._joinChar = joinChar self._joinChar = joinChar
self._valueType = type(self._values[0]) # cast to value type self._valueType = type(self._values[0]) # cast to value type
super(ChoiceParam, self).__init__(name=name, label=label, description=description, value=value, uid=uid, group=group, advanced=advanced, semantic=semantic, enabled=enabled) super(ChoiceParam, self).__init__(name=name, label=label, description=description, value=value, uid=uid, group=group, advanced=advanced,
semantic=semantic, enabled=enabled, validValue=validValue, errorMessage=errorMessage)
def conformValue(self, val): def conformValue(self, val):
""" Conform 'val' to the correct type and check for its validity """ """ Conform 'val' to the correct type and check for its validity """

5
meshroom/nodes/aliceVision/KeyframeSelection.py
View file

@ -3,6 +3,9 @@ __version__ = "5.0"
import os import os
from meshroom.core import desc from meshroom.core import desc
# List of supported video extensions (provided by OpenImageIO)
videoExts = [".avi", ".mov", ".mp4", ".m4a", ".m4v", ".3gp", ".3g2", ".mj2", ".m4v", ".mpg"]
class KeyframeSelectionNodeSize(desc.DynamicNodeSize): class KeyframeSelectionNodeSize(desc.DynamicNodeSize):
def computeSize(self, node): def computeSize(self, node):
inputPathsSize = super(KeyframeSelectionNodeSize, self).computeSize(node) inputPathsSize = super(KeyframeSelectionNodeSize, self).computeSize(node)
@ -299,6 +302,8 @@ You can extract frames at regular interval by configuring only the min/maxFrameS
value="none", value="none",
values=["none", "exr", "jpg", "png"], values=["none", "exr", "jpg", "png"],
exclusive=True, exclusive=True,
validValue=lambda node: not (any(ext in input.value.lower() for ext in videoExts for input in node.inputPaths.value) and node.outputExtension.value == "none"),
errorMessage="A video input has been provided. The output extension should be different from 'none'.",
uid=[0], uid=[0],
), ),
desc.ChoiceParam( desc.ChoiceParam(