OSDN Git Service

Bump NVEncC binaries to version 5.01 + added more supported profiles by new NVEncC...
[x264-launcher/x264-launcher.git] / src / win_addJob.cpp
index 2cbc965..ccd9eb1 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,8 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "win_addJob.h"
-#include "uic_win_addJob.h"
+#include "UIC_win_addJob.h"
 
+//Internal
 #include "global.h"
 #include "model_options.h"
 #include "model_preferences.h"
 #include "model_recently.h"
 #include "encoder_factory.h"
 #include "mediainfo.h"
+#include "string_validator.h"
 #include "win_help.h"
 #include "win_editor.h"
 
+//MUtils
+#include <MUtils/Global.h>
+#include <MUtils/OSSupport.h>
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDate>
 #include <QTimer>
 #include <QCloseEvent>
@@ -51,6 +59,7 @@
 
 #define ARRAY_SIZE(ARRAY) (sizeof((ARRAY))/sizeof((ARRAY[0])))
 #define VALID_DIR(PATH) ((!(PATH).isEmpty()) && QFileInfo(PATH).exists() && QFileInfo(PATH).isDir())
+#define SHFL(X) ((*reinterpret_cast<int*>(&(X))) <<= 1)
 
 #define REMOVE_USAFED_ITEM \
 { \
 Q_DECLARE_METATYPE(const void*)
 
 ///////////////////////////////////////////////////////////////////////////////
-// Validator
+// Disable Monitoring RAII
 ///////////////////////////////////////////////////////////////////////////////
 
-class StringValidator : public QValidator
+class DisableHelperRAII
 {
 public:
-       StringValidator(QLabel *notifier, QLabel *icon)
-       :
-               m_notifier(notifier), m_icon(icon)
+       DisableHelperRAII(bool *const flag) : m_flag(flag)
        {
-               m_notifier->hide();
-               m_icon->hide();
+               *m_flag = false;
        }
-       
-       virtual State validate(QString &input, int &pos) const = 0;
 
-       virtual void fixup(QString &input) const
+       ~DisableHelperRAII(void)
        {
-               input = input.simplified();
+               *m_flag = true;
        }
 
-protected:
-       QLabel *const m_notifier, *const m_icon;
-
-       bool checkParam(const QString &input, const QString &param, const bool doubleMinus) const
-       {
-               static const char c[20] = {' ', '*', '?', '<', '>', '/', '\\', '"', '\'', '!', '+', '#', '&', '%', '=', ',', ';', '.', 'ยด', '`'};
-               const QString prefix = doubleMinus ? QLatin1String("--") : QLatin1String("-");
-               
-               bool flag = false;
-               if(param.length() > 1)
-               {
-                       flag = flag || input.endsWith(QString("%1%2").arg(prefix, param), Qt::CaseInsensitive);
-                       for(size_t i = 0; i < sizeof(c); i++)
-                       {
-                               flag = flag || input.contains(QString("%1%2%3").arg(prefix, param, QChar::fromLatin1(c[i])), Qt::CaseInsensitive);
-                       }
-               }
-               else
-               {
-                       flag = flag || input.startsWith(QString("-%1").arg(param));
-                       for(size_t i = 0; i < sizeof(c); i++)
-                       {
-                               flag = flag || input.contains(QString("%1-%2").arg(QChar::fromLatin1(c[i]), param), Qt::CaseSensitive);
-                       }
-               }
-               if((flag) && (m_notifier))
-               {
-                       m_notifier->setText(tr("Invalid parameter: %1").arg((param.length() > 1) ? QString("%1%2").arg(prefix, param) : QString("-%1").arg(param)));
-               }
-               return flag;
-       }
-
-       const bool &setStatus(const bool &flag, const QString &toolName) const
-       {
-               if(flag)
-               {
-                       if(m_notifier)
-                       {
-                               if(m_notifier->isHidden()) m_notifier->show();
-                               if(m_icon) { if(m_icon->isHidden()) m_icon->show(); }
-                               if(QWidget *w = m_notifier->topLevelWidget()->focusWidget())
-                               {
-                                       QToolTip::showText(static_cast<QWidget*>(w->parent())->mapToGlobal(w->pos()), tr("<b>Warning:</b> You entered a parameter that is forbidden. Please note that the GUI will automatically set <i>this</i> parameter for you (if required)."), m_notifier, QRect());
-                               }
-                       }
-               }
-               else
-               {
-                       if(m_notifier)
-                       {
-                               if(m_notifier->isVisible()) m_notifier->hide();
-                               if(m_icon) { if(m_icon->isVisible()) m_icon->hide(); }
-                               QToolTip::hideText();
-                       }
-               }
-               return flag;
-       }
-};
-
-class StringValidatorX264 : public StringValidator
-{
-public:
-       StringValidatorX264(QLabel *notifier, QLabel *icon) : StringValidator(notifier, icon) {}
-
-       virtual State validate(QString &input, int &pos) const
-       {
-               static const char* p[] = {"B", "o", "h", "p", "q", /*"fps", "frames",*/ "preset", "tune", "profile",
-                       "stdin", "crf", "bitrate", "qp", "pass", "stats", "output", "help","quiet", NULL};
-
-               bool invalid = false;
-
-               for(size_t i = 0; p[i] && (!invalid); i++)
-               {
-                       invalid = invalid || checkParam(input, QString::fromLatin1(p[i]), true);
-               }
-
-               return setStatus(invalid, "encoder") ? QValidator::Intermediate : QValidator::Acceptable;
-       }
-};
-
-class StringValidatorAvs2YUV : public StringValidator
-{
-public:
-       StringValidatorAvs2YUV(QLabel *notifier, QLabel *icon) : StringValidator(notifier, icon) {}
-
-       virtual State validate(QString &input, int &pos) const
-       {
-               static const char* p[] = {"o", "frames", "seek", "raw", "hfyu", "slave", NULL};
-
-               bool invalid = false;
-
-               for(size_t i = 0; p[i] && (!invalid); i++)
-               {
-                       invalid = invalid || checkParam(input, QString::fromLatin1(p[i]), false);
-               }
-               
-               return setStatus(invalid, "Avs2YUV") ? QValidator::Intermediate : QValidator::Acceptable;
-       }
+private:
+       bool *const m_flag;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -219,7 +127,7 @@ AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *const options, Recentl
        m_preferences(preferences),
        m_defaults(new OptionsModel(sysinfo)),
        ui(new Ui::AddJobDialog()),
-       m_monitorConfigChanges(true)
+       m_monitorConfigChanges(false)
 {
        //Init the dialog, from the .ui file
        ui->setupUi(this);
@@ -232,8 +140,13 @@ AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *const options, Recentl
        setMinimumSize(size());
        setMaximumHeight(height());
 
+       //Init encoder combobox
+       ui->cbxEncoderType->addItem(tr("x264 (AVC)"),  OptionsModel::EncType_X264);
+       ui->cbxEncoderType->addItem(tr("x265 (HEVC)"), OptionsModel::EncType_X265);
+       ui->cbxEncoderType->addItem(tr("NVEncC"),      OptionsModel::EncType_NVEnc);
+
        //Init combobox items
-       ui->cbxTuning ->addItem(QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED));
+       ui->cbxTuning ->addItem(QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED));
        ui->cbxProfile->addItem(QString::fromLatin1(OptionsModel::PROFILE_UNRESTRICTED));
 
        //Hide optional controls
@@ -252,10 +165,10 @@ AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *const options, Recentl
 
        //Setup validator
        ui->editCustomX264Params->installEventFilter(this);
-       ui->editCustomX264Params->setValidator(new StringValidatorX264(ui->labelNotificationX264, ui->iconNotificationX264));
+       ui->editCustomX264Params->setValidator(new StringValidatorEncoder(ui->labelNotificationX264, ui->iconNotificationX264));
        ui->editCustomX264Params->clear();
        ui->editCustomAvs2YUVParams->installEventFilter(this);
-       ui->editCustomAvs2YUVParams->setValidator(new StringValidatorAvs2YUV(ui->labelNotificationAvs2YUV, ui->iconNotificationAvs2YUV));
+       ui->editCustomAvs2YUVParams->setValidator(new StringValidatorSource(ui->labelNotificationAvs2YUV, ui->iconNotificationAvs2YUV));
        ui->editCustomAvs2YUVParams->clear();
 
        //Install event filter
@@ -288,6 +201,10 @@ AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *const options, Recentl
        //Setup template selector
        loadTemplateList();
        connect(ui->cbxTemplate, SIGNAL(currentIndexChanged(int)), this, SLOT(templateSelected()));
+
+       //Force initial UI update
+       encoderIndexChanged(ui->cbxEncoderType->currentIndex());
+       m_monitorConfigChanges = true;
 }
 
 AddJobDialog::~AddJobDialog(void)
