mirror of https://git.ffmpeg.org/ffmpeg.git
Remove the ffserver test.
It doesn't work and is therefore useless.
This commit is contained in:
Anton Khirnov
parent
e5fc6ab665
commit
b4ea1c5a77
|
|
@ -1,5 +1,3 @@
|
|||
FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
|
||||
|
||||
AREF = fate-acodec-aref
|
||||
VREF = fate-vsynth1-vref fate-vsynth2-vref
|
||||
REFS = $(AREF) $(VREF)
|
||||
|
|
@ -7,13 +5,6 @@ REFS = $(AREF) $(VREF)
|
|||
$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
|
||||
$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
|
||||
|
||||
ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
|
||||
@echo
|
||||
@echo "Unfortunately ffserver is broken and therefore its regression"
|
||||
@echo "test fails randomly. Treat the results accordingly."
|
||||
@echo
|
||||
$(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
|
||||
|
||||
tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
|
||||
@mkdir -p tests/vsynth1
|
||||
$(M)./$< 'tests/vsynth1/'
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
|
||||
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
|
||||
|
||||
. $(dirname $0)/md5.sh
|
||||
|
||||
FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html)
|
||||
|
||||
rm -f tests/feed1.ffm
|
||||
./ffserver -d -f "$2" 2> /dev/null &
|
||||
FFSERVER_PID=$!
|
||||
echo "Waiting for feeds to startup..."
|
||||
sleep 2
|
||||
(
|
||||
cd tests/data || exit $?
|
||||
rm -f ff-* ffserver.regression
|
||||
WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
|
||||
for file in $FILES; do
|
||||
if [ $(expr $file : "a-*") != 0 ]; then
|
||||
wget $WGET_OPTIONS -O - http://localhost:9999/$file > ff-$file
|
||||
else
|
||||
wget $WGET_OPTIONS -O - http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null
|
||||
fi
|
||||
do_md5sum ff-$file >>ffserver.regression
|
||||
done
|
||||
)
|
||||
kill $FFSERVER_PID
|
||||
wait > /dev/null 2>&1
|
||||
rm -f tests/feed1.ffm
|
||||
if diff -u "$1" tests/data/ffserver.regression; then
|
||||
echo
|
||||
echo Server regression test succeeded.
|
||||
exit 0
|
||||
else
|
||||
echo
|
||||
echo Server regression test: Error.
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -1,307 +0,0 @@
|
|||
#
|
||||
# This is a test configuration file. You can invoke it with
|
||||
# ../ffserver -f ffserver.conf
|
||||
# when in the tests directory and once the vsynth1 subdirectory
|
||||
# has been populated. Then point your browser at http://whatever:9999/teststat.html
|
||||
# and you can look at the streams
|
||||
#
|
||||
|
||||
#
|
||||
# Port on which the server is listening. You must select a different
|
||||
# port from your standard http web server if it is running on the same
|
||||
# computer.
|
||||
|
||||
Port 9999
|
||||
RTSPPort 9990
|
||||
|
||||
# Address on which the server is bound. Only useful if you have
|
||||
# several network interfaces.
|
||||
|
||||
BindAddress 0.0.0.0
|
||||
|
||||
# Number of simultaneous requests that can be handled. Since FFServer
|
||||
# is very fast, this limit is determined mainly by your Internet
|
||||
# connection speed.
|
||||
|
||||
MaxClients 1000
|
||||
|
||||
MaxBandwidth 100000
|
||||
|
||||
# Access Log file (uses standard Apache log file format)
|
||||
# '-' is the standard output
|
||||
|
||||
CustomLog -
|
||||
|
||||
##################################################################
|
||||
# Definition of the live feeds. Each live feed contains one video
|
||||
# and/or audio sequence coming from an ffmpeg encoder or another
|
||||
# ffserver. This sequence may be encoded simultaneously with several
|
||||
# codecs at several resolutions.
|
||||
|
||||
<Feed feed1.ffm>
|
||||
|
||||
# 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
|
||||
# previously recorded live stream. The request should contain:
|
||||
# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify
|
||||
# a path where the feed is stored on disk. You also specify the
|
||||
# maximum size of the feed (100M bytes here). Default:
|
||||
# File=/tmp/feed_name.ffm FileMaxSize=5M
|
||||
|
||||
File tests/feed1.ffm
|
||||
FileMaxSize 100M
|
||||
|
||||
# Fire up ffmpeg pointing at this stream
|
||||
|
||||
Launch ./ffmpeg -v 0 -y -f pgmyuv -i tests/vsynth1/%02d.pgm
|
||||
|
||||
ACL allow localhost
|
||||
</Feed>
|
||||
|
||||
##################################################################
|
||||
# Now you can define each stream which will be generated from the
|
||||
# original audio and video stream. Each format has a filename (here
|
||||
# 'test128.mpg'). FFServer will send this stream when answering a
|
||||
# request containing this filename.
|
||||
|
||||
<Stream test_h.avi>
|
||||
Feed feed1.ffm
|
||||
Format avi
|
||||
#
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
VideoFrameRate 10
|
||||
VideoSize 352x288
|
||||
VideoBitRate 100
|
||||
VideoGopSize 30
|
||||
NoAudio
|
||||
|
||||
PreRoll 10
|
||||
StartSendOnKey
|
||||
MaxTime 100
|
||||
|
||||
</Stream>
|
||||
|
||||
<Stream test_l.avi>
|
||||
Feed feed1.ffm
|
||||
Format avi
|
||||
#
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
VideoFrameRate 2
|
||||
VideoSize 320x240
|
||||
VideoBitRate 40
|
||||
VideoGopSize 20
|
||||
NoAudio
|
||||
|
||||
PreRoll 20
|
||||
StartSendOnKey
|
||||
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>
|
||||
|
||||
<Stream test_h.asf>
|
||||
Feed feed1.ffm
|
||||
Format asf
|
||||
#
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
Qscale 10
|
||||
VideoFrameRate 10
|
||||
VideoSize 320x240
|
||||
VideoBitRate 100
|
||||
VideoGopSize 30
|
||||
NoAudio
|
||||
|
||||
PreRoll 10
|
||||
StartSendOnKey
|
||||
MaxTime 100
|
||||
|
||||
Title "Test data stream"
|
||||
|
||||
</Stream>
|
||||
|
||||
<Stream test_l.asf>
|
||||
Feed feed1.ffm
|
||||
Format asf
|
||||
#
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
Qscale 10
|
||||
VideoFrameRate 2
|
||||
VideoSize 320x240
|
||||
VideoBitRate 40
|
||||
VideoGopSize 20
|
||||
NoAudio
|
||||
|
||||
PreRoll 20
|
||||
StartSendOnKey
|
||||
MaxTime 100
|
||||
|
||||
Title "Test data stream"
|
||||
|
||||
</Stream>
|
||||
|
||||
<Stream test_h.rm>
|
||||
|
||||
Feed feed1.ffm
|
||||
Format rm
|
||||
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
Qscale 10
|
||||
VideoBitRate 100
|
||||
VideoFrameRate 10
|
||||
VideoGopSize 30
|
||||
VideoSize 320x240
|
||||
NoAudio
|
||||
|
||||
PreRoll 10
|
||||
StartSendOnKey
|
||||
MaxTime 100
|
||||
|
||||
</Stream>
|
||||
|
||||
<Stream test_l.rm>
|
||||
|
||||
Feed feed1.ffm
|
||||
Format rm
|
||||
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
Qscale 10
|
||||
VideoBitRate 40
|
||||
VideoFrameRate 2
|
||||
VideoGopSize 20
|
||||
VideoSize 320x240
|
||||
NoAudio
|
||||
|
||||
PreRoll 20
|
||||
StartSendOnKey
|
||||
MaxTime 100
|
||||
|
||||
</Stream>
|
||||
|
||||
|
||||
<Stream test.jpg>
|
||||
|
||||
Feed feed1.ffm
|
||||
Format jpeg
|
||||
Strict -1
|
||||
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
VideoFrameRate 1
|
||||
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
|
||||
|
||||
</Stream>
|
||||
|
||||
<Stream test.mjpg>
|
||||
|
||||
Feed feed1.ffm
|
||||
Format mpjpeg
|
||||
Strict -1
|
||||
|
||||
BitExact
|
||||
DctFastint
|
||||
IdctSimple
|
||||
VideoFrameRate 1
|
||||
VideoSize 320x240
|
||||
NoAudio
|
||||
StartSendOnKey
|
||||
|
||||
PreRoll 1
|
||||
MaxTime 100
|
||||
|
||||
</Stream>
|
||||
|
||||
|
||||
##################################################################
|
||||
# Special stream : server status
|
||||
|
||||
<Stream teststat.html>
|
||||
|
||||
Format status
|
||||
|
||||
</Stream>
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
18c4ba0e8e7adb781216e38de61c2e39 ff-test_h.avi
|
||||
f84767c7af61f360f4b443c2c73f322f ff-test_l.avi
|
||||
d976848a9e4d5d8fc2659e4841cdece5 ff-test.swf
|
||||
28fd87d5075b9b011aad57292f271a04 ff-test_h.asf
|
||||
a31ccd3aba2551e60b9fb1c156fca2f8 ff-test_l.asf
|
||||
3279d3ed0ef2d1347b5eda84db2cf3e6 ff-test_h.rm
|
||||
440231fe3cf0849887390b4d67d6894a ff-test_l.rm
|
||||
e0dc91430660c619e97b5c82e0f398fc ff-test.jpg
|
||||
0d6c98fc8a4f00560fe34e94e26880a9 ff-test_small.jpg
|
||||
e2a315d7ac0576279f8b4d917999615a ff-test.mjpg
|
||||
Loading…
Reference in New Issue