diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avplay.texi | 2 | ||||
| -rw-r--r-- | doc/avprobe.texi | 2 | ||||
| -rw-r--r-- | doc/avserver.conf (renamed from doc/ffserver.conf) | 14 | ||||
| -rw-r--r-- | doc/avserver.texi (renamed from doc/ffserver.texi) | 60 | ||||
| -rw-r--r-- | doc/ffmpeg.texi | 6 | ||||
| -rw-r--r-- | doc/general.texi | 2 |
6 files changed, 43 insertions, 43 deletions
diff --git a/doc/avplay.texi b/doc/avplay.texi index e8446b7..ff0b8f8 100644 --- a/doc/avplay.texi +++ b/doc/avplay.texi @@ -170,7 +170,7 @@ Seek to percentage in file corresponding to fraction of width. @settitle AVplay media player @c man begin SEEALSO -ffmpeg(1), avprobe(1), ffserver(1) and the Libav HTML documentation +ffmpeg(1), avprobe(1), avserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/avprobe.texi b/doc/avprobe.texi index 003f5e6..a0497de 100644 --- a/doc/avprobe.texi +++ b/doc/avprobe.texi @@ -122,7 +122,7 @@ with name "STREAM". @settitle avprobe media prober @c man begin SEEALSO -ffmpeg(1), avplay(1), ffserver(1) and the Libav HTML documentation +ffmpeg(1), avplay(1), avserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/ffserver.conf b/doc/avserver.conf index 62728b0..2105ac5 100644 --- a/doc/ffserver.conf +++ b/doc/avserver.conf @@ -12,7 +12,7 @@ BindAddress 0.0.0.0 # MaxClients maximum limit. MaxHTTPConnections 2000 -# Number of simultaneous requests that can be handled. Since FFServer +# Number of simultaneous requests that can be handled. Since AVServer # is very fast, it is more likely that you will want to leave this high # and use MaxBandwidth, below. MaxClients 1000 @@ -25,24 +25,24 @@ MaxBandwidth 1000 # '-' is the standard output. CustomLog - -# Suppress that if you want to launch ffserver as a daemon. +# Suppress that if you want to launch avserver as a daemon. NoDaemon ################################################################## # 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 +# avserver. 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 +# You must use 'ffmpeg' to send a live feed to avserver. 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 +# avserver 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 @@ -69,7 +69,7 @@ ACL allow 127.0.0.1 ################################################################## # Now you can define each stream which will be generated from the # original audio and video stream. Each format has a filename (here -# 'test1.mpg'). FFServer will send this stream when answering a +# 'test1.mpg'). AVServer will send this stream when answering a # request containing this filename. <Stream test1.mpg> @@ -334,7 +334,7 @@ StartSendOnKey # multicast address with MulticastAddress. The port and the TTL can # also be set. # -# An SDP file is automatically generated by ffserver by adding the +# An SDP file is automatically generated by avserver by adding the # 'sdp' extension to the stream name (here # http://localhost:8090/test1-sdp.sdp). You should usually give this # file to your player to play the stream. diff --git a/doc/ffserver.texi b/doc/avserver.texi index 05e5297..ad0eb46 100644 --- a/doc/ffserver.texi +++ b/doc/avserver.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle ffserver Documentation +@settitle avserver Documentation @titlepage -@center @titlefont{ffserver Documentation} +@center @titlefont{avserver Documentation} @end titlepage @top @@ -15,37 +15,37 @@ The generic syntax is: @example @c man begin SYNOPSIS -ffserver [options] +avserver [options] @c man end @end example @chapter Description @c man begin DESCRIPTION -ffserver is a streaming server for both audio and video. It supports +avserver is a streaming server for both audio and video. It supports several live feeds, streaming from files and time shifting on live feeds (you can seek to positions in the past on each live feed, provided you -specify a big enough feed storage in ffserver.conf). +specify a big enough feed storage in avserver.conf). -ffserver runs in daemon mode by default; that is, it puts itself in +avserver runs in daemon mode by default; that is, it puts itself in the background and detaches from its TTY, unless it is launched in debug mode or a NoDaemon option is specified in the configuration file. -This documentation covers only the streaming aspects of ffserver / +This documentation covers only the streaming aspects of avserver / ffmpeg. All questions about parameters for ffmpeg, codec questions, etc. are not covered here. Read @file{ffmpeg-doc.html} for more information. @section How does it work? -ffserver receives prerecorded files or FFM streams from some ffmpeg +avserver receives prerecorded files or FFM streams from some ffmpeg instance as input, then streams them over RTP/RTSP/HTTP. -An ffserver instance will listen on some port as specified in the +An avserver instance will listen on some port as specified in the configuration file. You can launch one or more instances of ffmpeg and -send one or more FFM streams to the port where ffserver is expecting -to receive them. Alternately, you can make ffserver launch such ffmpeg +send one or more FFM streams to the port where avserver is expecting +to receive them. Alternately, you can make avserver launch such ffmpeg instances at startup. Input streams are called feeds, and each one is specified by a <Feed> @@ -57,7 +57,7 @@ file. @section Status stream -ffserver supports an HTTP interface which exposes the current status +avserver supports an HTTP interface which exposes the current status of the server. Simply point your browser to the address of the special status stream @@ -100,7 +100,7 @@ I understand that FreeBSD systems work just fine as well. @section How do I make it work? First, build the kit. It *really* helps to have installed LAME first. Then when -you run the ffserver ./configure, make sure that you have the +you run the avserver ./configure, make sure that you have the @code{--enable-libmp3lame} flag turned on. LAME is important as it allows for streaming audio to Windows Media Player. @@ -110,7 +110,7 @@ As a simple test, just run the following two command lines where INPUTFILE is some file which you can decode with ffmpeg: @example -./ffserver -f doc/ffserver.conf & +./avserver -f doc/avserver.conf & ./ffmpeg -i INPUTFILE http://localhost:8090/feed1.ffm @end example @@ -129,8 +129,8 @@ The same is true of AVI files. @section What happens next? -You should edit the ffserver.conf file to suit your needs (in terms of -frame rates etc). Then install ffserver and ffmpeg, write a script to start +You should edit the avserver.conf file to suit your needs (in terms of +frame rates etc). Then install avserver and ffmpeg, write a script to start them up, and off you go. @section Troubleshooting @@ -166,14 +166,14 @@ I suspect that the new one is not available unless you have installed WMP 7]. You can replay video from .ffm files that was recorded earlier. However, there are a number of caveats, including the fact that the -ffserver parameters must match the original parameters used to record the -file. If they do not, then ffserver deletes the file before recording into it. +avserver parameters must match the original parameters used to record the +file. If they do not, then avserver deletes the file before recording into it. (Now that I write this, it seems broken). You can fiddle with many of the codec choices and encoding parameters, and there are a bunch more parameters that you cannot control. Post a message to the mailing list if there are some 'must have' parameters. Look in -ffserver.conf for a list of the currently available controls. +avserver.conf for a list of the currently available controls. It will automatically generate the ASX or RAM files that are often used in browsers. These files are actually redirections to the underlying ASF @@ -187,7 +187,7 @@ finishes.] * When you connect to a live stream, most players (WMP, RA, etc) want to buffer a certain number of seconds of material so that they can display the -signal continuously. However, ffserver (by default) starts sending data +signal continuously. However, avserver (by default) starts sending data in realtime. This means that there is a pause of a few seconds while the buffering is being done by the player. The good news is that this can be cured by adding a '?buffer=5' to the end of the URL. This means that the @@ -195,13 +195,13 @@ stream should start 5 seconds in the past -- and so the first 5 seconds of the stream are sent as fast as the network will allow. It will then slow down to real time. This noticeably improves the startup experience. -You can also add a 'Preroll 15' statement into the ffserver.conf that will +You can also add a 'Preroll 15' statement into the avserver.conf that will add the 15 second prebuffering on all requests that do not otherwise -specify a time. In addition, ffserver will skip frames until a key_frame +specify a time. In addition, avserver will skip frames until a key_frame is found. This further reduces the startup delay by not transferring data that will be discarded. -* You may want to adjust the MaxBandwidth in the ffserver.conf to limit +* You may want to adjust the MaxBandwidth in the avserver.conf to limit the amount of bandwidth consumed by live streams. @section Why does the ?buffer / Preroll stop working after a time? @@ -218,7 +218,7 @@ handled. @section Does the @code{?date=} stuff work. Yes (subject to the limitation outlined above). Also note that whenever you -start ffserver, it deletes the ffm file (if any parameters have changed), +start avserver, it deletes the ffm file (if any parameters have changed), thus wiping out what you had recorded before. The format of the @code{?date=xxxxxx} is fairly flexible. You should use one @@ -246,26 +246,26 @@ For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}. @table @option @item -f @var{configfile} -Use @file{configfile} instead of @file{/etc/ffserver.conf}. +Use @file{configfile} instead of @file{/etc/avserver.conf}. @item -n Enable no-launch mode. This option disables all the Launch directives -within the various <Stream> sections. Since ffserver will not launch +within the various <Stream> sections. Since avserver will not launch any ffmpeg instances, you will have to launch them manually. @item -d Enable debug mode. This option increases log verbosity, directs log -messages to stdout and causes ffserver to run in the foreground +messages to stdout and causes avserver to run in the foreground rather than as a daemon. @end table @c man end @ignore -@setfilename ffserver -@settitle ffserver video server +@setfilename avserver +@settitle avserver video server @c man begin SEEALSO -ffmpeg(1), avplay(1), avprobe(1), the @file{ffmpeg/doc/ffserver.conf} +ffmpeg(1), avplay(1), avprobe(1), the @file{ffmpeg/doc/avserver.conf} example and the Libav HTML documentation @c man end diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index af9bdcd..32916a7 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -164,7 +164,7 @@ Set the number of video frames to record. @item -r @var{fps} Set frame rate (Hz value, fraction or abbreviation), (default = 25). @item -s @var{size} -Set frame size. The format is @samp{wxh} (ffserver default = 160x128, ffmpeg default = same as source). +Set frame size. The format is @samp{wxh} (avserver default = 160x128, ffmpeg default = same as source). The following abbreviations are recognized: @table @samp @item sqcif @@ -726,7 +726,7 @@ Set RTP payload size in bytes. Read input at native frame rate. Mainly used to simulate a grab device. @item -loop_input Loop over the input stream. Currently it works only for image -streams. This option is used for automatic FFserver testing. +streams. This option is used for automatic AVserver testing. This option is deprecated, use -loop. @item -loop_output @var{number_of_times} Repeatedly loop output for formats that support looping such as animated GIF @@ -1079,7 +1079,7 @@ file to which you want to add them. @settitle ffmpeg video converter @c man begin SEEALSO -avplay(1), avprobe(1), ffserver(1) and the Libav HTML documentation +avplay(1), avprobe(1), avserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/general.texi b/doc/general.texi index 9806509..be5b570 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -91,7 +91,7 @@ library: @item Electronic Arts cdata @tab @tab X @item Electronic Arts Multimedia @tab @tab X @tab Used in various EA games; files have extensions like WVE and UV2. -@item FFM (FFserver live feed) @tab X @tab X +@item FFM (AVserver live feed) @tab X @tab X @item Flash (SWF) @tab X @tab X @item Flash 9 (AVM2) @tab X @tab X @tab Only embedded audio is decoded. |