@@ -301,22 +218,22 @@ AddJobDialog::~AddJobDialog(void)
                }
                const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
                ui->cbxTemplate->setItemData(i, QVariant::fromValue<const void*>(NULL));
-               X264_DELETE(item);
+               MUTILS_DELETE(item);
        }
 
        //Free validators
        if(const QValidator *tmp = ui->editCustomX264Params->validator())
        {
                ui->editCustomX264Params->setValidator(NULL);
-               X264_DELETE(tmp);
+               MUTILS_DELETE(tmp);
        }
        if(const QValidator *tmp = ui->editCustomAvs2YUVParams->validator())
        {
                ui->editCustomAvs2YUVParams->setValidator(NULL);
-               X264_DELETE(tmp);
+               MUTILS_DELETE(tmp);
        }
 
-       X264_DELETE(m_defaults);
+       MUTILS_DELETE(m_defaults);
        delete ui;
 }
 
@@ -426,14 +343,50 @@ void AddJobDialog::dropEvent(QDropEvent *event)
 
 void AddJobDialog::encoderIndexChanged(int index)
 {
-       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(ui->cbxEncoderType->currentIndex());
+       const OptionsModel::EncType encType = static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt());
+       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(encType);
+
+       //Update encoder architectures
+       const QList<AbstractEncoderInfo::ArchId> archs = encoderInfo.getArchitectures();
+       ui->cbxEncoderArch->clear();
+       for (quint32 archIdx = 0; archIdx < quint32(archs.count()); ++archIdx)
+       {
+               ui->cbxEncoderArch->addItem(archs[archIdx].first, archIdx);
+       }
 
        //Update encoder variants
