Rename ffserver to avserver.

Anton Khirnov committed 15 years ago

Commit 4d58e4c1 parent 9e12f0b16 files · +102 −102Browse files

Unified · Split

16 files

.gitignore +1 −1
Changelog +1 −1
Makefile +3 −3
avserver.c +32 −32
configure +10 −10
doc/avplay.texi +1 −1
doc/avprobe.texi +1 −1
doc/avserver.conf +7 −7
doc/avserver.texi +30 −30
doc/ffmpeg.texi +3 −3
doc/general.texi +1 −1
ffmpeg.c +4 −4
libavformat/ffm.h +1 −1
libavformat/ffmdec.c +4 −4
libavformat/ffmenc.c +2 −2
libavformat/mpjpeg.c +1 −1

@@ -14,7 +14,7 @@ doxy · 13 unmodified lines
14	14	ffmpeg
15	15	avplay
16	16	avprobe
17		−ffserver
	17	+avserver
18	18	libavcodec/*_tablegen
19	19	libavcodec/*_tables.c
20	20	libavcodec/*_tables.h

Changelog+1−1

@@ -5,7 +5,7 @@ releases are sorted from youngest to oldest. · 4 unmodified lines
5	5	version <next>:
6	6	- BWF muxer
7	7	- Flash Screen Video 2 decoder
8		−- ffplay/ffprobe renamed to avplay/avprobe
	8	+- ffplay/ffprobe/ffserver renamed to avplay/avprobe/avserver
9	9
10	10
11	11	version 0.7:

Makefile+3−3

@@ -55,7 +55,7 @@ COMPILE_S = $(call COMPILE,AS) · 54 unmodified lines
55	55	PROGS-$(CONFIG_FFMPEG) += ffmpeg
56	56	PROGS-$(CONFIG_AVPLAY) += avplay
57	57	PROGS-$(CONFIG_AVPROBE) += avprobe
58		−PROGS-$(CONFIG_FFSERVER) += ffserver
	58	+PROGS-$(CONFIG_AVSERVER) += avserver
59	59
60	60	PROGS := $(PROGS-yes:%=%$(EXESUF))
61	61	OBJS = $(PROGS-yes:%=%.o) cmdutils.o
@@ -64,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) · 2 unmodified lines
64	64	TOOLS = qt-faststart trasher
65	65	TOOLS-$(CONFIG_ZLIB) += cws2fws
66	66
67		−BASENAMES = ffmpeg avplay avprobe ffserver
	67	+BASENAMES = ffmpeg avplay avprobe avserver
68	68	ALLPROGS = $(BASENAMES:%=%$(EXESUF))
69	69	ALLMANPAGES = $(BASENAMES:%=%.1)
70	70
@@ -118,7 +118,7 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) · 47 unmodified lines
118	118
119	119	avplay.o: CFLAGS += $(SDL_CFLAGS)
120	120	avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
121		−ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
	121	+avserver$(EXESUF): LDFLAGS += $(AVSERVERLDFLAGS)
122	122
123	123	$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
124	124	$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)

avserver.crenamed from ffserver.c+32−32

@@ -59,7 +59,7 @@ · 58 unmodified lines
59	59
60	60	#include "cmdutils.h"
61	61
62		−const char program_name[] = "ffserver";
	62	+const char program_name[] = "avserver";
63	63	const int program_birth_year = 2000;
64	64
65	65	static const OptionDef options[];
@@ -200,7 +200,7 @@ typedef struct IPAddressACL { · 134 unmodified lines
200	200	struct in_addr last;
201	201	} IPAddressACL;
202	202
203		−/* description of each stream of the ffserver.conf file */
	203	+/* description of each stream of the avserver.conf file */
