Make "-fs ss" mean "make output file of size equals or less than ss"
authorVitor Sessak <vitor1001@gmail.com>
Mon, 23 Aug 2010 14:46:59 +0000 (14:46 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Mon, 23 Aug 2010 14:46:59 +0000 (14:46 +0000)
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c
tests/fate/mp3.mak

index 9e2e4cb..2dd575d 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2538,7 +2538,7 @@ static int transcode(AVFormatContext **output_files,
         }
 
         /* finish if limit size exhausted */
-        if (limit_filesize != 0 && limit_filesize < url_ftell(output_files[0]->pb))
+        if (limit_filesize != 0 && limit_filesize <= url_ftell(output_files[0]->pb))
             break;
 
         /* read a frame from it and output it in the fifo */
index 4177934..859a4f3 100644 (file)
@@ -4,32 +4,32 @@ fate-mp3-float-conf-compl: CMP = stddev
 fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_32khz
-fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float  -fs 343295 -i $(SAMPLES)/mp3-conformance/he_32khz.bit
+fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float  -fs 343296 -i $(SAMPLES)/mp3-conformance/he_32khz.bit
 fate-mp3-float-conf-he_32khz: CMP = stddev
 fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_44khz
-fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -fs 942335 -i $(SAMPLES)/mp3-conformance/he_44khz.bit
+fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -fs 942336 -i $(SAMPLES)/mp3-conformance/he_44khz.bit
 fate-mp3-float-conf-he_44khz: CMP = stddev
 fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_48khz
-fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -fs 343295 -i $(SAMPLES)/mp3-conformance/he_48khz.bit
+fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -fs 343296 -i $(SAMPLES)/mp3-conformance/he_48khz.bit
 fate-mp3-float-conf-he_48khz: CMP = stddev
 fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-hecommon
-fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -fs 133630 -i $(SAMPLES)/mp3-conformance/hecommon.bit
+fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -fs 133632 -i $(SAMPLES)/mp3-conformance/hecommon.bit
 fate-mp3-float-conf-hecommon: CMP = stddev
 fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm
 
 FATE_MP3 += fate-mp3-float-conf-si
-fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -fs 269567 -i $(SAMPLES)/mp3-conformance/si.bit
+fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -fs 269568 -i $(SAMPLES)/mp3-conformance/si.bit
 fate-mp3-float-conf-si: CMP = stddev
 fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm
 
 FATE_MP3 += fate-mp3-float-conf-si_block
-fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -fs 145151 -i $(SAMPLES)/mp3-conformance/si_block.bit
+fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -fs 145152 -i $(SAMPLES)/mp3-conformance/si_block.bit
 fate-mp3-float-conf-si_block: CMP = stddev
 fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm