From patchwork Wed Oct 26 22:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 1197 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp281316vsd; Wed, 26 Oct 2016 15:44:00 -0700 (PDT) X-Received: by 10.194.118.198 with SMTP id ko6mr4018268wjb.215.1477521840075; Wed, 26 Oct 2016 15:44:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b205si5750512wmb.95.2016.10.26.15.43.59; Wed, 26 Oct 2016 15:44:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CF39689E64; Thu, 27 Oct 2016 01:43:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4558F689E27 for ; Thu, 27 Oct 2016 01:43:45 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id i187so257154lfe.1 for ; Wed, 26 Oct 2016 15:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=YsEVEln7GQbk8AvEY9vS2dp15UmtUnrAvqY+qKYqXHU=; b=tBcbKl7ZundB6M6hOUq90DwVettloWMlT1owFaIYgh+xbfcJv701VxpAHC5ChN419P a2MvQxNyG0wN8xWPqxDuxYcM7QBN0n2eHAqSpHivPO4a62uugKL0AUu04m4oVb6DZiF5 8Kc9X4uRe4vUo+OdH7EMuB1Fpyhnrys1NqmLU35A28ldR2QLBlGz0gx3amHY7SD7vzp8 sM6n1NFhtM3Rmf0BPJdzyr4SeuluJAh5Rs8DncObIOx11CwI4D3Y2RW5pLGkjdmSikLB lLuXA2/YwFEq8FeQW2Y/VKGWsFUAQx8VjpT8VcXN3l0ahHJQ34DgUoQqUQ5eQ1qLzHPi oruw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=YsEVEln7GQbk8AvEY9vS2dp15UmtUnrAvqY+qKYqXHU=; b=DVRKORr64gg6sczQNYnYZkCdEgOi+N/btNV9PcODNgEJgGRvPlSULBAFLnErRiu1XU PsdH38VfluI4cLLTzre4H6vpTRIvrQBq0zXCZ3vPAliFxyPdswN+mRCqlUu67+TlwRnc kxpzN9F3WsOhkEgjD5PsZkqTh3dKLQujhd89JJA68fY5Lt3WbOSYZnJMqXsxsQUWbi+A rSoRIN2VO1Ke+73ml/ZLwdmjxvjL29ZEzsepnwandMNw0MV4F8I9SpC60LYhD7pdLagr 5pbRrn4QfDxLQNiTWJ95qkAOAiuvCPS7I+q9Jz4GXYoh9AMhtWpeXuD665F/Xnfe37GH tXyA== X-Gm-Message-State: ABUngvfR1tD73mSl36GHS1HxalpiO+lKtCPP3QksdVxxr0DFdFrZCIgedkF+ZKX/FEVwE0/vMRgQmu630tcmng== X-Received: by 10.25.149.199 with SMTP id x190mr3782746lfd.55.1477521827766; Wed, 26 Oct 2016 15:43:47 -0700 (PDT) MIME-Version: 1.0 Received: by 10.114.20.7 with HTTP; Wed, 26 Oct 2016 15:43:46 -0700 (PDT) In-Reply-To: References: <20161026211938.9320-1-atomnuker@gmail.com> From: Rostislav Pehlivanov Date: Wed, 26 Oct 2016 23:43:46 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] Remove the ffserver program and the ffm muxer/demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 26 October 2016 at 23:33, Andreas Cadhalpun < andreas.cadhalpun@googlemail.com> wrote: > On 27.10.2016 00:16, Rostislav Pehlivanov wrote: > > On 26 October 2016 at 22:48, James Almer wrote: > > > >> On 10/26/2016 6:19 PM, Rostislav Pehlivanov wrote: > >>> Also removes url_feof from libavformat.v which should have been > >>> removed long ago and changed the multipart jpeg boundary tag to > >>> ffmpeg rather than ffserver (it's arbitrary). > >> > >> [...] > >> > >>> diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v > >>> index c961cd8..47d5ddc 100644 > >>> --- a/libavformat/libavformat.v > >>> +++ b/libavformat/libavformat.v > >>> @@ -1,19 +1,6 @@ > >>> LIBAVFORMAT_MAJOR { > >>> global: > >>> av*; > >>> - #FIXME those are for ffserver > >>> - ff_inet_aton; > >>> - ff_socket_nonblock; > >>> - ff_rtsp_parse_line; > >>> - ff_rtp_get_local_rtp_port; > >>> - ff_rtp_get_local_rtcp_port; > >>> - ffio_open_dyn_packet_buf; > >>> - ffio_set_buf_size; > >>> - ffurl_close; > >>> - ffurl_open; > >>> - ffurl_write; > >>> - #those are deprecated, remove on next bump > >>> - url_feof; > >>> local: > >>> *; > >>> }; > >> > >> No, this can't be done until the next major bump. url_feof is even > guarded > >> by an scheduled FF_API define. > >> > >> The rest should be ok, but anything that implies a library ABI break > can't > >> be done just yet. Wait for other comments and/or testing. This removes a > >> lot of things after all. > >> > > Fixed version attached without removing url_feof (apparently that's meant > > to go in the next bump, wasn't forgotten) > > No, none of the symbols can be removed without a major bump. The simple > reason > is that a ffserver built from the 3.1 branch still has to work with the > libavformat from the 3.2 branch. > > Best regards, > Andreas > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > Thanks for telling me, Attached patch will only remove the ffserver program and documentation relating to it. The ffm demuxer/muxer will be removed with the next bump like url_feof. From 48d1ed653e7841f49f50559510ca06f524cbbf1f Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Wed, 26 Oct 2016 23:38:46 +0100 Subject: [PATCH] Remove the ffserver program Also changes the mpjpeg boundary tag to "ffmpeg" (it's arbitrary). Signed-off-by: Rostislav Pehlivanov --- .gitignore | 1 - Changelog | 1 + MAINTAINERS | 3 - Makefile | 4 +- README.md | 2 - configure | 5 - doc/ffmpeg-bitstream-filters.texi | 4 +- doc/ffmpeg-codecs.texi | 4 +- doc/ffmpeg-devices.texi | 4 +- doc/ffmpeg-filters.texi | 4 +- doc/ffmpeg-formats.texi | 4 +- doc/ffmpeg-protocols.texi | 4 +- doc/ffmpeg-resampler.texi | 4 +- doc/ffmpeg-scaler.texi | 4 +- doc/ffmpeg-utils.texi | 4 +- doc/ffmpeg.texi | 4 +- doc/ffplay.texi | 4 +- doc/ffprobe.texi | 4 +- doc/ffserver.conf | 372 ---- doc/ffserver.texi | 923 --------- doc/issue_tracker.txt | 3 - doc/libavcodec.texi | 4 +- doc/libavdevice.texi | 4 +- doc/libavfilter.texi | 4 +- doc/libavformat.texi | 4 +- doc/libavutil.texi | 4 +- doc/libswresample.texi | 4 +- doc/libswscale.texi | 4 +- doc/protocols.texi | 2 +- ffserver.c | 4043 ------------------------------------- ffserver_config.c | 1320 ------------ ffserver_config.h | 134 -- libavformat/mpjpeg.c | 2 +- tests/Makefile | 10 - tests/ffserver-regression.sh | 39 - tests/ffserver.conf | 311 --- tools/bisect-create | 2 +- 37 files changed, 43 insertions(+), 7210 deletions(-) delete mode 100644 doc/ffserver.conf delete mode 100644 doc/ffserver.texi delete mode 100644 ffserver.c delete mode 100644 ffserver_config.c delete mode 100644 ffserver_config.h delete mode 100755 tests/ffserver-regression.sh delete mode 100644 tests/ffserver.conf diff --git a/.gitignore b/.gitignore index 524fb73..fe97ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ /ffmpeg /ffplay /ffprobe -/ffserver /config.* /coverage.info /avversion.h diff --git a/Changelog b/Changelog index a3dfb9a..4edad39 100644 --- a/Changelog +++ b/Changelog @@ -40,6 +40,7 @@ version 3.2: - Matroska muxer now writes CRC32 elements by default in all Level 1 elements - sidedata video and asidedata audio filter - Changed mapping of rtp MIME type G726 to codec g726le. +- ffserver program removed version 3.1: diff --git a/MAINTAINERS b/MAINTAINERS index d0457a6..61bfd1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,9 +29,6 @@ ffplay: ffprobe: ffprobe.c Stefano Sabatini -ffserver: - ffserver.c Reynaldo H. Verdejo Pinochet - Commandline utility code: cmdutils.c, cmdutils.h Michael Niedermayer diff --git a/Makefile b/Makefile index 8aa72fd..82e5d31 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,12 @@ vpath %/fate_config.sh.template $(SRC_PATH) AVPROGS-$(CONFIG_FFMPEG) += ffmpeg AVPROGS-$(CONFIG_FFPLAY) += ffplay AVPROGS-$(CONFIG_FFPROBE) += ffprobe -AVPROGS-$(CONFIG_FFSERVER) += ffserver AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) INSTPROGS = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) PROGS += $(AVPROGS) -AVBASENAMES = ffmpeg ffplay ffprobe ffserver +AVBASENAMES = ffmpeg ffplay ffprobe ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) @@ -39,7 +38,6 @@ endif OBJS-ffmpeg-$(CONFIG_CUVID) += ffmpeg_cuvid.o OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o -OBJS-ffserver += ffserver_config.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options diff --git a/README.md b/README.md index 7d5a7ef..447347c 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,6 @@ such as audio, video, subtitles and related metadata. * [ffplay](https://ffmpeg.org/ffplay.html) is a minimalistic multimedia player. * [ffprobe](https://ffmpeg.org/ffprobe.html) is a simple analysis tool to inspect multimedia content. -* [ffserver](https://ffmpeg.org/ffserver.html) is a multimedia streaming server - for live broadcasts. * Additional small tools such as `aviocat`, `ismindex` and `qt-faststart`. ## Documentation diff --git a/configure b/configure index 7476ca8..b0486be 100755 --- a/configure +++ b/configure @@ -115,7 +115,6 @@ Program options: --disable-ffmpeg disable ffmpeg build --disable-ffplay disable ffplay build --disable-ffprobe disable ffprobe build - --disable-ffserver disable ffserver build Documentation options: --disable-doc do not build documentation @@ -1614,7 +1613,6 @@ LICENSE_LIST=" PROGRAM_LIST=" ffplay ffprobe - ffserver ffmpeg " @@ -3142,8 +3140,6 @@ ffplay_deps="avcodec avformat swscale swresample sdl2" ffplay_libs='$sdl2_libs' ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" ffprobe_deps="avcodec avformat" -ffserver_deps="avformat fork sarestart" -ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer" # documentation podpages_deps="perl" @@ -4887,7 +4883,6 @@ case $target_os in add_compat strtod.o strtod=avpriv_strtod network_extralibs='-lbsd' exeobjs=compat/plan9/main.o - disable ffserver cp_f='cp' ;; none) diff --git a/doc/ffmpeg-bitstream-filters.texi b/doc/ffmpeg-bitstream-filters.texi index bbde257..63c0b33 100644 --- a/doc/ffmpeg-bitstream-filters.texi +++ b/doc/ffmpeg-bitstream-filters.texi @@ -26,12 +26,12 @@ bitstream level modifications without performing decoding. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavcodec.html,libavcodec} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavcodec(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavcodec(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-codecs.texi b/doc/ffmpeg-codecs.texi index 7df4391..e46cd3a 100644 --- a/doc/ffmpeg-codecs.texi +++ b/doc/ffmpeg-codecs.texi @@ -23,12 +23,12 @@ the libavcodec library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavcodec.html,libavcodec} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavcodec(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavcodec(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-devices.texi b/doc/ffmpeg-devices.texi index 721c0df..a51de00 100644 --- a/doc/ffmpeg-devices.texi +++ b/doc/ffmpeg-devices.texi @@ -23,12 +23,12 @@ libavdevice library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavdevice.html,libavdevice} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavdevice(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavdevice(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-filters.texi b/doc/ffmpeg-filters.texi index b643f2c..a8ababa 100644 --- a/doc/ffmpeg-filters.texi +++ b/doc/ffmpeg-filters.texi @@ -23,12 +23,12 @@ libavfilter library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavfilter.html,libavfilter} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavfilter(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavfilter(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-formats.texi b/doc/ffmpeg-formats.texi index d916ee8..a1917a7 100644 --- a/doc/ffmpeg-formats.texi +++ b/doc/ffmpeg-formats.texi @@ -23,12 +23,12 @@ provided by the libavformat library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavformat.html,libavformat} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavformat(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavformat(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-protocols.texi b/doc/ffmpeg-protocols.texi index f3a09f6..7f0e62a 100644 --- a/doc/ffmpeg-protocols.texi +++ b/doc/ffmpeg-protocols.texi @@ -23,12 +23,12 @@ libavformat library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavformat.html,libavformat} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavformat(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavformat(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-resampler.texi b/doc/ffmpeg-resampler.texi index be3784f..0e9a3dd 100644 --- a/doc/ffmpeg-resampler.texi +++ b/doc/ffmpeg-resampler.texi @@ -25,12 +25,12 @@ and convert audio format and packing layout. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libswresample.html,libswresample} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libswresample(3) +ffmpeg(1), ffplay(1), ffprobe(1), libswresample(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-scaler.texi b/doc/ffmpeg-scaler.texi index 9ab12a1..d259da9 100644 --- a/doc/ffmpeg-scaler.texi +++ b/doc/ffmpeg-scaler.texi @@ -24,12 +24,12 @@ image rescaling and pixel format conversion. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libswscale.html,libswscale} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libswscale(3) +ffmpeg(1), ffplay(1), ffprobe(1), libswscale(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg-utils.texi b/doc/ffmpeg-utils.texi index e39cfa8..d8e0884 100644 --- a/doc/ffmpeg-utils.texi +++ b/doc/ffmpeg-utils.texi @@ -23,12 +23,12 @@ by the libavutil library. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{libavutil.html,libavutil} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavutil(3) +ffmpeg(1), ffplay(1), ffprobe(1), libavutil(3) @end ifnothtml @include authors.texi diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 47c8935..0743778 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1593,7 +1593,7 @@ ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext @ifset config-not-all @url{ffmpeg-all.html,ffmpeg-all}, @end ifset -@url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-utils.html,ffmpeg-utils}, @url{ffmpeg-scaler.html,ffmpeg-scaler}, @url{ffmpeg-resampler.html,ffmpeg-resampler}, @@ -1612,7 +1612,7 @@ ffmpeg(1), @ifset config-not-all ffmpeg-all(1), @end ifset -ffplay(1), ffprobe(1), ffserver(1), +ffplay(1), ffprobe(1), ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1), ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1), ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 4bc3ced..5cc5ef5 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -285,7 +285,7 @@ Toggle full screen. @ifset config-not-all @url{ffplay-all.html,ffmpeg-all}, @end ifset -@url{ffmpeg.html,ffmpeg}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-utils.html,ffmpeg-utils}, @url{ffmpeg-scaler.html,ffmpeg-scaler}, @url{ffmpeg-resampler.html,ffmpeg-resampler}, @@ -304,7 +304,7 @@ ffplay(1), @ifset config-not-all ffplay-all(1), @end ifset -ffmpeg(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffprobe(1), ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1), ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1), ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1) diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 1069ae3..488e365 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -646,7 +646,7 @@ DV, GXF and AVI timecodes are available in format metadata @ifset config-not-all @url{ffprobe-all.html,ffprobe-all}, @end ifset -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffmpeg-utils.html,ffmpeg-utils}, @url{ffmpeg-scaler.html,ffmpeg-scaler}, @url{ffmpeg-resampler.html,ffmpeg-resampler}, @@ -665,7 +665,7 @@ ffprobe(1), @ifset config-not-all ffprobe-all(1), @end ifset -ffmpeg(1), ffplay(1), ffserver(1), +ffmpeg(1), ffplay(1), ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1), ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1), ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1) diff --git a/doc/ffserver.conf b/doc/ffserver.conf deleted file mode 100644 index e3f99bb..0000000 --- a/doc/ffserver.conf +++ /dev/null @@ -1,372 +0,0 @@ -# Port on which the server is listening. You must select a different -# port from your standard HTTP web server if it is running on the same -# computer. -HTTPPort 8090 - -# Address on which the server is bound. Only useful if you have -# several network interfaces. -HTTPBindAddress 0.0.0.0 - -# Number of simultaneous HTTP connections that can be handled. It has -# to be defined *before* the MaxClients parameter, since it defines the -# MaxClients maximum limit. -MaxHTTPConnections 2000 - -# Number of simultaneous requests that can be handled. Since FFServer -# is very fast, it is more likely that you will want to leave this high -# and use MaxBandwidth, below. -MaxClients 1000 - -# This the maximum amount of kbit/sec that you are prepared to -# consume when streaming to clients. -MaxBandwidth 1000 - -# Access log file (uses standard Apache log file format) -# '-' is the standard output. -CustomLog - - -################################################################## -# Definition of the live feeds. Each live feed contains one video -# and/or audio sequence coming from an ffmpeg encoder or another -# ffserver. This sequence may be encoded simultaneously with several -# codecs at several resolutions. - - - -# You must use 'ffmpeg' to send a live feed to ffserver. In this -# example, you can type: -# -# ffmpeg http://localhost:8090/feed1.ffm - -# ffserver can also do time shifting. It means that it can stream any -# previously recorded live stream. The request should contain: -# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify -# a path where the feed is stored on disk. You also specify the -# maximum size of the feed, where zero means unlimited. Default: -# File=/tmp/feed_name.ffm FileMaxSize=5M -File /tmp/feed1.ffm -FileMaxSize 200K - -# You could specify -# ReadOnlyFile /saved/specialvideo.ffm -# This marks the file as readonly and it will not be deleted or updated. - -# Specify launch in order to start ffmpeg automatically. -# First ffmpeg must be defined with an appropriate path if needed, -# after that options can follow, but avoid adding the http:// field -#Launch ffmpeg - -# Only allow connections from localhost to the feed. -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 -# request containing this filename. - - - -# coming from live feed 'feed1' -Feed feed1.ffm - -# Format of the stream : you can choose among: -# mpeg : MPEG-1 multiplexed video and audio -# mpegvideo : only MPEG-1 video -# mp2 : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec) -# ogg : Ogg format (Vorbis audio codec) -# rm : RealNetworks-compatible stream. Multiplexed audio and video. -# ra : RealNetworks-compatible stream. Audio only. -# mpjpeg : Multipart JPEG (works with Netscape without any plugin) -# jpeg : Generate a single JPEG image. -# mjpeg : Generate a M-JPEG stream. -# asf : ASF compatible streaming (Windows Media Player format). -# swf : Macromedia Flash compatible stream -# avi : AVI format (MPEG-4 video, MPEG audio sound) -Format mpeg - -# Bitrate for the audio stream. Codecs usually support only a few -# different bitrates. -AudioBitRate 32 - -# Number of audio channels: 1 = mono, 2 = stereo -AudioChannels 1 - -# Sampling frequency for audio. When using low bitrates, you should -# lower this frequency to 22050 or 11025. The supported frequencies -# depend on the selected audio codec. -AudioSampleRate 44100 - -# Bitrate for the video stream -VideoBitRate 64 - -# Ratecontrol buffer size -VideoBufferSize 40 - -# Number of frames per second -VideoFrameRate 3 - -# Size of the video frame: WxH (default: 160x128) -# The following abbreviations are defined: sqcif, qcif, cif, 4cif, qqvga, -# qvga, vga, svga, xga, uxga, qxga, sxga, qsxga, hsxga, wvga, wxga, wsxga, -# wuxga, woxga, wqsxga, wquxga, whsxga, whuxga, cga, ega, hd480, hd720, -# hd1080 -VideoSize 160x128 - -# Transmit only intra frames (useful for low bitrates, but kills frame rate). -#VideoIntraOnly - -# If non-intra only, an intra frame is transmitted every VideoGopSize -# frames. Video synchronization can only begin at an intra frame. -VideoGopSize 12 - -# More MPEG-4 parameters -# VideoHighQuality -# Video4MotionVector - -# Choose your codecs: -#AudioCodec mp2 -#VideoCodec mpeg1video - -# Suppress audio -#NoAudio - -# Suppress video -#NoVideo - -#VideoQMin 3 -#VideoQMax 31 - -# Set this to the number of seconds backwards in time to start. Note that -# most players will buffer 5-10 seconds of video, and also you need to allow -# for a keyframe to appear in the data stream. -#Preroll 15 - -# ACL: - -# You can allow ranges of addresses (or single addresses) -#ACL ALLOW - -# You can deny ranges of addresses (or single addresses) -#ACL DENY - -# You can repeat the ACL allow/deny as often as you like. It is on a per -# stream basis. The first match defines the action. If there are no matches, -# then the default is the inverse of the last ACL statement. -# -# Thus 'ACL allow localhost' only allows access from localhost. -# 'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and -# allow everybody else. - - - - -################################################################## -# Example streams - - -# Multipart JPEG - -# -#Feed feed1.ffm -#Format mpjpeg -#VideoFrameRate 2 -#VideoIntraOnly -#NoAudio -#Strict -1 -# - - -# Single JPEG - -# -#Feed feed1.ffm -#Format jpeg -#VideoFrameRate 2 -#VideoIntraOnly -##VideoSize 352x240 -#NoAudio -#Strict -1 -# - - -# Flash - -# -#Feed feed1.ffm -#Format swf -#VideoFrameRate 2 -#VideoIntraOnly -#NoAudio -# - - -# ASF compatible - - -Feed feed1.ffm -Format asf -VideoFrameRate 15 -VideoSize 352x240 -VideoBitRate 256 -VideoBufferSize 40 -VideoGopSize 30 -AudioBitRate 64 -StartSendOnKey - - - -# MP3 audio - -# -#Feed feed1.ffm -#Format mp2 -#AudioCodec mp3 -#AudioBitRate 64 -#AudioChannels 1 -#AudioSampleRate 44100 -#NoVideo -# - - -# Ogg Vorbis audio - -# -#Feed feed1.ffm -#Metadata title "Stream title" -#AudioBitRate 64 -#AudioChannels 2 -#AudioSampleRate 44100 -#NoVideo -# - - -# Real with audio only at 32 kbits - -# -#Feed feed1.ffm -#Format rm -#AudioBitRate 32 -#NoVideo -#NoAudio -# - - -# Real with audio and video at 64 kbits - -# -#Feed feed1.ffm -#Format rm -#AudioBitRate 32 -#VideoBitRate 128 -#VideoFrameRate 25 -#VideoGopSize 25 -#NoAudio -# - - -################################################################## -# A stream coming from a file: you only need to set the input -# filename and optionally a new format. Supported conversions: -# AVI -> ASF - -# -#File "/usr/local/httpd/htdocs/tlive.rm" -#NoAudio -# - -# -#File "/usr/local/httpd/htdocs/test.asf" -#NoAudio -#Metadata author "Me" -#Metadata copyright "Super MegaCorp" -#Metadata title "Test stream from disk" -#Metadata comment "Test comment" -# - - -################################################################## -# RTSP examples -# -# You can access this stream with the RTSP URL: -# rtsp://localhost:5454/test1-rtsp.mpg -# -# A non-standard RTSP redirector is also created. Its URL is: -# http://localhost:8090/test1-rtsp.rtsp - -# -#Format rtp -#File "/usr/local/httpd/htdocs/test1.mpg" -# - - -# Transcode an incoming live feed to another live feed, -# using libx264 and video presets - -# -#Format rtp -#Feed feed1.ffm -#VideoCodec libx264 -#VideoFrameRate 24 -#VideoBitRate 100 -#VideoSize 480x272 -#AVPresetVideo default -#AVPresetVideo baseline -#AVOptionVideo flags +global_header -# -#AudioCodec aac -#AudioBitRate 32 -#AudioChannels 2 -#AudioSampleRate 22050 -#AVOptionAudio flags +global_header -# - -################################################################## -# SDP/multicast examples -# -# If you want to send your stream in multicast, you must set the -# multicast address with MulticastAddress. The port and the TTL can -# also be set. -# -# An SDP file is automatically generated by ffserver 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. -# -# The 'NoLoop' option can be used to avoid looping when the stream is -# terminated. - -# -#Format rtp -#File "/usr/local/httpd/htdocs/test1.mpg" -#MulticastAddress 224.124.0.1 -#MulticastPort 5000 -#MulticastTTL 16 -#NoLoop -# - - -################################################################## -# Special streams - -# Server status - - -Format status - -# Only allow local people to get the status -ACL allow localhost -ACL allow 192.168.0.0 192.168.255.255 - -#FaviconURL http://pond1.gladstonefamily.net:8080/favicon.ico - - - -# Redirect index.html to the appropriate site - - -URL http://www.ffmpeg.org/ - diff --git a/doc/ffserver.texi b/doc/ffserver.texi deleted file mode 100644 index ad48f47..0000000 --- a/doc/ffserver.texi +++ /dev/null @@ -1,923 +0,0 @@ -\input texinfo @c -*- texinfo -*- -@documentencoding UTF-8 - -@settitle ffserver Documentation -@titlepage -@center @titlefont{ffserver Documentation} -@end titlepage - -@top - -@contents - -@chapter Synopsis - -ffserver [@var{options}] - -@chapter Description -@c man begin DESCRIPTION - -@command{ffserver} 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. - -@command{ffserver} is configured through a configuration file, which -is read at startup. If not explicitly specified, it will read from -@file{/etc/ffserver.conf}. - -@command{ffserver} receives prerecorded files or FFM streams from some -@command{ffmpeg} instance as input, then streams them over -RTP/RTSP/HTTP. - -An @command{ffserver} instance will listen on some port as specified -in the configuration file. You can launch one or more instances of -@command{ffmpeg} and send one or more FFM streams to the port where -ffserver is expecting to receive them. Alternately, you can make -@command{ffserver} launch such @command{ffmpeg} instances at startup. - -Input streams are called feeds, and each one is specified by a -@code{} section in the configuration file. - -For each feed you can have different output streams in various -formats, each one specified by a @code{} section in the -configuration file. - -@chapter Detailed description - -@command{ffserver} works by forwarding streams encoded by -@command{ffmpeg}, or pre-recorded streams which are read from disk. - -Precisely, @command{ffserver} acts as an HTTP server, accepting POST -requests from @command{ffmpeg} to acquire the stream to publish, and -serving RTSP clients or HTTP clients GET requests with the stream -media content. - -A feed is an @ref{FFM} stream created by @command{ffmpeg}, and sent to -a port where @command{ffserver} is listening. - -Each feed is identified by a unique name, corresponding to the name -of the resource published on @command{ffserver}, and is configured by -a dedicated @code{Feed} section in the configuration file. - -The feed publish URL is given by: -@example -http://@var{ffserver_ip_address}:@var{http_port}/@var{feed_name} -@end example - -where @var{ffserver_ip_address} is the IP address of the machine where -@command{ffserver} is installed, @var{http_port} is the port number of -the HTTP server (configured through the @option{HTTPPort} option), and -@var{feed_name} is the name of the corresponding feed defined in the -configuration file. - -Each feed is associated to a file which is stored on disk. This stored -file is used to send pre-recorded data to a player as fast as -possible when new content is added in real-time to the stream. - -A "live-stream" or "stream" is a resource published by -@command{ffserver}, and made accessible through the HTTP protocol to -clients. - -A stream can be connected to a feed, or to a file. In the first case, -the published stream is forwarded from the corresponding feed -generated by a running instance of @command{ffmpeg}, in the second -case the stream is read from a pre-recorded file. - -Each stream is identified by a unique name, corresponding to the name -of the resource served by @command{ffserver}, and is configured by -a dedicated @code{Stream} section in the configuration file. - -The stream access HTTP URL is given by: -@example -http://@var{ffserver_ip_address}:@var{http_port}/@var{stream_name}[@var{options}] -@end example - -The stream access RTSP URL is given by: -@example -http://@var{ffserver_ip_address}:@var{rtsp_port}/@var{stream_name}[@var{options}] -@end example - -@var{stream_name} is the name of the corresponding stream defined in -the configuration file. @var{options} is a list of options specified -after the URL which affects how the stream is served by -@command{ffserver}. @var{http_port} and @var{rtsp_port} are the HTTP -and RTSP ports configured with the options @var{HTTPPort} and -@var{RTSPPort} respectively. - -In case the stream is associated to a feed, the encoding parameters -must be configured in the stream configuration. They are sent to -@command{ffmpeg} when setting up the encoding. This allows -@command{ffserver} to define the encoding parameters used by -the @command{ffmpeg} encoders. - -The @command{ffmpeg} @option{override_ffserver} commandline option -allows one to override the encoding parameters set by the server. - -Multiple streams can be connected to the same feed. - -For example, you can have a situation described by the following -graph: - -@verbatim - _________ __________ - | | | | -ffmpeg 1 -----| feed 1 |-----| stream 1 | - \ |_________|\ |__________| - \ \ - \ \ __________ - \ \ | | - \ \| stream 2 | - \ |__________| - \ - \ _________ __________ - \ | | | | - \| feed 2 |-----| stream 3 | - |_________| |__________| - - _________ __________ - | | | | -ffmpeg 2 -----| feed 3 |-----| stream 4 | - |_________| |__________| - - _________ __________ - | | | | - | file 1 |-----| stream 5 | - |_________| |__________| - -@end verbatim - -@anchor{FFM} -@section FFM, FFM2 formats - -FFM and FFM2 are formats used by ffserver. They allow storing a wide variety of -video and audio streams and encoding options, and can store a moving time segment -of an infinite movie or a whole movie. - -FFM is version specific, and there is limited compatibility of FFM files -generated by one version of ffmpeg/ffserver and another version of -ffmpeg/ffserver. It may work but it is not guaranteed to work. - -FFM2 is extensible while maintaining compatibility and should work between -differing versions of tools. FFM2 is the default. - -@section Status stream - -@command{ffserver} supports an HTTP interface which exposes the -current status of the server. - -Simply point your browser to the address of the special status stream -specified in the configuration file. - -For example if you have: -@example - -Format status - -# Only allow local people to get the status -ACL allow localhost -ACL allow 192.168.0.0 192.168.255.255 - -@end example - -then the server will post a page with the status information when -the special stream @file{status.html} is requested. - -@section How do I make it work? - -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 & -ffmpeg -i INPUTFILE http://localhost:8090/feed1.ffm -@end example - -At this point you should be able to go to your Windows machine and fire up -Windows Media Player (WMP). Go to Open URL and enter - -@example - http://:8090/test.asf -@end example - -You should (after a short delay) see video and hear audio. - -WARNING: trying to stream test1.mpg doesn't work with WMP as it tries to -transfer the entire file before starting to play. -The same is true of AVI files. - -You should edit the @file{ffserver.conf} file to suit your needs (in -terms of frame rates etc). Then install @command{ffserver} and -@command{ffmpeg}, write a script to start them up, and off you go. - -@section What else can it do? - -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. -(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. - -It will automatically generate the ASX or RAM files that are often used -in browsers. These files are actually redirections to the underlying ASF -or RM file. The reason for this is that the browser often fetches the -entire file before starting up the external viewer. The redirection files -are very small and can be transferred quickly. [The stream itself is -often 'infinite' and thus the browser tries to download it and never -finishes.] - -@section Tips - -* 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 -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 -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 -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 -is found. This further reduces the startup delay by not transferring data -that will be discarded. - -@section Why does the ?buffer / Preroll stop working after a time? - -It turns out that (on my machine at least) the number of frames successfully -grabbed is marginally less than the number that ought to be grabbed. This -means that the timestamp in the encoded data stream gets behind realtime. -This means that if you say 'Preroll 10', then when the stream gets 10 -or more seconds behind, there is no Preroll left. - -Fixing this requires a change in the internals of how timestamps are -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), -thus wiping out what you had recorded before. - -The format of the @code{?date=xxxxxx} is fairly flexible. You should use one -of the following formats (the 'T' is literal): - -@example -* YYYY-MM-DDTHH:MM:SS (localtime) -* YYYY-MM-DDTHH:MM:SSZ (UTC) -@end example - -You can omit the YYYY-MM-DD, and then it refers to the current day. However -note that @samp{?date=16:00:00} refers to 16:00 on the current day -- this -may be in the future and so is unlikely to be useful. - -You use this by adding the ?date= to the end of the URL for the stream. -For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}. -@c man end - -@chapter Options -@c man begin OPTIONS - -@include fftools-common-opts.texi - -@section Main options - -@table @option -@item -f @var{configfile} -Read configuration file @file{configfile}. If not specified it will -read by default from @file{/etc/ffserver.conf}. - -@item -n -Enable no-launch mode. This option disables all the @code{Launch} -directives within the various @code{} sections. Since -@command{ffserver} will not launch any @command{ffmpeg} instances, you -will have to launch them manually. - -@item -d -Enable debug mode. This option increases log verbosity, and directs -log messages to stdout. When specified, the @option{CustomLog} option -is ignored. -@end table - -@chapter Configuration file syntax - -@command{ffserver} reads a configuration file containing global -options and settings for each stream and feed. - -The configuration file consists of global options and dedicated -sections, which must be introduced by "<@var{SECTION_NAME} -@var{ARGS}>" on a separate line and must be terminated by a line in -the form "". @var{ARGS} is optional. - -Currently the following sections are recognized: @samp{Feed}, -@samp{Stream}, @samp{Redirect}. - -A line starting with @code{#} is ignored and treated as a comment. - -Name of options and sections are case-insensitive. - -@section ACL syntax -An ACL (Access Control List) specifies the address which are allowed -to access a given stream, or to write a given feed. - -It accepts the folling forms -@itemize -@item -Allow/deny access to @var{address}. -@example -ACL ALLOW
-ACL DENY
-@end example - -@item -Allow/deny access to ranges of addresses from @var{first_address} to -@var{last_address}. -@example -ACL ALLOW -ACL DENY -@end example -@end itemize - -You can repeat the ACL allow/deny as often as you like. It is on a per -stream basis. The first match defines the action. If there are no matches, -then the default is the inverse of the last ACL statement. - -Thus 'ACL allow localhost' only allows access from localhost. -'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and -allow everybody else. - -@section Global options -@table @option -@item HTTPPort @var{port_number} -@item Port @var{port_number} -@item RTSPPort @var{port_number} - -@var{HTTPPort} sets the HTTP server listening TCP port number, -@var{RTSPPort} sets the RTSP server listening TCP port number. - -@var{Port} is the equivalent of @var{HTTPPort} and is deprecated. - -You must select a different port from your standard HTTP web server if -it is running on the same computer. - -If not specified, no corresponding server will be created. - -@item HTTPBindAddress @var{ip_address} -@item BindAddress @var{ip_address} -@item RTSPBindAddress @var{ip_address} -Set address on which the HTTP/RTSP server is bound. Only useful if you -have several network interfaces. - -@var{BindAddress} is the equivalent of @var{HTTPBindAddress} and is -deprecated. - -@item MaxHTTPConnections @var{n} -Set number of simultaneous HTTP connections that can be handled. It -has to be defined @emph{before} the @option{MaxClients} parameter, -since it defines the @option{MaxClients} maximum limit. - -Default value is 2000. - -@item MaxClients @var{n} -Set number of simultaneous requests that can be handled. Since -@command{ffserver} is very fast, it is more likely that you will want -to leave this high and use @option{MaxBandwidth}. - -Default value is 5. - -@item MaxBandwidth @var{kbps} -Set the maximum amount of kbit/sec that you are prepared to consume -when streaming to clients. - -Default value is 1000. - -@item CustomLog @var{filename} -Set access log file (uses standard Apache log file format). '-' is the -standard output. - -If not specified @command{ffserver} will produce no log. - -In case the commandline option @option{-d} is specified this option is -ignored, and the log is written to standard output. - -@item NoDaemon -Set no-daemon mode. This option is currently ignored since now -@command{ffserver} will always work in no-daemon mode, and is -deprecated. - -@item UseDefaults -@item NoDefaults -Control whether default codec options are used for the all streams or not. -Each stream may overwrite this setting for its own. Default is @var{UseDefaults}. -The lastest occurrence overrides previous if multiple definitions. -@end table - -@section Feed section - -A Feed section defines a feed provided to @command{ffserver}. - -Each live feed contains one video and/or audio sequence coming from an -@command{ffmpeg} encoder or another @command{ffserver}. This sequence -may be encoded simultaneously with several codecs at several -resolutions. - -A feed instance specification is introduced by a line in the form: -@example - -@end example - -where @var{FEED_FILENAME} specifies the unique name of the FFM stream. - -The following options are recognized within a Feed section. - -@table @option -@item File @var{filename} -@item ReadOnlyFile @var{filename} -Set the path where the feed file is stored on disk. - -If not specified, the @file{/tmp/FEED.ffm} is assumed, where -@var{FEED} is the feed name. - -If @option{ReadOnlyFile} is used the file is marked as read-only and -it will not be deleted or updated. - -@item Truncate -Truncate the feed file, rather than appending to it. By default -@command{ffserver} will append data to the file, until the maximum -file size value is reached (see @option{FileMaxSize} option). - -@item FileMaxSize @var{size} -Set maximum size of the feed file in bytes. 0 means unlimited. The -postfixes @code{K} (2^10), @code{M} (2^20), and @code{G} (2^30) are -recognized. - -Default value is 5M. - -@item Launch @var{args} -Launch an @command{ffmpeg} command when creating @command{ffserver}. - -@var{args} must be a sequence of arguments to be provided to an -@command{ffmpeg} instance. The first provided argument is ignored, and -it is replaced by a path with the same dirname of the @command{ffserver} -instance, followed by the remaining argument and terminated with a -path corresponding to the feed. - -When the launched process exits, @command{ffserver} will launch -another program instance. - -In case you need a more complex @command{ffmpeg} configuration, -e.g. if you need to generate multiple FFM feeds with a single -@command{ffmpeg} instance, you should launch @command{ffmpeg} by hand. - -This option is ignored in case the commandline option @option{-n} is -specified. - -@item ACL @var{spec} -Specify the list of IP address which are allowed or denied to write -the feed. Multiple ACL options can be specified. -@end table - -@section Stream section - -A Stream section defines a stream provided by @command{ffserver}, and -identified by a single name. - -The stream is sent when answering a request containing the stream -name. - -A stream section must be introduced by the line: -@example - -@end example - -where @var{STREAM_NAME} specifies the unique name of the stream. - -The following options are recognized within a Stream section. - -Encoding options are marked with the @emph{encoding} tag, and they are -used to set the encoding parameters, and are mapped to libavcodec -encoding options. Not all encoding options are supported, in -particular it is not possible to set encoder private options. In order -to override the encoding options specified by @command{ffserver}, you -can use the @command{ffmpeg} @option{override_ffserver} commandline -option. - -Only one of the @option{Feed} and @option{File} options should be set. - -@table @option -@item Feed @var{feed_name} -Set the input feed. @var{feed_name} must correspond to an existing -feed defined in a @code{Feed} section. - -When this option is set, encoding options are used to setup the -encoding operated by the remote @command{ffmpeg} process. - -@item File @var{filename} -Set the filename of the pre-recorded input file to stream. - -When this option is set, encoding options are ignored and the input -file content is re-streamed as is. - -@item Format @var{format_name} -Set the format of the output stream. - -Must be the name of a format recognized by FFmpeg. If set to -@samp{status}, it is treated as a status stream. - -@item InputFormat @var{format_name} -Set input format. If not specified, it is automatically guessed. - -@item Preroll @var{n} -Set this to the number of seconds backwards in time to start. Note that -most players will buffer 5-10 seconds of video, and also you need to allow -for a keyframe to appear in the data stream. - -Default value is 0. - -@item StartSendOnKey -Do not send stream until it gets the first key frame. By default -@command{ffserver} will send data immediately. - -@item MaxTime @var{n} -Set the number of seconds to run. This value set the maximum duration -of the stream a client will be able to receive. - -A value of 0 means that no limit is set on the stream duration. - -@item ACL @var{spec} -Set ACL for the stream. - -@item DynamicACL @var{spec} - -@item RTSPOption @var{option} - -@item MulticastAddress @var{address} - -@item MulticastPort @var{port} - -@item MulticastTTL @var{integer} - -@item NoLoop - -@item FaviconURL @var{url} -Set favicon (favourite icon) for the server status page. It is ignored -for regular streams. - -@item Author @var{value} -@item Comment @var{value} -@item Copyright @var{value} -@item Title @var{value} -Set metadata corresponding to the option. All these options are -deprecated in favor of @option{Metadata}. - -@item Metadata @var{key} @var{value} -Set metadata value on the output stream. - -@item UseDefaults -@item NoDefaults -Control whether default codec options are used for the stream or not. -Default is @var{UseDefaults} unless disabled globally. - -@item NoAudio -@item NoVideo -Suppress audio/video. - -@item AudioCodec @var{codec_name} (@emph{encoding,audio}) -Set audio codec. - -@item AudioBitRate @var{rate} (@emph{encoding,audio}) -Set bitrate for the audio stream in kbits per second. - -@item AudioChannels @var{n} (@emph{encoding,audio}) -Set number of audio channels. - -@item AudioSampleRate @var{n} (@emph{encoding,audio}) -Set sampling frequency for audio. When using low bitrates, you should -lower this frequency to 22050 or 11025. The supported frequencies -depend on the selected audio codec. - -@item AVOptionAudio [@var{codec}:]@var{option} @var{value} (@emph{encoding,audio}) -Set generic or private option for audio stream. -Private option must be prefixed with codec name or codec must be defined before. - -@item AVPresetAudio @var{preset} (@emph{encoding,audio}) -Set preset for audio stream. - -@item VideoCodec @var{codec_name} (@emph{encoding,video}) -Set video codec. - -@item VideoBitRate @var{n} (@emph{encoding,video}) -Set bitrate for the video stream in kbits per second. - -@item VideoBitRateRange @var{range} (@emph{encoding,video}) -Set video bitrate range. - -A range must be specified in the form @var{minrate}-@var{maxrate}, and -specifies the @option{minrate} and @option{maxrate} encoding options -expressed in kbits per second. - -@item VideoBitRateRangeTolerance @var{n} (@emph{encoding,video}) -Set video bitrate tolerance in kbits per second. - -@item PixelFormat @var{pixel_format} (@emph{encoding,video}) -Set video pixel format. - -@item Debug @var{integer} (@emph{encoding,video}) -Set video @option{debug} encoding option. - -@item Strict @var{integer} (@emph{encoding,video}) -Set video @option{strict} encoding option. - -@item VideoBufferSize @var{n} (@emph{encoding,video}) -Set ratecontrol buffer size, expressed in KB. - -@item VideoFrameRate @var{n} (@emph{encoding,video}) -Set number of video frames per second. - -@item VideoSize (@emph{encoding,video}) -Set size of the video frame, must be an abbreviation or in the form -@var{W}x@var{H}. See @ref{video size syntax,,the Video size section -in the ffmpeg-utils(1) manual,ffmpeg-utils}. - -Default value is @code{160x128}. - -@item VideoIntraOnly (@emph{encoding,video}) -Transmit only intra frames (useful for low bitrates, but kills frame rate). - -@item VideoGopSize @var{n} (@emph{encoding,video}) -If non-intra only, an intra frame is transmitted every VideoGopSize -frames. Video synchronization can only begin at an intra frame. - -@item VideoTag @var{tag} (@emph{encoding,video}) -Set video tag. - -@item VideoHighQuality (@emph{encoding,video}) -@item Video4MotionVector (@emph{encoding,video}) - -@item BitExact (@emph{encoding,video}) -Set bitexact encoding flag. - -@item IdctSimple (@emph{encoding,video}) -Set simple IDCT algorithm. - -@item Qscale @var{n} (@emph{encoding,video}) -Enable constant quality encoding, and set video qscale (quantization -scale) value, expressed in @var{n} QP units. - -@item VideoQMin @var{n} (@emph{encoding,video}) -@item VideoQMax @var{n} (@emph{encoding,video}) -Set video qmin/qmax. - -@item VideoQDiff @var{integer} (@emph{encoding,video}) -Set video @option{qdiff} encoding option. - -@item LumiMask @var{float} (@emph{encoding,video}) -@item DarkMask @var{float} (@emph{encoding,video}) -Set @option{lumi_mask}/@option{dark_mask} encoding options. - -@item AVOptionVideo [@var{codec}:]@var{option} @var{value} (@emph{encoding,video}) -Set generic or private option for video stream. -Private option must be prefixed with codec name or codec must be defined before. - -@item AVPresetVideo @var{preset} (@emph{encoding,video}) -Set preset for video stream. - -@var{preset} must be the path of a preset file. -@end table - -@subsection Server status stream - -A server status stream is a special stream which is used to show -statistics about the @command{ffserver} operations. - -It must be specified setting the option @option{Format} to -@samp{status}. - -@section Redirect section - -A redirect section specifies where to redirect the requested URL to -another page. - -A redirect section must be introduced by the line: -@example - -@end example - -where @var{NAME} is the name of the page which should be redirected. - -It only accepts the option @option{URL}, which specify the redirection -URL. - -@chapter Stream examples - -@itemize -@item -Multipart JPEG -@example - -Feed feed1.ffm -Format mpjpeg -VideoFrameRate 2 -VideoIntraOnly -NoAudio -Strict -1 - -@end example - -@item -Single JPEG -@example - -Feed feed1.ffm -Format jpeg -VideoFrameRate 2 -VideoIntraOnly -VideoSize 352x240 -NoAudio -Strict -1 - -@end example - -@item -Flash -@example - -Feed feed1.ffm -Format swf -VideoFrameRate 2 -VideoIntraOnly -NoAudio - -@end example - -@item -ASF compatible -@example - -Feed feed1.ffm -Format asf -VideoFrameRate 15 -VideoSize 352x240 -VideoBitRate 256 -VideoBufferSize 40 -VideoGopSize 30 -AudioBitRate 64 -StartSendOnKey - -@end example - -@item -MP3 audio -@example - -Feed feed1.ffm -Format mp2 -AudioCodec mp3 -AudioBitRate 64 -AudioChannels 1 -AudioSampleRate 44100 -NoVideo - -@end example - -@item -Ogg Vorbis audio -@example - -Feed feed1.ffm -Metadata title "Stream title" -AudioBitRate 64 -AudioChannels 2 -AudioSampleRate 44100 -NoVideo - -@end example - -@item -Real with audio only at 32 kbits -@example - -Feed feed1.ffm -Format rm -AudioBitRate 32 -NoVideo - -@end example - -@item -Real with audio and video at 64 kbits -@example - -Feed feed1.ffm -Format rm -AudioBitRate 32 -VideoBitRate 128 -VideoFrameRate 25 -VideoGopSize 25 - -@end example - -@item -For stream coming from a file: you only need to set the input filename -and optionally a new format. - -@example - -File "/usr/local/httpd/htdocs/tlive.rm" -NoAudio - -@end example - -@example - -File "/usr/local/httpd/htdocs/test.asf" -NoAudio -Metadata author "Me" -Metadata copyright "Super MegaCorp" -Metadata title "Test stream from disk" -Metadata comment "Test comment" - -@end example -@end itemize - -@c man end - -@include config.texi -@ifset config-all -@ifset config-avutil -@include utils.texi -@end ifset -@ifset config-avcodec -@include codecs.texi -@include bitstream_filters.texi -@end ifset -@ifset config-avformat -@include formats.texi -@include protocols.texi -@end ifset -@ifset config-avdevice -@include devices.texi -@end ifset -@ifset config-swresample -@include resampler.texi -@end ifset -@ifset config-swscale -@include scaler.texi -@end ifset -@ifset config-avfilter -@include filters.texi -@end ifset -@end ifset - -@chapter See Also - -@ifhtml -@ifset config-all -@url{ffserver.html,ffserver}, -@end ifset -@ifset config-not-all -@url{ffserver-all.html,ffserver-all}, -@end ifset -the @file{doc/ffserver.conf} example, -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, -@url{ffmpeg-utils.html,ffmpeg-utils}, -@url{ffmpeg-scaler.html,ffmpeg-scaler}, -@url{ffmpeg-resampler.html,ffmpeg-resampler}, -@url{ffmpeg-codecs.html,ffmpeg-codecs}, -@url{ffmpeg-bitstream-filters.html,ffmpeg-bitstream-filters}, -@url{ffmpeg-formats.html,ffmpeg-formats}, -@url{ffmpeg-devices.html,ffmpeg-devices}, -@url{ffmpeg-protocols.html,ffmpeg-protocols}, -@url{ffmpeg-filters.html,ffmpeg-filters} -@end ifhtml - -@ifnothtml -@ifset config-all -ffserver(1), -@end ifset -@ifset config-not-all -ffserver-all(1), -@end ifset -the @file{doc/ffserver.conf} example, ffmpeg(1), ffplay(1), ffprobe(1), -ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1), -ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1), -ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1) -@end ifnothtml - -@include authors.texi - -@ignore - -@setfilename ffserver -@settitle ffserver video server - -@end ignore - -@bye diff --git a/doc/issue_tracker.txt b/doc/issue_tracker.txt index e8e8530..5d9805a 100644 --- a/doc/issue_tracker.txt +++ b/doc/issue_tracker.txt @@ -193,9 +193,6 @@ ffplay ffprobe issues in or related to ffprobe.c -ffserver - issues in or related to ffserver.c - postproc issues in libpostproc/* diff --git a/doc/libavcodec.texi b/doc/libavcodec.texi index 87b90db..b22c47a 100644 --- a/doc/libavcodec.texi +++ b/doc/libavcodec.texi @@ -26,13 +26,13 @@ implementing robust and fast codecs as well as for experimentation. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-codecs.html,ffmpeg-codecs}, @url{ffmpeg-bitstream-filters.html,bitstream-filters}, @url{libavutil.html,libavutil} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), libavutil(3) @end ifnothtml diff --git a/doc/libavdevice.texi b/doc/libavdevice.texi index 9b10282..0abdaaf 100644 --- a/doc/libavdevice.texi +++ b/doc/libavdevice.texi @@ -23,13 +23,13 @@ VfW, DShow, and ALSA. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-devices.html,ffmpeg-devices}, @url{libavutil.html,libavutil}, @url{libavcodec.html,libavcodec}, @url{libavformat.html,libavformat} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-devices(1), libavutil(3), libavcodec(3), libavformat(3) @end ifnothtml diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi index 52e0753..d9472eb 100644 --- a/doc/libavfilter.texi +++ b/doc/libavfilter.texi @@ -21,14 +21,14 @@ framework containing several filters, sources and sinks. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-filters.html,ffmpeg-filters}, @url{libavutil.html,libavutil}, @url{libswscale.html,libswscale}, @url{libswresample.html,libswresample}, @url{libavcodec.html,libavcodec}, @url{libavformat.html,libavformat}, @url{libavdevice.html,libavdevice} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-filters(1), libavutil(3), libswscale(3), libswresample(3), libavcodec(3), libavformat(3), libavdevice(3) @end ifnothtml diff --git a/doc/libavformat.texi b/doc/libavformat.texi index d505d64..7cf41fd 100644 --- a/doc/libavformat.texi +++ b/doc/libavformat.texi @@ -26,13 +26,13 @@ resource. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-formats.html,ffmpeg-formats}, @url{ffmpeg-protocols.html,ffmpeg-protocols}, @url{libavutil.html,libavutil}, @url{libavcodec.html,libavcodec} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-formats(1), ffmpeg-protocols(1), libavutil(3), libavcodec(3) @end ifnothtml diff --git a/doc/libavutil.texi b/doc/libavutil.texi index 7a1c332..ee50362 100644 --- a/doc/libavutil.texi +++ b/doc/libavutil.texi @@ -42,12 +42,12 @@ It should avoid useless features that almost no one needs. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-utils.html,ffmpeg-utils} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-utils(1) @end ifnothtml diff --git a/doc/libswresample.texi b/doc/libswresample.texi index bb57278..3108cb1 100644 --- a/doc/libswresample.texi +++ b/doc/libswresample.texi @@ -48,13 +48,13 @@ enabled through dedicated options. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-resampler.html,ffmpeg-resampler}, @url{libavutil.html,libavutil} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-resampler(1), libavutil(3) @end ifnothtml diff --git a/doc/libswscale.texi b/doc/libswscale.texi index 757fd24..e137c24 100644 --- a/doc/libswscale.texi +++ b/doc/libswscale.texi @@ -41,13 +41,13 @@ colorspaces differ. @chapter See Also @ifhtml -@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffmpeg-scaler.html,ffmpeg-scaler}, @url{libavutil.html,libavutil} @end ifhtml @ifnothtml -ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), +ffmpeg(1), ffplay(1), ffprobe(1), ffmpeg-scaler(1), libavutil(3) @end ifnothtml diff --git a/doc/protocols.texi b/doc/protocols.texi index 00e182e..dcca718 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -358,7 +358,7 @@ If set to 1 enables experimental HTTP server. This can be used to send data when used as an output option, or read data from a client with HTTP POST when used as an input option. If set to 2 enables experimental multi-client HTTP server. This is not yet implemented -in ffmpeg.c or ffserver.c and thus must not be used as a command line option. +in ffmpeg.c and thus must not be used as a command line option. @example # Server side (sending): ffmpeg -i somefile.ogg -c copy -listen 1 -f ogg http://@var{server}:@var{port} diff --git a/ffserver.c b/ffserver.c deleted file mode 100644 index 453d790..0000000 --- a/ffserver.c +++ /dev/null @@ -1,4043 +0,0 @@ -/* - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * multiple format streaming server based on the FFmpeg libraries - */ - -#include "config.h" -#if !HAVE_CLOSESOCKET -#define closesocket close -#endif -#include -#include -#include -#include "libavformat/avformat.h" -/* FIXME: those are internal headers, ffserver _really_ shouldn't use them */ -#include "libavformat/ffm.h" -#include "libavformat/network.h" -#include "libavformat/os_support.h" -#include "libavformat/rtpdec.h" -#include "libavformat/rtpproto.h" -#include "libavformat/rtsp.h" -#include "libavformat/rtspcodes.h" -#include "libavformat/avio_internal.h" -#include "libavformat/internal.h" -#include "libavformat/url.h" - -#include "libavutil/avassert.h" -#include "libavutil/avstring.h" -#include "libavutil/lfg.h" -#include "libavutil/dict.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" -#include "libavutil/random_seed.h" -#include "libavutil/parseutils.h" -#include "libavutil/opt.h" -#include "libavutil/time.h" - -#include -#if HAVE_UNISTD_H -#include -#endif -#include -#include -#if HAVE_POLL_H -#include -#endif -#include -#include -#include -#include - -#include "cmdutils.h" -#include "ffserver_config.h" - -#define PATH_LENGTH 1024 - -const char program_name[] = "ffserver"; -const int program_birth_year = 2000; - -static const OptionDef options[]; - -enum HTTPState { - HTTPSTATE_WAIT_REQUEST, - HTTPSTATE_SEND_HEADER, - HTTPSTATE_SEND_DATA_HEADER, - HTTPSTATE_SEND_DATA, /* sending TCP or UDP data */ - HTTPSTATE_SEND_DATA_TRAILER, - HTTPSTATE_RECEIVE_DATA, - HTTPSTATE_WAIT_FEED, /* wait for data from the feed */ - HTTPSTATE_READY, - - RTSPSTATE_WAIT_REQUEST, - RTSPSTATE_SEND_REPLY, - RTSPSTATE_SEND_PACKET, -}; - -static const char * const http_state[] = { - "HTTP_WAIT_REQUEST", - "HTTP_SEND_HEADER", - - "SEND_DATA_HEADER", - "SEND_DATA", - "SEND_DATA_TRAILER", - "RECEIVE_DATA", - "WAIT_FEED", - "READY", - - "RTSP_WAIT_REQUEST", - "RTSP_SEND_REPLY", - "RTSP_SEND_PACKET", -}; - -#define IOBUFFER_INIT_SIZE 8192 - -/* timeouts are in ms */ -#define HTTP_REQUEST_TIMEOUT (15 * 1000) -#define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000) - -#define SYNC_TIMEOUT (10 * 1000) - -typedef struct RTSPActionServerSetup { - uint32_t ipaddr; - char transport_option[512]; -} RTSPActionServerSetup; - -typedef struct { - int64_t count1, count2; - int64_t time1, time2; -} DataRateData; - -/* context associated with one connection */ -typedef struct HTTPContext { - enum HTTPState state; - int fd; /* socket file descriptor */ - struct sockaddr_in from_addr; /* origin */ - struct pollfd *poll_entry; /* used when polling */ - int64_t timeout; - uint8_t *buffer_ptr, *buffer_end; - int http_error; - int post; - int chunked_encoding; - int chunk_size; /* 0 if it needs to be read */ - struct HTTPContext *next; - int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */ - int64_t data_count; - /* feed input */ - int feed_fd; - /* input format handling */ - AVFormatContext *fmt_in; - int64_t start_time; /* In milliseconds - this wraps fairly often */ - int64_t first_pts; /* initial pts value */ - int64_t cur_pts; /* current pts value from the stream in us */ - int64_t cur_frame_duration; /* duration of the current frame in us */ - int cur_frame_bytes; /* output frame size, needed to compute - the time at which we send each - packet */ - int pts_stream_index; /* stream we choose as clock reference */ - int64_t cur_clock; /* current clock reference value in us */ - /* output format handling */ - struct FFServerStream *stream; - /* -1 is invalid stream */ - int feed_streams[FFSERVER_MAX_STREAMS]; /* index of streams in the feed */ - int switch_feed_streams[FFSERVER_MAX_STREAMS]; /* index of streams in the feed */ - int switch_pending; - AVFormatContext fmt_ctx; /* instance of FFServerStream for one user */ - int last_packet_sent; /* true if last data packet was sent */ - int suppress_log; - DataRateData datarate; - int wmp_client_id; - char protocol[16]; - char method[16]; - char url[128]; - int buffer_size; - uint8_t *buffer; - int is_packetized; /* if true, the stream is packetized */ - int packet_stream_index; /* current stream for output in state machine */ - - /* RTSP state specific */ - uint8_t *pb_buffer; /* XXX: use that in all the code */ - AVIOContext *pb; - int seq; /* RTSP sequence number */ - - /* RTP state specific */ - enum RTSPLowerTransport rtp_protocol; - char session_id[32]; /* session id */ - AVFormatContext *rtp_ctx[FFSERVER_MAX_STREAMS]; - - /* RTP/UDP specific */ - URLContext *rtp_handles[FFSERVER_MAX_STREAMS]; - - /* RTP/TCP specific */ - struct HTTPContext *rtsp_c; - uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end; -} HTTPContext; - -typedef struct FeedData { - long long data_count; - float avg_frame_size; /* frame size averaged over last frames with exponential mean */ -} FeedData; - -static HTTPContext *first_http_ctx; - -static FFServerConfig config = { - .nb_max_http_connections = 2000, - .nb_max_connections = 5, - .max_bandwidth = 1000, - .use_defaults = 1, -}; - -static void new_connection(int server_fd, int is_rtsp); -static void close_connection(HTTPContext *c); - -/* HTTP handling */ -static int handle_connection(HTTPContext *c); -static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream); -static void compute_status(HTTPContext *c); -static int open_input_stream(HTTPContext *c, const char *info); -static int http_parse_request(HTTPContext *c); -static int http_send_data(HTTPContext *c); -static int http_start_receive_data(HTTPContext *c); -static int http_receive_data(HTTPContext *c); - -/* RTSP handling */ -static int rtsp_parse_request(HTTPContext *c); -static void rtsp_cmd_describe(HTTPContext *c, const char *url); -static void rtsp_cmd_options(HTTPContext *c, const char *url); -static void rtsp_cmd_setup(HTTPContext *c, const char *url, - RTSPMessageHeader *h); -static void rtsp_cmd_play(HTTPContext *c, const char *url, - RTSPMessageHeader *h); -static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, - RTSPMessageHeader *h, int pause_only); - -/* SDP handling */ -static int prepare_sdp_description(FFServerStream *stream, uint8_t **pbuffer, - struct in_addr my_ip); - -/* RTP handling */ -static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, - FFServerStream *stream, - const char *session_id, - enum RTSPLowerTransport rtp_protocol); -static int rtp_new_av_stream(HTTPContext *c, - int stream_index, struct sockaddr_in *dest_addr, - HTTPContext *rtsp_c); -/* utils */ -static size_t htmlencode (const char *src, char **dest); -static inline void cp_html_entity (char *buffer, const char *entity); -static inline int check_codec_match(AVCodecContext *ccf, AVCodecContext *ccs, - int stream); - -static const char *my_program_name; - -static int no_launch; -static int need_to_start_children; - -/* maximum number of simultaneous HTTP connections */ -static unsigned int nb_connections; - -static uint64_t current_bandwidth; - -/* Making this global saves on passing it around everywhere */ -static int64_t cur_time; - -static AVLFG random_state; - -static FILE *logfile = NULL; - -static inline void cp_html_entity (char *buffer, const char *entity) { - if (!buffer || !entity) - return; - while (*entity) - *buffer++ = *entity++; -} - -/** - * Substitutes known conflicting chars on a text string with - * their corresponding HTML entities. - * - * Returns the number of bytes in the 'encoded' representation - * not including the terminating NUL. - */ -static size_t htmlencode (const char *src, char **dest) { - const char *amp = "&"; - const char *lt = "<"; - const char *gt = ">"; - const char *start; - char *tmp; - size_t final_size = 0; - - if (!src) - return 0; - - start = src; - - /* Compute needed dest size */ - while (*src != '\0') { - switch(*src) { - case 38: /* & */ - final_size += 5; - break; - case 60: /* < */ - case 62: /* > */ - final_size += 4; - break; - default: - final_size++; - } - src++; - } - - src = start; - *dest = av_mallocz(final_size + 1); - if (!*dest) - return 0; - - /* Build dest */ - tmp = *dest; - while (*src != '\0') { - switch(*src) { - case 38: /* & */ - cp_html_entity (tmp, amp); - tmp += 5; - break; - case 60: /* < */ - cp_html_entity (tmp, lt); - tmp += 4; - break; - case 62: /* > */ - cp_html_entity (tmp, gt); - tmp += 4; - break; - default: - *tmp = *src; - tmp += 1; - } - src++; - } - *tmp = '\0'; - - return final_size; -} - -static int64_t ffm_read_write_index(int fd) -{ - uint8_t buf[8]; - - if (lseek(fd, 8, SEEK_SET) < 0) - return AVERROR(EIO); - if (read(fd, buf, 8) != 8) - return AVERROR(EIO); - return AV_RB64(buf); -} - -static int ffm_write_write_index(int fd, int64_t pos) -{ - uint8_t buf[8]; - int i; - - for(i=0;i<8;i++) - buf[i] = (pos >> (56 - i * 8)) & 0xff; - if (lseek(fd, 8, SEEK_SET) < 0) - goto bail_eio; - if (write(fd, buf, 8) != 8) - goto bail_eio; - - return 8; - -bail_eio: - return AVERROR(EIO); -} - -static void ffm_set_write_index(AVFormatContext *s, int64_t pos, - int64_t file_size) -{ - av_opt_set_int(s, "server_attached", 1, AV_OPT_SEARCH_CHILDREN); - av_opt_set_int(s, "ffm_write_index", pos, AV_OPT_SEARCH_CHILDREN); - av_opt_set_int(s, "ffm_file_size", file_size, AV_OPT_SEARCH_CHILDREN); -} - -static char *ctime1(char *buf2, size_t buf_size) -{ - time_t ti; - char *p; - - ti = time(NULL); - p = ctime(&ti); - if (!p || !*p) { - *buf2 = '\0'; - return buf2; - } - av_strlcpy(buf2, p, buf_size); - p = buf2 + strlen(buf2) - 1; - if (*p == '\n') - *p = '\0'; - return buf2; -} - -static void http_vlog(const char *fmt, va_list vargs) -{ - static int print_prefix = 1; - char buf[32]; - - if (!logfile) - return; - - if (print_prefix) { - ctime1(buf, sizeof(buf)); - fprintf(logfile, "%s ", buf); - } - print_prefix = strstr(fmt, "\n") != NULL; - vfprintf(logfile, fmt, vargs); - fflush(logfile); -} - -#ifdef __GNUC__ -__attribute__ ((format (printf, 1, 2))) -#endif -static void http_log(const char *fmt, ...) -{ - va_list vargs; - va_start(vargs, fmt); - http_vlog(fmt, vargs); - va_end(vargs); -} - -static void http_av_log(void *ptr, int level, const char *fmt, va_list vargs) -{ - static int print_prefix = 1; - AVClass *avc = ptr ? *(AVClass**)ptr : NULL; - if (level > av_log_get_level()) - return; - if (print_prefix && avc) - http_log("[%s @ %p]", avc->item_name(ptr), ptr); - print_prefix = strstr(fmt, "\n") != NULL; - http_vlog(fmt, vargs); -} - -static void log_connection(HTTPContext *c) -{ - if (c->suppress_log) - return; - - http_log("%s - - [%s] \"%s %s\" %d %"PRId64"\n", - inet_ntoa(c->from_addr.sin_addr), c->method, c->url, - c->protocol, (c->http_error ? c->http_error : 200), c->data_count); -} - -static void update_datarate(DataRateData *drd, int64_t count) -{ - if (!drd->time1 && !drd->count1) { - drd->time1 = drd->time2 = cur_time; - drd->count1 = drd->count2 = count; - } else if (cur_time - drd->time2 > 5000) { - drd->time1 = drd->time2; - drd->count1 = drd->count2; - drd->time2 = cur_time; - drd->count2 = count; - } -} - -/* In bytes per second */ -static int compute_datarate(DataRateData *drd, int64_t count) -{ - if (cur_time == drd->time1) - return 0; - - return ((count - drd->count1) * 1000) / (cur_time - drd->time1); -} - - -static void start_children(FFServerStream *feed) -{ - char *pathname; - char *slash; - int i; - size_t cmd_length; - - if (no_launch) - return; - - cmd_length = strlen(my_program_name); - - /** - * FIXME: WIP Safeguard. Remove after clearing all harcoded - * '1024' path lengths - */ - if (cmd_length > PATH_LENGTH - 1) { - http_log("Could not start children. Command line: '%s' exceeds " - "path length limit (%d)\n", my_program_name, PATH_LENGTH); - return; - } - - pathname = av_strdup (my_program_name); - if (!pathname) { - http_log("Could not allocate memory for children cmd line\n"); - return; - } - /* replace "ffserver" with "ffmpeg" in the path of current - * program. Ignore user provided path */ - - slash = strrchr(pathname, '/'); - if (!slash) - slash = pathname; - else - slash++; - strcpy(slash, "ffmpeg"); - - for (; feed; feed = feed->next) { - - if (!feed->child_argv || feed->pid) - continue; - - feed->pid_start = time(0); - - feed->pid = fork(); - if (feed->pid < 0) { - http_log("Unable to create children: %s\n", strerror(errno)); - av_free (pathname); - exit(EXIT_FAILURE); - } - - if (feed->pid) - continue; - - /* In child */ - - http_log("Launch command line: "); - http_log("%s ", pathname); - - for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++) - http_log("%s ", feed->child_argv[i]); - http_log("\n"); - - for (i = 3; i < 256; i++) - close(i); - - if (!config.debug) { - if (!freopen("/dev/null", "r", stdin)) - http_log("failed to redirect STDIN to /dev/null\n;"); - if (!freopen("/dev/null", "w", stdout)) - http_log("failed to redirect STDOUT to /dev/null\n;"); - if (!freopen("/dev/null", "w", stderr)) - http_log("failed to redirect STDERR to /dev/null\n;"); - } - - signal(SIGPIPE, SIG_DFL); - execvp(pathname, feed->child_argv); - av_free (pathname); - _exit(1); - } - av_free (pathname); -} - -/* open a listening socket */ -static int socket_open_listen(struct sockaddr_in *my_addr) -{ - int server_fd, tmp; - - server_fd = socket(AF_INET,SOCK_STREAM,0); - if (server_fd < 0) { - perror ("socket"); - return -1; - } - - tmp = 1; - if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp))) - av_log(NULL, AV_LOG_WARNING, "setsockopt SO_REUSEADDR failed\n"); - - my_addr->sin_family = AF_INET; - if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) { - char bindmsg[32]; - snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", - ntohs(my_addr->sin_port)); - perror (bindmsg); - goto fail; - } - - if (listen (server_fd, 5) < 0) { - perror ("listen"); - goto fail; - } - - if (ff_socket_nonblock(server_fd, 1) < 0) - av_log(NULL, AV_LOG_WARNING, "ff_socket_nonblock failed\n"); - - return server_fd; - -fail: - closesocket(server_fd); - return -1; -} - -/* start all multicast streams */ -static void start_multicast(void) -{ - FFServerStream *stream; - char session_id[32]; - HTTPContext *rtp_c; - struct sockaddr_in dest_addr = {0}; - int default_port, stream_index; - unsigned int random0, random1; - - default_port = 6000; - for(stream = config.first_stream; stream; stream = stream->next) { - - if (!stream->is_multicast) - continue; - - random0 = av_lfg_get(&random_state); - random1 = av_lfg_get(&random_state); - - /* open the RTP connection */ - snprintf(session_id, sizeof(session_id), "%08x%08x", random0, random1); - - /* choose a port if none given */ - if (stream->multicast_port == 0) { - stream->multicast_port = default_port; - default_port += 100; - } - - dest_addr.sin_family = AF_INET; - dest_addr.sin_addr = stream->multicast_ip; - dest_addr.sin_port = htons(stream->multicast_port); - - rtp_c = rtp_new_connection(&dest_addr, stream, session_id, - RTSP_LOWER_TRANSPORT_UDP_MULTICAST); - if (!rtp_c) - continue; - - if (open_input_stream(rtp_c, "") < 0) { - http_log("Could not open input stream for stream '%s'\n", - stream->filename); - continue; - } - - /* open each RTP stream */ - for(stream_index = 0; stream_index < stream->nb_streams; - stream_index++) { - dest_addr.sin_port = htons(stream->multicast_port + - 2 * stream_index); - if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, NULL) >= 0) - continue; - - http_log("Could not open output stream '%s/streamid=%d'\n", - stream->filename, stream_index); - exit(1); - } - - rtp_c->state = HTTPSTATE_SEND_DATA; - } -} - -/* main loop of the HTTP server */ -static int http_server(void) -{ - int server_fd = 0, rtsp_server_fd = 0; - int ret, delay; - struct pollfd *poll_table, *poll_entry; - HTTPContext *c, *c_next; - - poll_table = av_mallocz_array(config.nb_max_http_connections + 2, - sizeof(*poll_table)); - if(!poll_table) { - http_log("Impossible to allocate a poll table handling %d " - "connections.\n", config.nb_max_http_connections); - return -1; - } - - if (config.http_addr.sin_port) { - server_fd = socket_open_listen(&config.http_addr); - if (server_fd < 0) - goto quit; - } - - if (config.rtsp_addr.sin_port) { - rtsp_server_fd = socket_open_listen(&config.rtsp_addr); - if (rtsp_server_fd < 0) { - closesocket(server_fd); - goto quit; - } - } - - if (!rtsp_server_fd && !server_fd) { - http_log("HTTP and RTSP disabled.\n"); - goto quit; - } - - http_log("FFserver started.\n"); - - start_children(config.first_feed); - - start_multicast(); - - for(;;) { - poll_entry = poll_table; - if (server_fd) { - poll_entry->fd = server_fd; - poll_entry->events = POLLIN; - poll_entry++; - } - if (rtsp_server_fd) { - poll_entry->fd = rtsp_server_fd; - poll_entry->events = POLLIN; - poll_entry++; - } - - /* wait for events on each HTTP handle */ - c = first_http_ctx; - delay = 1000; - while (c) { - int fd; - fd = c->fd; - switch(c->state) { - case HTTPSTATE_SEND_HEADER: - case RTSPSTATE_SEND_REPLY: - case RTSPSTATE_SEND_PACKET: - c->poll_entry = poll_entry; - poll_entry->fd = fd; - poll_entry->events = POLLOUT; - poll_entry++; - break; - case HTTPSTATE_SEND_DATA_HEADER: - case HTTPSTATE_SEND_DATA: - case HTTPSTATE_SEND_DATA_TRAILER: - if (!c->is_packetized) { - /* for TCP, we output as much as we can - * (may need to put a limit) */ - c->poll_entry = poll_entry; - poll_entry->fd = fd; - poll_entry->events = POLLOUT; - poll_entry++; - } else { - /* when ffserver is doing the timing, we work by - * looking at which packet needs to be sent every - * 10 ms (one tick wait XXX: 10 ms assumed) */ - if (delay > 10) - delay = 10; - } - break; - case HTTPSTATE_WAIT_REQUEST: - case HTTPSTATE_RECEIVE_DATA: - case HTTPSTATE_WAIT_FEED: - case RTSPSTATE_WAIT_REQUEST: - /* need to catch errors */ - c->poll_entry = poll_entry; - poll_entry->fd = fd; - poll_entry->events = POLLIN;/* Maybe this will work */ - poll_entry++; - break; - default: - c->poll_entry = NULL; - break; - } - c = c->next; - } - - /* wait for an event on one connection. We poll at least every - * second to handle timeouts */ - do { - ret = poll(poll_table, poll_entry - poll_table, delay); - if (ret < 0 && ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) { - goto quit; - } - } while (ret < 0); - - cur_time = av_gettime() / 1000; - - if (need_to_start_children) { - need_to_start_children = 0; - start_children(config.first_feed); - } - - /* now handle the events */ - for(c = first_http_ctx; c; c = c_next) { - c_next = c->next; - if (handle_connection(c) < 0) { - log_connection(c); - /* close and free the connection */ - close_connection(c); - } - } - - poll_entry = poll_table; - if (server_fd) { - /* new HTTP connection request ? */ - if (poll_entry->revents & POLLIN) - new_connection(server_fd, 0); - poll_entry++; - } - if (rtsp_server_fd) { - /* new RTSP connection request ? */ - if (poll_entry->revents & POLLIN) - new_connection(rtsp_server_fd, 1); - } - } - -quit: - av_free(poll_table); - return -1; -} - -/* start waiting for a new HTTP/RTSP request */ -static void start_wait_request(HTTPContext *c, int is_rtsp) -{ - c->buffer_ptr = c->buffer; - c->buffer_end = c->buffer + c->buffer_size - 1; /* leave room for '\0' */ - - c->state = is_rtsp ? RTSPSTATE_WAIT_REQUEST : HTTPSTATE_WAIT_REQUEST; - c->timeout = cur_time + - (is_rtsp ? RTSP_REQUEST_TIMEOUT : HTTP_REQUEST_TIMEOUT); -} - -static void http_send_too_busy_reply(int fd) -{ - char buffer[400]; - int len = snprintf(buffer, sizeof(buffer), - "HTTP/1.0 503 Server too busy\r\n" - "Content-type: text/html\r\n" - "\r\n" - "\n" - "Too busy\r\n" - "

The server is too busy to serve your request at " - "this time.

\r\n" - "

The number of current connections is %u, and this " - "exceeds the limit of %u.

\r\n" - "\r\n", - nb_connections, config.nb_max_connections); - av_assert0(len < sizeof(buffer)); - if (send(fd, buffer, len, 0) < len) - av_log(NULL, AV_LOG_WARNING, - "Could not send too-busy reply, send() failed\n"); -} - - -static void new_connection(int server_fd, int is_rtsp) -{ - struct sockaddr_in from_addr; - socklen_t len; - int fd; - HTTPContext *c = NULL; - - len = sizeof(from_addr); - fd = accept(server_fd, (struct sockaddr *)&from_addr, - &len); - if (fd < 0) { - http_log("error during accept %s\n", strerror(errno)); - return; - } - if (ff_socket_nonblock(fd, 1) < 0) - av_log(NULL, AV_LOG_WARNING, "ff_socket_nonblock failed\n"); - - if (nb_connections >= config.nb_max_connections) { - http_send_too_busy_reply(fd); - goto fail; - } - - /* add a new connection */ - c = av_mallocz(sizeof(HTTPContext)); - if (!c) - goto fail; - - c->fd = fd; - c->poll_entry = NULL; - c->from_addr = from_addr; - c->buffer_size = IOBUFFER_INIT_SIZE; - c->buffer = av_malloc(c->buffer_size); - if (!c->buffer) - goto fail; - - c->next = first_http_ctx; - first_http_ctx = c; - nb_connections++; - - start_wait_request(c, is_rtsp); - - return; - - fail: - if (c) { - av_freep(&c->buffer); - av_free(c); - } - closesocket(fd); -} - -static void close_connection(HTTPContext *c) -{ - HTTPContext **cp, *c1; - int i, nb_streams; - AVFormatContext *ctx; - AVStream *st; - - /* remove connection from list */ - cp = &first_http_ctx; - while (*cp) { - c1 = *cp; - if (c1 == c) - *cp = c->next; - else - cp = &c1->next; - } - - /* remove references, if any (XXX: do it faster) */ - for(c1 = first_http_ctx; c1; c1 = c1->next) { - if (c1->rtsp_c == c) - c1->rtsp_c = NULL; - } - - /* remove connection associated resources */ - if (c->fd >= 0) - closesocket(c->fd); - if (c->fmt_in) { - /* close each frame parser */ - for(i=0;ifmt_in->nb_streams;i++) { - st = c->fmt_in->streams[i]; - if (st->codec->codec) - avcodec_close(st->codec); - } - avformat_close_input(&c->fmt_in); - } - - /* free RTP output streams if any */ - nb_streams = 0; - if (c->stream) - nb_streams = c->stream->nb_streams; - - for(i=0;irtp_ctx[i]; - if (ctx) { - av_write_trailer(ctx); - av_dict_free(&ctx->metadata); - av_freep(&ctx->streams[0]); - av_freep(&ctx); - } - ffurl_close(c->rtp_handles[i]); - } - - ctx = &c->fmt_ctx; - - if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) { - /* prepare header */ - if (ctx->oformat && avio_open_dyn_buf(&ctx->pb) >= 0) { - av_write_trailer(ctx); - av_freep(&c->pb_buffer); - avio_close_dyn_buf(ctx->pb, &c->pb_buffer); - } - } - - for(i=0; inb_streams; i++) - av_freep(&ctx->streams[i]); - av_freep(&ctx->streams); - av_freep(&ctx->priv_data); - - if (c->stream && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE) - current_bandwidth -= c->stream->bandwidth; - - /* signal that there is no feed if we are the feeder socket */ - if (c->state == HTTPSTATE_RECEIVE_DATA && c->stream) { - c->stream->feed_opened = 0; - close(c->feed_fd); - } - - av_freep(&c->pb_buffer); - av_freep(&c->packet_buffer); - av_freep(&c->buffer); - av_free(c); - nb_connections--; -} - -static int handle_connection(HTTPContext *c) -{ - int len, ret; - uint8_t *ptr; - - switch(c->state) { - case HTTPSTATE_WAIT_REQUEST: - case RTSPSTATE_WAIT_REQUEST: - /* timeout ? */ - if ((c->timeout - cur_time) < 0) - return -1; - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - return -1; - - /* no need to read if no events */ - if (!(c->poll_entry->revents & POLLIN)) - return 0; - /* read the data */ - read_loop: - if (!(len = recv(c->fd, c->buffer_ptr, 1, 0))) - return -1; - - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) - return -1; - break; - } - /* search for end of request. */ - c->buffer_ptr += len; - ptr = c->buffer_ptr; - if ((ptr >= c->buffer + 2 && !memcmp(ptr-2, "\n\n", 2)) || - (ptr >= c->buffer + 4 && !memcmp(ptr-4, "\r\n\r\n", 4))) { - /* request found : parse it and reply */ - if (c->state == HTTPSTATE_WAIT_REQUEST) - ret = http_parse_request(c); - else - ret = rtsp_parse_request(c); - - if (ret < 0) - return -1; - } else if (ptr >= c->buffer_end) { - /* request too long: cannot do anything */ - return -1; - } else goto read_loop; - - break; - - case HTTPSTATE_SEND_HEADER: - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - return -1; - - /* no need to write if no events */ - if (!(c->poll_entry->revents & POLLOUT)) - return 0; - len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) { - goto close_connection; - } - break; - } - c->buffer_ptr += len; - if (c->stream) - c->stream->bytes_served += len; - c->data_count += len; - if (c->buffer_ptr >= c->buffer_end) { - av_freep(&c->pb_buffer); - /* if error, exit */ - if (c->http_error) - return -1; - /* all the buffer was sent : synchronize to the incoming - * stream */ - c->state = HTTPSTATE_SEND_DATA_HEADER; - c->buffer_ptr = c->buffer_end = c->buffer; - } - break; - - case HTTPSTATE_SEND_DATA: - case HTTPSTATE_SEND_DATA_HEADER: - case HTTPSTATE_SEND_DATA_TRAILER: - /* for packetized output, we consider we can always write (the - * input streams set the speed). It may be better to verify - * that we do not rely too much on the kernel queues */ - if (!c->is_packetized) { - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - return -1; - - /* no need to read if no events */ - if (!(c->poll_entry->revents & POLLOUT)) - return 0; - } - if (http_send_data(c) < 0) - return -1; - /* close connection if trailer sent */ - if (c->state == HTTPSTATE_SEND_DATA_TRAILER) - return -1; - /* Check if it is a single jpeg frame 123 */ - if (c->stream->single_frame && c->data_count > c->cur_frame_bytes && c->cur_frame_bytes > 0) { - close_connection(c); - } - break; - case HTTPSTATE_RECEIVE_DATA: - /* no need to read if no events */ - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - return -1; - if (!(c->poll_entry->revents & POLLIN)) - return 0; - if (http_receive_data(c) < 0) - return -1; - break; - case HTTPSTATE_WAIT_FEED: - /* no need to read if no events */ - if (c->poll_entry->revents & (POLLIN | POLLERR | POLLHUP)) - return -1; - - /* nothing to do, we'll be waken up by incoming feed packets */ - break; - - case RTSPSTATE_SEND_REPLY: - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - goto close_connection; - /* no need to write if no events */ - if (!(c->poll_entry->revents & POLLOUT)) - return 0; - len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) { - goto close_connection; - } - break; - } - c->buffer_ptr += len; - c->data_count += len; - if (c->buffer_ptr >= c->buffer_end) { - /* all the buffer was sent : wait for a new request */ - av_freep(&c->pb_buffer); - start_wait_request(c, 1); - } - break; - case RTSPSTATE_SEND_PACKET: - if (c->poll_entry->revents & (POLLERR | POLLHUP)) { - av_freep(&c->packet_buffer); - return -1; - } - /* no need to write if no events */ - if (!(c->poll_entry->revents & POLLOUT)) - return 0; - len = send(c->fd, c->packet_buffer_ptr, - c->packet_buffer_end - c->packet_buffer_ptr, 0); - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) { - /* error : close connection */ - av_freep(&c->packet_buffer); - return -1; - } - break; - } - c->packet_buffer_ptr += len; - if (c->packet_buffer_ptr >= c->packet_buffer_end) { - /* all the buffer was sent : wait for a new request */ - av_freep(&c->packet_buffer); - c->state = RTSPSTATE_WAIT_REQUEST; - } - break; - case HTTPSTATE_READY: - /* nothing to do */ - break; - default: - return -1; - } - return 0; - -close_connection: - av_freep(&c->pb_buffer); - return -1; -} - -static int extract_rates(char *rates, int ratelen, const char *request) -{ - const char *p; - - for (p = request; *p && *p != '\r' && *p != '\n'; ) { - if (av_strncasecmp(p, "Pragma:", 7) == 0) { - const char *q = p + 7; - - while (*q && *q != '\n' && av_isspace(*q)) - q++; - - if (av_strncasecmp(q, "stream-switch-entry=", 20) == 0) { - int stream_no; - int rate_no; - - q += 20; - - memset(rates, 0xff, ratelen); - - while (1) { - while (*q && *q != '\n' && *q != ':') - q++; - - if (sscanf(q, ":%d:%d", &stream_no, &rate_no) != 2) - break; - - stream_no--; - if (stream_no < ratelen && stream_no >= 0) - rates[stream_no] = rate_no; - - while (*q && *q != '\n' && !av_isspace(*q)) - q++; - } - - return 1; - } - } - p = strchr(p, '\n'); - if (!p) - break; - - p++; - } - - return 0; -} - -static int find_stream_in_feed(FFServerStream *feed, AVCodecContext *codec, - int bit_rate) -{ - int i; - int best_bitrate = 100000000; - int best = -1; - - for (i = 0; i < feed->nb_streams; i++) { - AVCodecContext *feed_codec = feed->streams[i]->codec; - - if (feed_codec->codec_id != codec->codec_id || - feed_codec->sample_rate != codec->sample_rate || - feed_codec->width != codec->width || - feed_codec->height != codec->height) - continue; - - /* Potential stream */ - - /* We want the fastest stream less than bit_rate, or the slowest - * faster than bit_rate - */ - - if (feed_codec->bit_rate <= bit_rate) { - if (best_bitrate > bit_rate || - feed_codec->bit_rate > best_bitrate) { - best_bitrate = feed_codec->bit_rate; - best = i; - } - continue; - } - if (feed_codec->bit_rate < best_bitrate) { - best_bitrate = feed_codec->bit_rate; - best = i; - } - } - return best; -} - -static int modify_current_stream(HTTPContext *c, char *rates) -{ - int i; - FFServerStream *req = c->stream; - int action_required = 0; - - /* Not much we can do for a feed */ - if (!req->feed) - return 0; - - for (i = 0; i < req->nb_streams; i++) { - AVCodecContext *codec = req->streams[i]->codec; - - switch(rates[i]) { - case 0: - c->switch_feed_streams[i] = req->feed_streams[i]; - break; - case 1: - c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 2); - break; - case 2: - /* Wants off or slow */ - c->switch_feed_streams[i] = find_stream_in_feed(req->feed, codec, codec->bit_rate / 4); -#ifdef WANTS_OFF - /* This doesn't work well when it turns off the only stream! */ - c->switch_feed_streams[i] = -2; - c->feed_streams[i] = -2; -#endif - break; - } - - if (c->switch_feed_streams[i] >= 0 && - c->switch_feed_streams[i] != c->feed_streams[i]) { - action_required = 1; - } - } - - return action_required; -} - -static void get_word(char *buf, int buf_size, const char **pp) -{ - const char *p; - char *q; - - p = *pp; - p += strspn(p, SPACE_CHARS); - q = buf; - while (!av_isspace(*p) && *p != '\0') { - if ((q - buf) < buf_size - 1) - *q++ = *p; - p++; - } - if (buf_size > 0) - *q = '\0'; - *pp = p; -} - -static FFServerIPAddressACL* parse_dynamic_acl(FFServerStream *stream, - HTTPContext *c) -{ - FILE* f; - char line[1024]; - char cmd[1024]; - FFServerIPAddressACL *acl = NULL; - int line_num = 0; - const char *p; - - f = fopen(stream->dynamic_acl, "r"); - if (!f) { - perror(stream->dynamic_acl); - return NULL; - } - - acl = av_mallocz(sizeof(FFServerIPAddressACL)); - if (!acl) { - fclose(f); - return NULL; - } - - /* Build ACL */ - while (fgets(line, sizeof(line), f)) { - line_num++; - p = line; - while (av_isspace(*p)) - p++; - if (*p == '\0' || *p == '#') - continue; - ffserver_get_arg(cmd, sizeof(cmd), &p); - - if (!av_strcasecmp(cmd, "ACL")) - ffserver_parse_acl_row(NULL, NULL, acl, p, stream->dynamic_acl, - line_num); - } - fclose(f); - return acl; -} - - -static void free_acl_list(FFServerIPAddressACL *in_acl) -{ - FFServerIPAddressACL *pacl, *pacl2; - - pacl = in_acl; - while(pacl) { - pacl2 = pacl; - pacl = pacl->next; - av_freep(pacl2); - } -} - -static int validate_acl_list(FFServerIPAddressACL *in_acl, HTTPContext *c) -{ - enum FFServerIPAddressAction last_action = IP_DENY; - FFServerIPAddressACL *acl; - struct in_addr *src = &c->from_addr.sin_addr; - unsigned long src_addr = src->s_addr; - - for (acl = in_acl; acl; acl = acl->next) { - if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr) - return (acl->action == IP_ALLOW) ? 1 : 0; - last_action = acl->action; - } - - /* Nothing matched, so return not the last action */ - return (last_action == IP_DENY) ? 1 : 0; -} - -static int validate_acl(FFServerStream *stream, HTTPContext *c) -{ - int ret = 0; - FFServerIPAddressACL *acl; - - /* if stream->acl is null validate_acl_list will return 1 */ - ret = validate_acl_list(stream->acl, c); - - if (stream->dynamic_acl[0]) { - acl = parse_dynamic_acl(stream, c); - ret = validate_acl_list(acl, c); - free_acl_list(acl); - } - - return ret; -} - -/** - * compute the real filename of a file by matching it without its - * extensions to all the stream's filenames - */ -static void compute_real_filename(char *filename, int max_size) -{ - char file1[1024]; - char file2[1024]; - char *p; - FFServerStream *stream; - - av_strlcpy(file1, filename, sizeof(file1)); - p = strrchr(file1, '.'); - if (p) - *p = '\0'; - for(stream = config.first_stream; stream; stream = stream->next) { - av_strlcpy(file2, stream->filename, sizeof(file2)); - p = strrchr(file2, '.'); - if (p) - *p = '\0'; - if (!strcmp(file1, file2)) { - av_strlcpy(filename, stream->filename, max_size); - break; - } - } -} - -enum RedirType { - REDIR_NONE, - REDIR_ASX, - REDIR_RAM, - REDIR_ASF, - REDIR_RTSP, - REDIR_SDP, -}; - -/* parse HTTP request and prepare header */ -static int http_parse_request(HTTPContext *c) -{ - const char *p; - char *p1; - enum RedirType redir_type; - char cmd[32]; - char info[1024], filename[1024]; - char url[1024], *q; - char protocol[32]; - char msg[1024]; - char *encoded_msg = NULL; - const char *mime_type; - FFServerStream *stream; - int i; - char ratebuf[32]; - const char *useragent = 0; - - p = c->buffer; - get_word(cmd, sizeof(cmd), &p); - av_strlcpy(c->method, cmd, sizeof(c->method)); - - if (!strcmp(cmd, "GET")) - c->post = 0; - else if (!strcmp(cmd, "POST")) - c->post = 1; - else - return -1; - - get_word(url, sizeof(url), &p); - av_strlcpy(c->url, url, sizeof(c->url)); - - get_word(protocol, sizeof(protocol), (const char **)&p); - if (strcmp(protocol, "HTTP/1.0") && strcmp(protocol, "HTTP/1.1")) - return -1; - - av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); - - if (config.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 */ - p1 = strchr(url, '?'); - if (p1) { - av_strlcpy(info, p1, sizeof(info)); - *p1 = '\0'; - } else - info[0] = '\0'; - - av_strlcpy(filename, url + ((*url == '/') ? 1 : 0), sizeof(filename)-1); - - for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { - if (av_strncasecmp(p, "User-Agent:", 11) == 0) { - useragent = p + 11; - if (*useragent && *useragent != '\n' && av_isspace(*useragent)) - useragent++; - break; - } - p = strchr(p, '\n'); - if (!p) - break; - - p++; - } - - redir_type = REDIR_NONE; - if (av_match_ext(filename, "asx")) { - redir_type = REDIR_ASX; - filename[strlen(filename)-1] = 'f'; - } else if (av_match_ext(filename, "asf") && - (!useragent || av_strncasecmp(useragent, "NSPlayer", 8))) { - /* if this isn't WMP or lookalike, return the redirector file */ - redir_type = REDIR_ASF; - } else if (av_match_ext(filename, "rpm,ram")) { - redir_type = REDIR_RAM; - strcpy(filename + strlen(filename)-2, "m"); - } else if (av_match_ext(filename, "rtsp")) { - redir_type = REDIR_RTSP; - compute_real_filename(filename, sizeof(filename) - 1); - } else if (av_match_ext(filename, "sdp")) { - redir_type = REDIR_SDP; - compute_real_filename(filename, sizeof(filename) - 1); - } - - /* "redirect" request to index.html */ - if (!strlen(filename)) - av_strlcpy(filename, "index.html", sizeof(filename) - 1); - - stream = config.first_stream; - while (stream) { - if (!strcmp(stream->filename, filename) && validate_acl(stream, c)) - break; - stream = stream->next; - } - if (!stream) { - snprintf(msg, sizeof(msg), "File '%s' not found", url); - http_log("File '%s' not found\n", url); - goto send_error; - } - - c->stream = stream; - memcpy(c->feed_streams, stream->feed_streams, sizeof(c->feed_streams)); - memset(c->switch_feed_streams, -1, sizeof(c->switch_feed_streams)); - - if (stream->stream_type == STREAM_TYPE_REDIRECT) { - c->http_error = 301; - q = c->buffer; - snprintf(q, c->buffer_size, - "HTTP/1.0 301 Moved\r\n" - "Location: %s\r\n" - "Content-type: text/html\r\n" - "\r\n" - "\n" - "Moved\r\n" - "You should be redirected.\r\n" - "\r\n", - stream->feed_filename, stream->feed_filename); - q += strlen(q); - /* prepare output buffer */ - c->buffer_ptr = c->buffer; - c->buffer_end = q; - c->state = HTTPSTATE_SEND_HEADER; - return 0; - } - - /* If this is WMP, get the rate information */ - if (extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) { - if (modify_current_stream(c, ratebuf)) { - for (i = 0; i < FF_ARRAY_ELEMS(c->feed_streams); i++) { - if (c->switch_feed_streams[i] >= 0) - c->switch_feed_streams[i] = -1; - } - } - } - - if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) - current_bandwidth += stream->bandwidth; - - /* If already streaming this feed, do not let another feeder start */ - if (stream->feed_opened) { - snprintf(msg, sizeof(msg), "This feed is already being received."); - http_log("Feed '%s' already being received\n", stream->feed_filename); - goto send_error; - } - - if (c->post == 0 && config.max_bandwidth < current_bandwidth) { - c->http_error = 503; - q = c->buffer; - snprintf(q, c->buffer_size, - "HTTP/1.0 503 Server too busy\r\n" - "Content-type: text/html\r\n" - "\r\n" - "\n" - "Too busy\r\n" - "

The server is too busy to serve your request at " - "this time.

\r\n" - "

The bandwidth being served (including your stream) " - "is %"PRIu64"kbit/s, and this exceeds the limit of " - "%"PRIu64"kbit/s.

\r\n" - "\r\n", - current_bandwidth, config.max_bandwidth); - q += strlen(q); - /* prepare output buffer */ - c->buffer_ptr = c->buffer; - c->buffer_end = q; - c->state = HTTPSTATE_SEND_HEADER; - return 0; - } - - if (redir_type != REDIR_NONE) { - const char *hostinfo = 0; - - for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { - if (av_strncasecmp(p, "Host:", 5) == 0) { - hostinfo = p + 5; - break; - } - p = strchr(p, '\n'); - if (!p) - break; - - p++; - } - - if (hostinfo) { - char *eoh; - char hostbuf[260]; - - while (av_isspace(*hostinfo)) - hostinfo++; - - eoh = strchr(hostinfo, '\n'); - if (eoh) { - if (eoh[-1] == '\r') - eoh--; - - if (eoh - hostinfo < sizeof(hostbuf) - 1) { - memcpy(hostbuf, hostinfo, eoh - hostinfo); - hostbuf[eoh - hostinfo] = 0; - - c->http_error = 200; - q = c->buffer; - switch(redir_type) { - case REDIR_ASX: - snprintf(q, c->buffer_size, - "HTTP/1.0 200 ASX Follows\r\n" - "Content-type: video/x-ms-asf\r\n" - "\r\n" - "\r\n" - //"\r\n" - "\r\n" - "\r\n", hostbuf, filename, info); - q += strlen(q); - break; - case REDIR_RAM: - snprintf(q, c->buffer_size, - "HTTP/1.0 200 RAM Follows\r\n" - "Content-type: audio/x-pn-realaudio\r\n" - "\r\n" - "# Autogenerated by ffserver\r\n" - "http://%s/%s%s\r\n", hostbuf, filename, info); - q += strlen(q); - break; - case REDIR_ASF: - snprintf(q, c->buffer_size, - "HTTP/1.0 200 ASF Redirect follows\r\n" - "Content-type: video/x-ms-asf\r\n" - "\r\n" - "[Reference]\r\n" - "Ref1=http://%s/%s%s\r\n", hostbuf, filename, info); - q += strlen(q); - break; - case REDIR_RTSP: - { - char hostname[256], *p; - /* extract only hostname */ - av_strlcpy(hostname, hostbuf, sizeof(hostname)); - p = strrchr(hostname, ':'); - if (p) - *p = '\0'; - snprintf(q, c->buffer_size, - "HTTP/1.0 200 RTSP Redirect follows\r\n" - /* XXX: incorrect MIME type ? */ - "Content-type: application/x-rtsp\r\n" - "\r\n" - "rtsp://%s:%d/%s\r\n", hostname, ntohs(config.rtsp_addr.sin_port), filename); - q += strlen(q); - } - break; - case REDIR_SDP: - { - uint8_t *sdp_data; - int sdp_data_size; - socklen_t len; - struct sockaddr_in my_addr; - - snprintf(q, c->buffer_size, - "HTTP/1.0 200 OK\r\n" - "Content-type: application/sdp\r\n" - "\r\n"); - q += strlen(q); - - len = sizeof(my_addr); - - /* XXX: Should probably fail? */ - if (getsockname(c->fd, (struct sockaddr *)&my_addr, &len)) - http_log("getsockname() failed\n"); - - /* XXX: should use a dynamic buffer */ - sdp_data_size = prepare_sdp_description(stream, - &sdp_data, - my_addr.sin_addr); - if (sdp_data_size > 0) { - memcpy(q, sdp_data, sdp_data_size); - q += sdp_data_size; - *q = '\0'; - av_free(sdp_data); - } - } - break; - default: - abort(); - break; - } - - /* prepare output buffer */ - c->buffer_ptr = c->buffer; - c->buffer_end = q; - c->state = HTTPSTATE_SEND_HEADER; - return 0; - } - } - } - - snprintf(msg, sizeof(msg), "ASX/RAM file not handled"); - goto send_error; - } - - stream->conns_served++; - - /* XXX: add there authenticate and IP match */ - - if (c->post) { - /* if post, it means a feed is being sent */ - if (!stream->is_feed) { - /* However it might be a status report from WMP! Let us log the - * data as it might come handy one day. */ - const char *logline = 0; - int client_id = 0; - - for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { - if (av_strncasecmp(p, "Pragma: log-line=", 17) == 0) { - logline = p; - break; - } - if (av_strncasecmp(p, "Pragma: client-id=", 18) == 0) - client_id = strtol(p + 18, 0, 10); - p = strchr(p, '\n'); - if (!p) - break; - - p++; - } - - if (logline) { - char *eol = strchr(logline, '\n'); - - logline += 17; - - if (eol) { - if (eol[-1] == '\r') - eol--; - http_log("%.*s\n", (int) (eol - logline), logline); - c->suppress_log = 1; - } - } - -#ifdef DEBUG - http_log("\nGot request:\n%s\n", c->buffer); -#endif - - if (client_id && extract_rates(ratebuf, sizeof(ratebuf), c->buffer)) { - HTTPContext *wmpc; - - /* Now we have to find the client_id */ - for (wmpc = first_http_ctx; wmpc; wmpc = wmpc->next) { - if (wmpc->wmp_client_id == client_id) - break; - } - - if (wmpc && modify_current_stream(wmpc, ratebuf)) - wmpc->switch_pending = 1; - } - - snprintf(msg, sizeof(msg), "POST command not handled"); - c->stream = 0; - goto send_error; - } - if (http_start_receive_data(c) < 0) { - snprintf(msg, sizeof(msg), "could not open feed"); - goto send_error; - } - c->http_error = 0; - c->state = HTTPSTATE_RECEIVE_DATA; - return 0; - } - -#ifdef DEBUG - if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0) - http_log("\nGot request:\n%s\n", c->buffer); -#endif - - if (c->stream->stream_type == STREAM_TYPE_STATUS) - goto send_status; - - /* open input stream */ - if (open_input_stream(c, info) < 0) { - snprintf(msg, sizeof(msg), "Input stream corresponding to '%s' not found", url); - goto send_error; - } - - /* prepare HTTP header */ - c->buffer[0] = 0; - av_strlcatf(c->buffer, c->buffer_size, "HTTP/1.0 200 OK\r\n"); - mime_type = c->stream->fmt->mime_type; - if (!mime_type) - mime_type = "application/x-octet-stream"; - av_strlcatf(c->buffer, c->buffer_size, "Pragma: no-cache\r\n"); - - /* for asf, we need extra headers */ - if (!strcmp(c->stream->fmt->name,"asf_stream")) { - /* Need to allocate a client id */ - - c->wmp_client_id = av_lfg_get(&random_state); - - av_strlcatf(c->buffer, c->buffer_size, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id); - } - av_strlcatf(c->buffer, c->buffer_size, "Content-Type: %s\r\n", mime_type); - av_strlcatf(c->buffer, c->buffer_size, "\r\n"); - q = c->buffer + strlen(c->buffer); - - /* prepare output buffer */ - c->http_error = 0; - c->buffer_ptr = c->buffer; - c->buffer_end = q; - c->state = HTTPSTATE_SEND_HEADER; - return 0; - send_error: - c->http_error = 404; - q = c->buffer; - if (!htmlencode(msg, &encoded_msg)) { - http_log("Could not encode filename '%s' as HTML\n", msg); - } - snprintf(q, c->buffer_size, - "HTTP/1.0 404 Not Found\r\n" - "Content-type: text/html\r\n" - "\r\n" - "\n" - "\n" - "\n" - "\n" - "404 Not Found\n" - "\n" - "%s\n" - "\n", encoded_msg? encoded_msg : "File not found"); - q += strlen(q); - /* prepare output buffer */ - c->buffer_ptr = c->buffer; - c->buffer_end = q; - c->state = HTTPSTATE_SEND_HEADER; - av_freep(&encoded_msg); - return 0; - send_status: - compute_status(c); - /* horrible: we use this value to avoid - * going to the send data state */ - c->http_error = 200; - c->state = HTTPSTATE_SEND_HEADER; - return 0; -} - -static void fmt_bytecount(AVIOContext *pb, int64_t count) -{ - static const char suffix[] = " kMGTP"; - const char *s; - - for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++); - - avio_printf(pb, "%"PRId64"%c", count, *s); -} - -static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream) -{ - int i, stream_no; - const char *type = "unknown"; - char parameters[64]; - AVStream *st; - AVCodec *codec; - - stream_no = stream->nb_streams; - - avio_printf(pb, "
Stream" - "typekbit/scodec" - "Parameters\n"); - - for (i = 0; i < stream_no; i++) { - st = stream->streams[i]; - codec = avcodec_find_encoder(st->codec->codec_id); - - parameters[0] = 0; - - switch(st->codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - type = "audio"; - snprintf(parameters, sizeof(parameters), "%d channel(s), %d Hz", - st->codec->channels, st->codec->sample_rate); - break; - case AVMEDIA_TYPE_VIDEO: - type = "video"; - snprintf(parameters, sizeof(parameters), - "%dx%d, q=%d-%d, fps=%d", st->codec->width, - st->codec->height, st->codec->qmin, st->codec->qmax, - st->codec->time_base.den / st->codec->time_base.num); - break; - default: - abort(); - } - - avio_printf(pb, "
%d%s%"PRId64 - "%s%s\n", - i, type, (int64_t)st->codec->bit_rate/1000, - codec ? codec->name : "", parameters); - } - - avio_printf(pb, "
\n"); -} - -static void compute_status(HTTPContext *c) -{ - HTTPContext *c1; - FFServerStream *stream; - char *p; - time_t ti; - int i, len; - AVIOContext *pb; - - if (avio_open_dyn_buf(&pb) < 0) { - /* XXX: return an error ? */ - c->buffer_ptr = c->buffer; - c->buffer_end = c->buffer; - return; - } - - avio_printf(pb, "HTTP/1.0 200 OK\r\n"); - avio_printf(pb, "Content-type: text/html\r\n"); - avio_printf(pb, "Pragma: no-cache\r\n"); - avio_printf(pb, "\r\n"); - - avio_printf(pb, "\n"); - avio_printf(pb, "%s Status\n", program_name); - if (c->stream->feed_filename[0]) - avio_printf(pb, "\n", - c->stream->feed_filename); - avio_printf(pb, "\n"); - avio_printf(pb, "

%s Status

\n", program_name); - /* format status */ - avio_printf(pb, "

Available Streams

\n"); - avio_printf(pb, "\n"); - avio_printf(pb, "
PathServed
Conns
bytes		FormatBit rate
kbit/s		Video
kbit/s
Codec		Audio
kbit/s
Codec		Feed\n"); - stream = config.first_stream; - while (stream) { - char sfilename[1024]; - char *eosf; - - if (stream->feed == stream) { - stream = stream->next; - continue; - } - - av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10); - eosf = sfilename + strlen(sfilename); - if (eosf - sfilename >= 4) { - if (strcmp(eosf - 4, ".asf") == 0) - strcpy(eosf - 4, ".asx"); - else if (strcmp(eosf - 3, ".rm") == 0) - strcpy(eosf - 3, ".ram"); - else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) { - /* generate a sample RTSP director if - * unicast. Generate an SDP redirector if - * multicast */ - eosf = strrchr(sfilename, '.'); - if (!eosf) - eosf = sfilename + strlen(sfilename); - if (stream->is_multicast) - strcpy(eosf, ".sdp"); - else - strcpy(eosf, ".rtsp"); - } - } - - avio_printf(pb, "
%s ", - sfilename, stream->filename); - avio_printf(pb, " %d ", - stream->conns_served); - fmt_bytecount(pb, stream->bytes_served); - - switch(stream->stream_type) { - case STREAM_TYPE_LIVE: { - int audio_bit_rate = 0; - int video_bit_rate = 0; - const char *audio_codec_name = ""; - const char *video_codec_name = ""; - const char *audio_codec_name_extra = ""; - const char *video_codec_name_extra = ""; - - for(i=0;inb_streams;i++) { - AVStream *st = stream->streams[i]; - AVCodec *codec = avcodec_find_encoder(st->codec->codec_id); - - switch(st->codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - audio_bit_rate += st->codec->bit_rate; - if (codec) { - if (*audio_codec_name) - audio_codec_name_extra = "..."; - audio_codec_name = codec->name; - } - break; - case AVMEDIA_TYPE_VIDEO: - video_bit_rate += st->codec->bit_rate; - if (codec) { - if (*video_codec_name) - video_codec_name_extra = "..."; - video_codec_name = codec->name; - } - break; - case AVMEDIA_TYPE_DATA: - video_bit_rate += st->codec->bit_rate; - break; - default: - abort(); - } - } - - avio_printf(pb, " %s %d " - " %d %s %s " - "%d %s %s", - stream->fmt->name, stream->bandwidth, - video_bit_rate / 1000, video_codec_name, - video_codec_name_extra, audio_bit_rate / 1000, - audio_codec_name, audio_codec_name_extra); - - if (stream->feed) - avio_printf(pb, "%s", stream->feed->filename); - else - avio_printf(pb, "%s", stream->feed_filename); - avio_printf(pb, "\n"); - } - break; - default: - avio_printf(pb, " - - " - " - - \n"); - break; - } - stream = stream->next; - } - avio_printf(pb, "
\n"); - - stream = config.first_stream; - while (stream) { - - if (stream->feed != stream) { - stream = stream->next; - continue; - } - - avio_printf(pb, "

Feed %s

", stream->filename); - if (stream->pid) { - avio_printf(pb, "Running as pid %"PRId64".\n", (int64_t) stream->pid); - -#if defined(linux) - { - FILE *pid_stat; - char ps_cmd[64]; - - /* This is somewhat linux specific I guess */ - snprintf(ps_cmd, sizeof(ps_cmd), - "ps -o \"%%cpu,cputime\" --no-headers %"PRId64"", - (int64_t) stream->pid); - - pid_stat = popen(ps_cmd, "r"); - if (pid_stat) { - char cpuperc[10]; - char cpuused[64]; - - if (fscanf(pid_stat, "%9s %63s", cpuperc, cpuused) == 2) { - avio_printf(pb, "Currently using %s%% of the cpu. " - "Total time used %s.\n", - cpuperc, cpuused); - } - fclose(pid_stat); - } - } -#endif - - avio_printf(pb, "

