ScummVM/scummvm-tools
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-tools.git synced 2026-05-21 05:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

TOOLS: Accept quality of -1 for ogg compression

Browse Source 
The tool was only accepting integer quality between 0 and 10.
However the documentation for oggenc and libvorbisenc states
that the valid range is between -1 and 10 and that fractional values
are also valid. Now the CLI tools does the same. I have not changed
the GUI.

svn-id: r52097
This commit is contained in:
Thierry Crozat
2010-08-15 11:20:23 +00:00
parent 27cb1e1999
commit 4073a8ec43
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compress.cpp
+5 -5
View File
@@ -372,7 +372,7 @@ void CompressionTool::encodeRaw(const char *rawData, int length, int samplerate,
} else {
int result = 0;
/* Quality input is 1 - 10, function takes -0.1 through 1.0 */
/* Quality input is -1 - 10, function takes -0.1 through 1.0 */
result = vorbis_encode_setup_vbr(&vi, numChannels, samplerate, oggparms.quality * 0.1f);
if (result == OV_EFAULT) {
@@ -885,13 +885,13 @@ void CompressionTool::setFlacBlockSize(const std::string& arg) {
// vorbis
void CompressionTool::setOggQuality(const std::string& arg) {
oggparms.quality = (float)atoi(arg.c_str());
oggparms.quality = (float)atof(arg.c_str());
if (oggparms.quality == 0. && arg != "0")
throw ToolException("Quality (-q) must be a number.");
if (oggparms.quality < 0. || oggparms.quality > 10.)
throw ToolException("Quality out of bounds (-q), must be between 0 and 10.");
if (oggparms.quality < -1.f || oggparms.quality > 10.f)
throw ToolException("Quality out of bounds (-q), must be between -1 and 10.");
}
void CompressionTool::setOggMinBitrate(const std::string& arg) {
@@ -1169,7 +1169,7 @@ std::string CompressionTool::getHelp() const {
os << " -b <rate> <rate> is the nominal bitrate (default:unset)\n";
os << " -m <rate> <rate> is the minimum bitrate (default:unset)\n";
os << " -M <rate> <rate> is the maximum bitrate (default:unset)\n";
os << " -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:" << oggqualDef << ")\n";
os << " -q <value> specifies the value (-1 - 10) of VBR quality (10=best) (default:" << oggqualDef << ")\n";
os << " --silent the output of oggenc is hidden (default:disabled)\n";
}