X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2FEncoder_FLAC.cpp;h=a2f51ea9c5209582be47e7de0bce91c76161d47f;hb=781314ce09d97adc894a5cccf835054d877beb3b;hp=ae3133b37b50e460c696a0f7188fa0e88cb11a20;hpb=dba6d2fb3ec9961b8090c3ca2c92bcc850e0e0b7;p=lamexp%2FLameXP.git diff --git a/src/Encoder_FLAC.cpp b/src/Encoder_FLAC.cpp index ae3133b3..a2f51ea9 100644 --- a/src/Encoder_FLAC.cpp +++ b/src/Encoder_FLAC.cpp @@ -1,11 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2011 LoRd_MuldeR +// Copyright (C) 2004-2020 LoRd_MuldeR // // 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 // the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// (at your option) any later version; always including the non-optional +// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "License.txt" file! // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,16 +28,106 @@ #include #include -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) +/////////////////////////////////////////////////////////////////////////////// +// Encoder Info +/////////////////////////////////////////////////////////////////////////////// + +class FLACEncoderInfo : public AbstractEncoderInfo +{ +public: + virtual bool isModeSupported(int mode) const + { + switch(mode) + { + case SettingsModel::VBRMode: + return true; + break; + case SettingsModel::ABRMode: + case SettingsModel::CBRMode: + return false; + break; + default: + MUTILS_THROW("Bad RC mode specified!"); + } + } + + virtual int valueCount(int mode) const + { + switch(mode) + { + case SettingsModel::VBRMode: + return 9; + break; + case SettingsModel::ABRMode: + case SettingsModel::CBRMode: + return 0; + break; + default: + MUTILS_THROW("Bad RC mode specified!"); + } + } + + virtual int valueAt(int mode, int index) const + { + switch(mode) + { + case SettingsModel::VBRMode: + return qBound(0, index, 8); + break; + case SettingsModel::ABRMode: + case SettingsModel::CBRMode: + return -1; + break; + default: + MUTILS_THROW("Bad RC mode specified!"); + } + } + + virtual int valueType(int mode) const + { + switch(mode) + { + case SettingsModel::VBRMode: + return TYPE_COMPRESSION_LEVEL; + break; + case SettingsModel::ABRMode: + case SettingsModel::CBRMode: + return -1; + default: + MUTILS_THROW("Bad RC mode specified!"); + } + } + + virtual const char *description(void) const + { + static const char* s_description = "Free Lossless Audio Codec (FLAC)"; + return s_description; + } + + virtual const char *extension(void) const + { + static const char* s_extension = "flac"; + return s_extension; + } + + virtual bool isResamplingSupported(void) const + { + return false; + } +} +static const g_flacEncoderInfo; + +/////////////////////////////////////////////////////////////////////////////// +// Encoder implementation +/////////////////////////////////////////////////////////////////////////////// FLACEncoder::FLACEncoder(void) : - m_binary(lamexp_lookup_tool("flac.exe")) + m_binary(lamexp_tools_lookup(L1S("flac.exe"))) { if(m_binary.isEmpty()) { - throw "Error initializing FLAC encoder. Tool 'flac.exe' is not registred!"; + MUTILS_THROW("Error initializing FLAC encoder. Tool 'flac.exe' is not registred!"); } } @@ -44,27 +135,28 @@ FLACEncoder::~FLACEncoder(void) { } -bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag) +bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, QAtomicInt &abortFlag) { QProcess process; QStringList args; - args << QString("-%1").arg(QString::number(max(0, min(8, m_configBitrate)))); + args << QString("-%1").arg(QString::number(qBound(0, m_configBitrate, 8))); + args << L1S("--channel-map=none"); - if(!metaInfo.fileName().isEmpty()) args << "-T" << QString("title=%1").arg(metaInfo.fileName()); - if(!metaInfo.fileArtist().isEmpty()) args << "-T" << QString("artist=%1").arg(metaInfo.fileArtist()); - if(!metaInfo.fileAlbum().isEmpty()) args << "-T" << QString("album=%1").arg(metaInfo.fileAlbum()); - if(!metaInfo.fileGenre().isEmpty()) args << "-T" << QString("genre=%1").arg(metaInfo.fileGenre()); - if(!metaInfo.fileComment().isEmpty()) args << "-T" << QString("comment=%1").arg(metaInfo.fileComment()); - if(metaInfo.fileYear()) args << "-T" << QString("date=%1").arg(QString::number(metaInfo.fileYear())); - if(metaInfo.filePosition()) args << "-T" << QString("track=%1").arg(QString::number(metaInfo.filePosition())); - if(!metaInfo.fileCover().isEmpty()) args << QString("--picture=%1").arg(metaInfo.fileCover()); + if(!metaInfo.title().isEmpty()) args << L1S("-T") << QString("title=%1").arg(cleanTag(metaInfo.title())); + if(!metaInfo.artist().isEmpty()) args << L1S("-T") << QString("artist=%1").arg(cleanTag(metaInfo.artist())); + if(!metaInfo.album().isEmpty()) args << L1S("-T") << QString("album=%1").arg(cleanTag(metaInfo.album())); + if(!metaInfo.genre().isEmpty()) args << L1S("-T") << QString("genre=%1").arg(cleanTag(metaInfo.genre())); + if(!metaInfo.comment().isEmpty()) args << L1S("-T") << QString("comment=%1").arg(cleanTag(metaInfo.comment())); + if(metaInfo.year()) args << L1S("-T") << QString("date=%1").arg(QString::number(metaInfo.year())); + if(metaInfo.position()) args << L1S("-T") << QString("track=%1").arg(QString::number(metaInfo.position())); + if(!metaInfo.cover().isEmpty()) args << QString("--picture=%1").arg(metaInfo.cover()); //args << "--tv" << QString().sprintf("Encoder=LameXP v%d.%02d.%04d [%s]", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build(), lamexp_version_release()); if(!m_configCustomParams.isEmpty()) args << m_configCustomParams.split(" ", QString::SkipEmptyParts); - args << "-f" << "-o" << QDir::toNativeSeparators(outputFile); + args << L1S("-f") << L1S("-o") << QDir::toNativeSeparators(outputFile); args << QDir::toNativeSeparators(sourceFile); if(!startProcess(process, m_binary, args)) @@ -72,74 +164,35 @@ bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn return false; } - bool bTimeout = false; - bool bAborted = false; - - QRegExp regExp("\\s(\\d+)% complete"); + int prevProgress = -1; + QRegExp regExp(L1S("\\b(\\d+)% complete")); - while(process.state() != QProcess::NotRunning) + const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, ®Exp](const QString &text) { - if(*abortFlag) + if (regExp.lastIndexIn(text) >= 0) { - process.kill(); - bAborted = true; - emit messageLogged("\nABORTED BY USER !!!"); - break; - } - process.waitForReadyRead(); - if(!process.bytesAvailable() && process.state() == QProcess::Running) - { - process.kill(); - qWarning("FLAC process timed out <-- killing!"); - emit messageLogged("\nPROCESS TIMEOUT !!!"); - bTimeout = true; - break; - } - while(process.bytesAvailable() > 0) - { - QByteArray line = process.readLine(); - QString text = QString::fromUtf8(line.constData()).simplified(); - if(regExp.lastIndexIn(text) >= 0) - { - bool ok = false; - int progress = regExp.cap(1).toInt(&ok); - if(ok) emit statusUpdated(progress); - } - else if(!text.isEmpty()) + qint32 newProgress; + if (MUtils::regexp_parse_int32(regExp, newProgress)) { - emit messageLogged(text); + if (newProgress > prevProgress) + { + emit statusUpdated(newProgress); + prevProgress = NEXT_PROGRESS(newProgress); + } } + return true; } - } - - process.waitForFinished(); - if(process.state() != QProcess::NotRunning) - { - process.kill(); - process.waitForFinished(-1); - } - - emit statusUpdated(100); - emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode())); - - if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit) - { return false; - } - - return true; -} + }); -QString FLACEncoder::extension(void) -{ - return "flac"; + return (result == RESULT_SUCCESS); } bool FLACEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion) { - if(containerType.compare("Wave", Qt::CaseInsensitive) == 0) + if(containerType.compare(L1S("Wave"), Qt::CaseInsensitive) == 0) { - if(formatType.compare("PCM", Qt::CaseInsensitive) == 0) + if(formatType.compare(L1S("PCM"), Qt::CaseInsensitive) == 0) { return true; } @@ -147,3 +200,20 @@ bool FLACEncoder::isFormatSupported(const QString &containerType, const QString return false; } + +const unsigned int *FLACEncoder::supportedChannelCount(void) +{ + static const unsigned int supportedChannels[] = {2, 4, 5, 6, 7, 8, NULL}; + return supportedChannels; +} + +const unsigned int *FLACEncoder::supportedBitdepths(void) +{ + static const unsigned int supportedBPS[] = {16, 24, NULL}; + return supportedBPS; +} + +const AbstractEncoderInfo *FLACEncoder::getEncoderInfo(void) +{ + return &g_flacEncoderInfo; +}