-       ui->cbxEncoderVariant->setItemText(OptionsModel::EncVariant_LoBit, encoderInfo.getVariantId(OptionsModel::EncVariant_LoBit));
-       ui->cbxEncoderVariant->setItemText(OptionsModel::EncVariant_HiBit, encoderInfo.getVariantId(OptionsModel::EncVariant_HiBit));
+       const QStringList variants = encoderInfo.getVariants();
+       ui->cbxEncoderVariant->clear();
+       for(quint32 varntIdx = 0; varntIdx < quint32(variants.count()); ++varntIdx)
+       {
+               ui->cbxEncoderVariant->addItem(variants[varntIdx], varntIdx);
+       }
+
+       //Update encoder RC modes
+       const QList<AbstractEncoderInfo::RCMode> rcModes = encoderInfo.getRCModes();
+       ui->cbxRateControlMode->clear();
+       for (quint32 rcIndex = 0; rcIndex < quint32(rcModes.count()); ++rcIndex)
+       {
+               ui->cbxRateControlMode->addItem(rcModes[rcIndex].first, rcIndex);
+       }
+
+       //Update presets
+       const QStringList presets = encoderInfo.getPresets();
+       if(presets.empty())
+       {
+               ui->cbxPreset->setEnabled(false);
+               ui->cbxPreset->setCurrentIndex(0);
+       }
+       else
+       {
+               ui->cbxPreset->setEnabled(true);
+               ui->cbxPreset->clear();
+               ui->cbxPreset->addItem(QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED));
+               ui->cbxPreset->addItems(presets);
+       }
 
        //Update tunings
