Skip to content

Commit

Permalink
Beta Version 4.2.0b2 (#203)
Browse files Browse the repository at this point in the history
* Changing VP9 to default to mkv instead of webm format to support more audio codecs
* Fixing that deinterlace detection could crash program due to CPython bug issue #43423 (thanks to macx)
  • Loading branch information
cdgriffith authored Mar 9, 2021
1 parent e835a65 commit 56fc6e7
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
* Adding #194 fast two pass encoding (thanks to Ugurtan)
* Adding Confirm dialogue for cancel encode
* Changing AVC defaults and recommendations for CRF to higher values
* Changing VP9 to default to mkv instead of webm format to support more audio codecs
* Fixing German translations (thanks to SMESH)
* Fixing #171 Be able to select encoder before selecting video
* Fixing #176 Unable to change queue order or delete task from queue since 4.1.0 (thanks to Etz)
* Fixing #185 need to specify channel layout when downmixing (thanks to Ugurtan)
* Fixing #187 cleaning up partial download of FFmpeg (thanks to Todd Wilkinson)
* Fixing #190 add missing chromaloc parameter for x265 (thanks to Etz)
* Fixing that deinterlace detection could crash program due to CPython bug issue #43423 (thanks to macx)
* Fixing that returning item back from queue of a different encoder type would crash Fastflix
* Fixing HDR10 details to be track specific (thanks to Harybo)

Expand Down
4 changes: 2 additions & 2 deletions fastflix/encoders/vp9/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
icon = str(Path(pkg_resources.resource_filename(__name__, f"../../data/encoders/icon_vp9.png")).resolve())


video_extension = "webm"
video_dimension_divisor = 1
video_extension = "mkv"
video_dimension_divisor = 2

enable_subtitles = False
enable_audio = True
Expand Down
42 changes: 23 additions & 19 deletions fastflix/flix.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,25 +285,29 @@ def detect_interlaced(app: FastFlixApp, config: Config, source: Path, **_):
# [Parsed_idet_0 @ 00000] Single frame detection: TFF: 0 BFF: 0 Progressive: 641 Undetermined: 359
# [Parsed_idet_0 @ 00000] Multi frame detection: TFF: 0 BFF: 0 Progressive: 953 Undetermined: 47

output = execute(
[
f"{config.ffmpeg}",
"-hide_banner",
"-i",
f"{unixy(source)}",
"-vf",
"idet",
"-frames:v",
"100",
"-an",
"-sn",
"-dn",
"-f",
"rawvideo",
f"{'NUL' if reusables.win_based else '/dev/null'}",
"-y",
]
)
try:
output = execute(
[
f"{config.ffmpeg}",
"-hide_banner",
"-i",
f"{unixy(source)}",
"-vf",
"idet",
"-frames:v",
"100",
"-an",
"-sn",
"-dn",
"-f",
"rawvideo",
f"{'NUL' if reusables.win_based else '/dev/null'}",
"-y",
]
)
except Exception:
logger.exception("Error while running the interlace detection command")
return

for line in output.stderr.splitlines():
if "Single frame detection" in line:
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__ = "4.2.0b1"
__version__ = "4.2.0b2"
__author__ = "Chris Griffith"
3 changes: 2 additions & 1 deletion fastflix/widgets/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
shutil.rmtree(item, ignore_errors=True)
if item.name.lower().endswith((".jpg", ".jpeg", ".png", ".gif")):
item.unlink()
cleanup_windows_notification()
if reusables.win_based:
cleanup_windows_notification()
self.main.close(from_container=True)
super(Container, self).closeEvent(a0)

Expand Down
5 changes: 5 additions & 0 deletions fastflix/widgets/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,11 @@ def update_video_info(self):
error_message(f"{t('Not a video file')}<br>{self.input_video}")
self.clear_current_video()
return
except Exception:
logger.exception(f"Could not properly read the files {self.input_video}")
self.clear_current_video()
error_message(f"Could not properly read the file {self.input_video}")
return

hdr10_indexes = [x.index for x in self.app.fastflix.current_video.hdr10_streams]
text_video_tracks = [
Expand Down

0 comments on commit 56fc6e7

Please sign in to comment.