Skip to content

Commit

Permalink
* Fixing #610 Do not try to divide by zero if HDR metadata has bad va…
Browse files Browse the repository at this point in the history
…lues (thanks to Noelle Leigh)
  • Loading branch information
cdgriffith committed Nov 2, 2024
1 parent 7db8ac0 commit 8439ef5
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 30 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Version 5.8.2

* Fixing #610 Do not try to divide by zero if HDR metadata has bad values (thanks to Noelle Leigh)
* Fixing #616 replace correct cmd line option for IDC level (thanks to pkleinejaeger)

## Version 5.8.1

* Fixing #598 'dict' object has no attribute 'to_yaml' (thanks to dmo marillat)
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ FastFlix (v4.0.2+) passes through HLG color transfer information to everything e

FastFlix does not plan to support Dolby Vision's proprietary format at this time.

# Support FastFlix

Check out the different ways you can help [support FastFlix](https://github.com/cdgriffith/FastFlix/wiki/Support-FastFlix)!

# Multilingual Support

FastFlix is machine translated using DeepL into Spanish (español), French (Français), German (Deutsch),
Expand Down
17 changes: 1 addition & 16 deletions fastflix/data/languages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4953,21 +4953,6 @@ Success:
ukr: Успіх
kor: 성공
ron: Succes
Support FastFlix:
deu: Unterstützt FastFlix
eng: Support FastFlix
fra: Soutenez FastFlix
ita: Supporto FastFlix
spa: Soporta FastFlix
chs: 支持FastFlix
jpn: FastFlixを応援/寄付
rus: Поддержка FastFlix
por: Suporte FastFlix
swe: Stöd för FastFlix
pol: Obsługa FastFlix
ukr: Підтримка FastFlix
kor: FastFlix 지원
ron: Sprijină FastFlix
Supported Image Files:
deu: Unterstützte Bilddateien
eng: Supported Image Files
Expand Down Expand Up @@ -8730,7 +8715,7 @@ Drag and Drop to reorder:
eng: Drag and Drop to reorder
deu: Ziehen und Ablegen zum Neuordnen
fra: Glisser et déposer pour réorganiser
ita: Per riordinare trascina e rilascia
ita: Per riordinare trascina e rilascia
spa: Arrastrar y soltar para reordenar
chs: 拖放重新排序
jpn: ドラッグ&ドロップで並び替え
Expand Down
7 changes: 6 additions & 1 deletion fastflix/flix.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,12 @@ def convert_mastering_display(data: Box) -> Tuple[Box, str]:
cll = None

def s(a, v, base=50_000):
upper, lower = [int(x) for x in a.get(v, "0/0").split("/")]
try:
upper, lower = [int(x) for x in a.get(v, "0/0").split("/")]
except ValueError:
raise FlixError(f"Could not parse HDR value {a} from {v}")
if lower <= 0: # avoid division by zero
raise FlixError(f"HDR value outside expected range, {v} was {a}")
if lower != base:
upper *= base / lower
value = int(upper)
Expand Down
2 changes: 1 addition & 1 deletion fastflix/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
__version__ = "5.8.1"
__version__ = "5.8.2"
__author__ = "Chris Griffith"
8 changes: 0 additions & 8 deletions fastflix/widgets/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ def __init__(self, app):
label.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
layout.addWidget(label)

support_label = QtWidgets.QLabel(
f'{link("https://github.com/cdgriffith/FastFlix/wiki/Support-FastFlix", t("Support FastFlix"), app.fastflix.config.theme)}<br><br>'
)
support_label.setOpenExternalLinks(True)
support_label.setFont(QtGui.QFont(self.app.font().family(), 12))
support_label.setAlignment((QtCore.Qt.AlignCenter | QtCore.Qt.AlignTop))
layout.addWidget(support_label)

bundle_label = QtWidgets.QLabel(
f"{t('Conversion suites')}: {link('https://www.ffmpeg.org/download.html', 'FFmpeg', app.fastflix.config.theme)} ({t('Various')}), "
f"{link('https://github.com/rigaya/NVEnc', 'NVEncC', app.fastflix.config.theme)} (MIT) "
Expand Down

0 comments on commit 8439ef5

Please sign in to comment.