Merge branch 'develop' into enhancement/OP-5600_Houdini-manage-colorspaces-in-review-ROP

This commit is contained in:
Mustafa Zarkash 2023-08-09 20:36:05 +03:00 committed by GitHub
commit a169be7755
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
451 changed files with 28909 additions and 7553 deletions

View file

@ -8,21 +8,15 @@ from string import Formatter
import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins
from openpype.lib import (
get_ffmpeg_tool_path,
get_ffmpeg_tool_args,
get_ffmpeg_codec_args,
get_ffmpeg_format_args,
convert_ffprobe_fps_value,
convert_ffprobe_fps_to_float,
)
ffmpeg_path = get_ffmpeg_tool_path("ffmpeg")
ffprobe_path = get_ffmpeg_tool_path("ffprobe")
FFMPEG = (
'"{}"%(input_args)s -i "%(input)s" %(filters)s %(args)s%(output)s'
).format(ffmpeg_path)
'{}%(input_args)s -i "%(input)s" %(filters)s %(args)s%(output)s'
).format(subprocess.list2cmdline(get_ffmpeg_tool_args("ffmpeg")))
DRAWTEXT = (
"drawtext@'%(label)s'=fontfile='%(font)s':text=\\'%(text)s\\':"
@ -46,14 +40,14 @@ def _get_ffprobe_data(source):
:param str source: source media file
:rtype: [{}, ...]
"""
command = [
ffprobe_path,
command = get_ffmpeg_tool_args(
"ffprobe",
"-v", "quiet",
"-print_format", "json",
"-show_format",
"-show_streams",
source
]
)
kwargs = {
"stdout": subprocess.PIPE,
}

View file

@ -9,4 +9,4 @@ except ImportError as exc:
if __name__ == "__main__":
# Perform remote publish with thorough error checking
log = Logger.get_logger(__name__)
remote_publish(log, raise_error=True)
remote_publish(log)