Check dia size a little more. Fixes CID80.

[ffmpeg] / tests / test.conf

diff --git a/tests/test.conf b/tests/test.conf
index af0327a98945946d111c44a7cecad730d95b5e9e..b5f2095ee0c1182c5cab386cab752b66a4a1d491 100644 (file)
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -25,6 +25,8 @@ BindAddress 0.0.0.0
 
 MaxClients 1000
 
+MaxBandwidth 100000
+
 # Access Log file (uses standard Apache log file format)
 # '-' is the standard output
 
@@ -40,7 +42,7 @@ CustomLog -
 
 # You must use 'ffmpeg' to send a live feed to ffserver. In this
 # example, you can type:
-# 
+#
 # ffmpeg http://localhost:8090/feed1.ffm
 
 # ffserver can also do time shifting. It means that it can stream any
@@ -50,13 +52,14 @@ CustomLog -
 # maximum size of the feed (100M bytes here). Default:
 # File=/tmp/feed_name.ffm FileMaxSize=5M
 
-File /tmp/feed.ffm
-FileMaxSize 10M
+File tests/feed1.ffm
+FileMaxSize 100M
 
 # Fire up ffmpeg pointing at this stream
 
-Launch -em_rate -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%125*d.pgm
-acl allow localhost
+Launch ./ffmpeg -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm
+
+ACL allow localhost
 </Feed>
 
 ##################################################################
@@ -69,15 +72,18 @@ acl allow localhost
 Feed feed1.ffm
 Format avi
 #
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 10
-VideoSize 320x240
+VideoSize 352x288
 VideoBitRate 100
 VideoGopSize 30
 NoAudio
 
 PreRoll 10
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
 
 </Stream>
 
@@ -85,6 +91,9 @@ MaxTime 1000
 Feed feed1.ffm
 Format avi
 #
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 2
 VideoSize 320x240
 VideoBitRate 40
@@ -93,7 +102,56 @@ NoAudio
 
 PreRoll 20
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
+
+</Stream>
+
+#<Stream test_h.mpg>
+#Feed feed1.ffm
+#
+#VideoFrameRate 10
+#VideoSize 352x288
+#VideoBitRate 100
+#VideoGopSize 30
+#NoAudio
+
+#PreRoll 10
+#StartSendOnKey
+#MaxTime 100
+#
+#</Stream>
+#
+#<Stream test_l.mpg>
+#Feed feed1.ffm
+##
+#VideoFrameRate 2
+#VideoSize 320x240
+#VideoBitRate 40
+#VideoGopSize 20
+#NoAudio
+#
+#PreRoll 20
+#StartSendOnKey
+#MaxTime 100
+#
+#</Stream>
+#
+<Stream test.swf>
+Feed feed1.ffm
+#
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoFrameRate 10
+VideoSize 352x288
+VideoBitRate 100
+VideoGopSize 30
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
 
 </Stream>
 
@@ -101,6 +159,10 @@ MaxTime 1000
 Feed feed1.ffm
 Format asf
 #
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoFrameRate 10
 VideoSize 320x240
 VideoBitRate 100
@@ -109,7 +171,7 @@ NoAudio
 
 PreRoll 10
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
 
 Title "Test data stream"
 
@@ -119,6 +181,10 @@ Title "Test data stream"
 Feed feed1.ffm
 Format asf
 #
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoFrameRate 2
 VideoSize 320x240
 VideoBitRate 40
@@ -127,7 +193,7 @@ NoAudio
 
 PreRoll 20
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
 
 Title "Test data stream"
 
@@ -138,6 +204,10 @@ Title "Test data stream"
 Feed feed1.ffm
 Format rm
 
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoBitRate 100
 VideoFrameRate 10
 VideoGopSize 30
@@ -146,7 +216,7 @@ NoAudio
 
 PreRoll 10
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
 
 </Stream>
 
@@ -155,6 +225,10 @@ MaxTime 1000
 Feed feed1.ffm
 Format rm
 
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoBitRate 40
 VideoFrameRate 2
 VideoGopSize 20
@@ -163,7 +237,7 @@ NoAudio
 
 PreRoll 20
 StartSendOnKey
-MaxTime 1000
+MaxTime 100
 
 </Stream>
 
@@ -171,10 +245,31 @@ MaxTime 1000
 <Stream test.jpg>
 
 Feed feed1.ffm
-Format singlejpeg
+Format jpeg
+Strict -1
 
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 1
-VideoSize    320x240
+VideoSize 352x288
+NoAudio
+
+PreRoll 2
+
+</Stream>
+
+<Stream test_small.jpg>
+
+Feed feed1.ffm
+Format jpeg
+Strict -1
+
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 1
+VideoSize 160x128
 NoAudio
 
 PreRoll 2
@@ -185,14 +280,18 @@ PreRoll 2
 
 Feed feed1.ffm
 Format mpjpeg
+Strict -1
 
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 1
 VideoSize    320x240
 NoAudio
 StartSendOnKey
 
 PreRoll 1
-MaxTime 1000
+MaxTime 100
 
 </Stream>