From 9a997452b372a702ad82c1cb04cad5ceea0eedc5 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu, 1 Sep 2022 12:53:57 -0700 Subject: [PATCH] sequence: increase default dividers Due to performance increases/optimizations, these dividers can be much less severe --- app/dialog/sequence/sequencedialogpresettab.cpp | 6 +++--- app/render/videoparams.cpp | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp index b8a94fbe7..776832906 100644 --- a/app/dialog/sequence/sequencedialogpresettab.cpp +++ b/app/dialog/sequence/sequencedialogpresettab.cpp @@ -63,9 +63,9 @@ SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) : preset_tree_->addTopLevelItem(my_presets_folder_); // Add presets - preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("4K UHD"), 3840, 2160, 6)); - preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("1080p"), 1920, 1080, 3)); - preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("720p"), 1280, 720, 2)); + preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("4K UHD"), 3840, 2160, 2)); + preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("1080p"), 1920, 1080, 1)); + preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("720p"), 1280, 720, 1)); preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("NTSC"), 720, 480, rational(30000, 1001), VideoParams::kPixelAspectNTSCStandard, diff --git a/app/render/videoparams.cpp b/app/render/videoparams.cpp index 239507b98..14474d49c 100644 --- a/app/render/videoparams.cpp +++ b/app/render/videoparams.cpp @@ -126,8 +126,7 @@ VideoParams::VideoParams(int width, int height, const rational &time_base, Forma int VideoParams::generate_auto_divider(qint64 width, qint64 height) { - // Arbitrary pixel count (from 640x360) - const int target_res = 230400; + const int target_res = 1920*1080; qint64 megapixels = width * height; @@ -155,8 +154,8 @@ int VideoParams::generate_auto_divider(qint64 width, qint64 height) } } - // "Safe" fallback - return 2; + // Fallback + return 1; } }