-       QStringList tunings = encoderInfo.getTunings();
+       const QStringList tunings = encoderInfo.getTunings();
        if(tunings.empty())
        {
                ui->cbxTuning->setEnabled(false);
@@ -443,7 +396,7 @@ void AddJobDialog::encoderIndexChanged(int index)
        {
                ui->cbxTuning->setEnabled(true);
                ui->cbxTuning->clear();
-               ui->cbxTuning->addItem(QString::fromLatin1(OptionsModel::TUNING_UNSPECIFIED));
+               ui->cbxTuning->addItem(QString::fromLatin1(OptionsModel::SETTING_UNSPECIFIED));
                ui->cbxTuning->addItems(tunings);
        }
 
@@ -452,10 +405,11 @@ void AddJobDialog::encoderIndexChanged(int index)
 
 void AddJobDialog::variantIndexChanged(int index)
 {
-       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(ui->cbxEncoderType->currentIndex());
+       const OptionsModel::EncType encType = static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt());
+       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(encType);
 
        //Update encoder profiles
-       QStringList profiles = encoderInfo.getProfiles(index);
+       const QStringList profiles = encoderInfo.getProfiles(ui->cbxEncoderVariant->itemData(index).toUInt());
        if(profiles.empty())
        {
                ui->cbxProfile->setEnabled(false);
@@ -474,18 +428,30 @@ void AddJobDialog::variantIndexChanged(int index)
 
 void AddJobDialog::modeIndexChanged(int index)
 {
-       ui->spinQuantizer->setEnabled(index == OptionsModel::RCMode_CRF || index == OptionsModel::RCMode_CQ);
-       ui->spinBitrate  ->setEnabled(index == OptionsModel::RCMode_ABR || index == OptionsModel::RCMode_2Pass);
+       const OptionsModel::EncType encType = static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt());
+       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(encType);
+
+       //Update bitrate/quantizer boxes
+       const AbstractEncoderInfo::RCType rcType = encoderInfo.rcModeToType(ui->cbxRateControlMode->itemData(index).toUInt());
+       ui->spinQuantizer->setEnabled(rcType == AbstractEncoderInfo::RC_TYPE_QUANTIZER);
+       ui->spinBitrate  ->setEnabled(rcType != AbstractEncoderInfo::RC_TYPE_QUANTIZER);
 }
 
 void AddJobDialog::accept(void)
 {
+       //Get encoder info
+       const OptionsModel::EncType encType = static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt());
+       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(encType);
+
        //Check 64-Bit support
-       if((ui->cbxEncoderArch->currentIndex() == OptionsModel::EncArch_x64) && (!m_sysinfo->hasX64Support()))
+       if (encoderInfo.archToType(ui->cbxEncoderArch->itemData(ui->cbxEncoderArch->currentIndex()).toUInt()) == AbstractEncoderInfo::ARCH_TYPE_X64)
        {
-               QMessageBox::warning(this, tr("64-Bit unsupported!"), tr("<nobr>Sorry, this computer does <b>not</b> support 64-Bit encoders!</nobr>"));
-               ui->cbxEncoderArch->setCurrentIndex(OptionsModel::EncArch_x32);
-               return;
+               if (!m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64))
+               {
+                       QMessageBox::warning(this, tr("64-Bit unsupported!"), tr("<nobr>Sorry, this computer does <b>not</b> support 64-Bit encoders!</nobr>"));
+                       ui->cbxEncoderArch->setCurrentIndex(AbstractEncoderInfo::ARCH_TYPE_X86);
+                       return;
+               }
        }
        
        //Selection complete?
@@ -508,29 +474,11 @@ void AddJobDialog::accept(void)
                return;
        }
 
