From f6dbd78ffd00c7e2828c1248c6ce2b8d7c0a6a04 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Tue, 7 Dec 2021 21:10:18 +0200 Subject: [PATCH] more sensible defaults --- .../ffmpeg-parser/ffmpegparser/ffprobeparser.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/py-packages/ffmpeg-parser/ffmpegparser/ffprobeparser.py b/py-packages/ffmpeg-parser/ffmpegparser/ffprobeparser.py index d7a0b93..016a62a 100755 --- a/py-packages/ffmpeg-parser/ffmpegparser/ffprobeparser.py +++ b/py-packages/ffmpeg-parser/ffmpegparser/ffprobeparser.py @@ -4,9 +4,9 @@ import subprocess import sys import os import time -import parse import argparse import json +import fractions from ansi.colour import fg, fx from datetime import datetime @@ -106,7 +106,12 @@ Language: {tags-lang}""".format( float(stream["r_frame_rate"].split("/")[0]) / float(stream["r_frame_rate"].split("/")[1]) ) - stream["display_aspect_ratio"] = stream.get("display_aspect_ratio", "NA") + stream["display_aspect_ratio"] = stream.get( + "display_aspect_ratio", + str( + fractions.Fraction(int(stream["width"]), int(stream["height"])) + ).replace("/", ":"), + ) msg = """{Y}==== Stream:{index} ===={z} Type: {G}{codec_type}{z} Codec: {codec_long_name} ({codec_name}) @@ -122,12 +127,13 @@ Language: {tags-lang}""".format( def format_audio(self, stream): stream["hrate"] = self._speedfmt(stream.get("bit_rate", 0)) + stream["channel_layout"] = stream.get("channel_layout", "") msg = """{Y}==== Stream:{index} ===={z} Type: {G}{codec_type}{z} Codec: {codec_long_name} ({codec_name}) Bitrate: {hrate} Sample Rate: {sample_rate} Hz - Channels: {channels} ({channel_layout})""".format( + Channels: {channels} {channel_layout}""".format( **stream )