[Scummvm-cvs-logs] SF.net SVN: scummvm:[48916] tools/trunk/compress.cpp

[criezy at users.sourceforge.net]

Revision: 48916
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48916&view=rev
Author:   criezy
Date:     2010-05-03 16:50:47 +0000 (Mon, 03 May 2010)

Log Message:
-----------
Remove rounding to multiples of 8 for ogg encoding bitrates.

This was introduced in GSoC 2007 to mimic what was done for MP3 encoding I think. But while the lame documentation says this must effectively be the case for lame, I didn't see any such limitations for oggenc, the Ogg Vorbis library or the Tremor library.

Modified Paths:
--------------
    tools/trunk/compress.cpp

Modified: tools/trunk/compress.cpp
===================================================================
--- tools/trunk/compress.cpp	2010-05-03 16:47:09 UTC (rev 48915)
+++ tools/trunk/compress.cpp	2010-05-03 16:50:47 UTC (rev 48916)
@@ -872,9 +872,6 @@
 
 	if (oggparms.minBitr == 0 && arg != "0")
 		throw ToolException("Minimum bitrate (-m) must be a number.");
-
-	if ((oggparms.minBitr % 8) != 0)
-		oggparms.minBitr -= oggparms.minBitr % 8;
 	
 	if (oggparms.minBitr < 8 || oggparms.minBitr > 160)
 		throw ToolException("Minimum bitrate out of bounds (-m), must be between 8 and 160.");
@@ -886,9 +883,6 @@
 	if (oggparms.nominalBitr == 0 && arg != "0")
 		throw ToolException("Nominal bitrate (-b) must be a number.");
 
-	if ((oggparms.nominalBitr % 8) != 0)
-		oggparms.nominalBitr -= oggparms.nominalBitr % 8;
-
 	if (oggparms.nominalBitr < 8 || oggparms.nominalBitr > 160)
 		throw ToolException("Nominal bitrate out of bounds (-b), must be between 8 and 160.");
 }
@@ -899,9 +893,6 @@
 	if (oggparms.maxBitr == 0 && arg != "0")
 		throw ToolException("Maximum bitrate (-M) must be a number.");
 
-	if ((oggparms.maxBitr % 8) != 0)
-		oggparms.maxBitr -= oggparms.maxBitr % 8;
-
 	if (oggparms.maxBitr < 8 || oggparms.maxBitr > 160)
 		throw ToolException("Maximum bitrate out of bounds (-M), must be between 8 and 160.");
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.