Some re-design of AbstractEncoderInfo to allow more flexible encoder variants and...

[x264-launcher/x264-launcher.git] / src / model_options.h

diff --git a/src/model_options.h b/src/model_options.h
index 1fe30bd..4ffe831 100644 (file)
--- a/src/model_options.h
+++ b/src/model_options.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 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
@@ -37,77 +37,48 @@ public:
 
        enum EncType
        {
-               EncType_X264 = 0,
-               EncType_X265 = 1,
+               EncType_X264  = 0,
+               EncType_X265  = 1,
+               EncType_NVEnc = 2,
 
                EncType_MIN  = EncType_X264,
-               EncType_MAX  = EncType_X265,
-       };
-
-       enum EncArch
-       {
-               EncArch_x86_32 = 0,
-               EncArch_x86_64 = 1,
-
-               EncArch_MIN    = EncArch_x86_32,
-               EncArch_MAX    = EncArch_x86_64
-       };
-
-       enum EncVariant
-       {
-               EncVariant_8Bit  = 1,
-               EncVariant_10Bit = 2,
-               EncVariant_12Bit = 4,
-
-               EncVariant_MIN   = EncVariant_8Bit,
-               EncVariant_MAX   = EncVariant_12Bit
-       };
-
-       enum RCMode
-       {
-               RCMode_CRF   = 0,
-               RCMode_CQ    = 1,
-               RCMode_2Pass = 2,
-               RCMode_ABR   = 3,
-
-               RCMode_MIN   = RCMode_CRF,
-               RCMode_MAX   = RCMode_ABR,
+               EncType_MAX  = EncType_NVEnc,
        };
 
        static const char *const SETTING_UNSPECIFIED;
        static const char *const PROFILE_UNRESTRICTED;
 
        //Getter
-       EncType encType(void) const { return m_encoderType; }
-       EncArch encArch(void) const { return m_encoderArch; }
-       EncVariant encVariant(void) const { return m_encoderVariant; }
-       RCMode rcMode(void) const { return m_rcMode; }
-       unsigned int bitrate(void) const { return m_bitrate; }
-       double quantizer(void) const { return m_quantizer; }
-       QString preset(void) const { return m_preset; }
-       QString tune(void) const { return m_tune; }
-       QString profile(void) const { return m_profile; }
+       EncType encType(void)         const { return m_encoderType; }
+       quint32 encArch(void)         const { return m_encoderArch; }
+       quint32 encVariant(void)      const { return m_encoderVariant; }
+       quint32 rcMode(void)          const { return m_rcMode; }
+       unsigned int bitrate(void)    const { return m_bitrate; }
+       double quantizer(void)        const { return m_quantizer; }
+       QString preset(void)          const { return m_preset; }
+       QString tune(void)            const { return m_tune; }
+       QString profile(void)         const { return m_profile; }
        QString customEncParams(void) const { return m_custom_encoder; }
-       QString customAvs2YUV(void) const { return m_custom_avs2yuv; }
+       QString customAvs2YUV(void)   const { return m_custom_avs2yuv; }
 
        //Setter
-       void setEncType(EncType type) { m_encoderType = qBound(EncType_X264, type, EncType_X265); }
-       void setEncArch(EncArch arch) { m_encoderArch = qBound(EncArch_x86_32, arch, EncArch_x86_64); }
-       void setEncVariant(EncVariant variant) { m_encoderVariant = qBound(EncVariant_8Bit, variant, EncVariant_12Bit); }
-       void setRCMode(RCMode mode) { m_rcMode = qBound(RCMode_CRF, mode, RCMode_ABR); }
-       void setBitrate(unsigned int bitrate) { m_bitrate = qBound(10U, bitrate, 800000U); }
-       void setQuantizer(double quantizer) { m_quantizer = qBound(0.0, quantizer, 52.0); }
-       void setPreset(const QString &preset) { m_preset = preset.trimmed(); }
-       void setTune(const QString &tune) { m_tune = tune.trimmed(); }
-       void setProfile(const QString &profile) { m_profile = profile.trimmed(); }
+       void setEncType(quint32 type)                  { setEncType(static_cast<EncType>(type)); }
+       void setEncType(EncType type)                  { m_encoderType = qBound(EncType_MIN, type, EncType_MAX); }
+       void setEncArch(quint32 arch)                  { m_encoderArch = arch; }
+       void setEncVariant(quint32 variant)            { m_encoderVariant = variant; }
+       void setRCMode(quint32 mode)                   { m_rcMode = mode; }
+       void setBitrate(unsigned int bitrate)          { m_bitrate = qBound(10U, bitrate, 800000U); }
+       void setQuantizer(double quantizer)            { m_quantizer = qBound(0.0, quantizer, 52.0); }
+       void setPreset(const QString &preset)          { m_preset = preset.trimmed(); }
+       void setTune(const QString &tune)              { m_tune = tune.trimmed(); }
+       void setProfile(const QString &profile)        { m_profile = profile.trimmed(); }
        void setCustomEncParams(const QString &custom) { m_custom_encoder = custom.trimmed(); }
-       void setCustomAvs2YUV(const QString &custom) { m_custom_avs2yuv = custom.trimmed(); }
+       void setCustomAvs2YUV(const QString &custom)   { m_custom_avs2yuv = custom.trimmed(); }
 
        //Stuff
        bool equals(const OptionsModel *model);
 
        //Static functions
-       static QString rcMode2String(RCMode mode);
        static bool saveTemplate(const OptionsModel *model, const QString &name);
        static bool loadTemplate(OptionsModel *model, const QString &name);
        static QMap<QString, OptionsModel*> loadAllTemplates(const SysinfoModel *sysinfo);
@@ -118,9 +89,9 @@ public:
 
 protected:
        EncType m_encoderType;
-       EncArch m_encoderArch;
-       EncVariant m_encoderVariant;
-       RCMode m_rcMode;
+       quint32 m_encoderArch;
+       quint32 m_encoderVariant;
+       quint32 m_rcMode;
        unsigned int m_bitrate;
        double m_quantizer;
        QString m_preset;