Merge pull request #1775 from pypeclub/bugfix/ffprobe_streams_order

FFprobe streams order

openpype/lib/vendor_bin_utils.py

@@ -89,8 +89,13 @@ def ffprobe_streams(path_to_file, logger=None):
 
  popen_stdout, popen_stderr = popen.communicate()
  if popen_stdout:
- logger.debug("ffprobe stdout: {}".format(popen_stdout))
+ logger.debug("FFprobe stdout:\n{}".format(
+ popen_stdout.decode("utf-8")
+ ))
 
  if popen_stderr:
- logger.debug("ffprobe stderr: {}".format(popen_stderr))
+ logger.warning("FFprobe stderr:\n{}".format(
+ popen_stderr.decode("utf-8")
+ ))
+
  return json.loads(popen_stdout)["streams"]

openpype/plugins/publish/extract_review.py

@@ -975,11 +975,31 @@ def rescaling_filters(self, temp_data, output_def, new_repre):
 
  # NOTE Skipped using instance's resolution
  full_input_path_single_file = temp_data["full_input_path_single_file"]
- input_data = ffprobe_streams(
- full_input_path_single_file, self.log
- )[0]
- input_width = int(input_data["width"])
- input_height = int(input_data["height"])
+ try:
+ streams = ffprobe_streams(
+ full_input_path_single_file, self.log
+ )
+ except Exception:
+ raise AssertionError((
+ "FFprobe couldn't read information about input file: \"{}\""
+ ).format(full_input_path_single_file))
+
+ # Try to find first stream with defined 'width' and 'height'
+ # - this is to avoid order of streams where audio can be as first
+ # - there may be a better way (checking `codec_type`?)
+ input_width = None
+ input_height = None
+ for stream in streams:
+ if "width" in stream and "height" in stream:
+ input_width = int(stream["width"])
+ input_height = int(stream["height"])
+ break
+
+ # Raise exception of any stream didn't define input resolution
+ if input_width is None:
+ raise AssertionError((
+ "FFprobe couldn't read resolution from input file: \"{}\""
+ ).format(full_input_path_single_file))
 
  # NOTE Setting only one of `width` or `heigth` is not allowed
  # - settings value can't have None but has value of 0

openpype/plugins/publish/extract_review_slate.py

@@ -26,9 +26,23 @@ def process(self, instance):
  slate_path = inst_data.get("slateFrame")
  ffmpeg_path = openpype.lib.get_ffmpeg_tool_path("ffmpeg")
 
- slate_stream = openpype.lib.ffprobe_streams(slate_path, self.log)[0]
- slate_width = slate_stream["width"]
- slate_height = slate_stream["height"]
+ slate_streams = openpype.lib.ffprobe_streams(slate_path, self.log)
+ # Try to find first stream with defined 'width' and 'height'
+ # - this is to avoid order of streams where audio can be as first
+ # - there may be a better way (checking `codec_type`?)+
+ slate_width = None
+ slate_height = None
+ for slate_stream in slate_streams:
+ if "width" in slate_stream and "height" in slate_stream:
+ slate_width = int(slate_stream["width"])
+ slate_height = int(slate_stream["height"])
+ break
+
+ # Raise exception of any stream didn't define input resolution
+ if slate_width is None:
+ raise AssertionError((
+ "FFprobe couldn't read resolution from input file: \"{}\""
+ ).format(slate_path))
 
  if "reviewToWidth" in inst_data:
  use_legacy_code = True
@@ -309,16 +323,29 @@ def codec_args(self, repre):
  )
  return codec_args
 
- codec_name = streams[0].get("codec_name")
+ # Try to find first stream that is not an audio
+ no_audio_stream = None
+ for stream in streams:
+ if stream.get("codec_type") != "audio":
+ no_audio_stream = stream
+ break
+
+ if no_audio_stream is None:
+ self.log.warning((
+ "Couldn't find stream that is not an audio from file \"{}\""
+ ).format(full_input_path))
+ return codec_args
+
+ codec_name = no_audio_stream.get("codec_name")
  if codec_name:
  codec_args.append("-codec:v {}".format(codec_name))
 
- profile_name = streams[0].get("profile")
+ profile_name = no_audio_stream.get("profile")
  if profile_name:
  profile_name = profile_name.replace(" ", "_").lower()
  codec_args.append("-profile:v {}".format(profile_name))
 
- pix_fmt = streams[0].get("pix_fmt")
+ pix_fmt = no_audio_stream.get("pix_fmt")
  if pix_fmt:
  codec_args.append("-pix_fmt {}".format(pix_fmt))
  return codec_args