Skip to content

Commit

Permalink
feat: Aviator 0.6.0
Browse files Browse the repository at this point in the history
        <p>Exciting SVT-AV1-PSY improvements and an awesome audio fix that's been a long time coming!</p>
        <p>First, Aviator changes:</p>
        <p>- Migrated to libadwaita 1.4+ widgets</p>
        <p>- Fixed the notorious 5.1(side) audio encoding error</p>
        <p>- Minor code clean-up</p>
        <p>SVT-AV1-PSY (v2.0.0rc2) updates relevant to Aviator:</p>
        <p>- Updated var...
  • Loading branch information
gianni-rosato committed Mar 12, 2024
1 parent b8c74c1 commit 80e320a
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 59 deletions.
Binary file modified assets/aviator_audio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/aviator_audio.webp
Binary file not shown.
Binary file modified assets/aviator_encoding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/aviator_encoding.webp
Binary file not shown.
Binary file modified assets/aviator_output.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/aviator_output.webp
Binary file not shown.
Binary file modified assets/aviator_video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/aviator_video.webp
Binary file not shown.
Binary file added assets/aviator_welcome.webp
Binary file not shown.
Binary file added assets/startup.webp
Binary file not shown.
17 changes: 17 additions & 0 deletions data/net.natesales.Aviator.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@

<releases>

<release version="0.6.0" date="2024-03-12">
<description translatable="no">
<p>Exciting SVT-AV1-PSY improvements and an awesome audio fix that's been a long time coming!</p>
<p>First, Aviator changes:</p>
<p>- Migrated to libadwaita 1.4+ widgets</p>
<p>- Fixed the notorious 5.1(side) audio encoding error</p>
<p>- Minor code clean-up</p>
<p>SVT-AV1-PSY (v2.0.0rc2) updates relevant to Aviator:</p>
<p>- Updated variance boost to improve encoding efficiency and eliminate rare flickering artifacts</p>
<p>- Variance boost refactored to work with native q-step ratios</p>
<p>- Preset -1 is twice as fast, &amp; presets 0 through 8 are up to 28% faster</p>
<p>- Presets 9 through 12 are 1-4% more efficient</p>
<p>- Additional ARM optimizations</p>
<p>- Bug fixes</p>
</description>
</release>

<release version="0.5.1" date="2024-02-05">
<description translatable="no">
<p>TL;DR, mostly SVT-AV1-PSY improvements. But still exciting, nonetheless!</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('aviator',
version: '0.5.1',
version: '0.6.0',
meson_version: '>= 0.59',
)

Expand Down
2 changes: 1 addition & 1 deletion net.natesales.Aviator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ modules:
sources:
- type: git
url: https://github.com/gianni-rosato/svt-av1-psy
commit: 7ae86e207b753a21d155ada248b83a697eb45133
commit: 5cac47c1eaee9c5229cdf693bf26e90ff6c54b40

- name: ffmpeg
config-opts:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='Aviator',
version='0.5.1',
version='0.6.0',
description='AV1/OPUS Encoder GUI',
author='Gianni Rosato',
author_email='grosatowork@proton.me',
Expand Down
52 changes: 8 additions & 44 deletions src/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,6 @@ def humanize(seconds):
else:
return ", ".join(duration[:-1]) + " and " + duration[-1]


# metadata returns the file's resolution and audio bitrate
# def metadata(file) -> (float, float, float):
# try:
# cmd = [
# "ffprobe",
# "-v",
# "quiet",
# "-print_format",
# "json",
# "-show_format",
# "-show_streams",
# file,
# ]
# logging.debug("Running ffprobe: " + " ".join(cmd))
# x = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout.read()
# m = json.loads(x)
# streams = m["streams"]
# video = streams[0]
# audio = streams[1]

# return video["width"], video["height"], float(audio["sample_rate"]) / 1000
# except Exception as e:
# logging.error("Get metadata:", e)
# return 1536, 864, 48


def notify(text):
application = Gtk.Application.get_default()
notification = Gio.Notification.new(title="Aviator")
Expand Down Expand Up @@ -387,28 +360,19 @@ def run_in_thread():
else:
if self.volume_scale.get_value() == 0:
if self.loudnorm_toggle.get_active():
audio_filters = "loudnorm"
audio_filters = "loudnorm,aformat=channel_layouts=7.1|6.1|5.1|stereo"
else:
audio_filters = "-y"
audio_filters = "aformat=channel_layouts=7.1|6.1|5.1|stereo"
else:
if self.loudnorm_toggle.get_active():
audio_filters = f"loudnorm,volume={int(self.volume_scale.get_value())}dB"
audio_filters = f"loudnorm,volume={int(self.volume_scale.get_value())}dB,aformat=channel_layouts=7.1|6.1|5.1|stereo"
else:
audio_filters = f"volume={int(self.volume_scale.get_value())}dB"
audio_filters = f"volume={int(self.volume_scale.get_value())}dB,aformat=channel_layouts=7.1|6.1|5.1|stereo"