"); - } - - print_stream_params(pb, stream); - stream = stream->next; - } - - /* connection status */ - avio_printf(pb, "

Connection Status

\n"); - - avio_printf(pb, "Number of connections: %d / %d
\n", - nb_connections, config.nb_max_connections); - - avio_printf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k
\n", - current_bandwidth, config.max_bandwidth); - - avio_printf(pb, "\n"); - avio_printf(pb, "
#FileIPProtoStateTarget " - "bit/sActual bit/sBytes transferred\n"); - c1 = first_http_ctx; - i = 0; - while (c1) { - int bitrate; - int j; - - bitrate = 0; - if (c1->stream) { - for (j = 0; j < c1->stream->nb_streams; j++) { - if (!c1->stream->feed) - bitrate += c1->stream->streams[j]->codec->bit_rate; - else if (c1->feed_streams[j] >= 0) - bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; - } - } - - i++; - p = inet_ntoa(c1->from_addr.sin_addr); - avio_printf(pb, "
%d%s%s%s%s%s" - "", - i, c1->stream ? c1->stream->filename : "", - c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", p, - c1->protocol, http_state[c1->state]); - fmt_bytecount(pb, bitrate); - avio_printf(pb, ""); - fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8); - avio_printf(pb, ""); - fmt_bytecount(pb, c1->data_count); - avio_printf(pb, "\n"); - c1 = c1->next; - } - avio_printf(pb, "
\n"); - - /* date */ - ti = time(NULL); - p = ctime(&ti); - avio_printf(pb, "
Generated at %s", p); - avio_printf(pb, "\n\n"); - - len = avio_close_dyn_buf(pb, &c->pb_buffer); - c->buffer_ptr = c->pb_buffer; - c->buffer_end = c->pb_buffer + len; -} - -static int open_input_stream(HTTPContext *c, const char *info) -{ - char buf[128]; - char input_filename[1024]; - AVFormatContext *s = NULL; - int buf_size, i, ret; - int64_t stream_pos; - - /* find file name */ - if (c->stream->feed) { - strcpy(input_filename, c->stream->feed->feed_filename); - buf_size = FFM_PACKET_SIZE; - /* compute position (absolute time) */ - if (av_find_info_tag(buf, sizeof(buf), "date", info)) { - if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0) { - http_log("Invalid date specification '%s' for stream\n", buf); - return ret; - } - } else if (av_find_info_tag(buf, sizeof(buf), "buffer", info)) { - int prebuffer = strtol(buf, 0, 10); - stream_pos = av_gettime() - prebuffer * (int64_t)1000000; - } else - stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000; - } else { - strcpy(input_filename, c->stream->feed_filename); - buf_size = 0; - /* compute position (relative time) */ - if (av_find_info_tag(buf, sizeof(buf), "date", info)) { - if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0) { - http_log("Invalid date specification '%s' for stream\n", buf); - return ret; - } - } else - stream_pos = 0; - } - if (!input_filename[0]) { - http_log("No filename was specified for stream\n"); - return AVERROR(EINVAL); - } - - /* open stream */ - ret = avformat_open_input(&s, input_filename, c->stream->ifmt, - &c->stream->in_opts); - if (ret < 0) { - http_log("Could not open input '%s': %s\n", - input_filename, av_err2str(ret)); - return ret; - } - - /* set buffer size */ - if (buf_size > 0) { - ret = ffio_set_buf_size(s->pb, buf_size); - if (ret < 0) { - http_log("Failed to set buffer size\n"); - return ret; - } - } - - s->flags |= AVFMT_FLAG_GENPTS; - c->fmt_in = s; - if (strcmp(s->iformat->name, "ffm") && - (ret = avformat_find_stream_info(c->fmt_in, NULL)) < 0) { - http_log("Could not find stream info for input '%s'\n", input_filename); - avformat_close_input(&s); - return ret; - } - - /* choose stream as clock source (we favor the video stream if - * present) for packet sending */ - c->pts_stream_index = 0; - for(i=0;istream->nb_streams;i++) { - if (c->pts_stream_index == 0 && - c->stream->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - c->pts_stream_index = i; - } - } - - if (c->fmt_in->iformat->read_seek) - av_seek_frame(c->fmt_in, -1, stream_pos, 0); - /* set the start time (needed for maxtime and RTP packet timing) */ - c->start_time = cur_time; - c->first_pts = AV_NOPTS_VALUE; - return 0; -} - -/* return the server clock (in us) */ -static int64_t get_server_clock(HTTPContext *c) -{ - /* compute current pts value from system time */ - return (cur_time - c->start_time) * 1000; -} - -/* return the estimated time (in us) at which the current packet must be sent */ -static int64_t get_packet_send_clock(HTTPContext *c) -{ - int bytes_left, bytes_sent, frame_bytes; - - frame_bytes = c->cur_frame_bytes; - if (frame_bytes <= 0) - return c->cur_pts; - - bytes_left = c->buffer_end - c->buffer_ptr; - bytes_sent = frame_bytes - bytes_left; - return c->cur_pts + (c->cur_frame_duration * bytes_sent) / frame_bytes; -} - - -static int http_prepare_data(HTTPContext *c) -{ - int i, len, ret; - AVFormatContext *ctx; - - av_freep(&c->pb_buffer); - switch(c->state) { - case HTTPSTATE_SEND_DATA_HEADER: - ctx = avformat_alloc_context(); - if (!ctx) - return AVERROR(ENOMEM); - c->fmt_ctx = *ctx; - av_freep(&ctx); - av_dict_copy(&(c->fmt_ctx.metadata), c->stream->metadata, 0); - c->fmt_ctx.streams = av_mallocz_array(c->stream->nb_streams, - sizeof(AVStream *)); - if (!c->fmt_ctx.streams) - return AVERROR(ENOMEM); - - for(i=0;istream->nb_streams;i++) { - AVStream *src; - c->fmt_ctx.streams[i] = av_mallocz(sizeof(AVStream)); - - /* if file or feed, then just take streams from FFServerStream - * struct */ - if (!c->stream->feed || - c->stream->feed == c->stream) - src = c->stream->streams[i]; - else - src = c->stream->feed->streams[c->stream->feed_streams[i]]; - - *(c->fmt_ctx.streams[i]) = *src; - c->fmt_ctx.streams[i]->priv_data = 0; - /* XXX: should be done in AVStream, not in codec */ - c->fmt_ctx.streams[i]->codec->frame_number = 0; - } - /* set output format parameters */ - c->fmt_ctx.oformat = c->stream->fmt; - c->fmt_ctx.nb_streams = c->stream->nb_streams; - - c->got_key_frame = 0; - - /* prepare header and save header data in a stream */ - if (avio_open_dyn_buf(&c->fmt_ctx.pb) < 0) { - /* XXX: potential leak */ - return -1; - } - c->fmt_ctx.pb->seekable = 0; - - /* - * HACK to avoid MPEG-PS muxer to spit many underflow errors - * Default value from FFmpeg - * Try to set it using configuration option - */ - c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE); - - if ((ret = avformat_write_header(&c->fmt_ctx, NULL)) < 0) { - http_log("Error writing output header for stream '%s': %s\n", - c->stream->filename, av_err2str(ret)); - return ret; - } - av_dict_free(&c->fmt_ctx.metadata); - - len = avio_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer); - c->buffer_ptr = c->pb_buffer; - c->buffer_end = c->pb_buffer + len; - - c->state = HTTPSTATE_SEND_DATA; - c->last_packet_sent = 0; - break; - case HTTPSTATE_SEND_DATA: - /* find a new packet */ - /* read a packet from the input stream */ - if (c->stream->feed) - ffm_set_write_index(c->fmt_in, - c->stream->feed->feed_write_index, - c->stream->feed->feed_size); - - if (c->stream->max_time && - c->stream->max_time + c->start_time - cur_time < 0) - /* We have timed out */ - c->state = HTTPSTATE_SEND_DATA_TRAILER; - else { - AVPacket pkt; - redo: - ret = av_read_frame(c->fmt_in, &pkt); - if (ret < 0) { - if (c->stream->feed) { - /* if coming from feed, it means we reached the end of the - * ffm file, so must wait for more data */ - c->state = HTTPSTATE_WAIT_FEED; - return 1; /* state changed */ - } - if (ret == AVERROR(EAGAIN)) { - /* input not ready, come back later */ - return 0; - } - if (c->stream->loop) { - avformat_close_input(&c->fmt_in); - if (open_input_stream(c, "") < 0) - goto no_loop; - goto redo; - } else { - no_loop: - /* must send trailer now because EOF or error */ - c->state = HTTPSTATE_SEND_DATA_TRAILER; - } - } else { - int source_index = pkt.stream_index; - /* update first pts if needed */ - if (c->first_pts == AV_NOPTS_VALUE && pkt.dts != AV_NOPTS_VALUE) { - c->first_pts = av_rescale_q(pkt.dts, c->fmt_in->streams[pkt.stream_index]->time_base, AV_TIME_BASE_Q); - c->start_time = cur_time; - } - /* send it to the appropriate stream */ - if (c->stream->feed) { - /* if coming from a feed, select the right stream */ - if (c->switch_pending) { - c->switch_pending = 0; - for(i=0;istream->nb_streams;i++) { - if (c->switch_feed_streams[i] == pkt.stream_index) - if (pkt.flags & AV_PKT_FLAG_KEY) - c->switch_feed_streams[i] = -1; - if (c->switch_feed_streams[i] >= 0) - c->switch_pending = 1; - } - } - for(i=0;istream->nb_streams;i++) { - if (c->stream->feed_streams[i] == pkt.stream_index) { - AVStream *st = c->fmt_in->streams[source_index]; - pkt.stream_index = i; - if (pkt.flags & AV_PKT_FLAG_KEY && - (st->codec->codec_type == AVMEDIA_TYPE_VIDEO || - c->stream->nb_streams == 1)) - c->got_key_frame = 1; - if (!c->stream->send_on_key || c->got_key_frame) - goto send_it; - } - } - } else { - AVCodecContext *codec; - AVStream *ist, *ost; - send_it: - ist = c->fmt_in->streams[source_index]; - /* specific handling for RTP: we use several - * output streams (one for each RTP connection). - * XXX: need more abstract handling */ - if (c->is_packetized) { - /* compute send time and duration */ - if (pkt.dts != AV_NOPTS_VALUE) { - c->cur_pts = av_rescale_q(pkt.dts, ist->time_base, AV_TIME_BASE_Q); - c->cur_pts -= c->first_pts; - } - c->cur_frame_duration = av_rescale_q(pkt.duration, ist->time_base, AV_TIME_BASE_Q); - /* find RTP context */ - c->packet_stream_index = pkt.stream_index; - ctx = c->rtp_ctx[c->packet_stream_index]; - if(!ctx) { - av_packet_unref(&pkt); - break; - } - codec = ctx->streams[0]->codec; - /* only one stream per RTP connection */ - pkt.stream_index = 0; - } else { - ctx = &c->fmt_ctx; - /* Fudge here */ - codec = ctx->streams[pkt.stream_index]->codec; - } - - if (c->is_packetized) { - int max_packet_size; - if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP) - max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; - else - max_packet_size = c->rtp_handles[c->packet_stream_index]->max_packet_size; - ret = ffio_open_dyn_packet_buf(&ctx->pb, - max_packet_size); - } else - ret = avio_open_dyn_buf(&ctx->pb); - - if (ret < 0) { - /* XXX: potential leak */ - return -1; - } - ost = ctx->streams[pkt.stream_index]; - - ctx->pb->seekable = 0; - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, ist->time_base, - ost->time_base); - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, ist->time_base, - ost->time_base); - pkt.duration = av_rescale_q(pkt.duration, ist->time_base, - ost->time_base); - if ((ret = av_write_frame(ctx, &pkt)) < 0) { - http_log("Error writing frame to output for stream '%s': %s\n", - c->stream->filename, av_err2str(ret)); - c->state = HTTPSTATE_SEND_DATA_TRAILER; - } - - av_freep(&c->pb_buffer); - len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer); - ctx->pb = NULL; - c->cur_frame_bytes = len; - c->buffer_ptr = c->pb_buffer; - c->buffer_end = c->pb_buffer + len; - - codec->frame_number++; - if (len == 0) { - av_packet_unref(&pkt); - goto redo; - } - } - av_packet_unref(&pkt); - } - } - break; - default: - case HTTPSTATE_SEND_DATA_TRAILER: - /* last packet test ? */ - if (c->last_packet_sent || c->is_packetized) - return -1; - ctx = &c->fmt_ctx; - /* prepare header */ - if (avio_open_dyn_buf(&ctx->pb) < 0) { - /* XXX: potential leak */ - return -1; - } - c->fmt_ctx.pb->seekable = 0; - av_write_trailer(ctx); - len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer); - c->buffer_ptr = c->pb_buffer; - c->buffer_end = c->pb_buffer + len; - - c->last_packet_sent = 1; - break; - } - return 0; -} - -/* should convert the format at the same time */ -/* send data starting at c->buffer_ptr to the output connection - * (either UDP or TCP) - */ -static int http_send_data(HTTPContext *c) -{ - int len, ret; - - for(;;) { - if (c->buffer_ptr >= c->buffer_end) { - ret = http_prepare_data(c); - if (ret < 0) - return -1; - else if (ret) - /* state change requested */ - break; - } else { - if (c->is_packetized) { - /* RTP data output */ - len = c->buffer_end - c->buffer_ptr; - if (len < 4) { - /* fail safe - should never happen */ - fail1: - c->buffer_ptr = c->buffer_end; - return 0; - } - len = (c->buffer_ptr[0] << 24) | - (c->buffer_ptr[1] << 16) | - (c->buffer_ptr[2] << 8) | - (c->buffer_ptr[3]); - if (len > (c->buffer_end - c->buffer_ptr)) - goto fail1; - if ((get_packet_send_clock(c) - get_server_clock(c)) > 0) { - /* nothing to send yet: we can wait */ - return 0; - } - - c->data_count += len; - update_datarate(&c->datarate, c->data_count); - if (c->stream) - c->stream->bytes_served += len; - - if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP) { - /* RTP packets are sent inside the RTSP TCP connection */ - AVIOContext *pb; - int interleaved_index, size; - uint8_t header[4]; - HTTPContext *rtsp_c; - - rtsp_c = c->rtsp_c; - /* if no RTSP connection left, error */ - if (!rtsp_c) - return -1; - /* if already sending something, then wait. */ - if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST) - break; - if (avio_open_dyn_buf(&pb) < 0) - goto fail1; - interleaved_index = c->packet_stream_index * 2; - /* RTCP packets are sent at odd indexes */ - if (c->buffer_ptr[1] == 200) - interleaved_index++; - /* write RTSP TCP header */ - header[0] = '$'; - header[1] = interleaved_index; - header[2] = len >> 8; - header[3] = len; - avio_write(pb, header, 4); - /* write RTP packet data */ - c->buffer_ptr += 4; - avio_write(pb, c->buffer_ptr, len); - size = avio_close_dyn_buf(pb, &c->packet_buffer); - /* prepare asynchronous TCP sending */ - rtsp_c->packet_buffer_ptr = c->packet_buffer; - rtsp_c->packet_buffer_end = c->packet_buffer + size; - c->buffer_ptr += len; - - /* send everything we can NOW */ - len = send(rtsp_c->fd, rtsp_c->packet_buffer_ptr, - rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr, 0); - if (len > 0) - rtsp_c->packet_buffer_ptr += len; - if (rtsp_c->packet_buffer_ptr < rtsp_c->packet_buffer_end) { - /* if we could not send all the data, we will - * send it later, so a new state is needed to - * "lock" the RTSP TCP connection */ - rtsp_c->state = RTSPSTATE_SEND_PACKET; - break; - } else - /* all data has been sent */ - av_freep(&c->packet_buffer); - } else { - /* send RTP packet directly in UDP */ - c->buffer_ptr += 4; - ffurl_write(c->rtp_handles[c->packet_stream_index], - c->buffer_ptr, len); - c->buffer_ptr += len; - /* here we continue as we can send several packets - * per 10 ms slot */ - } - } else { - /* TCP data output */ - len = send(c->fd, c->buffer_ptr, - c->buffer_end - c->buffer_ptr, 0); - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) - /* error : close connection */ - return -1; - else - return 0; - } - c->buffer_ptr += len; - - c->data_count += len; - update_datarate(&c->datarate, c->data_count); - if (c->stream) - c->stream->bytes_served += len; - break; - } - } - } /* for(;;) */ - return 0; -} - -static int http_start_receive_data(HTTPContext *c) -{ - int fd; - int ret; - int64_t ret64; - - if (c->stream->feed_opened) { - http_log("Stream feed '%s' was not opened\n", - c->stream->feed_filename); - return AVERROR(EINVAL); - } - - /* Don't permit writing to this one */ - if (c->stream->readonly) { - http_log("Cannot write to read-only file '%s'\n", - c->stream->feed_filename); - return AVERROR(EINVAL); - } - - /* open feed */ - fd = open(c->stream->feed_filename, O_RDWR); - if (fd < 0) { - ret = AVERROR(errno); - http_log("Could not open feed file '%s': %s\n", - c->stream->feed_filename, strerror(errno)); - return ret; - } - c->feed_fd = fd; - - if (c->stream->truncate) { - /* truncate feed file */ - ffm_write_write_index(c->feed_fd, FFM_PACKET_SIZE); - http_log("Truncating feed file '%s'\n", c->stream->feed_filename); - if (ftruncate(c->feed_fd, FFM_PACKET_SIZE) < 0) { - ret = AVERROR(errno); - http_log("Error truncating feed file '%s': %s\n", - c->stream->feed_filename, strerror(errno)); - return ret; - } - } else { - ret64 = ffm_read_write_index(fd); - if (ret64 < 0) { - http_log("Error reading write index from feed file '%s': %s\n", - c->stream->feed_filename, strerror(errno)); - return ret64; - } - c->stream->feed_write_index = ret64; - } - - c->stream->feed_write_index = FFMAX(ffm_read_write_index(fd), - FFM_PACKET_SIZE); - c->stream->feed_size = lseek(fd, 0, SEEK_END); - lseek(fd, 0, SEEK_SET); - - /* init buffer input */ - c->buffer_ptr = c->buffer; - c->buffer_end = c->buffer + FFM_PACKET_SIZE; - c->stream->feed_opened = 1; - c->chunked_encoding = !!av_stristr(c->buffer, "Transfer-Encoding: chunked"); - return 0; -} - -static int http_receive_data(HTTPContext *c) -{ - HTTPContext *c1; - int len, loop_run = 0; - - while (c->chunked_encoding && !c->chunk_size && - c->buffer_end > c->buffer_ptr) { - /* read chunk header, if present */ - len = recv(c->fd, c->buffer_ptr, 1, 0); - - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) - /* error : close connection */ - goto fail; - return 0; - } else if (len == 0) { - /* end of connection : close it */ - goto fail; - } else if (c->buffer_ptr - c->buffer >= 2 && - !memcmp(c->buffer_ptr - 1, "\r\n", 2)) { - c->chunk_size = strtol(c->buffer, 0, 16); - if (c->chunk_size == 0) // end of stream - goto fail; - c->buffer_ptr = c->buffer; - break; - } else if (++loop_run > 10) - /* no chunk header, abort */ - goto fail; - else - c->buffer_ptr++; - } - - if (c->buffer_end > c->buffer_ptr) { - len = recv(c->fd, c->buffer_ptr, - FFMIN(c->chunk_size, c->buffer_end - c->buffer_ptr), 0); - if (len < 0) { - if (ff_neterrno() != AVERROR(EAGAIN) && - ff_neterrno() != AVERROR(EINTR)) - /* error : close connection */ - goto fail; - } else if (len == 0) - /* end of connection : close it */ - goto fail; - else { - c->chunk_size -= len; - c->buffer_ptr += len; - c->data_count += len; - update_datarate(&c->datarate, c->data_count); - } - } - - if (c->buffer_ptr - c->buffer >= 2 && c->data_count > FFM_PACKET_SIZE) { - if (c->buffer[0] != 'f' || - c->buffer[1] != 'm') { - http_log("Feed stream has become desynchronized -- disconnecting\n"); - goto fail; - } - } - - if (c->buffer_ptr >= c->buffer_end) { - FFServerStream *feed = c->stream; - /* a packet has been received : write it in the store, except - * if header */ - if (c->data_count > FFM_PACKET_SIZE) { - /* XXX: use llseek or url_seek - * XXX: Should probably fail? */ - if (lseek(c->feed_fd, feed->feed_write_index, SEEK_SET) == -1) - http_log("Seek to %"PRId64" failed\n", feed->feed_write_index); - - if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) { - http_log("Error writing to feed file: %s\n", strerror(errno)); - goto fail; - } - - feed->feed_write_index += FFM_PACKET_SIZE; - /* update file size */ - if (feed->feed_write_index > c->stream->feed_size) - feed->feed_size = feed->feed_write_index; - - /* handle wrap around if max file size reached */ - if (c->stream->feed_max_size && - feed->feed_write_index >= c->stream->feed_max_size) - feed->feed_write_index = FFM_PACKET_SIZE; - - /* write index */ - if (ffm_write_write_index(c->feed_fd, feed->feed_write_index) < 0) { - http_log("Error writing index to feed file: %s\n", - strerror(errno)); - goto fail; - } - - /* wake up any waiting connections */ - for(c1 = first_http_ctx; c1; c1 = c1->next) { - if (c1->state == HTTPSTATE_WAIT_FEED && - c1->stream->feed == c->stream->feed) - c1->state = HTTPSTATE_SEND_DATA; - } - } else { - /* We have a header in our hands that contains useful data */ - AVFormatContext *s = avformat_alloc_context(); - AVIOContext *pb; - AVInputFormat *fmt_in; - int i; - - if (!s) - goto fail; - - /* use feed output format name to find corresponding input format */ - fmt_in = av_find_input_format(feed->fmt->name); - if (!fmt_in) - goto fail; - - pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer, - 0, NULL, NULL, NULL, NULL); - if (!pb) - goto fail; - - pb->seekable = 0; - - s->pb = pb; - if (avformat_open_input(&s, c->stream->feed_filename, fmt_in, NULL) < 0) { - av_freep(&pb); - goto fail; - } - - /* Now we have the actual streams */ - if (s->nb_streams != feed->nb_streams) { - avformat_close_input(&s); - av_freep(&pb); - http_log("Feed '%s' stream number does not match registered feed\n", - c->stream->feed_filename); - goto fail; - } - - for (i = 0; i < s->nb_streams; i++) { - AVStream *fst = feed->streams[i]; - AVStream *st = s->streams[i]; - avcodec_copy_context(fst->codec, st->codec); - } - - avformat_close_input(&s); - av_freep(&pb); - } - c->buffer_ptr = c->buffer; - } - - return 0; - fail: - c->stream->feed_opened = 0; - close(c->feed_fd); - /* wake up any waiting connections to stop waiting for feed */ - for(c1 = first_http_ctx; c1; c1 = c1->next) { - if (c1->state == HTTPSTATE_WAIT_FEED && - c1->stream->feed == c->stream->feed) - c1->state = HTTPSTATE_SEND_DATA_TRAILER; - } - return -1; -} - -/********************************************************************/ -/* RTSP handling */ - -static void rtsp_reply_header(HTTPContext *c, enum RTSPStatusCode error_number) -{ - const char *str; - time_t ti; - struct tm *tm; - char buf2[32]; - - str = RTSP_STATUS_CODE2STRING(error_number); - if (!str) - str = "Unknown Error"; - - avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", error_number, str); - avio_printf(c->pb, "CSeq: %d\r\n", c->seq); - - /* output GMT time */ - ti = time(NULL); - tm = gmtime(&ti); - strftime(buf2, sizeof(buf2), "%a, %d %b %Y %H:%M:%S", tm); - avio_printf(c->pb, "Date: %s GMT\r\n", buf2); -} - -static void rtsp_reply_error(HTTPContext *c, enum RTSPStatusCode error_number) -{ - rtsp_reply_header(c, error_number); - avio_printf(c->pb, "\r\n"); -} - -static int rtsp_parse_request(HTTPContext *c) -{ - const char *p, *p1, *p2; - char cmd[32]; - char url[1024]; - char protocol[32]; - char line[1024]; - int len; - RTSPMessageHeader header1 = { 0 }, *header = &header1; - - c->buffer_ptr[0] = '\0'; - p = c->buffer; - - get_word(cmd, sizeof(cmd), &p); - get_word(url, sizeof(url), &p); - get_word(protocol, sizeof(protocol), &p); - - av_strlcpy(c->method, cmd, sizeof(c->method)); - av_strlcpy(c->url, url, sizeof(c->url)); - av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); - - if (avio_open_dyn_buf(&c->pb) < 0) { - /* XXX: cannot do more */ - c->pb = NULL; /* safety */ - return -1; - } - - /* check version name */ - if (strcmp(protocol, "RTSP/1.0")) { - rtsp_reply_error(c, RTSP_STATUS_VERSION); - goto the_end; - } - - /* parse each header line */ - /* skip to next line */ - while (*p != '\n' && *p != '\0') - p++; - if (*p == '\n') - p++; - while (*p != '\0') { - p1 = memchr(p, '\n', (char *)c->buffer_ptr - p); - if (!p1) - break; - p2 = p1; - if (p2 > p && p2[-1] == '\r') - p2--; - /* skip empty line */ - if (p2 == p) - break; - len = p2 - p; - if (len > sizeof(line) - 1) - len = sizeof(line) - 1; - memcpy(line, p, len); - line[len] = '\0'; - ff_rtsp_parse_line(NULL, header, line, NULL, NULL); - p = p1 + 1; - } - - /* handle sequence number */ - c->seq = header->seq; - - if (!strcmp(cmd, "DESCRIBE")) - rtsp_cmd_describe(c, url); - else if (!strcmp(cmd, "OPTIONS")) - rtsp_cmd_options(c, url); - else if (!strcmp(cmd, "SETUP")) - rtsp_cmd_setup(c, url, header); - else if (!strcmp(cmd, "PLAY")) - rtsp_cmd_play(c, url, header); - else if (!strcmp(cmd, "PAUSE")) - rtsp_cmd_interrupt(c, url, header, 1); - else if (!strcmp(cmd, "TEARDOWN")) - rtsp_cmd_interrupt(c, url, header, 0); - else - rtsp_reply_error(c, RTSP_STATUS_METHOD); - - the_end: - len = avio_close_dyn_buf(c->pb, &c->pb_buffer); - c->pb = NULL; /* safety */ - if (len < 0) - /* XXX: cannot do more */ - return -1; - - c->buffer_ptr = c->pb_buffer; - c->buffer_end = c->pb_buffer + len; - c->state = RTSPSTATE_SEND_REPLY; - return 0; -} - -static int prepare_sdp_description(FFServerStream *stream, uint8_t **pbuffer, - struct in_addr my_ip) -{ - AVFormatContext *avc; - AVStream *avs = NULL; - AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); - AVDictionaryEntry *entry = av_dict_get(stream->metadata, "title", NULL, 0); - int i; - - *pbuffer = NULL; - - avc = avformat_alloc_context(); - if (!avc || !rtp_format) - return -1; - - avc->oformat = rtp_format; - av_dict_set(&avc->metadata, "title", - entry ? entry->value : "No Title", 0); - avc->nb_streams = stream->nb_streams; - if (stream->is_multicast) { - snprintf(avc->filename, 1024, "rtp://%s:%d?multicast=1?ttl=%d", - inet_ntoa(stream->multicast_ip), - stream->multicast_port, stream->multicast_ttl); - } else - snprintf(avc->filename, 1024, "rtp://0.0.0.0"); - - avc->streams = av_malloc_array(avc->nb_streams, sizeof(*avc->streams)); - if (!avc->streams) - goto sdp_done; - - avs = av_malloc_array(avc->nb_streams, sizeof(*avs)); - if (!avs) - goto sdp_done; - - for(i = 0; i < stream->nb_streams; i++) { - avc->streams[i] = &avs[i]; - avc->streams[i]->codec = stream->streams[i]->codec; - avcodec_parameters_from_context(stream->streams[i]->codecpar, stream->streams[i]->codec); - avc->streams[i]->codecpar = stream->streams[i]->codecpar; - } - *pbuffer = av_mallocz(2048); - if (!*pbuffer) - goto sdp_done; - av_sdp_create(&avc, 1, *pbuffer, 2048); - - sdp_done: - av_freep(&avc->streams); - av_dict_free(&avc->metadata); - av_free(avc); - av_free(avs); - - return *pbuffer ? strlen(*pbuffer) : AVERROR(ENOMEM); -} - -static void rtsp_cmd_options(HTTPContext *c, const char *url) -{ - /* rtsp_reply_header(c, RTSP_STATUS_OK); */ - avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", RTSP_STATUS_OK, "OK"); - avio_printf(c->pb, "CSeq: %d\r\n", c->seq); - avio_printf(c->pb, "Public: %s\r\n", - "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE"); - avio_printf(c->pb, "\r\n"); -} - -static void rtsp_cmd_describe(HTTPContext *c, const char *url) -{ - FFServerStream *stream; - char path1[1024]; - const char *path; - uint8_t *content; - int content_length; - socklen_t len; - struct sockaddr_in my_addr; - - /* find which URL is asked */ - av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); - path = path1; - if (*path == '/') - path++; - - for(stream = config.first_stream; stream; stream = stream->next) { - if (!stream->is_feed && - stream->fmt && !strcmp(stream->fmt->name, "rtp") && - !strcmp(path, stream->filename)) { - goto found; - } - } - /* no stream found */ - rtsp_reply_error(c, RTSP_STATUS_NOT_FOUND); - return; - - found: - /* prepare the media description in SDP format */ - - /* get the host IP */ - len = sizeof(my_addr); - getsockname(c->fd, (struct sockaddr *)&my_addr, &len); - content_length = prepare_sdp_description(stream, &content, - my_addr.sin_addr); - if (content_length < 0) { - rtsp_reply_error(c, RTSP_STATUS_INTERNAL); - return; - } - rtsp_reply_header(c, RTSP_STATUS_OK); - avio_printf(c->pb, "Content-Base: %s/\r\n", url); - avio_printf(c->pb, "Content-Type: application/sdp\r\n"); - avio_printf(c->pb, "Content-Length: %d\r\n", content_length); - avio_printf(c->pb, "\r\n"); - avio_write(c->pb, content, content_length); - av_free(content); -} - -static HTTPContext *find_rtp_session(const char *session_id) -{ - HTTPContext *c; - - if (session_id[0] == '\0') - return NULL; - - for(c = first_http_ctx; c; c = c->next) { - if (!strcmp(c->session_id, session_id)) - return c; - } - return NULL; -} - -static RTSPTransportField *find_transport(RTSPMessageHeader *h, enum RTSPLowerTransport lower_transport) -{ - RTSPTransportField *th; - int i; - - for(i=0;inb_transports;i++) { - th = &h->transports[i]; - if (th->lower_transport == lower_transport) - return th; - } - return NULL; -} - -static void rtsp_cmd_setup(HTTPContext *c, const char *url, - RTSPMessageHeader *h) -{ - FFServerStream *stream; - int stream_index, rtp_port, rtcp_port; - char buf[1024]; - char path1[1024]; - const char *path; - HTTPContext *rtp_c; - RTSPTransportField *th; - struct sockaddr_in dest_addr; - RTSPActionServerSetup setup; - - /* find which URL is asked */ - av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); - path = path1; - if (*path == '/') - path++; - - /* now check each stream */ - for(stream = config.first_stream; stream; stream = stream->next) { - if (stream->is_feed || !stream->fmt || - strcmp(stream->fmt->name, "rtp")) { - continue; - } - /* accept aggregate filenames only if single stream */ - if (!strcmp(path, stream->filename)) { - if (stream->nb_streams != 1) { - rtsp_reply_error(c, RTSP_STATUS_AGGREGATE); - return; - } - stream_index = 0; - goto found; - } - - for(stream_index = 0; stream_index < stream->nb_streams; - stream_index++) { - snprintf(buf, sizeof(buf), "%s/streamid=%d", - stream->filename, stream_index); - if (!strcmp(path, buf)) - goto found; - } - } - /* no stream found */ - rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */ - return; - found: - - /* generate session id if needed */ - if (h->session_id[0] == '\0') { - unsigned random0 = av_lfg_get(&random_state); - unsigned random1 = av_lfg_get(&random_state); - snprintf(h->session_id, sizeof(h->session_id), "%08x%08x", - random0, random1); - } - - /* find RTP session, and create it if none found */ - rtp_c = find_rtp_session(h->session_id); - if (!rtp_c) { - /* always prefer UDP */ - th = find_transport(h, RTSP_LOWER_TRANSPORT_UDP); - if (!th) { - th = find_transport(h, RTSP_LOWER_TRANSPORT_TCP); - if (!th) { - rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); - return; - } - } - - rtp_c = rtp_new_connection(&c->from_addr, stream, h->session_id, - th->lower_transport); - if (!rtp_c) { - rtsp_reply_error(c, RTSP_STATUS_BANDWIDTH); - return; - } - - /* open input stream */ - if (open_input_stream(rtp_c, "") < 0) { - rtsp_reply_error(c, RTSP_STATUS_INTERNAL); - return; - } - } - - /* test if stream is OK (test needed because several SETUP needs - * to be done for a given file) */ - if (rtp_c->stream != stream) { - rtsp_reply_error(c, RTSP_STATUS_SERVICE); - return; - } - - /* test if stream is already set up */ - if (rtp_c->rtp_ctx[stream_index]) { - rtsp_reply_error(c, RTSP_STATUS_STATE); - return; - } - - /* check transport */ - th = find_transport(h, rtp_c->rtp_protocol); - if (!th || (th->lower_transport == RTSP_LOWER_TRANSPORT_UDP && - th->client_port_min <= 0)) { - rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); - return; - } - - /* setup default options */ - setup.transport_option[0] = '\0'; - dest_addr = rtp_c->from_addr; - dest_addr.sin_port = htons(th->client_port_min); - - /* setup stream */ - if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, c) < 0) { - rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); - return; - } - - /* now everything is OK, so we can send the connection parameters */ - rtsp_reply_header(c, RTSP_STATUS_OK); - /* session ID */ - avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id); - - switch(rtp_c->rtp_protocol) { - case RTSP_LOWER_TRANSPORT_UDP: - rtp_port = ff_rtp_get_local_rtp_port(rtp_c->rtp_handles[stream_index]); - rtcp_port = ff_rtp_get_local_rtcp_port(rtp_c->rtp_handles[stream_index]); - avio_printf(c->pb, "Transport: RTP/AVP/UDP;unicast;" - "client_port=%d-%d;server_port=%d-%d", - th->client_port_min, th->client_port_max, - rtp_port, rtcp_port); - break; - case RTSP_LOWER_TRANSPORT_TCP: - avio_printf(c->pb, "Transport: RTP/AVP/TCP;interleaved=%d-%d", - stream_index * 2, stream_index * 2 + 1); - break; - default: - break; - } - if (setup.transport_option[0] != '\0') - avio_printf(c->pb, ";%s", setup.transport_option); - avio_printf(c->pb, "\r\n"); - - - avio_printf(c->pb, "\r\n"); -} - - -/** - * find an RTP connection by using the session ID. Check consistency - * with filename - */ -static HTTPContext *find_rtp_session_with_url(const char *url, - const char *session_id) -{ - HTTPContext *rtp_c; - char path1[1024]; - const char *path; - char buf[1024]; - int s, len; - - rtp_c = find_rtp_session(session_id); - if (!rtp_c) - return NULL; - - /* find which URL is asked */ - av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); - path = path1; - if (*path == '/') - path++; - if(!strcmp(path, rtp_c->stream->filename)) return rtp_c; - for(s=0; sstream->nb_streams; ++s) { - snprintf(buf, sizeof(buf), "%s/streamid=%d", - rtp_c->stream->filename, s); - if(!strncmp(path, buf, sizeof(buf))) - /* XXX: Should we reply with RTSP_STATUS_ONLY_AGGREGATE - * if nb_streams>1? */ - return rtp_c; - } - len = strlen(path); - if (len > 0 && path[len - 1] == '/' && - !strncmp(path, rtp_c->stream->filename, len - 1)) - return rtp_c; - return NULL; -} - -static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h) -{ - HTTPContext *rtp_c; - - rtp_c = find_rtp_session_with_url(url, h->session_id); - if (!rtp_c) { - rtsp_reply_error(c, RTSP_STATUS_SESSION); - return; - } - - if (rtp_c->state != HTTPSTATE_SEND_DATA && - rtp_c->state != HTTPSTATE_WAIT_FEED && - rtp_c->state != HTTPSTATE_READY) { - rtsp_reply_error(c, RTSP_STATUS_STATE); - return; - } - - rtp_c->state = HTTPSTATE_SEND_DATA; - - /* now everything is OK, so we can send the connection parameters */ - rtsp_reply_header(c, RTSP_STATUS_OK); - /* session ID */ - avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id); - avio_printf(c->pb, "\r\n"); -} - -static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, - RTSPMessageHeader *h, int pause_only) -{ - HTTPContext *rtp_c; - - rtp_c = find_rtp_session_with_url(url, h->session_id); - if (!rtp_c) { - rtsp_reply_error(c, RTSP_STATUS_SESSION); - return; - } - - if (pause_only) { - if (rtp_c->state != HTTPSTATE_SEND_DATA && - rtp_c->state != HTTPSTATE_WAIT_FEED) { - rtsp_reply_error(c, RTSP_STATUS_STATE); - return; - } - rtp_c->state = HTTPSTATE_READY; - rtp_c->first_pts = AV_NOPTS_VALUE; - } - - /* now everything is OK, so we can send the connection parameters */ - rtsp_reply_header(c, RTSP_STATUS_OK); - /* session ID */ - avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id); - avio_printf(c->pb, "\r\n"); - - if (!pause_only) - close_connection(rtp_c); -} - -/********************************************************************/ -/* RTP handling */ - -static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, - FFServerStream *stream, - const char *session_id, - enum RTSPLowerTransport rtp_protocol) -{ - HTTPContext *c = NULL; - const char *proto_str; - - /* XXX: should output a warning page when coming - * close to the connection limit */ - if (nb_connections >= config.nb_max_connections) - goto fail; - - /* add a new connection */ - c = av_mallocz(sizeof(HTTPContext)); - if (!c) - goto fail; - - c->fd = -1; - c->poll_entry = NULL; - c->from_addr = *from_addr; - c->buffer_size = IOBUFFER_INIT_SIZE; - c->buffer = av_malloc(c->buffer_size); - if (!c->buffer) - goto fail; - nb_connections++; - c->stream = stream; - av_strlcpy(c->session_id, session_id, sizeof(c->session_id)); - c->state = HTTPSTATE_READY; - c->is_packetized = 1; - c->rtp_protocol = rtp_protocol; - - /* protocol is shown in statistics */ - switch(c->rtp_protocol) { - case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: - proto_str = "MCAST"; - break; - case RTSP_LOWER_TRANSPORT_UDP: - proto_str = "UDP"; - break; - case RTSP_LOWER_TRANSPORT_TCP: - proto_str = "TCP"; - break; - default: - proto_str = "???"; - break; - } - av_strlcpy(c->protocol, "RTP/", sizeof(c->protocol)); - av_strlcat(c->protocol, proto_str, sizeof(c->protocol)); - - current_bandwidth += stream->bandwidth; - - c->next = first_http_ctx; - first_http_ctx = c; - return c; - - fail: - if (c) { - av_freep(&c->buffer); - av_free(c); - } - return NULL; -} - -/** - * add a new RTP stream in an RTP connection (used in RTSP SETUP - * command). If RTP/TCP protocol is used, TCP connection 'rtsp_c' is - * used. - */ -static int rtp_new_av_stream(HTTPContext *c, - int stream_index, struct sockaddr_in *dest_addr, - HTTPContext *rtsp_c) -{ - AVFormatContext *ctx; - AVStream *st; - char *ipaddr; - URLContext *h = NULL; - uint8_t *dummy_buf; - int max_packet_size; - void *st_internal; - - /* now we can open the relevant output stream */ - ctx = avformat_alloc_context(); - if (!ctx) - return -1; - ctx->oformat = av_guess_format("rtp", NULL, NULL); - - st = avformat_new_stream(ctx, NULL); - if (!st) - goto fail; - - av_freep(&st->codec); - av_freep(&st->info); - st_internal = st->internal; - - if (!c->stream->feed || - c->stream->feed == c->stream) - memcpy(st, c->stream->streams[stream_index], sizeof(AVStream)); - else - memcpy(st, - c->stream->feed->streams[c->stream->feed_streams[stream_index]], - sizeof(AVStream)); - st->priv_data = NULL; - st->internal = st_internal; - - /* build destination RTP address */ - ipaddr = inet_ntoa(dest_addr->sin_addr); - - switch(c->rtp_protocol) { - case RTSP_LOWER_TRANSPORT_UDP: - case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: - /* RTP/UDP case */ - - /* XXX: also pass as parameter to function ? */ - if (c->stream->is_multicast) { - int ttl; - ttl = c->stream->multicast_ttl; - if (!ttl) - ttl = 16; - snprintf(ctx->filename, sizeof(ctx->filename), - "rtp://%s:%d?multicast=1&ttl=%d", - ipaddr, ntohs(dest_addr->sin_port), ttl); - } else { - snprintf(ctx->filename, sizeof(ctx->filename), - "rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port)); - } - - if (ffurl_open(&h, ctx->filename, AVIO_FLAG_WRITE, NULL, NULL) < 0) - goto fail; - c->rtp_handles[stream_index] = h; - max_packet_size = h->max_packet_size; - break; - case RTSP_LOWER_TRANSPORT_TCP: - /* RTP/TCP case */ - c->rtsp_c = rtsp_c; - max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; - break; - default: - goto fail; - } - - http_log("%s:%d - - \"PLAY %s/streamid=%d %s\"\n", - ipaddr, ntohs(dest_addr->sin_port), - c->stream->filename, stream_index, c->protocol); - - /* normally, no packets should be output here, but the packet size may - * be checked */ - if (ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) - /* XXX: close stream */ - goto fail; - - if (avformat_write_header(ctx, NULL) < 0) { - fail: - if (h) - ffurl_close(h); - av_free(st); - av_free(ctx); - return -1; - } - avio_close_dyn_buf(ctx->pb, &dummy_buf); - ctx->pb = NULL; - av_free(dummy_buf); - - c->rtp_ctx[stream_index] = ctx; - return 0; -} - -/********************************************************************/ -/* ffserver initialization */ - -/* FIXME: This code should use avformat_new_stream() */ -static AVStream *add_av_stream1(FFServerStream *stream, - AVCodecContext *codec, int copy) -{ - AVStream *fst; - - if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams)) - return NULL; - - fst = av_mallocz(sizeof(AVStream)); - if (!fst) - return NULL; - if (copy) { - fst->codec = avcodec_alloc_context3(codec->codec); - if (!fst->codec) { - av_free(fst); - return NULL; - } - avcodec_copy_context(fst->codec, codec); - } else - /* live streams must use the actual feed's codec since it may be - * updated later to carry extradata needed by them. - */ - fst->codec = codec; - - fst->priv_data = av_mallocz(sizeof(FeedData)); - fst->internal = av_mallocz(sizeof(*fst->internal)); - fst->internal->avctx = avcodec_alloc_context3(NULL); - fst->codecpar = avcodec_parameters_alloc(); - fst->index = stream->nb_streams; - avpriv_set_pts_info(fst, 33, 1, 90000); - fst->sample_aspect_ratio = codec->sample_aspect_ratio; - stream->streams[stream->nb_streams++] = fst; - return fst; -} - -/* return the stream number in the feed */ -static int add_av_stream(FFServerStream *feed, AVStream *st) -{ - AVStream *fst; - AVCodecContext *av, *av1; - int i; - - av = st->codec; - for(i=0;inb_streams;i++) { - av1 = feed->streams[i]->codec; - if (av1->codec_id == av->codec_id && - av1->codec_type == av->codec_type && - av1->bit_rate == av->bit_rate) { - - switch(av->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if (av1->channels == av->channels && - av1->sample_rate == av->sample_rate) - return i; - break; - case AVMEDIA_TYPE_VIDEO: - if (av1->width == av->width && - av1->height == av->height && - av1->time_base.den == av->time_base.den && - av1->time_base.num == av->time_base.num && - av1->gop_size == av->gop_size) - return i; - break; - default: - abort(); - } - } - } - - fst = add_av_stream1(feed, av, 0); - if (!fst) - return -1; - if (av_stream_get_recommended_encoder_configuration(st)) - av_stream_set_recommended_encoder_configuration(fst, - av_strdup(av_stream_get_recommended_encoder_configuration(st))); - return feed->nb_streams - 1; -} - -static void remove_stream(FFServerStream *stream) -{ - FFServerStream **ps; - ps = &config.first_stream; - while (*ps) { - if (*ps == stream) - *ps = (*ps)->next; - else - ps = &(*ps)->next; - } -} - -/* specific MPEG4 handling : we extract the raw parameters */ -static void extract_mpeg4_header(AVFormatContext *infile) -{ - int mpeg4_count, i, size; - AVPacket pkt; - AVStream *st; - const uint8_t *p; - - infile->flags |= AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE; - - mpeg4_count = 0; - for(i=0;inb_streams;i++) { - st = infile->streams[i]; - if (st->codec->codec_id == AV_CODEC_ID_MPEG4 && - st->codec->extradata_size == 0) { - mpeg4_count++; - } - } - if (!mpeg4_count) - return; - - printf("MPEG4 without extra data: trying to find header in %s\n", - infile->filename); - while (mpeg4_count > 0) { - if (av_read_frame(infile, &pkt) < 0) - break; - st = infile->streams[pkt.stream_index]; - if (st->codec->codec_id == AV_CODEC_ID_MPEG4 && - st->codec->extradata_size == 0) { - av_freep(&st->codec->extradata); - /* fill extradata with the header */ - /* XXX: we make hard suppositions here ! */ - p = pkt.data; - while (p < pkt.data + pkt.size - 4) { - /* stop when vop header is found */ - if (p[0] == 0x00 && p[1] == 0x00 && - p[2] == 0x01 && p[3] == 0xb6) { - size = p - pkt.data; - st->codec->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - st->codec->extradata_size = size; - memcpy(st->codec->extradata, pkt.data, size); - break; - } - p++; - } - mpeg4_count--; - } - av_packet_unref(&pkt); - } -} - -/* compute the needed AVStream for each file */ -static void build_file_streams(void) -{ - FFServerStream *stream; - AVFormatContext *infile; - int i, ret; - - /* gather all streams */ - for(stream = config.first_stream; stream; stream = stream->next) { - infile = NULL; - - if (stream->stream_type != STREAM_TYPE_LIVE || stream->feed) - continue; - - /* the stream comes from a file */ - /* try to open the file */ - /* open stream */ - - - /* specific case: if transport stream output to RTP, - * we use a raw transport stream reader */ - if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) - av_dict_set(&stream->in_opts, "mpeg2ts_compute_pcr", "1", 0); - - if (!stream->feed_filename[0]) { - http_log("Unspecified feed file for stream '%s'\n", - stream->filename); - goto fail; - } - - http_log("Opening feed file '%s' for stream '%s'\n", - stream->feed_filename, stream->filename); - - ret = avformat_open_input(&infile, stream->feed_filename, - stream->ifmt, &stream->in_opts); - if (ret < 0) { - http_log("Could not open '%s': %s\n", stream->feed_filename, - av_err2str(ret)); - /* remove stream (no need to spend more time on it) */ - fail: - remove_stream(stream); - } else { - /* find all the AVStreams inside and reference them in - * 'stream' */ - if (avformat_find_stream_info(infile, NULL) < 0) { - http_log("Could not find codec parameters from '%s'\n", - stream->feed_filename); - avformat_close_input(&infile); - goto fail; - } - extract_mpeg4_header(infile); - - for(i=0;inb_streams;i++) - add_av_stream1(stream, infile->streams[i]->codec, 1); - - avformat_close_input(&infile); - } - } -} - -static inline -int check_codec_match(AVCodecContext *ccf, AVCodecContext *ccs, int stream) -{ - int matches = 1; - -#define CHECK_CODEC(x) (ccf->x != ccs->x) - if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) { - http_log("Codecs do not match for stream %d\n", stream); - matches = 0; - } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) { - http_log("Codec bitrates do not match for stream %d\n", stream); - matches = 0; - } else if (ccf->codec_type == AVMEDIA_TYPE_VIDEO) { - if (CHECK_CODEC(time_base.den) || - CHECK_CODEC(time_base.num) || - CHECK_CODEC(width) || - CHECK_CODEC(height)) { - http_log("Codec width, height or framerate do not match for stream %d\n", stream); - matches = 0; - } - } else if (ccf->codec_type == AVMEDIA_TYPE_AUDIO) { - if (CHECK_CODEC(sample_rate) || - CHECK_CODEC(channels) || - CHECK_CODEC(frame_size)) { - http_log("Codec sample_rate, channels, frame_size do not match for stream %d\n", stream); - matches = 0; - } - } else { - http_log("Unknown codec type for stream %d\n", stream); - matches = 0; - } - - return matches; -} - -/* compute the needed AVStream for each feed */ -static int build_feed_streams(void) -{ - FFServerStream *stream, *feed; - int i, fd; - - /* gather all streams */ - for(stream = config.first_stream; stream; stream = stream->next) { - feed = stream->feed; - if (!feed) - continue; - - if (stream->is_feed) { - for(i=0;inb_streams;i++) - stream->feed_streams[i] = i; - continue; - } - /* we handle a stream coming from a feed */ - for(i=0;inb_streams;i++) - stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]); - } - - /* create feed files if needed */ - for(feed = config.first_feed; feed; feed = feed->next_feed) { - - if (avio_check(feed->feed_filename, AVIO_FLAG_READ) > 0) { - AVFormatContext *s = NULL; - int matches = 0; - - /* See if it matches */ - - if (avformat_open_input(&s, feed->feed_filename, NULL, NULL) < 0) { - http_log("Deleting feed file '%s' as it appears " - "to be corrupt\n", - feed->feed_filename); - goto drop; - } - - /* set buffer size */ - if (ffio_set_buf_size(s->pb, FFM_PACKET_SIZE) < 0) { - http_log("Failed to set buffer size\n"); - avformat_close_input(&s); - goto bail; - } - - /* Now see if it matches */ - if (s->nb_streams != feed->nb_streams) { - http_log("Deleting feed file '%s' as stream counts " - "differ (%d != %d)\n", - feed->feed_filename, s->nb_streams, feed->nb_streams); - goto drop; - } - - matches = 1; - for(i=0;inb_streams;i++) { - AVStream *sf, *ss; - - sf = feed->streams[i]; - ss = s->streams[i]; - - if (sf->index != ss->index || sf->id != ss->id) { - http_log("Index & Id do not match for stream %d (%s)\n", - i, feed->feed_filename); - matches = 0; - break; - } - - matches = check_codec_match (sf->codec, ss->codec, i); - if (!matches) - break; - } - -drop: - if (s) - avformat_close_input(&s); - - if (!matches) { - if (feed->readonly) { - http_log("Unable to delete read-only feed file '%s'\n", - feed->feed_filename); - goto bail; - } - unlink(feed->feed_filename); - } - } - - if (avio_check(feed->feed_filename, AVIO_FLAG_WRITE) <= 0) { - AVFormatContext *s = avformat_alloc_context(); - - if (!s) { - http_log("Failed to allocate context\n"); - goto bail; - } - - if (feed->readonly) { - http_log("Unable to create feed file '%s' as it is " - "marked readonly\n", - feed->feed_filename); - avformat_free_context(s); - goto bail; - } - - /* only write the header of the ffm file */ - if (avio_open(&s->pb, feed->feed_filename, AVIO_FLAG_WRITE) < 0) { - http_log("Could not open output feed file '%s'\n", - feed->feed_filename); - avformat_free_context(s); - goto bail; - } - s->oformat = feed->fmt; - s->nb_streams = feed->nb_streams; - s->streams = feed->streams; - if (avformat_write_header(s, NULL) < 0) { - http_log("Container doesn't support the required parameters\n"); - avio_closep(&s->pb); - s->streams = NULL; - s->nb_streams = 0; - avformat_free_context(s); - goto bail; - } - /* XXX: need better API */ - av_freep(&s->priv_data); - avio_closep(&s->pb); - s->streams = NULL; - s->nb_streams = 0; - avformat_free_context(s); - } - - /* get feed size and write index */ - fd = open(feed->feed_filename, O_RDONLY); - if (fd < 0) { - http_log("Could not open output feed file '%s'\n", - feed->feed_filename); - goto bail; - } - - feed->feed_write_index = FFMAX(ffm_read_write_index(fd), - FFM_PACKET_SIZE); - feed->feed_size = lseek(fd, 0, SEEK_END); - /* ensure that we do not wrap before the end of file */ - if (feed->feed_max_size && feed->feed_max_size < feed->feed_size) - feed->feed_max_size = feed->feed_size; - - close(fd); - } - return 0; - -bail: - return -1; -} - -/* compute the bandwidth used by each stream */ -static void compute_bandwidth(void) -{ - unsigned bandwidth; - int i; - FFServerStream *stream; - - for(stream = config.first_stream; stream; stream = stream->next) { - bandwidth = 0; - for(i=0;inb_streams;i++) { - AVStream *st = stream->streams[i]; - switch(st->codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - case AVMEDIA_TYPE_VIDEO: - bandwidth += st->codec->bit_rate; - break; - default: - break; - } - } - stream->bandwidth = (bandwidth + 999) / 1000; - } -} - -static void handle_child_exit(int sig) -{ - pid_t pid; - int status; - time_t uptime; - - while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { - FFServerStream *feed; - - for (feed = config.first_feed; feed; feed = feed->next) { - if (feed->pid != pid) - continue; - - uptime = time(0) - feed->pid_start; - feed->pid = 0; - fprintf(stderr, - "%s: Pid %"PRId64" exited with status %d after %"PRId64" " - "seconds\n", - feed->filename, (int64_t) pid, status, (int64_t)uptime); - - if (uptime < 30) - /* Turn off any more restarts */ - ffserver_free_child_args(&feed->child_argv); - } - } - - need_to_start_children = 1; -} - -static void opt_debug(void) -{ - config.debug = 1; - snprintf(config.logfilename, sizeof(config.logfilename), "-"); -} - -void show_help_default(const char *opt, const char *arg) -{ - printf("usage: ffserver [options]\n" - "Hyper fast multi format Audio/Video streaming server\n"); - printf("\n"); - show_help_options(options, "Main options:", 0, 0, 0); -} - -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" }, - { NULL }, -}; - -int main(int argc, char **argv) -{ - struct sigaction sigact = { { 0 } }; - int cfg_parsed; - int ret = EXIT_FAILURE; - - init_dynload(); - - config.filename = av_strdup("/etc/ffserver.conf"); - - parse_loglevel(argc, argv, options); - av_register_all(); - avformat_network_init(); - - show_banner(argc, argv, options); - - my_program_name = argv[0]; - - parse_options(NULL, argc, argv, options, NULL); - - unsetenv("http_proxy"); /* Kill the http_proxy */ - - av_lfg_init(&random_state, av_get_random_seed()); - - sigact.sa_handler = handle_child_exit; - sigact.sa_flags = SA_NOCLDSTOP | SA_RESTART; - sigaction(SIGCHLD, &sigact, 0); - - if ((cfg_parsed = ffserver_parse_ffconfig(config.filename, &config)) < 0) { - fprintf(stderr, "Error reading configuration file '%s': %s\n", - config.filename, av_err2str(cfg_parsed)); - goto bail; - } - - /* open log file if needed */ - if (config.logfilename[0] != '\0') { - if (!strcmp(config.logfilename, "-")) - logfile = stdout; - else - logfile = fopen(config.logfilename, "a"); - av_log_set_callback(http_av_log); - } - - build_file_streams(); - - if (build_feed_streams() < 0) { - http_log("Could not setup feed streams\n"); - goto bail; - } - - compute_bandwidth(); - - /* signal init */ - signal(SIGPIPE, SIG_IGN); - - if (http_server() < 0) { - http_log("Could not start server\n"); - goto bail; - } - - ret=EXIT_SUCCESS; - -bail: - av_freep (&config.filename); - avformat_network_deinit(); - return ret; -} diff --git a/ffserver_config.c b/ffserver_config.c deleted file mode 100644 index 0ec93b5..0000000 --- a/ffserver_config.c +++ /dev/null @@ -1,1320 +0,0 @@ -/* - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "libavutil/opt.h" -#include "libavutil/parseutils.h" -#include "libavutil/avstring.h" -#include "libavutil/pixdesc.h" -#include "libavutil/avassert.h" - -// FIXME those are internal headers, ffserver _really_ shouldn't use them -#include "libavformat/ffm.h" - -#include "cmdutils.h" -#include "ffserver_config.h" - -#define MAX_CHILD_ARGS 64 - -static int ffserver_save_avoption(const char *opt, const char *arg, int type, - FFServerConfig *config); -static void vreport_config_error(const char *filename, int line_num, - int log_level, int *errors, const char *fmt, - va_list vl); -static void report_config_error(const char *filename, int line_num, - int log_level, int *errors, const char *fmt, - ...); - -#define ERROR(...) report_config_error(config->filename, config->line_num,\ - AV_LOG_ERROR, &config->errors, __VA_ARGS__) -#define WARNING(...) report_config_error(config->filename, config->line_num,\ - AV_LOG_WARNING, &config->warnings, __VA_ARGS__) - -/* FIXME: make ffserver work with IPv6 */ -/* resolve host with also IP address parsing */ -static int resolve_host(struct in_addr *sin_addr, const char *hostname) -{ - - if (!ff_inet_aton(hostname, sin_addr)) { -#if HAVE_GETADDRINFO - struct addrinfo *ai, *cur; - struct addrinfo hints = { 0 }; - hints.ai_family = AF_INET; - if (getaddrinfo(hostname, NULL, &hints, &ai)) - return -1; - /* getaddrinfo returns a linked list of addrinfo structs. - * Even if we set ai_family = AF_INET above, make sure - * that the returned one actually is of the correct type. */ - for (cur = ai; cur; cur = cur->ai_next) { - if (cur->ai_family == AF_INET) { - *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr; - freeaddrinfo(ai); - return 0; - } - } - freeaddrinfo(ai); - return -1; -#else - struct hostent *hp; - hp = gethostbyname(hostname); - if (!hp) - return -1; - memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr)); -#endif - } - return 0; -} - -void ffserver_get_arg(char *buf, int buf_size, const char **pp) -{ - const char *p; - char *q; - int quote = 0; - - p = *pp; - q = buf; - - while (av_isspace(*p)) p++; - - if (*p == '\"' || *p == '\'') - quote = *p++; - - while (*p != '\0') { - if (quote && *p == quote || !quote && av_isspace(*p)) - break; - if ((q - buf) < buf_size - 1) - *q++ = *p; - p++; - } - - *q = '\0'; - if (quote && *p == quote) - p++; - *pp = p; -} - -void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed, - FFServerIPAddressACL *ext_acl, - const char *p, const char *filename, int line_num) -{ - char arg[1024]; - FFServerIPAddressACL acl; - FFServerIPAddressACL *nacl; - FFServerIPAddressACL **naclp; - - ffserver_get_arg(arg, sizeof(arg), &p); - if (av_strcasecmp(arg, "allow") == 0) - acl.action = IP_ALLOW; - else if (av_strcasecmp(arg, "deny") == 0) - acl.action = IP_DENY; - else { - fprintf(stderr, "%s:%d: ACL action '%s' should be ALLOW or DENY.\n", - filename, line_num, arg); - goto bail; - } - - ffserver_get_arg(arg, sizeof(arg), &p); - - if (resolve_host(&acl.first, arg)) { - fprintf(stderr, - "%s:%d: ACL refers to invalid host or IP address '%s'\n", - filename, line_num, arg); - goto bail; - } - - acl.last = acl.first; - - ffserver_get_arg(arg, sizeof(arg), &p); - - if (arg[0]) { - if (resolve_host(&acl.last, arg)) { - fprintf(stderr, - "%s:%d: ACL refers to invalid host or IP address '%s'\n", - filename, line_num, arg); - goto bail; - } - } - - nacl = av_mallocz(sizeof(*nacl)); - naclp = 0; - - acl.next = 0; - *nacl = acl; - - if (stream) - naclp = &stream->acl; - else if (feed) - naclp = &feed->acl; - else if (ext_acl) - naclp = &ext_acl; - else - fprintf(stderr, "%s:%d: ACL found not in or \n", - filename, line_num); - - if (naclp) { - while (*naclp) - naclp = &(*naclp)->next; - - *naclp = nacl; - } else - av_free(nacl); - -bail: - return; - -} - -/* add a codec and set the default parameters */ -static void add_codec(FFServerStream *stream, AVCodecContext *av, - FFServerConfig *config) -{ - AVStream *st; - AVDictionary **opts, *recommended = NULL; - char *enc_config; - - if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams)) - return; - - opts = av->codec_type == AVMEDIA_TYPE_AUDIO ? - &config->audio_opts : &config->video_opts; - av_dict_copy(&recommended, *opts, 0); - av_opt_set_dict2(av->priv_data, opts, AV_OPT_SEARCH_CHILDREN); - av_opt_set_dict2(av, opts, AV_OPT_SEARCH_CHILDREN); - - if (av_dict_count(*opts)) - av_log(NULL, AV_LOG_WARNING, - "Something is wrong, %d options are not set!\n", - av_dict_count(*opts)); - - if (!config->stream_use_defaults) { - switch(av->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if (av->bit_rate == 0) - report_config_error(config->filename, config->line_num, - AV_LOG_ERROR, &config->errors, - "audio bit rate is not set\n"); - if (av->sample_rate == 0) - report_config_error(config->filename, config->line_num, - AV_LOG_ERROR, &config->errors, - "audio sample rate is not set\n"); - break; - case AVMEDIA_TYPE_VIDEO: - if (av->width == 0 || av->height == 0) - report_config_error(config->filename, config->line_num, - AV_LOG_ERROR, &config->errors, - "video size is not set\n"); - break; - default: - av_assert0(0); - } - goto done; - } - - /* stream_use_defaults = true */ - - /* compute default parameters */ - switch(av->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if (!av_dict_get(recommended, "b", NULL, 0)) { - av->bit_rate = 64000; - av_dict_set_int(&recommended, "b", av->bit_rate, 0); - WARNING("Setting default value for audio bit rate = %d. " - "Use NoDefaults to disable it.\n", - av->bit_rate); - } - if (!av_dict_get(recommended, "ar", NULL, 0)) { - av->sample_rate = 22050; - av_dict_set_int(&recommended, "ar", av->sample_rate, 0); - WARNING("Setting default value for audio sample rate = %d. " - "Use NoDefaults to disable it.\n", - av->sample_rate); - } - if (!av_dict_get(recommended, "ac", NULL, 0)) { - av->channels = 1; - av_dict_set_int(&recommended, "ac", av->channels, 0); - WARNING("Setting default value for audio channel count = %d. " - "Use NoDefaults to disable it.\n", - av->channels); - } - break; - case AVMEDIA_TYPE_VIDEO: - if (!av_dict_get(recommended, "b", NULL, 0)) { - av->bit_rate = 64000; - av_dict_set_int(&recommended, "b", av->bit_rate, 0); - WARNING("Setting default value for video bit rate = %d. " - "Use NoDefaults to disable it.\n", - av->bit_rate); - } - if (!av_dict_get(recommended, "time_base", NULL, 0)){ - av->time_base.den = 5; - av->time_base.num = 1; - av_dict_set(&recommended, "time_base", "1/5", 0); - WARNING("Setting default value for video frame rate = %d. " - "Use NoDefaults to disable it.\n", - av->time_base.den); - } - if (!av_dict_get(recommended, "video_size", NULL, 0)) { - av->width = 160; - av->height = 128; - av_dict_set(&recommended, "video_size", "160x128", 0); - WARNING("Setting default value for video size = %dx%d. " - "Use NoDefaults to disable it.\n", - av->width, av->height); - } - /* Bitrate tolerance is less for streaming */ - if (!av_dict_get(recommended, "bt", NULL, 0)) { - av->bit_rate_tolerance = FFMAX(av->bit_rate / 4, - (int64_t)av->bit_rate*av->time_base.num/av->time_base.den); - av_dict_set_int(&recommended, "bt", av->bit_rate_tolerance, 0); - WARNING("Setting default value for video bit rate tolerance = %d. " - "Use NoDefaults to disable it.\n", - av->bit_rate_tolerance); - } - - if (!av_dict_get(recommended, "rc_eq", NULL, 0)) { - av->rc_eq = av_strdup("tex^qComp"); - av_dict_set(&recommended, "rc_eq", "tex^qComp", 0); - WARNING("Setting default value for video rate control equation = " - "%s. Use NoDefaults to disable it.\n", - av->rc_eq); - } - if (!av_dict_get(recommended, "maxrate", NULL, 0)) { - av->rc_max_rate = av->bit_rate * 2; - av_dict_set_int(&recommended, "maxrate", av->rc_max_rate, 0); - WARNING("Setting default value for video max rate = %d. " - "Use NoDefaults to disable it.\n", - av->rc_max_rate); - } - - if (av->rc_max_rate && !av_dict_get(recommended, "bufsize", NULL, 0)) { - av->rc_buffer_size = av->rc_max_rate; - av_dict_set_int(&recommended, "bufsize", av->rc_buffer_size, 0); - WARNING("Setting default value for video buffer size = %d. " - "Use NoDefaults to disable it.\n", - av->rc_buffer_size); - } - break; - default: - abort(); - } - -done: - st = av_mallocz(sizeof(AVStream)); - if (!st) - return; - av_dict_get_string(recommended, &enc_config, '=', ','); - av_dict_free(&recommended); - av_stream_set_recommended_encoder_configuration(st, enc_config); - st->codec = av; - stream->streams[stream->nb_streams++] = st; -} - -static int ffserver_set_codec(AVCodecContext *ctx, const char *codec_name, - FFServerConfig *config) -{ - int ret; - AVCodec *codec = avcodec_find_encoder_by_name(codec_name); - if (!codec || codec->type != ctx->codec_type) { - report_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, - "Invalid codec name: '%s'\n", codec_name); - return 0; - } - if (ctx->codec_id == AV_CODEC_ID_NONE && !ctx->priv_data) { - if ((ret = avcodec_get_context_defaults3(ctx, codec)) < 0) - return ret; - ctx->codec = codec; - } - if (ctx->codec_id != codec->id) - report_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, - "Inconsistent configuration: trying to set '%s' " - "codec option, but '%s' codec is used previously\n", - codec_name, avcodec_get_name(ctx->codec_id)); - return 0; -} - -static int ffserver_opt_preset(const char *arg, int type, FFServerConfig *config) -{ - FILE *f=NULL; - char filename[1000], tmp[1000], tmp2[1000], line[1000]; - int ret = 0; - AVCodecContext *avctx; - const AVCodec *codec; - - switch(type) { - case AV_OPT_FLAG_AUDIO_PARAM: - avctx = config->dummy_actx; - break; - case AV_OPT_FLAG_VIDEO_PARAM: - avctx = config->dummy_vctx; - break; - default: - av_assert0(0); - } - codec = avcodec_find_encoder(avctx->codec_id); - - if (!(f = get_preset_file(filename, sizeof(filename), arg, 0, - codec ? codec->name : NULL))) { - av_log(NULL, AV_LOG_ERROR, "File for preset '%s' not found\n", arg); - return AVERROR(EINVAL); - } - - while(!feof(f)){ - int e= fscanf(f, "%999[^\n]\n", line) - 1; - if(line[0] == '#' && !e) - continue; - e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2; - if(e){ - av_log(NULL, AV_LOG_ERROR, "%s: Invalid syntax: '%s'\n", filename, - line); - ret = AVERROR(EINVAL); - break; - } - if (!strcmp(tmp, "acodec") && avctx->codec_type == AVMEDIA_TYPE_AUDIO || - !strcmp(tmp, "vcodec") && avctx->codec_type == AVMEDIA_TYPE_VIDEO) - { - if (ffserver_set_codec(avctx, tmp2, config) < 0) - break; - } else if (!strcmp(tmp, "scodec")) { - av_log(NULL, AV_LOG_ERROR, "Subtitles preset found.\n"); - ret = AVERROR(EINVAL); - break; - } else if (ffserver_save_avoption(tmp, tmp2, type, config) < 0) - break; - } - - fclose(f); - - return ret; -} - -static AVOutputFormat *ffserver_guess_format(const char *short_name, - const char *filename, - const char *mime_type) -{ - AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type); - - if (fmt) { - AVOutputFormat *stream_fmt; - char stream_format_name[64]; - - snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", - fmt->name); - stream_fmt = av_guess_format(stream_format_name, NULL, NULL); - - if (stream_fmt) - fmt = stream_fmt; - } - - return fmt; -} - -static void vreport_config_error(const char *filename, int line_num, - int log_level, int *errors, const char *fmt, - va_list vl) -{ - av_log(NULL, log_level, "%s:%d: ", filename, line_num); - av_vlog(NULL, log_level, fmt, vl); - if (errors) - (*errors)++; -} - -static void report_config_error(const char *filename, int line_num, - int log_level, int *errors, - const char *fmt, ...) -{ - va_list vl; - va_start(vl, fmt); - vreport_config_error(filename, line_num, log_level, errors, fmt, vl); - va_end(vl); -} - -static int ffserver_set_int_param(int *dest, const char *value, int factor, - int min, int max, FFServerConfig *config, - const char *error_msg, ...) -{ - int tmp; - char *tailp; - if (!value || !value[0]) - goto error; - errno = 0; - tmp = strtol(value, &tailp, 0); - if (tmp < min || tmp > max) - goto error; - if (factor) { - if (tmp == INT_MIN || FFABS(tmp) > INT_MAX / FFABS(factor)) - goto error; - tmp *= factor; - } - if (tailp[0] || errno) - goto error; - if (dest) - *dest = tmp; - return 0; - error: - if (config) { - va_list vl; - va_start(vl, error_msg); - vreport_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, error_msg, vl); - va_end(vl); - } - return AVERROR(EINVAL); -} - -static int ffserver_set_float_param(float *dest, const char *value, - float factor, float min, float max, - FFServerConfig *config, - const char *error_msg, ...) -{ - double tmp; - char *tailp; - if (!value || !value[0]) - goto error; - errno = 0; - tmp = strtod(value, &tailp); - if (tmp < min || tmp > max) - goto error; - if (factor) - tmp *= factor; - if (tailp[0] || errno) - goto error; - if (dest) - *dest = tmp; - return 0; - error: - if (config) { - va_list vl; - va_start(vl, error_msg); - vreport_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, error_msg, vl); - va_end(vl); - } - return AVERROR(EINVAL); -} - -static int ffserver_save_avoption(const char *opt, const char *arg, int type, - FFServerConfig *config) -{ - static int hinted = 0; - int ret = 0; - AVDictionaryEntry *e; - const AVOption *o = NULL; - const char *option = NULL; - const char *codec_name = NULL; - char buff[1024]; - AVCodecContext *ctx; - AVDictionary **dict; - enum AVCodecID guessed_codec_id; - - switch (type) { - case AV_OPT_FLAG_VIDEO_PARAM: - ctx = config->dummy_vctx; - dict = &config->video_opts; - guessed_codec_id = config->guessed_video_codec_id != AV_CODEC_ID_NONE ? - config->guessed_video_codec_id : AV_CODEC_ID_H264; - break; - case AV_OPT_FLAG_AUDIO_PARAM: - ctx = config->dummy_actx; - dict = &config->audio_opts; - guessed_codec_id = config->guessed_audio_codec_id != AV_CODEC_ID_NONE ? - config->guessed_audio_codec_id : AV_CODEC_ID_AAC; - break; - default: - av_assert0(0); - } - - if (strchr(opt, ':')) { - //explicit private option - snprintf(buff, sizeof(buff), "%s", opt); - codec_name = buff; - if(!(option = strchr(buff, ':'))){ - report_config_error(config->filename, config->line_num, - AV_LOG_ERROR, &config->errors, - "Syntax error. Unmatched ':'\n"); - return -1; - - } - buff[option - buff] = '\0'; - option++; - if ((ret = ffserver_set_codec(ctx, codec_name, config)) < 0) - return ret; - if (!ctx->codec || !ctx->priv_data) - return -1; - } else { - option = opt; - } - - o = av_opt_find(ctx, option, NULL, type | AV_OPT_FLAG_ENCODING_PARAM, - AV_OPT_SEARCH_CHILDREN); - if (!o && - (!strcmp(option, "time_base") || !strcmp(option, "pixel_format") || - !strcmp(option, "video_size") || !strcmp(option, "codec_tag"))) - o = av_opt_find(ctx, option, NULL, 0, 0); - if (!o) { - report_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, "Option not found: '%s'\n", opt); - if (!hinted && ctx->codec_id == AV_CODEC_ID_NONE) { - hinted = 1; - report_config_error(config->filename, config->line_num, - AV_LOG_ERROR, NULL, "If '%s' is a codec private" - "option, then prefix it with codec name, for " - "example '%s:%s %s' or define codec earlier.\n", - opt, avcodec_get_name(guessed_codec_id) ,opt, - arg); - } - } else if ((ret = av_opt_set(ctx, option, arg, AV_OPT_SEARCH_CHILDREN)) < 0) { - report_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, "Invalid value for option %s (%s): %s\n", opt, - arg, av_err2str(ret)); - } else if ((e = av_dict_get(*dict, option, NULL, 0))) { - if ((o->type == AV_OPT_TYPE_FLAGS) && arg && - (arg[0] == '+' || arg[0] == '-')) - return av_dict_set(dict, option, arg, AV_DICT_APPEND); - report_config_error(config->filename, config->line_num, AV_LOG_ERROR, - &config->errors, "Redeclaring value of option '%s'." - "Previous value was: '%s'.\n", opt, e->value); - } else if (av_dict_set(dict, option, arg, 0) < 0) { - return AVERROR(ENOMEM); - } - return 0; -} - -static int ffserver_save_avoption_int(const char *opt, int64_t arg, - int type, FFServerConfig *config) -{ - char buf[22]; - snprintf(buf, sizeof(buf), "%"PRId64, arg); - return ffserver_save_avoption(opt, buf, type, config); -} - -static int ffserver_parse_config_global(FFServerConfig *config, const char *cmd, - const char **p) -{ - int val; - char arg[1024]; - if (!av_strcasecmp(cmd, "Port") || !av_strcasecmp(cmd, "HTTPPort")) { - if (!av_strcasecmp(cmd, "Port")) - WARNING("Port option is deprecated. Use HTTPPort instead.\n"); - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, 1, 65535, config, - "Invalid port: %s\n", arg); - if (val < 1024) - WARNING("Trying to use IETF assigned system port: '%d'\n", val); - config->http_addr.sin_port = htons(val); - } else if (!av_strcasecmp(cmd, "HTTPBindAddress") || - !av_strcasecmp(cmd, "BindAddress")) { - if (!av_strcasecmp(cmd, "BindAddress")) - WARNING("BindAddress option is deprecated. Use HTTPBindAddress " - "instead.\n"); - ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&config->http_addr.sin_addr, arg)) - ERROR("Invalid host/IP address: '%s'\n", arg); - } else if (!av_strcasecmp(cmd, "NoDaemon")) { - WARNING("NoDaemon option has no effect. You should remove it.\n"); - } else if (!av_strcasecmp(cmd, "RTSPPort")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, 1, 65535, config, - "Invalid port: %s\n", arg); - config->rtsp_addr.sin_port = htons(val); - } else if (!av_strcasecmp(cmd, "RTSPBindAddress")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&config->rtsp_addr.sin_addr, arg)) - ERROR("Invalid host/IP address: %s\n", arg); - } else if (!av_strcasecmp(cmd, "MaxHTTPConnections")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, 1, 65535, config, - "Invalid MaxHTTPConnections: %s\n", arg); - config->nb_max_http_connections = val; - if (config->nb_max_connections > config->nb_max_http_connections) { - ERROR("Inconsistent configuration: MaxClients(%d) > " - "MaxHTTPConnections(%d)\n", config->nb_max_connections, - config->nb_max_http_connections); - } - } else if (!av_strcasecmp(cmd, "MaxClients")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, 1, 65535, config, - "Invalid MaxClients: '%s'\n", arg); - config->nb_max_connections = val; - if (config->nb_max_connections > config->nb_max_http_connections) { - ERROR("Inconsistent configuration: MaxClients(%d) > " - "MaxHTTPConnections(%d)\n", config->nb_max_connections, - config->nb_max_http_connections); - } - } else if (!av_strcasecmp(cmd, "MaxBandwidth")) { - int64_t llval; - char *tailp; - ffserver_get_arg(arg, sizeof(arg), p); - errno = 0; - llval = strtoll(arg, &tailp, 10); - if (llval < 10 || llval > 10000000 || tailp[0] || errno) - ERROR("Invalid MaxBandwidth: '%s'\n", arg); - else - config->max_bandwidth = llval; - } else if (!av_strcasecmp(cmd, "CustomLog")) { - if (!config->debug) { - ffserver_get_arg(config->logfilename, sizeof(config->logfilename), - p); - } - } else if (!av_strcasecmp(cmd, "LoadModule")) { - ERROR("Loadable modules are no longer supported\n"); - } else if (!av_strcasecmp(cmd, "NoDefaults")) { - config->use_defaults = 0; - } else if (!av_strcasecmp(cmd, "UseDefaults")) { - config->use_defaults = 1; - } else - ERROR("Incorrect keyword: '%s'\n", cmd); - return 0; -} - -static int ffserver_parse_config_feed(FFServerConfig *config, const char *cmd, - const char **p, FFServerStream **pfeed) -{ - FFServerStream *feed; - char arg[1024]; - av_assert0(pfeed); - feed = *pfeed; - if (!av_strcasecmp(cmd, "filename, sizeof(feed->filename), p); - q = strrchr(feed->filename, '>'); - if (*q) - *q = '\0'; - - for (s = config->first_feed; s; s = s->next) { - if (!strcmp(feed->filename, s->filename)) - ERROR("Feed '%s' already registered\n", s->filename); - } - - feed->fmt = av_guess_format("ffm", NULL, NULL); - /* default feed file */ - snprintf(feed->feed_filename, sizeof(feed->feed_filename), - "/tmp/%s.ffm", feed->filename); - feed->feed_max_size = 5 * 1024 * 1024; - feed->is_feed = 1; - feed->feed = feed; /* self feeding :-) */ - *pfeed = feed; - return 0; - } - av_assert0(feed); - if (!av_strcasecmp(cmd, "Launch")) { - int i; - - feed->child_argv = av_mallocz_array(MAX_CHILD_ARGS, sizeof(char *)); - if (!feed->child_argv) - return AVERROR(ENOMEM); - for (i = 0; i < MAX_CHILD_ARGS - 2; i++) { - ffserver_get_arg(arg, sizeof(arg), p); - if (!arg[0]) - break; - - feed->child_argv[i] = av_strdup(arg); - if (!feed->child_argv[i]) - return AVERROR(ENOMEM); - } - - feed->child_argv[i] = - av_asprintf("http://%s:%d/%s", - (config->http_addr.sin_addr.s_addr == INADDR_ANY) ? - "127.0.0.1" : inet_ntoa(config->http_addr.sin_addr), - ntohs(config->http_addr.sin_port), feed->filename); - if (!feed->child_argv[i]) - return AVERROR(ENOMEM); - } else if (!av_strcasecmp(cmd, "ACL")) { - ffserver_parse_acl_row(NULL, feed, NULL, *p, config->filename, - config->line_num); - } else if (!av_strcasecmp(cmd, "File") || - !av_strcasecmp(cmd, "ReadOnlyFile")) { - ffserver_get_arg(feed->feed_filename, sizeof(feed->feed_filename), p); - feed->readonly = !av_strcasecmp(cmd, "ReadOnlyFile"); - } else if (!av_strcasecmp(cmd, "Truncate")) { - ffserver_get_arg(arg, sizeof(arg), p); - /* assume Truncate is true in case no argument is specified */ - if (!arg[0]) { - feed->truncate = 1; - } else { - WARNING("Truncate N syntax in configuration file is deprecated. " - "Use Truncate alone with no arguments.\n"); - feed->truncate = strtod(arg, NULL); - } - } else if (!av_strcasecmp(cmd, "FileMaxSize")) { - char *p1; - double fsize; - - ffserver_get_arg(arg, sizeof(arg), p); - p1 = arg; - fsize = strtod(p1, &p1); - switch(av_toupper(*p1)) { - case 'K': - fsize *= 1024; - break; - case 'M': - fsize *= 1024 * 1024; - break; - case 'G': - fsize *= 1024 * 1024 * 1024; - break; - default: - ERROR("Invalid file size: '%s'\n", arg); - break; - } - feed->feed_max_size = (int64_t)fsize; - if (feed->feed_max_size < FFM_PACKET_SIZE*4) { - ERROR("Feed max file size is too small. Must be at least %d.\n", - FFM_PACKET_SIZE*4); - } - } else if (!av_strcasecmp(cmd, "")) { - *pfeed = NULL; - } else { - ERROR("Invalid entry '%s' inside \n", cmd); - } - return 0; -} - -static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd, - const char **p, - FFServerStream **pstream) -{ - char arg[1024], arg2[1024]; - FFServerStream *stream; - int val; - - av_assert0(pstream); - stream = *pstream; - - if (!av_strcasecmp(cmd, "dummy_actx = avcodec_alloc_context3(NULL); - config->dummy_vctx = avcodec_alloc_context3(NULL); - if (!config->dummy_vctx || !config->dummy_actx) { - av_free(stream); - avcodec_free_context(&config->dummy_vctx); - avcodec_free_context(&config->dummy_actx); - return AVERROR(ENOMEM); - } - config->dummy_actx->codec_type = AVMEDIA_TYPE_AUDIO; - config->dummy_vctx->codec_type = AVMEDIA_TYPE_VIDEO; - ffserver_get_arg(stream->filename, sizeof(stream->filename), p); - q = strrchr(stream->filename, '>'); - if (q) - *q = '\0'; - - for (s = config->first_stream; s; s = s->next) { - if (!strcmp(stream->filename, s->filename)) - ERROR("Stream '%s' already registered\n", s->filename); - } - - stream->fmt = ffserver_guess_format(NULL, stream->filename, NULL); - if (stream->fmt) { - config->guessed_audio_codec_id = stream->fmt->audio_codec; - config->guessed_video_codec_id = stream->fmt->video_codec; - } else { - config->guessed_audio_codec_id = AV_CODEC_ID_NONE; - config->guessed_video_codec_id = AV_CODEC_ID_NONE; - } - config->stream_use_defaults = config->use_defaults; - *pstream = stream; - return 0; - } - av_assert0(stream); - if (!av_strcasecmp(cmd, "Feed")) { - FFServerStream *sfeed; - ffserver_get_arg(arg, sizeof(arg), p); - sfeed = config->first_feed; - while (sfeed) { - if (!strcmp(sfeed->filename, arg)) - break; - sfeed = sfeed->next_feed; - } - if (!sfeed) - ERROR("Feed with name '%s' for stream '%s' is not defined\n", arg, - stream->filename); - else - stream->feed = sfeed; - } else if (!av_strcasecmp(cmd, "Format")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (!strcmp(arg, "status")) { - stream->stream_type = STREAM_TYPE_STATUS; - stream->fmt = NULL; - } else { - stream->stream_type = STREAM_TYPE_LIVE; - /* JPEG cannot be used here, so use single frame MJPEG */ - if (!strcmp(arg, "jpeg")) { - strcpy(arg, "singlejpeg"); - stream->single_frame=1; - } - stream->fmt = ffserver_guess_format(arg, NULL, NULL); - if (!stream->fmt) - ERROR("Unknown Format: '%s'\n", arg); - } - if (stream->fmt) { - config->guessed_audio_codec_id = stream->fmt->audio_codec; - config->guessed_video_codec_id = stream->fmt->video_codec; - } - } else if (!av_strcasecmp(cmd, "InputFormat")) { - ffserver_get_arg(arg, sizeof(arg), p); - stream->ifmt = av_find_input_format(arg); - if (!stream->ifmt) - ERROR("Unknown input format: '%s'\n", arg); - } else if (!av_strcasecmp(cmd, "FaviconURL")) { - if (stream->stream_type == STREAM_TYPE_STATUS) - ffserver_get_arg(stream->feed_filename, - sizeof(stream->feed_filename), p); - else - ERROR("FaviconURL only permitted for status streams\n"); - } else if (!av_strcasecmp(cmd, "Author") || - !av_strcasecmp(cmd, "Comment") || - !av_strcasecmp(cmd, "Copyright") || - !av_strcasecmp(cmd, "Title")) { - char key[32]; - int i; - ffserver_get_arg(arg, sizeof(arg), p); - for (i = 0; i < strlen(cmd); i++) - key[i] = av_tolower(cmd[i]); - key[i] = 0; - WARNING("Deprecated '%s' option in configuration file. Use " - "'Metadata %s VALUE' instead.\n", cmd, key); - if (av_dict_set(&stream->metadata, key, arg, 0) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "Metadata")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_get_arg(arg2, sizeof(arg2), p); - if (av_dict_set(&stream->metadata, arg, arg2, 0) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "Preroll")) { - ffserver_get_arg(arg, sizeof(arg), p); - stream->prebuffer = atof(arg) * 1000; - } else if (!av_strcasecmp(cmd, "StartSendOnKey")) { - stream->send_on_key = 1; - } else if (!av_strcasecmp(cmd, "AudioCodec")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_codec(config->dummy_actx, arg, config); - } else if (!av_strcasecmp(cmd, "VideoCodec")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_codec(config->dummy_vctx, arg, config); - } else if (!av_strcasecmp(cmd, "MaxTime")) { - ffserver_get_arg(arg, sizeof(arg), p); - stream->max_time = atof(arg) * 1000; - } else if (!av_strcasecmp(cmd, "AudioBitRate")) { - float f; - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX, config, - "Invalid %s: '%s'\n", cmd, arg); - if (ffserver_save_avoption_int("b", (int64_t)lrintf(f), - AV_OPT_FLAG_AUDIO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "AudioChannels")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("ac", arg, AV_OPT_FLAG_AUDIO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "AudioSampleRate")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("ar", arg, AV_OPT_FLAG_AUDIO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoBitRateRange")) { - int minrate, maxrate; - char *dash; - ffserver_get_arg(arg, sizeof(arg), p); - dash = strchr(arg, '-'); - if (dash) { - *dash = '\0'; - dash++; - if (ffserver_set_int_param(&minrate, arg, 1000, 0, INT_MAX, config, "Invalid %s: '%s'", cmd, arg) >= 0 && - ffserver_set_int_param(&maxrate, dash, 1000, 0, INT_MAX, config, "Invalid %s: '%s'", cmd, arg) >= 0) { - if (ffserver_save_avoption_int("minrate", minrate, AV_OPT_FLAG_VIDEO_PARAM, config) < 0 || - ffserver_save_avoption_int("maxrate", maxrate, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } - } else - ERROR("Incorrect format for VideoBitRateRange. It should be " - "-: '%s'.\n", arg); - } else if (!av_strcasecmp(cmd, "Debug")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("debug", arg, AV_OPT_FLAG_AUDIO_PARAM, config) < 0 || - ffserver_save_avoption("debug", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "Strict")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("strict", arg, AV_OPT_FLAG_AUDIO_PARAM, config) < 0 || - ffserver_save_avoption("strict", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoBufferSize")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 8*1024, 0, INT_MAX, config, - "Invalid %s: '%s'", cmd, arg); - if (ffserver_save_avoption_int("bufsize", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoBitRateTolerance")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 1000, INT_MIN, INT_MAX, config, - "Invalid %s: '%s'", cmd, arg); - if (ffserver_save_avoption_int("bt", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoBitRate")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 1000, INT_MIN, INT_MAX, config, - "Invalid %s: '%s'", cmd, arg); - if (ffserver_save_avoption_int("b", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoSize")) { - int ret, w, h; - ffserver_get_arg(arg, sizeof(arg), p); - ret = av_parse_video_size(&w, &h, arg); - if (ret < 0) - ERROR("Invalid video size '%s'\n", arg); - else { - if (w % 2 || h % 2) - WARNING("Image size is not a multiple of 2\n"); - if (ffserver_save_avoption("video_size", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } - } else if (!av_strcasecmp(cmd, "VideoFrameRate")) { - ffserver_get_arg(&arg[2], sizeof(arg) - 2, p); - arg[0] = '1'; arg[1] = '/'; - if (ffserver_save_avoption("time_base", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "PixelFormat")) { - enum AVPixelFormat pix_fmt; - ffserver_get_arg(arg, sizeof(arg), p); - pix_fmt = av_get_pix_fmt(arg); - if (pix_fmt == AV_PIX_FMT_NONE) - ERROR("Unknown pixel format: '%s'\n", arg); - else if (ffserver_save_avoption("pixel_format", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoGopSize")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("g", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoIntraOnly")) { - if (ffserver_save_avoption("g", "1", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoHighQuality")) { - if (ffserver_save_avoption("mbd", "+bits", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "Video4MotionVector")) { - if (ffserver_save_avoption("mbd", "+bits", AV_OPT_FLAG_VIDEO_PARAM, config) < 0 || //FIXME remove - ffserver_save_avoption("flags", "+mv4", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "AVOptionVideo") || - !av_strcasecmp(cmd, "AVOptionAudio")) { - int ret; - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_get_arg(arg2, sizeof(arg2), p); - if (!av_strcasecmp(cmd, "AVOptionVideo")) - ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_VIDEO_PARAM, - config); - else - ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_AUDIO_PARAM, - config); - if (ret < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "AVPresetVideo") || - !av_strcasecmp(cmd, "AVPresetAudio")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (!av_strcasecmp(cmd, "AVPresetVideo")) - ffserver_opt_preset(arg, AV_OPT_FLAG_VIDEO_PARAM, config); - else - ffserver_opt_preset(arg, AV_OPT_FLAG_AUDIO_PARAM, config); - } else if (!av_strcasecmp(cmd, "VideoTag")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (strlen(arg) == 4 && - ffserver_save_avoption_int("codec_tag", - MKTAG(arg[0], arg[1], arg[2], arg[3]), - AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "BitExact")) { - if (ffserver_save_avoption("flags", "+bitexact", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "DctFastint")) { - if (ffserver_save_avoption("dct", "fastint", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "IdctSimple")) { - if (ffserver_save_avoption("idct", "simple", AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "Qscale")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, INT_MIN, INT_MAX, config, - "Invalid Qscale: '%s'\n", arg); - if (ffserver_save_avoption("flags", "+qscale", AV_OPT_FLAG_VIDEO_PARAM, config) < 0 || - ffserver_save_avoption_int("global_quality", FF_QP2LAMBDA * val, - AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoQDiff")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("qdiff", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoQMax")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("qmax", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "VideoQMin")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("qmin", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "LumiMask")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("lumi_mask", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "DarkMask")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (ffserver_save_avoption("dark_mask", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0) - goto nomem; - } else if (!av_strcasecmp(cmd, "NoVideo")) { - config->no_video = 1; - } else if (!av_strcasecmp(cmd, "NoAudio")) { - config->no_audio = 1; - } else if (!av_strcasecmp(cmd, "ACL")) { - ffserver_parse_acl_row(stream, NULL, NULL, *p, config->filename, - config->line_num); - } else if (!av_strcasecmp(cmd, "DynamicACL")) { - ffserver_get_arg(stream->dynamic_acl, sizeof(stream->dynamic_acl), p); - } else if (!av_strcasecmp(cmd, "RTSPOption")) { - ffserver_get_arg(arg, sizeof(arg), p); - av_freep(&stream->rtsp_option); - stream->rtsp_option = av_strdup(arg); - } else if (!av_strcasecmp(cmd, "MulticastAddress")) { - ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&stream->multicast_ip, arg)) - ERROR("Invalid host/IP address: '%s'\n", arg); - stream->is_multicast = 1; - stream->loop = 1; /* default is looping */ - } else if (!av_strcasecmp(cmd, "MulticastPort")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, 1, 65535, config, - "Invalid MulticastPort: '%s'\n", arg); - stream->multicast_port = val; - } else if (!av_strcasecmp(cmd, "MulticastTTL")) { - ffserver_get_arg(arg, sizeof(arg), p); - ffserver_set_int_param(&val, arg, 0, INT_MIN, INT_MAX, config, - "Invalid MulticastTTL: '%s'\n", arg); - stream->multicast_ttl = val; - } else if (!av_strcasecmp(cmd, "NoLoop")) { - stream->loop = 0; - } else if (!av_strcasecmp(cmd, "")) { - config->stream_use_defaults &= 1; - if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm")) { - if (config->dummy_actx->codec_id == AV_CODEC_ID_NONE) - config->dummy_actx->codec_id = config->guessed_audio_codec_id; - if (!config->no_audio && - config->dummy_actx->codec_id != AV_CODEC_ID_NONE) { - AVCodecContext *audio_enc = avcodec_alloc_context3(avcodec_find_encoder(config->dummy_actx->codec_id)); - add_codec(stream, audio_enc, config); - } - if (config->dummy_vctx->codec_id == AV_CODEC_ID_NONE) - config->dummy_vctx->codec_id = config->guessed_video_codec_id; - if (!config->no_video && - config->dummy_vctx->codec_id != AV_CODEC_ID_NONE) { - AVCodecContext *video_enc = avcodec_alloc_context3(avcodec_find_encoder(config->dummy_vctx->codec_id)); - add_codec(stream, video_enc, config); - } - } - av_dict_free(&config->video_opts); - av_dict_free(&config->audio_opts); - avcodec_free_context(&config->dummy_vctx); - avcodec_free_context(&config->dummy_actx); - config->no_video = 0; - config->no_audio = 0; - *pstream = NULL; - } else if (!av_strcasecmp(cmd, "File") || - !av_strcasecmp(cmd, "ReadOnlyFile")) { - ffserver_get_arg(stream->feed_filename, sizeof(stream->feed_filename), - p); - } else if (!av_strcasecmp(cmd, "UseDefaults")) { - if (config->stream_use_defaults > 1) - WARNING("Multiple UseDefaults/NoDefaults entries.\n"); - config->stream_use_defaults = 3; - } else if (!av_strcasecmp(cmd, "NoDefaults")) { - if (config->stream_use_defaults > 1) - WARNING("Multiple UseDefaults/NoDefaults entries.\n"); - config->stream_use_defaults = 2; - } else { - ERROR("Invalid entry '%s' inside \n", cmd); - } - return 0; - nomem: - av_log(NULL, AV_LOG_ERROR, "Out of memory. Aborting.\n"); - av_dict_free(&config->video_opts); - av_dict_free(&config->audio_opts); - avcodec_free_context(&config->dummy_vctx); - avcodec_free_context(&config->dummy_actx); - return AVERROR(ENOMEM); -} - -static int ffserver_parse_config_redirect(FFServerConfig *config, - const char *cmd, const char **p, - FFServerStream **predirect) -{ - FFServerStream *redirect; - av_assert0(predirect); - redirect = *predirect; - - if (!av_strcasecmp(cmd, "filename, sizeof(redirect->filename), p); - q = strrchr(redirect->filename, '>'); - if (*q) - *q = '\0'; - redirect->stream_type = STREAM_TYPE_REDIRECT; - *predirect = redirect; - return 0; - } - av_assert0(redirect); - if (!av_strcasecmp(cmd, "URL")) { - ffserver_get_arg(redirect->feed_filename, - sizeof(redirect->feed_filename), p); - } else if (!av_strcasecmp(cmd, "")) { - if (!redirect->feed_filename[0]) - ERROR("No URL found for \n"); - *predirect = NULL; - } else { - ERROR("Invalid entry '%s' inside \n", cmd); - } - return 0; -} - -int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config) -{ - FILE *f; - char line[1024]; - char cmd[64]; - const char *p; - FFServerStream **last_stream, *stream = NULL, *redirect = NULL; - FFServerStream **last_feed, *feed = NULL; - int ret = 0; - - av_assert0(config); - - f = fopen(filename, "r"); - if (!f) { - ret = AVERROR(errno); - av_log(NULL, AV_LOG_ERROR, - "Could not open the configuration file '%s'\n", filename); - return ret; - } - - config->first_stream = NULL; - config->first_feed = NULL; - config->errors = config->warnings = 0; - - last_stream = &config->first_stream; - last_feed = &config->first_feed; - - config->line_num = 0; - while (fgets(line, sizeof(line), f) != NULL) { - config->line_num++; - p = line; - while (av_isspace(*p)) - p++; - if (*p == '\0' || *p == '#') - continue; - - ffserver_get_arg(cmd, sizeof(cmd), &p); - - if (feed || !av_strcasecmp(cmd, "next; - last_feed = &feed->next_feed; - } - } - } else if (stream || !av_strcasecmp(cmd, "next; - } - } - } else if (redirect || !av_strcasecmp(cmd, "next; - } - } - } else { - ffserver_parse_config_global(config, cmd, &p); - } - } - if (stream || feed || redirect) - ERROR("Missing closing tag\n", - stream ? "Stream" : (feed ? "Feed" : "Redirect")); - - fclose(f); - if (ret < 0) - return ret; - if (config->errors) - return AVERROR(EINVAL); - else - return 0; -} - -#undef ERROR -#undef WARNING - -void ffserver_free_child_args(void *argsp) -{ - int i; - char **args; - if (!argsp) - return; - args = *(char ***)argsp; - if (!args) - return; - for (i = 0; i < MAX_CHILD_ARGS; i++) - av_free(args[i]); - av_freep(argsp); -} diff --git a/ffserver_config.h b/ffserver_config.h deleted file mode 100644 index 1b12194..0000000 --- a/ffserver_config.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef FFSERVER_CONFIG_H -#define FFSERVER_CONFIG_H - -#include "libavutil/dict.h" -#include "libavformat/avformat.h" -#include "libavformat/network.h" - -#define FFSERVER_MAX_STREAMS 20 - -/* each generated stream is described here */ -enum FFServerStreamType { - STREAM_TYPE_LIVE, - STREAM_TYPE_STATUS, - STREAM_TYPE_REDIRECT, -}; - -enum FFServerIPAddressAction { - IP_ALLOW = 1, - IP_DENY, -}; - -typedef struct FFServerIPAddressACL { - struct FFServerIPAddressACL *next; - enum FFServerIPAddressAction action; - /* These are in host order */ - struct in_addr first; - struct in_addr last; -} FFServerIPAddressACL; - -/* description of each stream of the ffserver.conf file */ -typedef struct FFServerStream { - enum FFServerStreamType stream_type; - char filename[1024]; /* stream filename */ - struct FFServerStream *feed; /* feed we are using (can be null if coming from file) */ - AVDictionary *in_opts; /* input parameters */ - AVDictionary *metadata; /* metadata to set on the stream */ - AVInputFormat *ifmt; /* if non NULL, force input format */ - AVOutputFormat *fmt; - FFServerIPAddressACL *acl; - char dynamic_acl[1024]; - int nb_streams; - int prebuffer; /* Number of milliseconds early to start */ - int64_t max_time; /* Number of milliseconds to run */ - int send_on_key; - AVStream *streams[FFSERVER_MAX_STREAMS]; - int feed_streams[FFSERVER_MAX_STREAMS]; /* index of streams in the feed */ - char feed_filename[1024]; /* file name of the feed storage, or - input file name for a stream */ - pid_t pid; /* Of ffmpeg process */ - time_t pid_start; /* Of ffmpeg process */ - char **child_argv; - struct FFServerStream *next; - unsigned bandwidth; /* bandwidth, in kbits/s */ - /* RTSP options */ - char *rtsp_option; - /* multicast specific */ - int is_multicast; - struct in_addr multicast_ip; - int multicast_port; /* first port used for multicast */ - int multicast_ttl; - int loop; /* if true, send the stream in loops (only meaningful if file) */ - char single_frame; /* only single frame */ - - /* feed specific */ - int feed_opened; /* true if someone is writing to the feed */ - int is_feed; /* true if it is a feed */ - int readonly; /* True if writing is prohibited to the file */ - int truncate; /* True if feeder connection truncate the feed file */ - int conns_served; - int64_t bytes_served; - int64_t feed_max_size; /* maximum storage size, zero means unlimited */ - int64_t feed_write_index; /* current write position in feed (it wraps around) */ - int64_t feed_size; /* current size of feed */ - struct FFServerStream *next_feed; -} FFServerStream; - -typedef struct FFServerConfig { - char *filename; - FFServerStream *first_feed; /* contains only feeds */ - FFServerStream *first_stream; /* contains all streams, including feeds */ - unsigned int nb_max_http_connections; - unsigned int nb_max_connections; - uint64_t max_bandwidth; - int debug; - char logfilename[1024]; - struct sockaddr_in http_addr; - struct sockaddr_in rtsp_addr; - int errors; - int warnings; - int use_defaults; - // Following variables MUST NOT be used outside configuration parsing code. - enum AVCodecID guessed_audio_codec_id; - enum AVCodecID guessed_video_codec_id; - AVDictionary *video_opts; /* AVOptions for video encoder */ - AVDictionary *audio_opts; /* AVOptions for audio encoder */ - AVCodecContext *dummy_actx; /* Used internally to test audio AVOptions. */ - AVCodecContext *dummy_vctx; /* Used internally to test video AVOptions. */ - int no_audio; - int no_video; - int line_num; - int stream_use_defaults; -} FFServerConfig; - -void ffserver_get_arg(char *buf, int buf_size, const char **pp); - -void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed, - FFServerIPAddressACL *ext_acl, - const char *p, const char *filename, int line_num); - -int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config); - -void ffserver_free_child_args(void *argsp); - -#endif /* FFSERVER_CONFIG_H */ diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 3904ccb..80f83c5 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -23,7 +23,7 @@ /* Multipart JPEG */ -#define BOUNDARY_TAG "ffserver" +#define BOUNDARY_TAG "ffmpeg" typedef struct MPJPEGContext { AVClass *class; diff --git a/tests/Makefile b/tests/Makefile index 8e810ff..0c8e577 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,3 @@ -FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref - THREADS = 1 VREF = tests/vsynth1/00.pgm AREF = tests/data/asynth1.sw @@ -11,14 +9,6 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) $(AREF): CMP= -ffservertest: export PROGSUF = $(PROGSSUF) -ffservertest: ffserver$(PROGSSUF)$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw - @echo - @echo "Unfortunately ffserver is broken and therefore its regression" - @echo "test fails randomly. Treat the results accordingly." - @echo - $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf - APITESTSDIR := tests/api OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/ diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh deleted file mode 100755 index 192d362..0000000 --- a/tests/ffserver-regression.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf -#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf - -. $(dirname $0)/md5.sh - -FILES=$(sed -n 's/^[^#]*.*/\1/p' $2 | grep -v html) - -rm -f tests/feed1.ffm -./ffserver${PROGSUF} -d -f "$2" 2> /dev/null & -FFSERVER_PID=$! -echo "Waiting for feeds to startup..." -sleep 2 -( - cd tests/data || exit $? - rm -f ff-* ffserver.regression - WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off" - for file in $FILES; do - if [ $(expr $file : "a-*") != 0 ]; then - wget $WGET_OPTIONS -O - http://localhost:9999/$file > ff-$file - else - wget $WGET_OPTIONS -O - http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null - fi - do_md5sum ff-$file >>ffserver.regression - done -) -kill $FFSERVER_PID -wait > /dev/null 2>&1 -rm -f tests/feed1.ffm -if diff -u "$1" tests/data/ffserver.regression; then - echo - echo Server regression test succeeded. - exit 0 -else - echo - echo Server regression test: Error. - exit 1 -fi diff --git a/tests/ffserver.conf b/tests/ffserver.conf deleted file mode 100644 index ae35d7f..0000000 --- a/tests/ffserver.conf +++ /dev/null @@ -1,311 +0,0 @@ -# -# This is a test configuration file. You can invoke it with -# ../ffserver -f ffserver.conf -# when in the tests directory and once the vsynth1 subdirectory -# has been populated. Then point your browser at http://whatever:9999/teststat.html -# and you can look at the streams -# - -# -# Port on which the server is listening. You must select a different -# port from your standard http web server if it is running on the same -# computer. - -HTTPPort 9999 -RTSPPort 9990 - -# Address on which the server is bound. Only useful if you have -# several network interfaces. - -HTTPBindAddress 0.0.0.0 - -# Number of simultaneous requests that can be handled. Since FFServer -# is very fast, this limit is determined mainly by your Internet -# connection speed. - -MaxClients 1000 - -MaxBandwidth 100000 - -# Access Log file (uses standard Apache log file format) -# '-' is the standard output - -CustomLog - - -################################################################## -# Definition of the live feeds. Each live feed contains one video -# and/or audio sequence coming from an ffmpeg encoder or another -# ffserver. This sequence may be encoded simultaneously with several -# codecs at several resolutions. - - - -# You must use 'ffmpeg' to send a live feed to ffserver. In this -# example, you can type: -# -# ffmpeg http://localhost:8090/feed1.ffm - -# ffserver can also do time shifting. It means that it can stream any -# previously recorded live stream. The request should contain: -# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify -# a path where the feed is stored on disk. You also specify the -# maximum size of the feed (100M bytes here). Default: -# File=/tmp/feed_name.ffm FileMaxSize=5M - -File tests/feed1.ffm -FileMaxSize 100M - -# Fire up ffmpeg pointing at this stream - -Launch ./ffmpeg -v 0 -y -f image2 -i tests/vsynth1/%02d.pgm - -ACL allow localhost - - -################################################################## -# Now you can define each stream which will be generated from the -# original audio and video stream. Each format has a filename (here -# 'test128.mpg'). FFServer will send this stream when answering a -# request containing this filename. - - -Feed feed1.ffm -Format avi -# -BitExact -DctFastint -IdctSimple -VideoFrameRate 10 -VideoSize 352x288 -VideoBitRate 100 -VideoGopSize 30 -NoAudio - -PreRoll 10 -StartSendOnKey -MaxTime 100 - - - - -Feed feed1.ffm -Format avi -# -BitExact -DctFastint -IdctSimple -VideoFrameRate 2 -VideoSize 320x240 -VideoBitRate 40 -VideoGopSize 20 -NoAudio - -PreRoll 20 -StartSendOnKey -MaxTime 100 - - - -# -#Feed feed1.ffm -# -#VideoFrameRate 10 -#VideoSize 352x288 -#VideoBitRate 100 -#VideoGopSize 30 -#NoAudio - -#PreRoll 10 -#StartSendOnKey -#MaxTime 100 -# -# -# -# -#Feed feed1.ffm -## -#VideoFrameRate 2 -#VideoSize 320x240 -#VideoBitRate 40 -#VideoGopSize 20 -#NoAudio -# -#PreRoll 20 -#StartSendOnKey -#MaxTime 100 -# -# -# - -Feed feed1.ffm -# -BitExact -DctFastint -IdctSimple -Qscale 10 -VideoFrameRate 10 -VideoSize 352x288 -VideoBitRate 100 -VideoGopSize 30 -NoAudio - -PreRoll 10 -StartSendOnKey -MaxTime 100 - - - - -Feed feed1.ffm -Format asf -# -BitExact -DctFastint -IdctSimple -Qscale 10 -VideoFrameRate 10 -VideoSize 320x240 -VideoBitRate 100 -VideoGopSize 30 -NoAudio - -PreRoll 10 -StartSendOnKey -MaxTime 100 - -AVOptionVideo flags +global_header - -Metadata title "Test data stream" - - - - -Feed feed1.ffm -Format asf -# -BitExact -DctFastint -IdctSimple -Qscale 10 -VideoFrameRate 2 -VideoSize 320x240 -VideoBitRate 40 -VideoGopSize 20 -NoAudio - -PreRoll 20 -StartSendOnKey -MaxTime 100 - -AVOptionVideo flags +global_header - -Metadata title "Test data stream" - - - - - -Feed feed1.ffm -Format rm - -BitExact -DctFastint -IdctSimple -Qscale 10 -VideoBitRate 100 -VideoFrameRate 10 -VideoGopSize 30 -VideoSize 320x240 -NoAudio - -PreRoll 10 -StartSendOnKey -MaxTime 100 - - - - - -Feed feed1.ffm -Format rm - -BitExact -DctFastint -IdctSimple -Qscale 10 -VideoBitRate 40 -VideoFrameRate 2 -VideoGopSize 20 -VideoSize 320x240 -NoAudio - -PreRoll 20 -StartSendOnKey -MaxTime 100 - - - - - - -Feed feed1.ffm -Format jpeg -Strict -1 - -BitExact -DctFastint -IdctSimple -VideoFrameRate 1 -VideoSize 352x288 -NoAudio - -PreRoll 2 - - - - - -Feed feed1.ffm -Format jpeg -Strict -1 - -BitExact -DctFastint -IdctSimple -VideoFrameRate 1 -VideoSize 160x128 -NoAudio - -PreRoll 2 - - - - - -Feed feed1.ffm -Format mpjpeg -Strict -1 - -BitExact -DctFastint -IdctSimple -VideoFrameRate 1 -VideoSize 320x240 -NoAudio -StartSendOnKey - -PreRoll 1 -MaxTime 100 - - - - -################################################################## -# Special stream : server status - - - -Format status - - - diff --git a/tools/bisect-create b/tools/bisect-create index fc60e86..ee6ec3f 100755 --- a/tools/bisect-create +++ b/tools/bisect-create @@ -20,7 +20,7 @@ fi case "$1" in need) case $2 in - ffmpeg|ffplay|ffprobe|ffserver) + ffmpeg|ffplay|ffprobe) echo $2.c >> tools/bisect.need ;; esac -- 2.10.1