-       //Get encoder info
-       const AbstractEncoderInfo &encoderInfo = EncoderFactory::getEncoderInfo(ui->cbxEncoderType->currentIndex());
-
-       //Is selected RC mode supported?
-       if(!encoderInfo.isRCModeSupported(ui->cbxRateControlMode->currentIndex()))
-       {
-               QMessageBox::warning(this, tr("Bad RC Mode!"), tr("<nobr>The selected RC mode is not supported by the selected encoder!</nobr>"));
-               for(int i = 0; i < ui->cbxRateControlMode->count(); i++)
-               {
-                       if(encoderInfo.isRCModeSupported(i))
-                       {
-                               ui->cbxRateControlMode->setCurrentIndex(i);
-                               break;
-                       }
-               }
-               return;
-       }
-
        //Is the type of the source file supported?
        const int sourceType = MediaInfo::analyze(sourceFile.canonicalFilePath());
        if(sourceType == MediaInfo::FILETYPE_AVISYNTH)
        {
-               if(!m_sysinfo->hasAVSSupport())
+               if(!m_sysinfo->hasAvisynth())
                {
                        if(QMessageBox::warning(this, tr("Avisynth unsupported!"), tr("<nobr>An Avisynth script was selected as input, although Avisynth is <b>not</b> available!</nobr>"), tr("Abort"), tr("Ignore (at your own risk!)")) != 1)
                        {
@@ -540,7 +488,7 @@ void AddJobDialog::accept(void)
        }
        else if(sourceType == MediaInfo::FILETYPE_VAPOURSYNTH)
        {
-               if(!m_sysinfo->hasVPSSupport())
+               if(!m_sysinfo->hasVapourSynth())
                {
                        if(QMessageBox::warning(this, tr("VapurSynth unsupported!"), tr("<nobr>A VapourSynth script was selected as input, although VapourSynth is <b>not/<b> available!</nobr>"), tr("Abort"), tr("Ignore (at your own risk!)")) != 1)
                        {
@@ -815,7 +763,7 @@ void AddJobDialog::deleteTemplateButtonClicked(void)
        OptionsModel::deleteTemplate(name);
        const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(index).value<const void*>());
        ui->cbxTemplate->removeItem(index);
-       X264_DELETE(item);
+       MUTILS_DELETE(item);
 }
 
 void AddJobDialog::editorActionTriggered(void)
@@ -833,7 +781,7 @@ void AddJobDialog::editorActionTriggered(void)
                        lineEdit->setText(editor->getEditText());
                }
 
-               X264_DELETE(editor);
+               MUTILS_DELETE(editor);
        }
 }
 
@@ -938,7 +886,7 @@ void AddJobDialog::loadTemplateList(void)
        }
 }
 
-void AddJobDialog::updateComboBox(QComboBox *cbox, const QString &text)
+void AddJobDialog::updateComboBox(QComboBox *const cbox, const QString &text)
 {
        int index = 0;
        if(QAbstractItemModel *model = cbox->model())
@@ -955,15 +903,48 @@ void AddJobDialog::updateComboBox(QComboBox *cbox, const QString &text)
        cbox->setCurrentIndex(index);
 }
 