if self.audio_copy_switch.get_state():
audio_filters_prefix = "-y"
else:
if self.volume_scale.get_value() == 0:
if self.loudnorm_toggle.get_active():
audio_filters_prefix = "-af"
else:
audio_filters_prefix = "-y"
else:
if self.loudnorm_toggle.get_active():
audio_filters_prefix = "-af"
else:
audio_filters_prefix = "-af"
audio_filters_prefix = "-af"

cmd = [
"ffmpeg",
Expand Down Expand Up @@ -489,9 +453,9 @@ def about_dialog(self, action, user_data):
license_type=Gtk.License.GPL_3_0,
website="https://github.com/gianni-rosato/aviator",
issue_url="https://github.com/gianni-rosato/aviator/issues")
# about.set_translator_credits(translators())
about.set_developers(["Nate Sales <nate@natesales.net>","Gianni Rosato <grosatowork@proton.me>","Trix<>"])
about.set_designers(["Gianni Rosato <grosatowork@proton.me>"])
about.set_translator_credits("Thank you Vovkiv, k1llo, & Sabri Ünal!")
about.set_developers(["Nate Sales https://natesales.net","Gianni Rosato https://giannirosato.com","Trix<>"])
about.set_designers(["Gianni Rosato https://giannirosato.com"])
about.add_acknowledgement_section(
("Special thanks to the encoding community!"),
[
Expand Down
33 changes: 21 additions & 12 deletions src/window.ui
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
</menu>
<template class="AviatorWindow" parent="AdwWindow">
<property name="modal">False</property>
<property name="width-request">360</property>
<property name="width-request">380</property>
<property name="height-request">294</property>
<property name="title" translatable="yes">Aviator</property>
<property name="content">
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="AdwToolbarView">
<child type="top">
<object class="AdwHeaderBar">
<property name="centering-policy">strict</property>
<child type="end">
Expand All @@ -34,15 +32,14 @@
<property name="title-widget">
<object class="AdwViewSwitcherTitle" id="switcher_title">
<property name="stack">stack</property>
<property name="title" translatable="yes">Aviator</property>
<!-- <property name="title" bind-source="AdwViewSwitcherDemoWindow" bind-property="title" bind-flags="sync-create"/> -->
</object>
</property>
</object>
</child>
<child>
<property name="content">
<object class="AdwViewStack" id="stack">
<property name="vexpand">True</property>

<!-- Video Tab -->
<child>
<object class="AdwViewStackPage">
Expand Down Expand Up @@ -109,13 +106,22 @@
<property name="title" translatable="yes">_Resolution</property>
<property name="use-underline">true</property>
<property name="tooltip-text" translatable="yes">Sets the output resolution. Width &amp; height will match the source media if left empty. Putting in one value will automatically calculate the other based on the source video's aspect ratio if "Crop" is unchecked; otherwise, the empty value will match the original.</property>
<!-- <child>
<object class="GtkCheckButton" id="hdr_toggle">
<property name="active">False</property>
<property name="label">HDR</property>
<property name="valign">center</property>
<property name="hexpand">False</property>
<property name="tooltip-text">Writes HDR10 bitstream metadata. Enable if encoding an HDR10 video.</property>
</object>
</child> -->
<child>
<object class="GtkCheckButton" id="crop_toggle">
<property name="active">True</property>
<property name="label">Crop</property>
<property name="valign">center</property>
<property name="hexpand">False</property>
<property name="tooltip-text">Crops the video instead of scaling it to the target resolution.</property>
<property name="tooltip-text">When enabled, crops instead of scaling to the target resolution.</property>
</object>
</child>
<child>
Expand Down Expand Up @@ -600,11 +606,14 @@
</object>
</child>
</object>
</child>
<child>
</property>
<child type="bottom">
<object class="AdwViewSwitcherBar" id="switcher_bar">
<property name="stack">stack</property>
<property name="reveal" bind-source="switcher_title" bind-property="title-visible" bind-flags="sync-create" />
<property name="reveal"
bind-source="switcher_title"
bind-property="title-visible"
bind-flags="sync-create" />
</object>
</child>
</object>
Expand Down

0 comments on commit 80e320a

Please sign in to comment.