summaryrefslogtreecommitdiff
path: root/tests/test.conf
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2002-12-12 19:53:05 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2002-12-12 19:53:05 +0000
commite2b2851e5aaba85c42ba527a47375f93abe361df (patch)
treed57a3f18c230f3b099470c9de9555e6c42cf3260 /tests/test.conf
parent96d9cb220b3705cfb9e82befaedb72b6accc1240 (diff)
First shot at the ffserver regression tests. All feedback received with
interest Originally committed as revision 1336 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/test.conf')
-rw-r--r--tests/test.conf78
1 files changed, 68 insertions, 10 deletions
diff --git a/tests/test.conf b/tests/test.conf
index af0327a989..028eea4ab8 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -51,7 +51,7 @@ CustomLog -
# File=/tmp/feed_name.ffm FileMaxSize=5M
File /tmp/feed.ffm
-FileMaxSize 10M
+FileMaxSize 100M
# Fire up ffmpeg pointing at this stream
@@ -70,14 +70,14 @@ Feed feed1.ffm
Format avi
#
VideoFrameRate 10
-VideoSize 320x240
+VideoSize 352x288
VideoBitRate 100
VideoGopSize 30
NoAudio
PreRoll 10
StartSendOnKey
-MaxTime 1000
+MaxTime 100
</Stream>
@@ -93,7 +93,52 @@ 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
+#
+VideoFrameRate 10
+VideoSize 352x288
+VideoBitRate 100
+VideoGopSize 30
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
</Stream>
@@ -109,7 +154,7 @@ NoAudio
PreRoll 10
StartSendOnKey
-MaxTime 1000
+MaxTime 100
Title "Test data stream"
@@ -127,7 +172,7 @@ NoAudio
PreRoll 20
StartSendOnKey
-MaxTime 1000
+MaxTime 100
Title "Test data stream"
@@ -146,7 +191,7 @@ NoAudio
PreRoll 10
StartSendOnKey
-MaxTime 1000
+MaxTime 100
</Stream>
@@ -163,7 +208,7 @@ NoAudio
PreRoll 20
StartSendOnKey
-MaxTime 1000
+MaxTime 100
</Stream>
@@ -174,7 +219,20 @@ Feed feed1.ffm
Format singlejpeg
VideoFrameRate 1
-VideoSize 320x240
+VideoSize 352x288
+NoAudio
+
+PreRoll 2
+
+</Stream>
+
+<Stream test_small.jpg>
+
+Feed feed1.ffm
+Format singlejpeg
+
+VideoFrameRate 1
+VideoSize 160x128
NoAudio
PreRoll 2
@@ -192,7 +250,7 @@ NoAudio
StartSendOnKey
PreRoll 1
-MaxTime 1000
+MaxTime 100
</Stream>