Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in bugifx/PYPE-340_not_video_component (pull request #148)

Browse source 
Bugifx/PYPE-340 not video component

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Jakub Trllo 2019-05-22 18:12:56 +00:00 • committed by Milan Kolar
commit 84cbf4ad34
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pype/standalonepublish/widgets/widget_drop_frame.py
View file

@ -241,14 +241,18 @@ class DropDataFrame(QtWidgets.QFrame):
def get_file_data(self, data):
filepath = data['files'][0]
ext = data['ext']
ext = data['ext'].lower()
output = {}
probe_data = self.load_data_with_probe(filepath)
file_info = None
if 'file_info' in data:
file_info = data['file_info']
if (
ext in self.presets['extensions']['image_file'] or
ext in self.presets['extensions']['video_file']
):
probe_data = self.load_data_with_probe(filepath)
if 'frameRate' not in data:
# default value
frameRate = 25
@ -268,11 +272,8 @@ class DropDataFrame(QtWidgets.QFrame):
output['startFrame'] = startFrame
output['endFrame'] = endFrame
file_info = None
if 'file_info' in data:
file_info = data['file_info']
elif ext in ['.mov']:
file_info = probe_data.get('codec_name')
if (ext == '.mov') and (not file_info):
file_info = probe_data.get('codec_name')
output['file_info'] = file_info