Skip to content

Commit

Permalink
* Adding #354 M1 support (thanks to Nhunz and Anton)
Browse files Browse the repository at this point in the history
* Adding #536 Improve Profiles - save advanced options (thanks to CelticTaonga and DCNerds)
* Fixing #185 audio channels not being set properly and resetting on encoder change (thanks to Tupsi)
* Fixing #522 add file fails - fixed as of 5.7.0 (thanks to pcl5x2008)
* Fixing #531 list limitation in readme that FFmpeg must support the software encoders listed (thanks to brunoais)
  • Loading branch information
cdgriffith committed Aug 6, 2024
1 parent 20ec4f5 commit ac8811e
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-nix:
strategy:
matrix:
os: [ ubuntu-20.04, ubuntu-22.04, macos-12 ]
os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-latest-xlarge ]
runs-on: ${{ matrix.os }}

steps:
Expand Down
7 changes: 6 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Changelog

## Version 5.7.5
## Version 5.8.0

* Adding #354 M1 support (thanks to Nhunz and Anton)
* Adding #536 Improve Profiles - save advanced options (thanks to CelticTaonga and DCNerds)
* Fixing #185 audio channels not being set properly and resetting on encoder change (thanks to Tupsi)
* Fixing #522 add file fails - fixed as of 5.7.0 (thanks to pcl5x2008)
* Fixing #531 list limitation in readme that FFmpeg must support the software encoders listed (thanks to brunoais)
* Fixing #586 audio channels being set incorrectly (thanks to Hankuu)
* Fixing #588 audio and subtitle dispositions were not set from source (thanks to GeZorTenPlotZ)

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Check out [the FastFlix github wiki](https://github.com/cdgriffith/FastFlix/wiki
| Covers |||||| ||
| bt.2020 ||||||||

If one of the above software encoders is not listed, it is due to your version of FFmpeg not having that encoder compiled in.

## Hardware Encoders

These will require the appropriate hardware. Nvidia GPU for NVEnc, Intel GPU/CPU for QSVEnc, and AMD GPU for VCEEnc.
Expand Down
1 change: 1 addition & 0 deletions fastflix/encoders/vp9/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"8-bit: yuv420p",
"10-bit: yuv420p10le",
"12-bit: yuv420p12le",
"8-bit 420 Transparent: yuva420p",
"8-bit 422: yuv422p",
"8-bit 444: yuv444p",
"10-bit 422: yuv422p10le",
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.7.5"
__version__ = "5.8.0"
__author__ = "Chris Griffith"
61 changes: 58 additions & 3 deletions fastflix/widgets/panels/advanced_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -679,23 +679,78 @@ def reset(self, settings: VideoSettings = None):
def new_source(self):
self.reset()

if self.app.fastflix.current_video.color_primaries in ffmpeg_valid_color_primaries:
advanced_options: AdvancedOptions = self.app.fastflix.config.opt("advanced_options")

if color_primaries := advanced_options.color_primaries:
self.color_primaries_widget.setCurrentText(color_primaries)
elif self.app.fastflix.current_video.color_primaries in ffmpeg_valid_color_primaries:
self.color_primaries_widget.setCurrentIndex(
ffmpeg_valid_color_primaries.index(self.app.fastflix.current_video.color_primaries) + 1
)
else:
self.color_primaries_widget.setCurrentIndex(0)

if self.app.fastflix.current_video.color_transfer in ffmpeg_valid_color_transfers:
if color_transfer := advanced_options.color_transfer:
self.color_transfer_widget.setCurrentText(color_transfer)
elif self.app.fastflix.current_video.color_transfer in ffmpeg_valid_color_transfers:
self.color_transfer_widget.setCurrentIndex(
ffmpeg_valid_color_transfers.index(self.app.fastflix.current_video.color_transfer) + 1
)
else:
self.color_transfer_widget.setCurrentIndex(0)

if self.app.fastflix.current_video.color_space in ffmpeg_valid_color_space:
if color_space := advanced_options.color_space:
self.color_space_widget.setCurrentText(color_space)
elif self.app.fastflix.current_video.color_space in ffmpeg_valid_color_space:
self.color_space_widget.setCurrentIndex(
ffmpeg_valid_color_space.index(self.app.fastflix.current_video.color_space) + 1
)
else:
self.color_space_widget.setCurrentIndex(0)

if video_speed := advanced_options.video_speed:
self.video_speed_widget.setCurrentText(get_key(video_speeds, video_speed))

if deblock := advanced_options.deblock:
self.deblock_widget.setCurrentText(deblock)

if deblock_size := advanced_options.deblock_size:
self.deblock_size_widget.setCurrentText(str(deblock_size))

if tone_map := advanced_options.tone_map:
self.tone_map_widget.setCurrentText(tone_map)

if vsync := advanced_options.vsync:
self.vsync_widget.setCurrentText(vsync)

if brightness := advanced_options.brightness:
self.brightness_widget.setText(brightness)

if saturation := advanced_options.saturation:
self.saturation_widget.setText(saturation)

if contrast := advanced_options.contrast:
self.contrast_widget.setText(contrast)

if maxrate := advanced_options.maxrate:
self.maxrate_widget.setText(str(maxrate))

if bufsize := advanced_options.bufsize:
self.bufsize_widget.setText(str(bufsize))

if source_fps := advanced_options.source_fps:
self.incoming_fps_widget.setText(source_fps)
self.incoming_same_as_source.setChecked(False)
else:
self.incoming_same_as_source.setChecked(True)

if output_fps := advanced_options.output_fps:
self.outgoing_fps_widget.setText(output_fps)
self.outgoing_same_as_source.setChecked(False)
else:
self.outgoing_same_as_source.setChecked(True)

if denoise_type_index := advanced_options.denoise_type_index:
self.denoise_type_widget.setCurrentIndex(denoise_type_index)
if denoise_strength_index := advanced_options.denoise_strength_index:
self.denoise_strength_widget.setCurrentIndex(denoise_strength_index)

0 comments on commit ac8811e

Please sign in to comment.