From 266463daff7bbd4c3a8a26ff11b1131df0fd5520 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Jul 2011 17:51:34 +0200 Subject: [PATCH 1/3] Rename ffplay to avplay. --- .gitignore | 2 +- Changelog | 1 + Makefile | 8 ++++---- ffplay.c => avplay.c | 12 ++++++------ configure | 10 +++++----- doc/{ffplay.texi => avplay.texi} | 12 ++++++------ doc/demuxers.texi | 2 +- doc/developer.texi | 2 +- doc/ffmpeg.texi | 2 +- doc/ffprobe.texi | 2 +- doc/ffserver.texi | 2 +- doc/general.texi | 2 +- doc/indevs.texi | 4 ++-- doc/libavfilter.texi | 4 ++-- doc/protocols.texi | 28 ++++++++++++++-------------- 15 files changed, 47 insertions(+), 46 deletions(-) rename ffplay.c => avplay.c (99%) rename doc/{ffplay.texi => avplay.texi} (94%) diff --git a/.gitignore b/.gitignore index bfce23d311..e867470820 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ doc/*.html doc/*.pod doxy ffmpeg -ffplay +avplay ffprobe ffserver libavcodec/*_tablegen diff --git a/Changelog b/Changelog index 7b8be5b302..ad3d867cb4 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ releases are sorted from youngest to oldest. version : - BWF muxer - Flash Screen Video 2 decoder +- ffplay renamed to avplay version 0.7: diff --git a/Makefile b/Makefile index 9d6ec3a46d..5214f5a45e 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ COMPILE_S = $(call COMPILE,AS) %.c %.h: TAG = GEN PROGS-$(CONFIG_FFMPEG) += ffmpeg -PROGS-$(CONFIG_FFPLAY) += ffplay +PROGS-$(CONFIG_AVPLAY) += avplay PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFSERVER) += ffserver @@ -64,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg ffplay ffprobe ffserver +BASENAMES = ffmpeg avplay ffprobe ffserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) @@ -116,8 +116,8 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) -ffplay.o: CFLAGS += $(SDL_CFLAGS) -ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) +avplay.o: CFLAGS += $(SDL_CFLAGS) +avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) diff --git a/ffplay.c b/avplay.c similarity index 99% rename from ffplay.c rename to avplay.c index bef75fe574..f43cf6faa6 100644 --- a/ffplay.c +++ b/avplay.c @@ -1,5 +1,5 @@ /* - * ffplay : Simple Media Player based on the Libav libraries + * avplay : Simple Media Player based on the Libav libraries * Copyright (c) 2003 Fabrice Bellard * * This file is part of Libav. @@ -55,7 +55,7 @@ #include #include -const char program_name[] = "ffplay"; +const char program_name[] = "avplay"; const int program_birth_year = 2003; #define MAX_QUEUE_SIZE (15 * 1024 * 1024) @@ -1678,7 +1678,7 @@ static int input_config_props(AVFilterLink *link) static AVFilter input_filter = { - .name = "ffplay_input", + .name = "avplay_input", .priv_size = sizeof(FilterPriv), @@ -2357,7 +2357,7 @@ static int decode_thread(void *arg) av_freep(&opts); if(ic->pb) - ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end + ic->pb->eof_reached= 0; //FIXME hack, avplay maybe should not use url_feof() to test for the end if(seek_by_bytes<0) seek_by_bytes= !!(ic->iformat->flags & AVFMT_TS_DISCONT); @@ -2954,7 +2954,7 @@ static const OptionDef options[] = { static void show_usage(void) { printf("Simple media player\n"); - printf("usage: ffplay [options] input_file\n"); + printf("usage: %s [options] input_file\n", program_name); printf("\n"); } @@ -3030,7 +3030,7 @@ int main(int argc, char **argv) if (!input_filename) { show_usage(); fprintf(stderr, "An input file must be specified\n"); - fprintf(stderr, "Use -h to get full help or, even better, run 'man ffplay'\n"); + fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name); exit(1); } diff --git a/configure b/configure index ef2c566d85..7277409996 100755 --- a/configure +++ b/configure @@ -81,7 +81,7 @@ Configuration options: and binaries will be unredistributable [no] --disable-doc do not build documentation --disable-ffmpeg disable ffmpeg build - --disable-ffplay disable ffplay build + --disable-avplay disable avplay build --disable-ffprobe disable ffprobe build --disable-ffserver disable ffserver build --disable-avdevice disable libavdevice build @@ -913,7 +913,7 @@ CONFIG_LIST=" dxva2 fastdiv ffmpeg - ffplay + avplay ffprobe ffserver fft @@ -1489,8 +1489,8 @@ postproc_deps="gpl" # programs ffmpeg_deps="avcodec avformat swscale" ffmpeg_select="buffer_filter" -ffplay_deps="avcodec avformat swscale sdl" -ffplay_select="rdft" +avplay_deps="avcodec avformat swscale sdl" +avplay_select="rdft" ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' @@ -1635,7 +1635,7 @@ enable debug enable doc enable fastdiv enable ffmpeg -enable ffplay +enable avplay enable ffprobe enable ffserver enable network diff --git a/doc/ffplay.texi b/doc/avplay.texi similarity index 94% rename from doc/ffplay.texi rename to doc/avplay.texi index d60852603a..0c74c59a3d 100644 --- a/doc/ffplay.texi +++ b/doc/avplay.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle ffplay Documentation +@settitle avplay Documentation @titlepage -@center @titlefont{ffplay Documentation} +@center @titlefont{avplay Documentation} @end titlepage @top @@ -13,14 +13,14 @@ @example @c man begin SYNOPSIS -ffplay [options] @file{input_file} +avplay [options] @file{input_file} @c man end @end example @chapter Description @c man begin DESCRIPTION -FFplay is a very simple and portable media player using the Libav +AVplay is a very simple and portable media player using the Libav libraries and the SDL library. It is mostly used as a testbed for the various Libav APIs. @c man end @@ -166,8 +166,8 @@ Seek to percentage in file corresponding to fraction of width. @ignore -@setfilename ffplay -@settitle FFplay media player +@setfilename avplay +@settitle AVplay media player @c man begin SEEALSO ffmpeg(1), ffprobe(1), ffserver(1) and the Libav HTML documentation diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 98f9fdeff8..fc03459417 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -70,7 +70,7 @@ Apple HTTP Live Streaming demuxer. This demuxer presents all AVStreams from all variant streams. The id field is set to the bitrate variant index number. By setting -the discard flags on AVStreams (by pressing 'a' or 'v' in ffplay), +the discard flags on AVStreams (by pressing 'a' or 'v' in avplay), the caller can decide which variant streams to actually receive. The total bitrate of the variant that the stream belongs to is available in a metadata key named "variant_bitrate". diff --git a/doc/developer.texi b/doc/developer.texi index 208c119753..d75471cb29 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -17,7 +17,7 @@ decoding). Look at @file{libavcodec/apiexample.c} to see how to use it. @item libavformat is the library containing the file format handling (mux and -demux code for several formats). Look at @file{ffplay.c} to use it in a +demux code for several formats). Look at @file{avplay.c} to use it in a player. See @file{libavformat/output-example.c} to use it to generate audio or video streams. diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ca801d31e4..6393516c6d 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1079,7 +1079,7 @@ file to which you want to add them. @settitle ffmpeg video converter @c man begin SEEALSO -ffplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation +avplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 5e856e6645..079cf659d7 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -122,7 +122,7 @@ with name "STREAM". @settitle ffprobe media prober @c man begin SEEALSO -ffmpeg(1), ffplay(1), ffserver(1) and the Libav HTML documentation +ffmpeg(1), avplay(1), ffserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/ffserver.texi b/doc/ffserver.texi index d247016bbc..3d64b79377 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -265,7 +265,7 @@ rather than as a daemon. @c man begin SEEALSO -ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf} +ffmpeg(1), avplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf} example and the Libav HTML documentation @c man end diff --git a/doc/general.texi b/doc/general.texi index c9919390d6..98065093b5 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -837,7 +837,7 @@ speed up is close to non-existent for normal one-off builds and is only noticeable when running make for a second time (for example in @code{make install}). -@item In order to compile FFplay, you must have the MinGW development library +@item In order to compile AVplay, you must have the MinGW development library of @uref{http://www.libsdl.org/, SDL}. Edit the @file{bin/sdl-config} script so that it points to the correct prefix where SDL was installed. Verify that @file{sdl-config} can be launched from diff --git a/doc/indevs.texi b/doc/indevs.texi index fa21c099d5..e1c058b8a6 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -199,10 +199,10 @@ tools. @example # Grab and show the input of a video4linux device, frame rate is set # to the default of 25/1. -ffplay -s 320x240 -f video4linux /dev/video0 +avplay -s 320x240 -f video4linux /dev/video0 # Grab and show the input of a video4linux2 device, autoadjust size. -ffplay -f video4linux2 /dev/video0 +avplay -f video4linux2 /dev/video0 # Grab and record the input of a video4linux2 device, autoadjust size, # frame rate value defaults to 0/0 so it is read from the video4linux2 diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi index 1c1220541c..172b7fc4d0 100644 --- a/doc/libavfilter.texi +++ b/doc/libavfilter.texi @@ -24,7 +24,7 @@ some directory of your choice by: @end example And then read the README file in the top directory to learn how to -integrate it into ffmpeg and ffplay. +integrate it into ffmpeg and avplay. But note that there may still be serious bugs in the code and its API and ABI should not be considered stable yet! @@ -56,7 +56,7 @@ result will be that in output the top half of the video is mirrored onto the bottom half. Video filters are loaded using the @var{-vf} option passed to -ffmpeg or to ffplay. Filters in the same linear chain are separated by +ffmpeg or to avplay. Filters in the same linear chain are separated by commas. In our example, @var{split, fifo, overlay} are in one linear chain, and @var{fifo, crop, vflip} are in another. The points where the linear chains join are labeled by names enclosed in square diff --git a/doc/protocols.texi b/doc/protocols.texi index 59906312fa..cc35982e77 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -52,10 +52,10 @@ resource to be concatenated, each one possibly specifying a distinct protocol. For example to read a sequence of files @file{split1.mpeg}, -@file{split2.mpeg}, @file{split3.mpeg} with @file{ffplay} use the +@file{split2.mpeg}, @file{split3.mpeg} with @file{avplay} use the command: @example -ffplay concat:split1.mpeg\|split2.mpeg\|split3.mpeg +avplay concat:split1.mpeg\|split2.mpeg\|split3.mpeg @end example Note that you may need to escape the character "|" which is special for @@ -183,10 +183,10 @@ application specified in @var{app}, may be prefixed by "mp4:". @end table -For example to read with @file{ffplay} a multimedia resource named +For example to read with @file{avplay} a multimedia resource named "sample" from the application "vod" from an RTMP server "myserver": @example -ffplay rtmp://myserver/vod/sample +avplay rtmp://myserver/vod/sample @end example @section rtmp, rtmpe, rtmps, rtmpt, rtmpte @@ -224,9 +224,9 @@ For example, to stream a file in real-time to an RTMP server using ffmpeg -re -i myfile -f flv rtmp://myserver/live/mystream @end example -To play the same stream using @file{ffplay}: +To play the same stream using @file{avplay}: @example -ffplay "rtmp://myserver/live/mystream live=1" +avplay "rtmp://myserver/live/mystream live=1" @end example @section rtp @@ -281,7 +281,7 @@ When receiving data over UDP, the demuxer tries to reorder received packets order for this to be enabled, a maximum delay must be specified in the @code{max_delay} field of AVFormatContext. -When watching multi-bitrate Real-RTSP streams with @file{ffplay}, the +When watching multi-bitrate Real-RTSP streams with @file{avplay}, the streams to display can be chosen with @code{-vst} @var{n} and @code{-ast} @var{n} for video and audio respectively, and can be switched on the fly by pressing @code{v} and @code{a}. @@ -291,13 +291,13 @@ Example command lines: To watch a stream over UDP, with a max reordering delay of 0.5 seconds: @example -ffplay -max_delay 500000 rtsp://server/video.mp4?udp +avplay -max_delay 500000 rtsp://server/video.mp4?udp @end example To watch a stream tunneled over HTTP: @example -ffplay rtsp://server/video.mp4?http +avplay rtsp://server/video.mp4?http @end example To send a stream in realtime to a RTSP server, for others to watch: @@ -358,13 +358,13 @@ To broadcast a stream on the local subnet, for watching in VLC: ffmpeg -re -i @var{input} -f sap sap://224.0.0.255?same_port=1 @end example -Similarly, for watching in ffplay: +Similarly, for watching in avplay: @example ffmpeg -re -i @var{input} -f sap sap://224.0.0.255 @end example -And for watching in ffplay, over IPv6: +And for watching in avplay, over IPv6: @example ffmpeg -re -i @var{input} -f sap sap://[ff0e::1:2:3:4] @@ -389,13 +389,13 @@ Example command lines follow. To play back the first stream announced on the normal SAP multicast address: @example -ffplay sap:// +avplay sap:// @end example To play back the first stream announced on one the default IPv6 SAP multicast address: @example -ffplay sap://[ff0e::2:7ffe] +avplay sap://[ff0e::2:7ffe] @end example @section tcp @@ -414,7 +414,7 @@ Listen for an incoming connection @example ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen -ffplay tcp://@var{hostname}:@var{port} +avplay tcp://@var{hostname}:@var{port} @end example @end table From 9e12f0bf5f45361a36f9d8c3abca24af55ca740c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Jul 2011 19:04:43 +0200 Subject: [PATCH 2/3] Rename ffprobe to avprobe. --- .gitignore | 2 +- Changelog | 2 +- Makefile | 4 ++-- ffprobe.c => avprobe.c | 10 +++++----- configure | 8 ++++---- doc/avplay.texi | 2 +- doc/{ffprobe.texi => avprobe.texi} | 22 +++++++++++----------- doc/ffmpeg.texi | 2 +- doc/ffserver.texi | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) rename ffprobe.c => avprobe.c (98%) rename doc/{ffprobe.texi => avprobe.texi} (83%) diff --git a/.gitignore b/.gitignore index e867470820..5fb57b11b6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ doc/*.pod doxy ffmpeg avplay -ffprobe +avprobe ffserver libavcodec/*_tablegen libavcodec/*_tables.c diff --git a/Changelog b/Changelog index ad3d867cb4..6cdafbabf6 100644 --- a/Changelog +++ b/Changelog @@ -5,7 +5,7 @@ releases are sorted from youngest to oldest. version : - BWF muxer - Flash Screen Video 2 decoder -- ffplay renamed to avplay +- ffplay/ffprobe renamed to avplay/avprobe version 0.7: diff --git a/Makefile b/Makefile index 5214f5a45e..958ef8a14b 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ COMPILE_S = $(call COMPILE,AS) PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_AVPLAY) += avplay -PROGS-$(CONFIG_FFPROBE) += ffprobe +PROGS-$(CONFIG_AVPROBE) += avprobe PROGS-$(CONFIG_FFSERVER) += ffserver PROGS := $(PROGS-yes:%=%$(EXESUF)) @@ -64,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg avplay ffprobe ffserver +BASENAMES = ffmpeg avplay avprobe ffserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) diff --git a/ffprobe.c b/avprobe.c similarity index 98% rename from ffprobe.c rename to avprobe.c index 2457b063a5..3843af9b72 100644 --- a/ffprobe.c +++ b/avprobe.c @@ -1,5 +1,5 @@ /* - * ffprobe : Simple Media Prober based on the Libav libraries + * avprobe : Simple Media Prober based on the Libav libraries * Copyright (c) 2007-2010 Stefano Sabatini * * This file is part of Libav. @@ -29,7 +29,7 @@ #include "libavdevice/avdevice.h" #include "cmdutils.h" -const char program_name[] = "ffprobe"; +const char program_name[] = "avprobe"; const int program_birth_year = 2007; static int do_show_format = 0; @@ -44,7 +44,7 @@ static int use_value_sexagesimal_format = 0; /* globals */ static const OptionDef options[]; -/* FFprobe context */ +/* AVprobe context */ static const char *input_filename; static AVInputFormat *iformat = NULL; @@ -327,7 +327,7 @@ static int probe_file(const char *filename) static void show_usage(void) { printf("Simple multimedia streams analyzer\n"); - printf("usage: ffprobe [OPTIONS] [INPUT_FILE]\n"); + printf("usage: %s [OPTIONS] [INPUT_FILE]\n", program_name); printf("\n"); } @@ -407,7 +407,7 @@ int main(int argc, char **argv) if (!input_filename) { show_usage(); fprintf(stderr, "You have to specify one input file.\n"); - fprintf(stderr, "Use -h to get full help or, even better, run 'man ffprobe'.\n"); + fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'.\n", program_name); exit(1); } diff --git a/configure b/configure index 7277409996..9134bc51a1 100755 --- a/configure +++ b/configure @@ -82,7 +82,7 @@ Configuration options: --disable-doc do not build documentation --disable-ffmpeg disable ffmpeg build --disable-avplay disable avplay build - --disable-ffprobe disable ffprobe build + --disable-avprobe disable avprobe build --disable-ffserver disable ffserver build --disable-avdevice disable libavdevice build --disable-avcodec disable libavcodec build @@ -914,7 +914,7 @@ CONFIG_LIST=" fastdiv ffmpeg avplay - ffprobe + avprobe ffserver fft frei0r @@ -1491,7 +1491,7 @@ ffmpeg_deps="avcodec avformat swscale" ffmpeg_select="buffer_filter" avplay_deps="avcodec avformat swscale sdl" avplay_select="rdft" -ffprobe_deps="avcodec avformat" +avprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' @@ -1636,7 +1636,7 @@ enable doc enable fastdiv enable ffmpeg enable avplay -enable ffprobe +enable avprobe enable ffserver enable network enable optimizations diff --git a/doc/avplay.texi b/doc/avplay.texi index 0c74c59a3d..e8446b75d9 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), ffprobe(1), ffserver(1) and the Libav HTML documentation +ffmpeg(1), avprobe(1), ffserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/ffprobe.texi b/doc/avprobe.texi similarity index 83% rename from doc/ffprobe.texi rename to doc/avprobe.texi index 079cf659d7..003f5e65c9 100644 --- a/doc/ffprobe.texi +++ b/doc/avprobe.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle ffprobe Documentation +@settitle avprobe Documentation @titlepage -@center @titlefont{ffprobe Documentation} +@center @titlefont{avprobe Documentation} @end titlepage @top @@ -15,33 +15,33 @@ The generic syntax is: @example @c man begin SYNOPSIS -ffprobe [options] [@file{input_file}] +avprobe [options] [@file{input_file}] @c man end @end example @chapter Description @c man begin DESCRIPTION -ffprobe gathers information from multimedia streams and prints it in +avprobe gathers information from multimedia streams and prints it in human- and machine-readable fashion. For example it can be used to check the format of the container used by a multimedia stream and the format and type of each media stream contained in it. -If a filename is specified in input, ffprobe will try to open and +If a filename is specified in input, avprobe will try to open and probe the file content. If the file cannot be opened or recognized as a multimedia file, a positive exit code is returned. -ffprobe may be employed both as a standalone application or in +avprobe may be employed both as a standalone application or in combination with a textual filter, which may perform more sophisticated processing, e.g. statistical processing or plotting. -Options are used to list some of the formats supported by ffprobe or +Options are used to list some of the formats supported by avprobe or for specifying which information to display, and for setting how -ffprobe will show it. +avprobe will show it. -ffprobe output is designed to be easily parsable by a textual filter, +avprobe output is designed to be easily parsable by a textual filter, and consists of one or more sections of the form: @example [SECTION] @@ -118,8 +118,8 @@ with name "STREAM". @ignore -@setfilename ffprobe -@settitle ffprobe media prober +@setfilename avprobe +@settitle avprobe media prober @c man begin SEEALSO ffmpeg(1), avplay(1), ffserver(1) and the Libav HTML documentation diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 6393516c6d..af9bdcd3f3 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1079,7 +1079,7 @@ file to which you want to add them. @settitle ffmpeg video converter @c man begin SEEALSO -avplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation +avplay(1), avprobe(1), ffserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 3d64b79377..05e52970dc 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -265,7 +265,7 @@ rather than as a daemon. @c man begin SEEALSO -ffmpeg(1), avplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf} +ffmpeg(1), avplay(1), avprobe(1), the @file{ffmpeg/doc/ffserver.conf} example and the Libav HTML documentation @c man end From 4d58e4cb4ca8e04317fecea432ea3272a445877c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Jul 2011 21:56:56 +0200 Subject: [PATCH 3/3] Rename ffserver to avserver. --- .gitignore | 2 +- Changelog | 2 +- Makefile | 6 +-- ffserver.c => avserver.c | 64 ++++++++++++++-------------- configure | 20 ++++----- doc/avplay.texi | 2 +- doc/avprobe.texi | 2 +- doc/{ffserver.conf => avserver.conf} | 14 +++--- doc/{ffserver.texi => avserver.texi} | 60 +++++++++++++------------- doc/ffmpeg.texi | 6 +-- doc/general.texi | 2 +- ffmpeg.c | 8 ++-- libavformat/ffm.h | 2 +- libavformat/ffmdec.c | 8 ++-- libavformat/ffmenc.c | 4 +- libavformat/mpjpeg.c | 2 +- 16 files changed, 102 insertions(+), 102 deletions(-) rename ffserver.c => avserver.c (99%) rename doc/{ffserver.conf => avserver.conf} (95%) rename doc/{ffserver.texi => avserver.texi} (82%) diff --git a/.gitignore b/.gitignore index 5fb57b11b6..734e31373c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ doxy ffmpeg avplay avprobe -ffserver +avserver libavcodec/*_tablegen libavcodec/*_tables.c libavcodec/*_tables.h diff --git a/Changelog b/Changelog index 6cdafbabf6..363d9a6532 100644 --- a/Changelog +++ b/Changelog @@ -5,7 +5,7 @@ releases are sorted from youngest to oldest. version : - BWF muxer - Flash Screen Video 2 decoder -- ffplay/ffprobe renamed to avplay/avprobe +- ffplay/ffprobe/ffserver renamed to avplay/avprobe/avserver version 0.7: diff --git a/Makefile b/Makefile index 958ef8a14b..7f88de5552 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ COMPILE_S = $(call COMPILE,AS) PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_AVPLAY) += avplay PROGS-$(CONFIG_AVPROBE) += avprobe -PROGS-$(CONFIG_FFSERVER) += ffserver +PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = $(PROGS-yes:%=%.o) cmdutils.o @@ -64,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg avplay avprobe ffserver +BASENAMES = ffmpeg avplay avprobe avserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) @@ -118,7 +118,7 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) avplay.o: CFLAGS += $(SDL_CFLAGS) avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) +avserver$(EXESUF): LDFLAGS += $(AVSERVERLDFLAGS) $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) diff --git a/ffserver.c b/avserver.c similarity index 99% rename from ffserver.c rename to avserver.c index 2cbfe7589e..f31b8ddb01 100644 --- a/ffserver.c +++ b/avserver.c @@ -59,7 +59,7 @@ #include "cmdutils.h" -const char program_name[] = "ffserver"; +const char program_name[] = "avserver"; const int program_birth_year = 2000; static const OptionDef options[]; @@ -200,7 +200,7 @@ typedef struct IPAddressACL { struct in_addr last; } IPAddressACL; -/* description of each stream of the ffserver.conf file */ +/* description of each stream of the avserver.conf file */ typedef struct FFStream { enum StreamType stream_type; char filename[1024]; /* stream filename */ @@ -299,10 +299,10 @@ static int rtp_new_av_stream(HTTPContext *c, static const char *my_program_name; static const char *my_program_dir; -static const char *config_filename = "/etc/ffserver.conf"; +static const char *config_filename = "/etc/avserver.conf"; -static int ffserver_debug; -static int ffserver_daemon; +static int avserver_debug; +static int avserver_daemon; static int no_launch; static int need_to_start_children; @@ -320,7 +320,7 @@ static AVLFG random_state; static FILE *logfile = NULL; -/* FIXME: make ffserver work with IPv6 */ +/* FIXME: make avserver work with IPv6 */ /* resolve host with also IP address parsing */ static int resolve_host(struct in_addr *sin_addr, const char *hostname) { @@ -480,7 +480,7 @@ static void start_children(FFStream *feed) for (i = 3; i < 256; i++) close(i); - if (!ffserver_debug) { + if (!avserver_debug) { i = open("/dev/null", O_RDWR); if (i != -1) { dup2(i, 0); @@ -620,7 +620,7 @@ static int http_server(void) return -1; } - http_log("FFserver started.\n"); + http_log("AVserver started.\n"); start_children(first_feed); @@ -664,7 +664,7 @@ static int http_server(void) poll_entry->events = POLLOUT; poll_entry++; } else { - /* when ffserver is doing the timing, we work by + /* when avserver is doing the timing, we work by looking at which packet need to be sent every 10 ms */ delay1 = 10; /* one tick wait XXX: 10 ms assumed */ @@ -1480,7 +1480,7 @@ static int http_parse_request(HTTPContext *c) av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); - if (ffserver_debug) + if (avserver_debug) http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url); /* find the filename and the optional info string in the request */ @@ -1643,7 +1643,7 @@ static int http_parse_request(HTTPContext *c) "Content-type: video/x-ms-asf\r\n" "\r\n" "\r\n" - //"\r\n" + //"\r\n" "\r\n" "\r\n", hostbuf, filename, info); break; @@ -1652,7 +1652,7 @@ static int http_parse_request(HTTPContext *c) "HTTP/1.0 200 RAM Follows\r\n" "Content-type: audio/x-pn-realaudio\r\n" "\r\n" - "# Autogenerated by ffserver\r\n" + "# Autogenerated by avserver\r\n" "http://%s/%s%s\r\n", hostbuf, filename, info); break; case REDIR_ASF: @@ -3458,7 +3458,7 @@ static int rtp_new_av_stream(HTTPContext *c, } /********************************************************************/ -/* ffserver initialization */ +/* avserver initialization */ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int copy) { @@ -3914,10 +3914,10 @@ static void load_module(const char *filename) return; } - init_func = dlsym(dll, "ffserver_module_init"); + init_func = dlsym(dll, "avserver_module_init"); if (!init_func) { fprintf(stderr, - "%s: init function 'ffserver_module_init()' not found\n", + "%s: init function 'avserver_module_init()' not found\n", filename); dlclose(dll); } @@ -3926,7 +3926,7 @@ static void load_module(const char *filename) } #endif -static int ffserver_opt_default(const char *opt, const char *arg, +static int avserver_opt_default(const char *opt, const char *arg, AVCodecContext *avctx, int type) { int ret = 0; @@ -3936,7 +3936,7 @@ static int ffserver_opt_default(const char *opt, const char *arg, return ret; } -static int ffserver_opt_preset(const char *arg, +static int avserver_opt_preset(const char *arg, AVCodecContext *avctx, int type, enum CodecID *audio_id, enum CodecID *video_id) { @@ -3967,7 +3967,7 @@ static int ffserver_opt_preset(const char *arg, *video_id = opt_video_codec(tmp2); }else if(!strcmp(tmp, "scodec")){ /* opt_subtitle_codec(tmp2); */ - }else if(ffserver_opt_default(tmp, tmp2, avctx, type) < 0){ + }else if(avserver_opt_default(tmp, tmp2, avctx, type) < 0){ fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2); ret = 1; break; @@ -3979,7 +3979,7 @@ static int ffserver_opt_preset(const char *arg, return ret; } -static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename, +static AVOutputFormat *avserver_guess_format(const char *short_name, const char *filename, const char *mime_type) { AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type); @@ -4066,7 +4066,7 @@ static int parse_ffconfig(const char *filename) ERROR("%s:%d: Invalid host/IP address: %s\n", arg); } } else if (!strcasecmp(cmd, "NoDaemon")) { - ffserver_daemon = 0; + avserver_daemon = 0; } else if (!strcasecmp(cmd, "RTSPPort")) { get_arg(arg, sizeof(arg), &p); val = atoi(arg); @@ -4103,7 +4103,7 @@ static int parse_ffconfig(const char *filename) } else max_bandwidth = llval; } else if (!strcasecmp(cmd, "CustomLog")) { - if (!ffserver_debug) + if (!avserver_debug) get_arg(logfilename, sizeof(logfilename), &p); } else if (!strcasecmp(cmd, "fmt = ffserver_guess_format(NULL, stream->filename, NULL); + stream->fmt = avserver_guess_format(NULL, stream->filename, NULL); avcodec_get_context_defaults2(&video_enc, AVMEDIA_TYPE_VIDEO); avcodec_get_context_defaults2(&audio_enc, AVMEDIA_TYPE_AUDIO); audio_id = CODEC_ID_NONE; @@ -4267,7 +4267,7 @@ static int parse_ffconfig(const char *filename) /* jpeg cannot be used here, so use single frame jpeg */ if (!strcmp(arg, "jpeg")) strcpy(arg, "mjpeg"); - stream->fmt = ffserver_guess_format(arg, NULL, NULL); + stream->fmt = avserver_guess_format(arg, NULL, NULL); if (!stream->fmt) { ERROR("Unknown Format: %s\n", arg); } @@ -4430,7 +4430,7 @@ static int parse_ffconfig(const char *filename) avctx = &audio_enc; type = AV_OPT_FLAG_AUDIO_PARAM; } - if (ffserver_opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) { + if (avserver_opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) { ERROR("AVOption error: %s %s\n", arg, arg2); } } else if (!strcasecmp(cmd, "AVPresetVideo") || @@ -4447,7 +4447,7 @@ static int parse_ffconfig(const char *filename) audio_enc.codec_id = audio_id; type = AV_OPT_FLAG_AUDIO_PARAM; } - if (ffserver_opt_preset(arg, avctx, type|AV_OPT_FLAG_ENCODING_PARAM, &audio_id, &video_id)) { + if (avserver_opt_preset(arg, avctx, type|AV_OPT_FLAG_ENCODING_PARAM, &audio_id, &video_id)) { ERROR("AVPreset error: %s\n", arg); } } else if (!strcasecmp(cmd, "VideoTag")) { @@ -4638,14 +4638,14 @@ static void handle_child_exit(int sig) static void opt_debug(void) { - ffserver_debug = 1; - ffserver_daemon = 0; + avserver_debug = 1; + avserver_daemon = 0; logfilename[0] = '-'; } static void show_help(void) { - printf("usage: ffserver [options]\n" + printf("usage: avserver [options]\n" "Hyper fast multi format Audio/Video streaming server\n"); printf("\n"); show_help_options(options, "Main options:\n", 0, 0); @@ -4655,7 +4655,7 @@ static const OptionDef options[] = { #include "cmdutils_common_opts.h" { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" }, { "d", 0, {(void*)opt_debug}, "enable debug mode" }, - { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" }, + { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/avserver.conf", "configfile" }, { NULL }, }; @@ -4669,7 +4669,7 @@ int main(int argc, char **argv) my_program_name = argv[0]; my_program_dir = getcwd(0, 0); - ffserver_daemon = 1; + avserver_daemon = 1; parse_options(argc, argv, options, NULL); @@ -4703,7 +4703,7 @@ int main(int argc, char **argv) compute_bandwidth(); /* put the process in background and detach it from its TTY */ - if (ffserver_daemon) { + if (avserver_daemon) { int pid; pid = fork(); @@ -4730,7 +4730,7 @@ int main(int argc, char **argv) /* signal init */ signal(SIGPIPE, SIG_IGN); - if (ffserver_daemon) + if (avserver_daemon) chdir("/"); if (http_server() < 0) { diff --git a/configure b/configure index 9134bc51a1..bcf944f61e 100755 --- a/configure +++ b/configure @@ -83,7 +83,7 @@ Configuration options: --disable-ffmpeg disable ffmpeg build --disable-avplay disable avplay build --disable-avprobe disable avprobe build - --disable-ffserver disable ffserver build + --disable-avserver disable avserver build --disable-avdevice disable libavdevice build --disable-avcodec disable libavcodec build --disable-avformat disable libavformat build @@ -915,7 +915,7 @@ CONFIG_LIST=" ffmpeg avplay avprobe - ffserver + avserver fft frei0r golomb @@ -1492,8 +1492,8 @@ ffmpeg_select="buffer_filter" avplay_deps="avcodec avformat swscale sdl" avplay_select="rdft" avprobe_deps="avcodec avformat" -ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" -ffserver_extralibs='$ldl' +avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" +avserver_extralibs='$ldl' doc_deps="texi2html" @@ -1637,7 +1637,7 @@ enable fastdiv enable ffmpeg enable avplay enable avprobe -enable ffserver +enable avserver enable network enable optimizations enable postproc @@ -1648,7 +1648,7 @@ enable swscale_alpha # build settings SHFLAGS='-shared -Wl,-soname,$$(@F)' -FFSERVERLDFLAGS=-Wl,-E +AVSERVERLDFLAGS=-Wl,-E LIBPREF="lib" LIBSUF=".a" FULLNAME='$(NAME)$(BUILDSUF)' @@ -2355,7 +2355,7 @@ case $target_os in host_libs= ;; sunos) - FFSERVERLDFLAGS="" + AVSERVERLDFLAGS="" SHFLAGS='-shared -Wl,-h,$$(@F)' enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" network_extralibs="-lsocket -lnsl" @@ -2400,7 +2400,7 @@ case $target_os in SLIBSUF=".dylib" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' - FFSERVERLDFLAGS=-Wl,-bind_at_load + AVSERVERLDFLAGS=-Wl,-bind_at_load objformat="macho" enabled x86_64 && objformat="macho64" enabled_any pic shared || @@ -2472,7 +2472,7 @@ case $target_os in add_cppflags -D_GNU_SOURCE add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' - FFSERVERLDFLAGS="" + AVSERVERLDFLAGS="" LIBSUF="_s.a" SLIBPREF="" SLIBSUF=".dll" @@ -3218,7 +3218,7 @@ AS_O=$CC_O CC_O=$CC_O DLLTOOL=$dlltool LDFLAGS=$LDFLAGS -FFSERVERLDFLAGS=$FFSERVERLDFLAGS +AVSERVERLDFLAGS=$AVSERVERLDFLAGS SHFLAGS=$SHFLAGS YASMFLAGS=$YASMFLAGS BUILDSUF=$build_suffix diff --git a/doc/avplay.texi b/doc/avplay.texi index e8446b75d9..ff0b8f8dd8 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 003f5e65c9..a0497de897 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 similarity index 95% rename from doc/ffserver.conf rename to doc/avserver.conf index 62728b036c..2105ac5e8c 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. -# 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. @@ -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 similarity index 82% rename from doc/ffserver.texi rename to doc/avserver.texi index 05e52970dc..ad0eb465d9 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 @@ -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 sections. Since ffserver will not launch +within the various 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 af9bdcd3f3..32916a7c96 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 98065093b5..be5b570419 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. diff --git a/ffmpeg.c b/ffmpeg.c index c76aeacbe6..c155a73b6d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -691,7 +691,7 @@ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode return ost; } -static int read_ffserver_streams(AVFormatContext *s, const char *filename) +static int read_avserver_streams(AVFormatContext *s, const char *filename) { int i, err; AVFormatContext *ic = NULL; @@ -3766,9 +3766,9 @@ static void opt_output_file(const char *filename) if (!strcmp(file_oformat->name, "ffm") && av_strstart(filename, "http:", NULL)) { - /* special case for files sent to ffserver: we get the stream - parameters from ffserver */ - int err = read_ffserver_streams(oc, filename); + /* special case for files sent to avserver: we get the stream + parameters from avserver */ + int err = read_avserver_streams(oc, filename); if (err < 0) { print_error(filename, err); ffmpeg_exit(1); diff --git a/libavformat/ffm.h b/libavformat/ffm.h index 89a14a5a88..6ce5e0408c 100644 --- a/libavformat/ffm.h +++ b/libavformat/ffm.h @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) common header + * FFM (avserver live feed) common header * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 9168ac57e8..07f790773c 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) demuxer + * FFM (avserver live feed) demuxer * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. @@ -23,7 +23,7 @@ #include "libavutil/intfloat_readwrite.h" #include "avformat.h" #include "ffm.h" -#if CONFIG_FFSERVER +#if CONFIG_AVSERVER #include int64_t ffm_read_write_index(int fd) @@ -55,7 +55,7 @@ void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size) ffm->write_index = pos; ffm->file_size = file_size; } -#endif // CONFIG_FFSERVER +#endif // CONFIG_AVSERVER static int ffm_is_avail_data(AVFormatContext *s, int size) { @@ -510,7 +510,7 @@ static int ffm_probe(AVProbeData *p) AVInputFormat ff_ffm_demuxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), .priv_data_size = sizeof(FFMContext), .read_probe = ffm_probe, .read_header = ffm_read_header, diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 87a477fcbb..07876ccd4b 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) muxer + * FFM (avserver live feed) muxer * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. @@ -242,7 +242,7 @@ static int ffm_write_trailer(AVFormatContext *s) AVOutputFormat ff_ffm_muxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), .mime_type = "", .extensions = "ffm", .priv_data_size = sizeof(FFMContext), diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 6580904d7e..79cc272e27 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -22,7 +22,7 @@ /* Multipart JPEG */ -#define BOUNDARY_TAG "ffserver" +#define BOUNDARY_TAG "avserver" static int mpjpeg_write_header(AVFormatContext *s) {