+void AddJobDialog::updateComboBox(QComboBox *const cbox, const int &data)
+{
+       int index = 0;
+       if (QAbstractItemModel *model = cbox->model())
+       {
+               for (int i = 0; i < cbox->model()->rowCount(); i++)
+               {
+                       if (cbox->itemData(i).toInt() == data)
+                       {
+                               index = i;
+                               break;
+                       }
+               }
+       }
+       cbox->setCurrentIndex(index);
+}
+
+void AddJobDialog::updateComboBox(QComboBox *const cbox, const quint32 &data)
+{
+       int index = 0;
+       if(QAbstractItemModel *model = cbox->model())
+       {
+               for(int i = 0; i < cbox->model()->rowCount(); i++)
+               {
+                       if(cbox->itemData(i).toUInt() == data)
+                       {
+                               index = i;
+                               break;
+                       }
+               }
+       }
+       cbox->setCurrentIndex(index);
+}
+
 void AddJobDialog::restoreOptions(const OptionsModel *options)
 {
-       //Ignore config changes while restoring template!
-       m_monitorConfigChanges = false;
+       DisableHelperRAII disable(&m_monitorConfigChanges);
 
-       ui->cbxEncoderType    ->setCurrentIndex(options->encType());
-       ui->cbxEncoderArch    ->setCurrentIndex(options->encArch());
-       ui->cbxEncoderVariant ->setCurrentIndex(options->encVariant());
-       ui->cbxRateControlMode->setCurrentIndex(options->rcMode());
+       updateComboBox(ui->cbxEncoderType,     options->encType());
+       updateComboBox(ui->cbxEncoderArch,     options->encArch());
+       updateComboBox(ui->cbxEncoderVariant,  options->encVariant());
+       updateComboBox(ui->cbxRateControlMode, options->rcMode());
 
        ui->spinQuantizer->setValue(options->quantizer());
        ui->spinBitrate  ->setValue(options->bitrate());
@@ -974,26 +955,24 @@ void AddJobDialog::restoreOptions(const OptionsModel *options)
 
        ui->editCustomX264Params   ->setText(options->customEncParams());
        ui->editCustomAvs2YUVParams->setText(options->customAvs2YUV());
-
-       //Make sure we will monitor config changes again!
-       m_monitorConfigChanges = true;
 }
 
 void AddJobDialog::saveOptions(OptionsModel *options)
 {
-       options->setEncType(static_cast<OptionsModel::EncType>(ui->cbxEncoderType->currentIndex()));
-       options->setEncArch(static_cast<OptionsModel::EncArch>(ui->cbxEncoderArch->currentIndex()));
-       options->setEncVariant(static_cast<OptionsModel::EncVariant>(ui->cbxEncoderVariant->currentIndex()));
-       options->setRCMode(static_cast<OptionsModel::RCMode>(ui->cbxRateControlMode->currentIndex()));
+       options->setEncType(static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt()));
+
+       options->setEncArch   (ui->cbxEncoderArch    ->itemData(ui->cbxEncoderArch    ->currentIndex()).toUInt());
+       options->setEncVariant(ui->cbxEncoderVariant ->itemData(ui->cbxEncoderVariant ->currentIndex()).toUInt());
+       options->setRCMode    (ui->cbxRateControlMode->itemData(ui->cbxRateControlMode->currentIndex()).toUInt());
        
        options->setQuantizer(ui->spinQuantizer->value());
-       options->setBitrate(ui->spinBitrate->value());
+       options->setBitrate  (ui->spinBitrate  ->value());
        
        options->setPreset (ui->cbxPreset ->model()->data(ui->cbxPreset ->model()->index(ui->cbxPreset ->currentIndex(), 0)).toString());
        options->setTune   (ui->cbxTuning ->model()->data(ui->cbxTuning ->model()->index(ui->cbxTuning ->currentIndex(), 0)).toString());
        options->setProfile(ui->cbxProfile->model()->data(ui->cbxProfile->model()->index(ui->cbxProfile->currentIndex(), 0)).toString());
 
-       options->setCustomEncParams(ui->editCustomX264Params->hasAcceptableInput() ? ui->editCustomX264Params->text().simplified() : QString());
+       options->setCustomEncParams(ui->editCustomX264Params->hasAcceptableInput() ? ui->editCustomX264Params->text().simplified()     : QString());
        options->setCustomAvs2YUV(ui->editCustomAvs2YUVParams->hasAcceptableInput() ? ui->editCustomAvs2YUVParams->text().simplified() : QString());
 }
 
@@ -1041,7 +1020,8 @@ QString AddJobDialog::currentOutputPath(const bool bWithName)
 
 int AddJobDialog::currentOutputIndx(void)
 {
-       if(ui->cbxEncoderType->currentIndex() == OptionsModel::EncType_X265)
+       const OptionsModel::EncType encType = static_cast<OptionsModel::EncType>(ui->cbxEncoderType->itemData(ui->cbxEncoderType->currentIndex()).toInt());
+       if(encType == OptionsModel::EncType_X265)
        {
                return ARRAY_SIZE(X264_FILE_TYPE_FILTERS) - 1;
        }
@@ -1182,3 +1162,5 @@ QString AddJobDialog::getInputFilterLst(void)
        filters << QString("All files (*.*)");
        return filters.join(";;");
 }
+
+