204	204	typedef struct FFStream {
205	205	enum StreamType stream_type;
206	206	char filename[1024]; /* stream filename */
@@ -299,10 +299,10 @@ static int rtp_new_av_stream(HTTPContext *c, · 92 unmodified lines
299	299	static const char *my_program_name;
300	300	static const char *my_program_dir;
301	301
302		−static const char *config_filename = "/etc/ffserver.conf";
	302	+static const char *config_filename = "/etc/avserver.conf";
303	303
304		−static int ffserver_debug;
305		−static int ffserver_daemon;
	304	+static int avserver_debug;
	305	+static int avserver_daemon;
306	306	static int no_launch;
307	307	static int need_to_start_children;
308	308
@@ -320,7 +320,7 @@ static AVLFG random_state; · 11 unmodified lines
320	320
321	321	static FILE *logfile = NULL;
322	322
323		−/* FIXME: make ffserver work with IPv6 */
	323	+/* FIXME: make avserver work with IPv6 */
324	324	/* resolve host with also IP address parsing */
325	325	static int resolve_host(struct in_addr sin_addr, const char hostname)
326	326	{
@@ -480,7 +480,7 @@ static void start_children(FFStream *feed) · 153 unmodified lines
480	480	for (i = 3; i < 256; i++)
481	481	close(i);
482	482
483		− if (!ffserver_debug) {
	483	+ if (!avserver_debug) {
484	484	i = open("/dev/null", O_RDWR);
485	485	if (i != -1) {
486	486	dup2(i, 0);
@@ -620,7 +620,7 @@ static int http_server(void) · 133 unmodified lines
620	620	return -1;
621	621	}
622	622
623		− http_log("FFserver started.\n");
	623	+ http_log("AVserver started.\n");
624	624
625	625	start_children(first_feed);
626	626
@@ -664,7 +664,7 @@ static int http_server(void) · 37 unmodified lines
664	664	poll_entry->events = POLLOUT;
665	665	poll_entry++;
666	666	} else {
667		− /* when ffserver is doing the timing, we work by
	667	+ /* when avserver is doing the timing, we work by
668	668	looking at which packet need to be sent every
669	669	10 ms */
670	670	delay1 = 10; /* one tick wait XXX: 10 ms assumed */
@@ -1480,7 +1480,7 @@ static int http_parse_request(HTTPContext *c) · 809 unmodified lines
1480	1480
1481	1481	av_strlcpy(c->protocol, protocol, sizeof(c->protocol));
1482	1482
1483		− if (ffserver_debug)
	1483	+ if (avserver_debug)
1484	1484	http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url);
1485	1485
1486	1486	/* find the filename and the optional info string in the request */
@@ -1643,7 +1643,7 @@ static int http_parse_request(HTTPContext *c) · 156 unmodified lines
1643	1643	"Content-type: video/x-ms-asf\r\n"
1644	1644	"\r\n"
1645	1645	"<ASX Version=\"3\">\r\n"
1646		− //"<!-- Autogenerated by ffserver -->\r\n"
	1646	+ //"<!-- Autogenerated by avserver -->\r\n"
1647	1647	"<ENTRY><REF HREF=\"http://%s/%s%s\"/></ENTRY>\r\n"
1648	1648	"</ASX>\r\n", hostbuf, filename, info);
1649	1649	break;
@@ -1652,7 +1652,7 @@ static int http_parse_request(HTTPContext *c) · 2 unmodified lines
1652	1652	"HTTP/1.0 200 RAM Follows\r\n"
1653	1653	"Content-type: audio/x-pn-realaudio\r\n"
1654	1654	"\r\n"
1655		− "# Autogenerated by ffserver\r\n"
	1655	+ "# Autogenerated by avserver\r\n"
1656	1656	"http://%s/%s%s\r\n", hostbuf, filename, info);
1657	1657	break;
1658	1658	case REDIR_ASF:
@@ -3458,7 +3458,7 @@ static int rtp_new_av_stream(HTTPContext *c, · 1799 unmodified lines
3458	3458	}
3459	3459
3460	3460	/********************************************************************/
3461		−/* ffserver initialization */
	3461	+/* avserver initialization */
3462	3462
3463	3463	static AVStream add_av_stream1(FFStream stream, AVCodecContext *codec, int copy)
3464	3464	{
@@ -3914,10 +3914,10 @@ static void load_module(const char *filename) · 449 unmodified lines
3914	3914	return;
3915	3915	}
3916	3916
3917		− init_func = dlsym(dll, "ffserver_module_init");
	3917	+ init_func = dlsym(dll, "avserver_module_init");
3918	3918	if (!init_func) {
3919	3919	fprintf(stderr,
3920		− "%s: init function 'ffserver_module_init()' not found\n",
	3920	+ "%s: init function 'avserver_module_init()' not found\n",
3921	3921	filename);
3922	3922	dlclose(dll);
3923	3923	}
@@ -3926,7 +3926,7 @@ static void load_module(const char *filename) · 2 unmodified lines
3926	3926	}
3927	3927	#endif
3928	3928
3929		−static int ffserver_opt_default(const char opt, const char arg,
	3929	+static int avserver_opt_default(const char opt, const char arg,
3930	3930	AVCodecContext *avctx, int type)
3931	3931	{
3932	3932	int ret = 0;
@@ -3936,7 +3936,7 @@ static int ffserver_opt_default(const char opt, const char arg, · 3 unmodified lines
3936	3936	return ret;
3937	3937	}
3938	3938
3939		−static int ffserver_opt_preset(const char *arg,
	3939	+static int avserver_opt_preset(const char *arg,
3940	3940	AVCodecContext *avctx, int type,
3941	3941	enum CodecID audio_id, enum CodecID video_id)
3942	3942	{
@@ -3967,7 +3967,7 @@ static int ffserver_opt_preset(const char *arg, · 24 unmodified lines
3967	3967	*video_id = opt_video_codec(tmp2);
3968	3968	}else if(!strcmp(tmp, "scodec")){
3969	3969	/* opt_subtitle_codec(tmp2); */
3970		− }else if(ffserver_opt_default(tmp, tmp2, avctx, type) < 0){
	3970	+ }else if(avserver_opt_default(tmp, tmp2, avctx, type) < 0){
3971	3971	fprintf(stderr, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, tmp, tmp2);
3972	3972	ret = 1;
3973	3973	break;
@@ -3979,7 +3979,7 @@ static int ffserver_opt_preset(const char *arg, · 5 unmodified lines
3979	3979	return ret;
3980	3980	}
3981	3981
3982		−static AVOutputFormat ffserver_guess_format(const char short_name, const char *filename,
	3982	+static AVOutputFormat avserver_guess_format(const char short_name, const char *filename,
3983	3983	const char *mime_type)
3984	3984	{
3985	3985	AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
@@ -4066,7 +4066,7 @@ static int parse_ffconfig(const char *filename) · 80 unmodified lines
4066	4066	ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
4067	4067	}
4068	4068	} else if (!strcasecmp(cmd, "NoDaemon")) {
4069		− ffserver_daemon = 0;
	4069	+ avserver_daemon = 0;
4070	4070	} else if (!strcasecmp(cmd, "RTSPPort")) {
4071	4071	get_arg(arg, sizeof(arg), &p);
4072	4072	val = atoi(arg);
@@ -4103,7 +4103,7 @@ static int parse_ffconfig(const char *filename) · 30 unmodified lines
4103	4103	} else
4104	4104	max_bandwidth = llval;
4105	4105	} else if (!strcasecmp(cmd, "CustomLog")) {
4106		− if (!ffserver_debug)
	4106	+ if (!avserver_debug)
4107	4107	get_arg(logfilename, sizeof(logfilename), &p);
4108	4108	} else if (!strcasecmp(cmd, "<Feed")) {
4109	4109	/*********************************************/
@@ -4227,7 +4227,7 @@ static int parse_ffconfig(const char *filename) · 117 unmodified lines
4227	4227	}
4228	4228	}
4229	4229
4230		− stream->fmt = ffserver_guess_format(NULL, stream->filename, NULL);
	4230	+ stream->fmt = avserver_guess_format(NULL, stream->filename, NULL);
4231	4231	avcodec_get_context_defaults2(&video_enc, AVMEDIA_TYPE_VIDEO);
4232	4232	avcodec_get_context_defaults2(&audio_enc, AVMEDIA_TYPE_AUDIO);
4233	4233	audio_id = CODEC_ID_NONE;
@@ -4267,7 +4267,7 @@ static int parse_ffconfig(const char *filename) · 33 unmodified lines
4267	4267	/* jpeg cannot be used here, so use single frame jpeg */
4268	4268	if (!strcmp(arg, "jpeg"))
4269	4269	strcpy(arg, "mjpeg");
4270		− stream->fmt = ffserver_guess_format(arg, NULL, NULL);
	4270	+ stream->fmt = avserver_guess_format(arg, NULL, NULL);
4271	4271	if (!stream->fmt) {
4272	4272	ERROR("Unknown Format: %s\n", arg);
4273	4273	}
@@ -4430,7 +4430,7 @@ static int parse_ffconfig(const char *filename) · 156 unmodified lines
4430	4430	avctx = &audio_enc;
4431	4431	type = AV_OPT_FLAG_AUDIO_PARAM;
4432	4432	}
4433		− if (ffserver_opt_default(arg, arg2, avctx, type\|AV_OPT_FLAG_ENCODING_PARAM)) {
	4433	+ if (avserver_opt_default(arg, arg2, avctx, type\|AV_OPT_FLAG_ENCODING_PARAM)) {
4434	4434	ERROR("AVOption error: %s %s\n", arg, arg2);
4435	4435	}
4436	4436	} else if (!strcasecmp(cmd, "AVPresetVideo") \|\|
@@ -4447,7 +4447,7 @@ static int parse_ffconfig(const char *filename) · 10 unmodified lines
4447	4447	audio_enc.codec_id = audio_id;
4448	4448	type = AV_OPT_FLAG_AUDIO_PARAM;
4449	4449	}
4450		− if (ffserver_opt_preset(arg, avctx, type\|AV_OPT_FLAG_ENCODING_PARAM, &audio_id, &video_id)) {
	4450	+ if (avserver_opt_preset(arg, avctx, type\|AV_OPT_FLAG_ENCODING_PARAM, &audio_id, &video_id)) {
4451	4451	ERROR("AVPreset error: %s\n", arg);
4452	4452	}
4453	4453	} else if (!strcasecmp(cmd, "VideoTag")) {
@@ -4638,14 +4638,14 @@ static void handle_child_exit(int sig) · 184 unmodified lines
4638	4638
4639	4639	static void opt_debug(void)
4640	4640	{
4641		− ffserver_debug = 1;
4642		− ffserver_daemon = 0;
	4641	+ avserver_debug = 1;
	4642	+ avserver_daemon = 0;
4643	4643	logfilename[0] = '-';
4644	4644	}
4645	4645
4646	4646	static void show_help(void)
4647	4647	{
4648		− printf("usage: ffserver [options]\n"
	4648	+ printf("usage: avserver [options]\n"
4649	4649	"Hyper fast multi format Audio/Video streaming server\n");
4650	4650	printf("\n");
4651	4651	show_help_options(options, "Main options:\n", 0, 0);
@@ -4655,7 +4655,7 @@ static const OptionDef options[] = { · 3 unmodified lines
4655	4655	#include "cmdutils_common_opts.h"
4656	4656	{ "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
4657	4657	{ "d", 0, {(void*)opt_debug}, "enable debug mode" },
4658		− { "f", HAS_ARG \| OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" },
	4658	+ { "f", HAS_ARG \| OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/avserver.conf", "configfile" },
4659	4659	{ NULL },
4660	4660	};
4661	4661
@@ -4669,7 +4669,7 @@ int main(int argc, char **argv) · 7 unmodified lines
4669	4669
4670	4670	my_program_name = argv[0];
4671	4671	my_program_dir = getcwd(0, 0);
4672		− ffserver_daemon = 1;
	4672	+ avserver_daemon = 1;
4673	4673
4674	4674	parse_options(argc, argv, options, NULL);
4675	4675
@@ -4703,7 +4703,7 @@ int main(int argc, char **argv) · 27 unmodified lines
4703	4703	compute_bandwidth();
4704	4704
4705	4705	/* put the process in background and detach it from its TTY */
4706		− if (ffserver_daemon) {
	4706	+ if (avserver_daemon) {
4707	4707	int pid;
4708	4708
4709	4709	pid = fork();
@@ -4730,7 +4730,7 @@ int main(int argc, char **argv) · 20 unmodified lines
4730	4730	/* signal init */
4731	4731	signal(SIGPIPE, SIG_IGN);
4732	4732
4733		− if (ffserver_daemon)
	4733	+ if (avserver_daemon)
4734	4734	chdir("/");
4735	4735
4736	4736	if (http_server() < 0) {

configure+10−10

@@ -83,7 +83,7 @@ Configuration options: · 82 unmodified lines
83	83	--disable-ffmpeg disable ffmpeg build
84	84	--disable-avplay disable avplay build
85	85	--disable-avprobe disable avprobe build
86		− --disable-ffserver disable ffserver build
	86	+ --disable-avserver disable avserver build
87	87	--disable-avdevice disable libavdevice build
88	88	--disable-avcodec disable libavcodec build
89	89	--disable-avformat disable libavformat build
@@ -915,7 +915,7 @@ CONFIG_LIST=" · 825 unmodified lines
915	915	ffmpeg
916	916	avplay
917	917	avprobe
918		− ffserver
	918	+ avserver
919	919	fft
920	920	frei0r
921	921	golomb
@@ -1492,8 +1492,8 @@ ffmpeg_select="buffer_filter" · 570 unmodified lines
1492	1492	avplay_deps="avcodec avformat swscale sdl"
1493	1493	avplay_select="rdft"
1494	1494	avprobe_deps="avcodec avformat"
1495		−ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
1496		−ffserver_extralibs='$ldl'
	1495	+avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
	1496	+avserver_extralibs='$ldl'
1497	1497
1498	1498	doc_deps="texi2html"
1499	1499
@@ -1637,7 +1637,7 @@ enable fastdiv · 137 unmodified lines
1637	1637	enable ffmpeg
1638	1638	enable avplay
1639	1639	enable avprobe
1640		−enable ffserver
	1640	+enable avserver
1641	1641	enable network
1642	1642	enable optimizations
1643	1643	enable postproc
@@ -1648,7 +1648,7 @@ enable swscale_alpha · 4 unmodified lines
1648	1648
1649	1649	# build settings
1650	1650	SHFLAGS='-shared -Wl,-soname,$$(@F)'
1651		−FFSERVERLDFLAGS=-Wl,-E
	1651	+AVSERVERLDFLAGS=-Wl,-E
1652	1652	LIBPREF="lib"
1653	1653	LIBSUF=".a"
1654	1654	FULLNAME='$(NAME)$(BUILDSUF)'
@@ -2355,7 +2355,7 @@ case $target_os in · 700 unmodified lines
2355	2355	host_libs=
2356	2356	;;
2357	2357	sunos)
2358		− FFSERVERLDFLAGS=""
	2358	+ AVSERVERLDFLAGS=""
2359	2359	SHFLAGS='-shared -Wl,-h,$$(@F)'
2360	2360	enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
2361	2361	network_extralibs="-lsocket -lnsl"
@@ -2400,7 +2400,7 @@ case $target_os in · 38 unmodified lines
2400	2400	SLIBSUF=".dylib"
2401	2401	SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
2402	2402	SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
2403		− FFSERVERLDFLAGS=-Wl,-bind_at_load
	2403	+ AVSERVERLDFLAGS=-Wl,-bind_at_load
2404	2404	objformat="macho"
2405	2405	enabled x86_64 && objformat="macho64"
2406	2406	enabled_any pic shared \|\|
@@ -2472,7 +2472,7 @@ case $target_os in · 65 unmodified lines
2472	2472	add_cppflags -D_GNU_SOURCE
2473	2473	add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
2474	2474	SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
2475		− FFSERVERLDFLAGS=""
	2475	+ AVSERVERLDFLAGS=""
2476	2476	LIBSUF="_s.a"
2477	2477	SLIBPREF=""
2478	2478	SLIBSUF=".dll"
@@ -3218,7 +3218,7 @@ AS_O=$CC_O · 739 unmodified lines
3218	3218	CC_O=$CC_O
3219	3219	DLLTOOL=$dlltool
3220	3220	LDFLAGS=$LDFLAGS
3221		−FFSERVERLDFLAGS=$FFSERVERLDFLAGS
	3221	+AVSERVERLDFLAGS=$AVSERVERLDFLAGS
3222	3222	SHFLAGS=$SHFLAGS
3223	3223	YASMFLAGS=$YASMFLAGS
3224	3224	BUILDSUF=$build_suffix

doc/avplay.texi+1−1

@@ -170,7 +170,7 @@ Seek to percentage in file corresponding to fraction of width. · 169 unmodified lines
170	170	@settitle AVplay media player
171	171
172	172	@c man begin SEEALSO
173		−ffmpeg(1), avprobe(1), ffserver(1) and the Libav HTML documentation
	173	+ffmpeg(1), avprobe(1), avserver(1) and the Libav HTML documentation
174	174	@c man end
175	175
176	176	@c man begin AUTHORS

doc/avprobe.texi+1−1

@@ -122,7 +122,7 @@ with name "STREAM". · 121 unmodified lines
122	122	@settitle avprobe media prober
123	123
124	124	@c man begin SEEALSO
125		−ffmpeg(1), avplay(1), ffserver(1) and the Libav HTML documentation
	125	+ffmpeg(1), avplay(1), avserver(1) and the Libav HTML documentation
126	126	@c man end
127	127
128	128	@c man begin AUTHORS

doc/avserver.confrenamed from doc/ffserver.conf+7−7

@@ -12,7 +12,7 @@ BindAddress 0.0.0.0 · 11 unmodified lines
12	12	# MaxClients maximum limit.
13	13	MaxHTTPConnections 2000
14	14
15		−# Number of simultaneous requests that can be handled. Since FFServer
	15	+# Number of simultaneous requests that can be handled. Since AVServer
16	16	# is very fast, it is more likely that you will want to leave this high
17	17	# and use MaxBandwidth, below.
18	18	MaxClients 1000
@@ -25,24 +25,24 @@ MaxBandwidth 1000 · 6 unmodified lines
25	25	# '-' is the standard output.
26	26	CustomLog -
27	27
28		−# Suppress that if you want to launch ffserver as a daemon.
	28	+# Suppress that if you want to launch avserver as a daemon.
29	29	NoDaemon
30	30
31	31
32	32	##################################################################
33	33	# Definition of the live feeds. Each live feed contains one video
34	34	# and/or audio sequence coming from an ffmpeg encoder or another
35		−# ffserver. This sequence may be encoded simultaneously with several
	35	+# avserver. This sequence may be encoded simultaneously with several
36	36	# codecs at several resolutions.
37	37
38	38	<Feed feed1.ffm>
39	39
40		−# You must use 'ffmpeg' to send a live feed to ffserver. In this
	40	+# You must use 'ffmpeg' to send a live feed to avserver. In this
41	41	# example, you can type:
42	42	#
43	43	# ffmpeg http://localhost:8090/feed1.ffm
44	44
45		−# ffserver can also do time shifting. It means that it can stream any
	45	+# avserver can also do time shifting. It means that it can stream any
46	46	# previously recorded live stream. The request should contain:
47	47	# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify
48	48	# a path where the feed is stored on disk. You also specify the
@@ -69,7 +69,7 @@ ACL allow 127.0.0.1 · 20 unmodified lines
69	69	##################################################################
70	70	# Now you can define each stream which will be generated from the
71	71	# original audio and video stream. Each format has a filename (here
72		−# 'test1.mpg'). FFServer will send this stream when answering a
	72	+# 'test1.mpg'). AVServer will send this stream when answering a
73	73	# request containing this filename.
74	74
75	75	<Stream test1.mpg>
@@ -334,7 +334,7 @@ StartSendOnKey · 258 unmodified lines
334	334	# multicast address with MulticastAddress. The port and the TTL can
335	335	# also be set.
336	336	#
337		−# An SDP file is automatically generated by ffserver by adding the
	337	+# An SDP file is automatically generated by avserver by adding the
338	338	# 'sdp' extension to the stream name (here
339	339	# http://localhost:8090/test1-sdp.sdp). You should usually give this
340	340	# file to your player to play the stream.

doc/avserver.texirenamed from doc/ffserver.texi+30−30

@@ -1,8 +1,8 @@
1	1	\input texinfo @c -- texinfo --
2	2
3		−@settitle ffserver Documentation
	3	+@settitle avserver Documentation
4	4	@titlepage
5		−@center @titlefont{ffserver Documentation}
	5	+@center @titlefont{avserver Documentation}
6	6	@end titlepage
7	7
8	8	@top
@@ -15,37 +15,37 @@ The generic syntax is: · 6 unmodified lines
15	15
16	16	@example
17	17	@c man begin SYNOPSIS
18		−ffserver [options]
	18	+avserver [options]
19	19	@c man end
20	20	@end example
21	21
22	22	@chapter Description
23	23	@c man begin DESCRIPTION
24	24
25		−ffserver is a streaming server for both audio and video. It supports
	25	+avserver is a streaming server for both audio and video. It supports
26	26	several live feeds, streaming from files and time shifting on live feeds
27	27	(you can seek to positions in the past on each live feed, provided you
28		−specify a big enough feed storage in ffserver.conf).
	28	+specify a big enough feed storage in avserver.conf).
29	29
30		−ffserver runs in daemon mode by default; that is, it puts itself in
	30	+avserver runs in daemon mode by default; that is, it puts itself in
31	31	the background and detaches from its TTY, unless it is launched in
32	32	debug mode or a NoDaemon option is specified in the configuration
33	33	file.
34	34
35		−This documentation covers only the streaming aspects of ffserver /
	35	+This documentation covers only the streaming aspects of avserver /
36	36	ffmpeg. All questions about parameters for ffmpeg, codec questions,
37	37	etc. are not covered here. Read @file{ffmpeg-doc.html} for more
38	38	information.
39	39
40	40	@section How does it work?
41	41
42		−ffserver receives prerecorded files or FFM streams from some ffmpeg
	42	+avserver receives prerecorded files or FFM streams from some ffmpeg
43	43	instance as input, then streams them over RTP/RTSP/HTTP.
44	44
45		−An ffserver instance will listen on some port as specified in the
	45	+An avserver instance will listen on some port as specified in the
46	46	configuration file. You can launch one or more instances of ffmpeg and
47		−send one or more FFM streams to the port where ffserver is expecting
48		−to receive them. Alternately, you can make ffserver launch such ffmpeg
	47	+send one or more FFM streams to the port where avserver is expecting
	48	+to receive them. Alternately, you can make avserver launch such ffmpeg
49	49	instances at startup.
50	50
51	51	Input streams are called feeds, and each one is specified by a <Feed>
@@ -57,7 +57,7 @@ file. · 5 unmodified lines
57	57
58	58	@section Status stream
59	59
60		−ffserver supports an HTTP interface which exposes the current status
	60	+avserver supports an HTTP interface which exposes the current status
61	61	of the server.
62	62
63	63	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. · 36 unmodified lines
100	100	@section How do I make it work?
101	101
102	102	First, build the kit. It really helps to have installed LAME first. Then when
103		−you run the ffserver ./configure, make sure that you have the
	103	+you run the avserver ./configure, make sure that you have the
104	104	@code{--enable-libmp3lame} flag turned on.
105	105
106	106	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 · 3 unmodified lines
110	110	is some file which you can decode with ffmpeg:
111	111
112	112	@example
113		−./ffserver -f doc/ffserver.conf &
	113	+./avserver -f doc/avserver.conf &
114	114	./ffmpeg -i INPUTFILE http://localhost:8090/feed1.ffm
115	115	@end example
116	116
@@ -129,8 +129,8 @@ The same is true of AVI files. · 12 unmodified lines
129	129
130	130	@section What happens next?
131	131
132		−You should edit the ffserver.conf file to suit your needs (in terms of
133		−frame rates etc). Then install ffserver and ffmpeg, write a script to start
	132	+You should edit the avserver.conf file to suit your needs (in terms of
	133	+frame rates etc). Then install avserver and ffmpeg, write a script to start
134	134	them up, and off you go.
135	135
136	136	@section Troubleshooting
@@ -166,14 +166,14 @@ I suspect that the new one is not available unless you have installed WMP 7]. · 29 unmodified lines
166	166
167	167	You can replay video from .ffm files that was recorded earlier.
168	168	However, there are a number of caveats, including the fact that the
169		−ffserver parameters must match the original parameters used to record the
170		−file. If they do not, then ffserver deletes the file before recording into it.
	169	+avserver parameters must match the original parameters used to record the
	170	+file. If they do not, then avserver deletes the file before recording into it.
171	171	(Now that I write this, it seems broken).
172	172
173	173	You can fiddle with many of the codec choices and encoding parameters, and
174	174	there are a bunch more parameters that you cannot control. Post a message
175	175	to the mailing list if there are some 'must have' parameters. Look in
176		−ffserver.conf for a list of the currently available controls.
	176	+avserver.conf for a list of the currently available controls.
177	177
178	178	It will automatically generate the ASX or RAM files that are often used
179	179	in browsers. These files are actually redirections to the underlying ASF
@@ -187,7 +187,7 @@ finishes.] · 7 unmodified lines
187	187
188	188	* When you connect to a live stream, most players (WMP, RA, etc) want to
189	189	buffer a certain number of seconds of material so that they can display the
190		−signal continuously. However, ffserver (by default) starts sending data
	190	+signal continuously. However, avserver (by default) starts sending data
191	191	in realtime. This means that there is a pause of a few seconds while the
192	192	buffering is being done by the player. The good news is that this can be
193	193	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 · 1 unmodified line
195	195	of the stream are sent as fast as the network will allow. It will then
196	196	slow down to real time. This noticeably improves the startup experience.
197	197
198		−You can also add a 'Preroll 15' statement into the ffserver.conf that will
	198	+You can also add a 'Preroll 15' statement into the avserver.conf that will
199	199	add the 15 second prebuffering on all requests that do not otherwise
200		−specify a time. In addition, ffserver will skip frames until a key_frame
	200	+specify a time. In addition, avserver will skip frames until a key_frame
201	201	is found. This further reduces the startup delay by not transferring data
202	202	that will be discarded.
203	203
204		−* You may want to adjust the MaxBandwidth in the ffserver.conf to limit
	204	+* You may want to adjust the MaxBandwidth in the avserver.conf to limit
205	205	the amount of bandwidth consumed by live streams.
206	206
207	207	@section Why does the ?buffer / Preroll stop working after a time?
@@ -218,7 +218,7 @@ handled. · 10 unmodified lines
218	218	@section Does the @code{?date=} stuff work.
219	219
220	220	Yes (subject to the limitation outlined above). Also note that whenever you
221		−start ffserver, it deletes the ffm file (if any parameters have changed),
	221	+start avserver, it deletes the ffm file (if any parameters have changed),
222	222	thus wiping out what you had recorded before.
223	223
224	224	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}. · 21 unmodified lines
246	246
247	247	@table @option
248	248	@item -f @var{configfile}
249		−Use @file{configfile} instead of @file{/etc/ffserver.conf}.
	249	+Use @file{configfile} instead of @file{/etc/avserver.conf}.
250	250	@item -n
251	251	Enable no-launch mode. This option disables all the Launch directives
252		−within the various <Stream> sections. Since ffserver will not launch
	252	+within the various <Stream> sections. Since avserver will not launch
253	253	any ffmpeg instances, you will have to launch them manually.
254	254	@item -d
255	255	Enable debug mode. This option increases log verbosity, directs log
256		−messages to stdout and causes ffserver to run in the foreground
	256	+messages to stdout and causes avserver to run in the foreground
257	257	rather than as a daemon.
258	258	@end table
259	259	@c man end
260	260
261	261	@ignore
262	262
263		−@setfilename ffserver
264		−@settitle ffserver video server
	263	+@setfilename avserver
	264	+@settitle avserver video server
265	265
266	266	@c man begin SEEALSO
267	267
268		−ffmpeg(1), avplay(1), avprobe(1), the @file{ffmpeg/doc/ffserver.conf}
	268	+ffmpeg(1), avplay(1), avprobe(1), the @file{ffmpeg/doc/avserver.conf}
269	269	example and the Libav HTML documentation
270	270	@c man end
271	271

doc/ffmpeg.texi+3−3

@@ -164,7 +164,7 @@ Set the number of video frames to record. · 163 unmodified lines
164	164	@item -r @var{fps}
165	165	Set frame rate (Hz value, fraction or abbreviation), (default = 25).
166	166	@item -s @var{size}
167		−Set frame size. The format is @samp{wxh} (ffserver default = 160x128, ffmpeg default = same as source).
	167	+Set frame size. The format is @samp{wxh} (avserver default = 160x128, ffmpeg default = same as source).
168	168	The following abbreviations are recognized:
169	169	@table @samp
170	170	@item sqcif
@@ -726,7 +726,7 @@ Set RTP payload size in bytes. · 555 unmodified lines
726	726	Read input at native frame rate. Mainly used to simulate a grab device.
727	727	@item -loop_input
728	728	Loop over the input stream. Currently it works only for image
729		−streams. This option is used for automatic FFserver testing.
	729	+streams. This option is used for automatic AVserver testing.
730	730	This option is deprecated, use -loop.
731	731	@item -loop_output @var{number_of_times}
732	732	Repeatedly loop output for formats that support looping such as animated GIF
@@ -1079,7 +1079,7 @@ file to which you want to add them. · 346 unmodified lines
1079	1079	@settitle ffmpeg video converter
1080	1080
1081	1081	@c man begin SEEALSO
1082		−avplay(1), avprobe(1), ffserver(1) and the Libav HTML documentation
	1082	+avplay(1), avprobe(1), avserver(1) and the Libav HTML documentation
1083	1083	@c man end
1084	1084
1085	1085	@c man begin AUTHORS

doc/general.texi+1−1

@@ -91,7 +91,7 @@ library: · 90 unmodified lines
91	91	@item Electronic Arts cdata @tab @tab X
92	92	@item Electronic Arts Multimedia @tab @tab X
93	93	@tab Used in various EA games; files have extensions like WVE and UV2.
94		−@item FFM (FFserver live feed) @tab X @tab X
	94	+@item FFM (AVserver live feed) @tab X @tab X
95	95	@item Flash (SWF) @tab X @tab X
96	96	@item Flash 9 (AVM2) @tab X @tab X
97	97	@tab Only embedded audio is decoded.

ffmpeg.c+4−4

@@ -691,7 +691,7 @@ static OutputStream new_output_stream(AVFormatContext oc, int file_idx, AVCode · 690 unmodified lines
691	691	return ost;
692	692	}
693	693
694		−static int read_ffserver_streams(AVFormatContext s, const char filename)
	694	+static int read_avserver_streams(AVFormatContext s, const char filename)
695	695	{
696	696	int i, err;
697	697	AVFormatContext *ic = NULL;
@@ -3766,9 +3766,9 @@ static void opt_output_file(const char *filename) · 3068 unmodified lines
3766	3766
3767	3767	if (!strcmp(file_oformat->name, "ffm") &&
3768	3768	av_strstart(filename, "http:", NULL)) {
3769		− /* special case for files sent to ffserver: we get the stream
3770		− parameters from ffserver */
3771		− int err = read_ffserver_streams(oc, filename);
	3769	+ /* special case for files sent to avserver: we get the stream
	3770	+ parameters from avserver */
	3771	+ int err = read_avserver_streams(oc, filename);
3772	3772	if (err < 0) {
3773	3773	print_error(filename, err);
3774	3774	ffmpeg_exit(1);

libavformat/ffm.h+1−1

@@ -1,5 +1,5 @@
1	1	/*
2		− * FFM (ffserver live feed) common header
	2	+ * FFM (avserver live feed) common header
3	3	* Copyright (c) 2001 Fabrice Bellard
4	4	*
5	5	* This file is part of Libav.

libavformat/ffmdec.c+4−4

@@ -1,5 +1,5 @@
1	1	/*
2		− * FFM (ffserver live feed) demuxer
	2	+ * FFM (avserver live feed) demuxer
3	3	* Copyright (c) 2001 Fabrice Bellard
4	4	*
5	5	* This file is part of Libav.
@@ -23,7 +23,7 @@ · 17 unmodified lines
23	23	#include "libavutil/intfloat_readwrite.h"
24	24	#include "avformat.h"
25	25	#include "ffm.h"
26		−#if CONFIG_FFSERVER
	26	+#if CONFIG_AVSERVER
27	27	#include <unistd.h>
28	28
29	29	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) · 25 unmodified lines
55	55	ffm->write_index = pos;
56	56	ffm->file_size = file_size;
57	57	}
58		−#endif // CONFIG_FFSERVER
	58	+#endif // CONFIG_AVSERVER
59	59
60	60	static int ffm_is_avail_data(AVFormatContext *s, int size)
61	61	{
@@ -510,7 +510,7 @@ static int ffm_probe(AVProbeData *p) · 448 unmodified lines
510	510
511	511	AVInputFormat ff_ffm_demuxer = {
512	512	.name = "ffm",
513		− .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
	513	+ .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"),
514	514	.priv_data_size = sizeof(FFMContext),
515	515	.read_probe = ffm_probe,
516	516	.read_header = ffm_read_header,

libavformat/ffmenc.c+2−2

@@ -1,5 +1,5 @@
1	1	/*
2		− * FFM (ffserver live feed) muxer
	2	+ * FFM (avserver live feed) muxer
3	3	* Copyright (c) 2001 Fabrice Bellard
4	4	*
5	5	* This file is part of Libav.
@@ -242,7 +242,7 @@ static int ffm_write_trailer(AVFormatContext *s) · 236 unmodified lines
242	242
243	243	AVOutputFormat ff_ffm_muxer = {
244	244	.name = "ffm",
245		− .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
	245	+ .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"),
246	246	.mime_type = "",
247	247	.extensions = "ffm",
248	248	.priv_data_size = sizeof(FFMContext),

libavformat/mpjpeg.c+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	22
23	23	/* Multipart JPEG */
24	24
25		−#define BOUNDARY_TAG "ffserver"
	25	+#define BOUNDARY_TAG "avserver"
26	26
27	27	static int mpjpeg_write_header(AVFormatContext *s)
28	28	{

Rename ffserver to avserver.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code