Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Bump x264 version + added support for x264 multi-bitdepth binaries.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-02-26 15:57:47 +01:00
parent d90f8d0508
commit 40b4ff6d76
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/encoder_x264.cpp
View File

@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Simple x264 Launcher // Simple x264 Launcher
// Copyright (C) 2004-2017 LoRd_MuldeR <MuldeR2@GMX.de> // Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License as published by
@ -40,8 +40,8 @@
#include <QPair> #include <QPair>
//x264 version info //x264 version info
static const unsigned int VERSION_X264_MINIMUM_REV = 2795; static const unsigned int VERSION_X264_MINIMUM_REV = 2870;
static const unsigned int VERSION_X264_CURRENT_API = 152; static const unsigned int VERSION_X264_CURRENT_API = 155;
// ------------------------------------------------------------ // ------------------------------------------------------------
// Helper Macros // Helper Macros
@ -172,13 +172,11 @@ public:
case 1: arch = "x64"; break; case 1: arch = "x64"; break;
default: MUTILS_THROW("Unknown encoder arch!"); default: MUTILS_THROW("Unknown encoder arch!");
} }
switch(encVariant) if ((encVariant < 0) || (encVariant > 1))
{ {
case 0: variant = "8bit"; break; MUTILS_THROW("Unknown encoder variant!");
case 1: variant = "10bit"; break;
default: MUTILS_THROW("Unknown encoder variant!");
} }
return QString("%1/toolset/%2/x264_%3_%2.exe").arg(sysinfo->getAppPath(), arch, variant); return QString("%1/toolset/%2/x264_%2.exe").arg(sysinfo->getAppPath(), arch);
} }
virtual QString getHelpCommand(void) const virtual QString getHelpCommand(void) const
@ -304,6 +302,19 @@ void X264Encoder::buildCommandLine(QStringList &cmdLine, const bool &usePipe, co
{ {
double crf_int = 0.0, crf_frc = 0.0; double crf_int = 0.0, crf_frc = 0.0;
cmdLine << "--output-depth";
switch (m_options->encVariant())
{
case 0:
cmdLine << QString::number(8);
break;
case 1:
cmdLine << QString::number(10);
break;
default:
MUTILS_THROW("Unknown encoder variant!");
}
switch(m_options->rcMode()) switch(m_options->rcMode())
{ {
case 0: case 0: