Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.5 (2012-11-23). Also removed obsolete Opus options.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-11-23 21:03:59 +01:00
parent d0288b7c57
commit c220a0b73f
36 changed files with 1011 additions and 1312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog.html
View File

@ -20,6 +20,7 @@ a:visited { color: #0000EE; }
<a name="4.07"></a>Changes between v4.06 and v4.07 [<font color="darkred">unreleased</font>]:<br><ul>
<li>Added option to select the "overwrite mode" to advanced options tab
<li>Added option to filter the log entries on the "processing" dialog (see context menu)
<li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.5 (2012-11-23)
</ul><br>
<a name="4.06"></a>Changes between v4.05 and v4.06 [2012-11-04]:<br><ul>

657
etc/Translation/Blank.ts
View File

File diff suppressed because it is too large Load Diff

16
etc/Translation/LameXP_DE.ts
View File

@ -1926,30 +1926,14 @@
<source> Opus Encoder Options </source>
<translation>Opus Kodierer Optionen</translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation>Optimieren für Signaltyp:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation>Kodierer Komplexität:</translation>
</message>
<message>
<source>Music</source>
<translation>Musik</translation>
</message>
<message>
<source>(Undefined)</source>
<translation>(Undefiniert)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation>Framegröße:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation>Psychoakustische Optimierungen (experimentell)</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation></translation>

16
etc/Translation/LameXP_ES.ts
View File

@ -1925,30 +1925,14 @@
<source> Opus Encoder Options </source>
<translation>Opciones del codificador Opus</translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation>Optimizar para tipo de señal:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation>Complejidad de codificación:</translation>
</message>
<message>
<source>Music</source>
<translation>Música</translation>
</message>
<message>
<source>(Undefined)</source>
<translation>(Sin definir)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation>Tamaño de muestra:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation>Utilizar Experimental Encoder Perceptual Tuning</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation>OpusEnc:</translation>

16
etc/Translation/LameXP_FR.ts
View File

@ -1935,30 +1935,14 @@ Ouvrir le dossier récursivement...</translation>
<source> Opus Encoder Options </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Music</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(Undefined)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frame Size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OpusEnc:</source>
<translation type="unfinished"></translation>

16
etc/Translation/LameXP_IT.ts
View File

@ -1926,30 +1926,14 @@
<source> Opus Encoder Options </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Music</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(Undefined)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Frame Size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OpusEnc:</source>
<translation type="unfinished"></translation>

16
etc/Translation/LameXP_KR.ts
View File

@ -1925,30 +1925,14 @@
<source> Opus Encoder Options </source>
<translation type="unfinished"> Opus 인코더 옵션 </translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation type="unfinished">신호 방식 최적화:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation type="unfinished">인코딩 복잡도:</translation>
</message>
<message>
<source>Music</source>
<translation type="unfinished">음악</translation>
</message>
<message>
<source>(Undefined)</source>
<translation type="unfinished">(정의되지 않음)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation type="unfinished">프레임 크기:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation type="unfinished">경험적 인코더 인식 조정 사용</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation type="unfinished">OpusEnc:</translation>

657
etc/Translation/LameXP_PL.ts
View File

File diff suppressed because it is too large Load Diff

16
etc/Translation/LameXP_RU.ts
View File

@ -1931,30 +1931,14 @@
<source> Opus Encoder Options </source>
<translation type="unfinished">Параметры кодера Opus</translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation type="unfinished">Оптимизация:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation type="unfinished">Сложность кодирования:</translation>
</message>
<message>
<source>Music</source>
<translation type="unfinished">Музыка</translation>
</message>
<message>
<source>(Undefined)</source>
<translation type="unfinished">Нет</translation>
</message>
<message>
<source>Frame Size:</source>
<translation type="unfinished">Размер кадра:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation type="unfinished">Экспериментальный перцептуальный режим</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation type="unfinished"></translation>

657
etc/Translation/LameXP_SV.ts
View File

File diff suppressed because it is too large Load Diff

16
etc/Translation/LameXP_TW.ts
View File

@ -1925,30 +1925,14 @@
<source> Opus Encoder Options </source>
<translation> Opus 編碼器選項 </translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation>優化信號類型:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation>編碼復雜度:</translation>
</message>
<message>
<source>Music</source>
<translation>音樂</translation>
</message>
<message>
<source>(Undefined)</source>
<translation>(未定義)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation>幀大小:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation>使用實驗編碼調整感知</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation>OpusEnc:</translation>

16
etc/Translation/LameXP_UK.ts
View File

@ -1926,30 +1926,14 @@
<source> Opus Encoder Options </source>
<translation>Налаштування кодера Opus</translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation>Оптимізувати відносно типу сигнала:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation>Складність кодування:</translation>
</message>
<message>
<source>Music</source>
<translation>Музика</translation>
</message>
<message>
<source>(Undefined)</source>
<translation>(Невизначено)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation>Розмір кадру:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation>Використовувати експериментальне сприйняттєве налагодження кодера</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation>OpusEnc:</translation>

16
etc/Translation/LameXP_ZH.ts
View File

@ -1925,30 +1925,14 @@
<source> Opus Encoder Options </source>
<translation> Opus 编码器选项 </translation>
</message>
<message>
<source>Optimize for Signal Type:</source>
<translation>优化信号类型:</translation>
</message>
<message>
<source>Encoding Complexity:</source>
<translation>编码复杂度:</translation>
</message>
<message>
<source>Music</source>
<translation>音乐</translation>
</message>
<message>
<source>(Undefined)</source>
<translation>(未定义)</translation>
</message>
<message>
<source>Frame Size:</source>
<translation>帧大小:</translation>
</message>
<message>
<source>Use Experimental Encoder Perceptual Tuning</source>
<translation>使用实验编码调整感知</translation>
</message>
<message>
<source>OpusEnc:</source>
<translation>OpusEnc:</translation>

156
gui/MainWindow.ui
View File

@ -1397,8 +1397,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>607</width>
<height>1762</height>
<width>604</width>
<height>1724</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
@ -3617,7 +3617,7 @@
<layout class="QGridLayout" name="gridLayout_40">
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_39">
<item row="1" column="0" rowspan="3">
<item row="1" column="0" rowspan="2">
<spacer name="horizontalSpacer_56">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -3633,7 +3633,7 @@
</property>
</spacer>
</item>
<item row="1" column="14" rowspan="3">
<item row="1" column="11" rowspan="2">
<spacer name="horizontalSpacer_57">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -3649,7 +3649,7 @@
</property>
</spacer>
</item>
<item row="0" column="1" colspan="13">
<item row="0" column="1" colspan="10">
<spacer name="verticalSpacer_33">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -3665,7 +3665,7 @@
</property>
</spacer>
</item>
<item row="4" column="1" colspan="13">
<item row="3" column="1" colspan="10">
<spacer name="verticalSpacer_34">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -3681,23 +3681,36 @@
</property>
</spacer>
</item>
<item row="2" column="1" colspan="13">
<spacer name="verticalSpacer_35">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="1" column="2" rowspan="2" colspan="2">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Encoding Complexity:</string>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</widget>
</item>
<item row="1" column="4" rowspan="2">
<widget class="QSpinBox" name="spinBoxOpusComplexity">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<property name="minimumSize">
<size>
<width>20</width>
<height>6</height>
<width>128</width>
<height>0</height>
</size>
</property>
</spacer>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="7">
<item row="1" column="5" rowspan="2">
<spacer name="horizontalSpacer_58">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -3710,20 +3723,7 @@
</property>
</spacer>
</item>
<item row="1" column="13">
<spacer name="horizontalSpacer_59">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="8" colspan="2">
<item row="1" column="6" rowspan="2" colspan="2">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Frame Size:</string>
@ -3733,20 +3733,7 @@
</property>
</widget>
</item>
<item row="3" column="8" colspan="2">
<widget class="QLabel" name="label_20">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Optimize for Signal Type:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="10" colspan="3">
<item row="1" column="8" rowspan="2" colspan="2">
<widget class="QComboBox" name="comboBoxOpusFramesize">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -3795,81 +3782,18 @@
</item>
</widget>
</item>
<item row="3" column="10" colspan="3">
<widget class="QComboBox" name="comboBoxOpusOptimize">
<property name="enabled">
<bool>false</bool>
<item row="1" column="10" rowspan="2">
<spacer name="horizontalSpacer_59">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="sizeHint" stdset="0">
<size>
<width>128</width>
<height>0</height>
<width>1</width>
<height>20</height>
</size>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Music</string>
</property>
</item>
<item>
<property name="text">
<string>Speech</string>
</property>
</item>
<item>
<property name="text">
<string>(Undefined)</string>
</property>
</item>
</widget>
</item>
<item row="3" column="3" colspan="4">
<widget class="QSpinBox" name="spinBoxOpusComplexity">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>128</width>
<height>0</height>
</size>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="6">
<widget class="QCheckBox" name="checkBoxOpusExpAnalysis">
<property name="text">
<string>Use Experimental Encoder Perceptual Tuning</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Encoding Complexity:</string>
</property>
</widget>
</spacer>
</item>
</layout>
</item>

3
res/Tools_Encd.qrc
View File

@ -11,7 +11,6 @@
<file>tools/oggenc2.i386.exe</file>
<file>tools/oggenc2.sse2.exe</file>
<file>tools/oggenc2.x64.exe</file>
<file>tools/opusenc_ea7.exe</file>
<file>tools/opusenc_std.exe</file>
<file>tools/opusenc.exe</file>
</qresource>
</RCC>

BIN
res/localization/LameXP_DE.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_ES.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_KR.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_PL.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_RU.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_SV.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_TW.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_UK.qm
View File

Binary file not shown.

BIN
res/localization/LameXP_ZH.qm
View File

Binary file not shown.

BIN
res/tools/opusdec.exe
View File

Binary file not shown.

BIN
res/tools/opusenc.exe Normal file
View File

Binary file not shown.

BIN
res/tools/opusenc_ea7.exe
View File

Binary file not shown.

BIN
res/tools/opusenc_std.exe
View File

Binary file not shown.

4
src/Config.h
View File

@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 1194
#define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 1196
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

17
src/Dialog_MainWindow.cpp
View File

@ -376,7 +376,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingMode());
comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompression());
comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationMode());
comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeFor());
//comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeFor());
comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesize());
SET_CHECKBOX_STATE(checkBoxBitrateManagement, m_settings->bitrateManagementEnabled());
@ -387,7 +387,6 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
SET_CHECKBOX_STATE(checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabled());
SET_CHECKBOX_STATE(checkBoxRenameOutput, m_settings->renameOutputFilesEnabled());
SET_CHECKBOX_STATE(checkBoxForceStereoDownmix, m_settings->forceStereoDownmix());
SET_CHECKBOX_STATE(checkBoxOpusExpAnalysis, m_settings->opusExpAnalysis());
checkBoxNeroAAC2PassMode->setEnabled(!(m_fhgEncoderAvailable || m_qaacEncoderAvailable));
lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
@ -451,10 +450,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
connect(lineEditRenamePattern, SIGNAL(textChanged(QString)), this, SLOT(renameOutputPatternChanged(QString)));
connect(labelShowRenameMacros, SIGNAL(linkActivated(QString)), this, SLOT(showRenameMacros(QString)));
connect(checkBoxForceStereoDownmix, SIGNAL(clicked(bool)), this, SLOT(forceStereoDownmixEnabledChanged(bool)));
connect(comboBoxOpusOptimize, SIGNAL(currentIndexChanged(int)), SLOT(opusSettingsChanged()));
connect(comboBoxOpusFramesize, SIGNAL(currentIndexChanged(int)), this, SLOT(opusSettingsChanged()));
connect(spinBoxOpusComplexity, SIGNAL(valueChanged(int)), this, SLOT(opusSettingsChanged()));
connect(checkBoxOpusExpAnalysis, SIGNAL(clicked(bool)), this, SLOT(opusSettingsChanged()));
//connect(comboBoxOpusOptimize, SIGNAL(currentIndexChanged(int)), SLOT(opusSettingsChanged()));
//connect(checkBoxOpusExpAnalysis, SIGNAL(clicked(bool)), this, SLOT(opusSettingsChanged()));
connect(m_overwriteButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(overwriteModeChanged(int)));
connect(m_evenFilterCustumParamsHelp, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(customParamsHelpRequested(QWidget*, QEvent*)));
@ -937,7 +936,7 @@ void MainWindow::changeEvent(QEvent *e)
comboBoxIndex[3] = comboBoxAftenCodingMode->currentIndex();
comboBoxIndex[4] = comboBoxAftenDRCMode->currentIndex();
comboBoxIndex[5] = comboBoxNormalizationMode->currentIndex();
comboBoxIndex[6] = comboBoxOpusOptimize->currentIndex();
comboBoxIndex[6] = 0; //comboBoxOpusOptimize->currentIndex();
comboBoxIndex[7] = comboBoxOpusFramesize->currentIndex();
//Re-translate from UIC
@ -950,7 +949,7 @@ void MainWindow::changeEvent(QEvent *e)
comboBoxAftenCodingMode->setCurrentIndex(comboBoxIndex[3]);
comboBoxAftenDRCMode->setCurrentIndex(comboBoxIndex[4]);
comboBoxNormalizationMode->setCurrentIndex(comboBoxIndex[5]);
comboBoxOpusOptimize->setCurrentIndex(comboBoxIndex[6]);
//comboBoxOpusOptimize->setCurrentIndex(comboBoxIndex[6]);
comboBoxOpusFramesize->setCurrentIndex(comboBoxIndex[7]);
//Update the window title
@ -3611,10 +3610,9 @@ void MainWindow::aftenFastAllocationChanged(bool checked)
*/
void MainWindow::opusSettingsChanged(void)
{
m_settings->opusOptimizeFor(comboBoxOpusOptimize->currentIndex());
m_settings->opusFramesize(comboBoxOpusFramesize->currentIndex());
m_settings->opusComplexity(spinBoxOpusComplexity->value());
m_settings->opusExpAnalysis(checkBoxOpusExpAnalysis->isChecked());
//m_settings->opusOptimizeFor(comboBoxOpusOptimize->currentIndex());
}
/*
@ -3987,7 +3985,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault());
comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault());
comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationModeDefault());
comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeForDefault());
//comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeForDefault());
comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesizeDefault());
SET_CHECKBOX_STATE(checkBoxBitrateManagement, m_settings->bitrateManagementEnabledDefault());
SET_CHECKBOX_STATE(checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2PassDefault());
@ -3997,7 +3995,6 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
SET_CHECKBOX_STATE(checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocationDefault());
SET_CHECKBOX_STATE(checkBoxRenameOutput, m_settings->renameOutputFilesEnabledDefault());
SET_CHECKBOX_STATE(checkBoxForceStereoDownmix, m_settings->forceStereoDownmixDefault());
SET_CHECKBOX_STATE(checkBoxOpusExpAnalysis, m_settings->opusExpAnalysisDefault());
lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault());
lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault());
lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEncDefault());

1
src/Dialog_Processing.cpp
View File

@ -1051,7 +1051,6 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
opusEncoder->setOptimizeFor(m_settings->opusOptimizeFor());
opusEncoder->setEncodeComplexity(m_settings->opusComplexity());
opusEncoder->setFrameSize(m_settings->opusFramesize());
opusEncoder->setExpAnalysisOn(m_settings->opusExpAnalysis());
opusEncoder->setCustomParams(m_settings->customParametersOpus());
encoder = opusEncoder;
}

13
src/Encoder_Opus.cpp
View File

@ -30,10 +30,9 @@
OpusEncoder::OpusEncoder(void)
:
m_binary_std(lamexp_lookup_tool("opusenc_std.exe")),
m_binary_ea7(lamexp_lookup_tool("opusenc_ea7.exe"))
m_binary(lamexp_lookup_tool("opusenc.exe"))
{
if(m_binary_std.isEmpty() || m_binary_ea7.isEmpty())
if(m_binary.isEmpty())
{
throw "Error initializing Opus encoder. Tool 'opusenc.exe' is not registred!";
}
@ -41,7 +40,6 @@ OpusEncoder::OpusEncoder(void)
m_configOptimizeFor = 0;
m_configEncodeComplexity = 10;
m_configFrameSize = 3;
m_configExpAnalysisOn = true;
}
OpusEncoder::~OpusEncoder(void)
@ -120,7 +118,7 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
args << QDir::toNativeSeparators(sourceFile);
args << QDir::toNativeSeparators(outputFile);
if(!startProcess(process, m_configExpAnalysisOn ? m_binary_ea7 : m_binary_std, args))
if(!startProcess(process, m_binary, args))
{
return false;
}
@ -203,11 +201,6 @@ void OpusEncoder::setFrameSize(int frameSize)
m_configFrameSize = qBound(0, frameSize, 5);
}
void OpusEncoder::setExpAnalysisOn(bool expAnalysisOn)
{
m_configExpAnalysisOn = expAnalysisOn;
}
QString OpusEncoder::extension(void)
{
return "opus";

5
src/Encoder_Opus.h
View File

@ -44,14 +44,11 @@ public:
virtual void setOptimizeFor(int optimizeFor);
virtual void setEncodeComplexity(int complexity);
virtual void setFrameSize(int frameSize);
virtual void setExpAnalysisOn(bool expAnalysisOn);
private:
const QString m_binary_std;
const QString m_binary_ea7;
const QString m_binary;
int m_configOptimizeFor;
int m_configEncodeComplexity;
int m_configFrameSize;
bool m_configExpAnalysisOn;
};

2
src/Model_Settings.cpp
View File

@ -105,7 +105,6 @@ LAMEXP_MAKE_ID(aacEncProfile, "AdvancedOptions/AACEnc/ForceProfile");
LAMEXP_MAKE_ID(opusOptimizeFor, "AdvancedOptions/Opus/OptimizeForSignalType");
LAMEXP_MAKE_ID(opusComplexity, "AdvancedOptions/Opus/EncodingComplexity");
LAMEXP_MAKE_ID(opusFramesize, "AdvancedOptions/Opus/FrameSize");
LAMEXP_MAKE_ID(opusExpAnalysis, "AdvancedOptions/Opus/EnableExpAnalysis");
LAMEXP_MAKE_ID(normalizationFilterEnabled, "AdvancedOptions/VolumeNormalization/Enabled");
LAMEXP_MAKE_ID(normalizationFilterMaxVolume, "AdvancedOptions/VolumeNormalization/MaxVolume");
LAMEXP_MAKE_ID(normalizationFilterEqualizationMode, "AdvancedOptions/VolumeNormalization/EqualizationMode");
@ -410,7 +409,6 @@ LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize, 8);
LAMEXP_MAKE_OPTION_I(opusOptimizeFor, 0);
LAMEXP_MAKE_OPTION_I(opusComplexity, 10);
LAMEXP_MAKE_OPTION_I(opusFramesize, 3);
LAMEXP_MAKE_OPTION_B(opusExpAnalysis, true);
LAMEXP_MAKE_OPTION_B(normalizationFilterEnabled, false)
LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume, -50)
LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode, 0);

1
src/Model_Settings.h
View File

@ -122,7 +122,6 @@ public:
LAMEXP_MAKE_OPTION_I(opusOptimizeFor);
LAMEXP_MAKE_OPTION_I(opusComplexity);
LAMEXP_MAKE_OPTION_I(opusFramesize);
LAMEXP_MAKE_OPTION_B(opusExpAnalysis);
LAMEXP_MAKE_OPTION_B(normalizationFilterEnabled);
LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume);
LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode);

5
src/Tools.h
View File

@ -72,9 +72,8 @@ g_lamexp_tools[] =
{"8b68461f38410421be30cc895e94e63184daa6f2cb20eb110b66b376b48141838a09bc920efeb1c49de79dd0770ce41b", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603},
{"20648f83cc637cada481143d48c437ced8423e9a0aae01dbce860cd97fb1ce4000e314f3a5395d1eafd8e154a8e74d08", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603},
{"e1da48055a57bae41d6a1a0dc08b86831c121e85c07aa60aae4196997b166a08cfb7265d9f0f289f445ad73bce28d81f", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 287603},
{"64bdd8ef4841a4b2e0937e5956d1f441fa40d33b60bbd5333314f2e02e7c50423ca2b4c301689ab34c1dc2d01a3ac8ad", CPU_TYPE_ALL_ALL, "opusdec.exe", 20120922},
{"4a44373491af8cb3e7620f5b0acfaa5c06839739869c93767e5036225b0a3d6399fb720f822970d6c7d186f5d84de918", CPU_TYPE_ALL_ALL, "opusenc_ea7.exe", 20120922},
{"a5dd4358277ed70e0abd80ddd7960c7e60c7720335b2f09cead35c068ce78e6583793574225ede57c00c800e241a4903", CPU_TYPE_ALL_ALL, "opusenc_std.exe", 20120922},
{"13c0026d61a53531183cc08d485a546cfc356fc224238a8681e643e7a29c40aa9b9bca8b95e38435c403782138866adc", CPU_TYPE_ALL_ALL, "opusdec.exe", 20121123},
{"bbfb49e665aa8fa6a94ebff1970a6d94216fc1a81243a6b5611a9307841752575658260c6767582e1f0f9d6c7718d821", CPU_TYPE_ALL_ALL, "opusenc.exe", 20121123},
{"bdfa8dec142b6327a33af6bb314d7beb924588d1b73f2ef3f46b31fa6046fe2f4e64ca78b025b7eb9290a78320e2aa57", CPU_TYPE_ALL_ALL, "refalac.exe", 56},
{"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361},
{"81633b4808ff13e25249aac038ed97570aaeea2bbffacf0f3905514064d1b82d141a6b04f63f1a913e4d09b2d892aea0", CPU_TYPE_ALL_ALL, "sox.exe", 1440},