| Branch: | Revision:

ffmpeg / ffserver.c @ 64eaac62

History | View | Annotate | Download (150 KB)

# Date Author Comment
267b0e57 03/09/2006 12:36 AM Aurelien Jacobs

Update ffserver regression tests:
- really produce readable files (instead of 0 byte files or headers only)
- use bitexact, fastint dct, simple idct and qscale
- gives consistent results across several archs
- still fails on altivec ppc

Originally committed as revision 5129 to svn://

33f5e2ec 02/21/2006 09:15 PM Alex Beregszaszi

make those nasty variables static, also fix a html bug

Originally committed as revision 5044 to svn://

b2b77b9c 02/02/2006 08:11 PM Måns Rullgård

remove unused function get_longterm_datarate()

Originally committed as revision 4928 to svn://

5509bffa 01/12/2006 10:43 PM Diego Biurrun

Update licensing information: The FSF changed postal address.

Originally committed as revision 4842 to svn://

bb270c08 12/22/2005 01:10 AM Diego Biurrun

COSMETICS: tabs --> spaces, some prettyprinting

Originally committed as revision 4764 to svn://

115329f1 12/17/2005 06:14 PM Diego Biurrun

COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://

4733abcb 12/12/2005 01:56 AM Måns Rullgård

use PRIxN, %zd, %td formats where needed

Originally committed as revision 4740 to svn://

6b0bdc75 11/13/2005 03:26 AM Alex Beregszaszi

support for unlimited feed size

Originally committed as revision 4697 to svn://

90f9c440 11/13/2005 03:12 AM Alex Beregszaszi

debug the launch commandline and new connections

Originally committed as revision 4695 to svn://

ac6a655b 11/13/2005 01:45 AM Alex Beregszaszi

Make Launch more appropriate with support for full paths for the ffmpeg binary

Originally committed as revision 4693 to svn://

4b4f38e4 11/13/2005 01:41 AM Alex Beregszaszi

Support Launch when BindAddress is not INADDR_ANY or localhost. Also fix a possible buffer overflow

Originally committed as revision 4692 to svn://

edfdd798 10/14/2005 05:29 PM Alex Beregszaszi

10l, dont make bandwidth statistics negative when feed stops being sent (it was decreased every time feed sending was aborted)

Originally committed as revision 4642 to svn://

8d931070 07/18/2005 09:02 AM Michael Niedermayer

ffserver segfault & other fatal failure fixes

Originally committed as revision 4454 to svn://

01f4895c 07/17/2005 10:24 PM Michael Niedermayer

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility

Originally committed as revision 4453 to svn://

e8d27bc3 05/07/2005 12:56 AM Philip Gladstone

Turn on the seeking support for ffm streams. Now means that streams are
played from the current time rahter than from the beginning

Originally committed as revision 4194 to svn://

291fe90a 05/06/2005 03:21 AM Philip Gladstone

Fill out some mandatory fields in the Codec structure. Also add fields in
the configuration to allow you to set Debug and Strict values.

Originally committed as revision 4185 to svn://

c0df9d75 04/30/2005 09:43 PM Michael Niedermayer

switch to native time bases

Originally committed as revision 4168 to svn://

7c054ea7 01/03/2005 02:42 AM Philip Gladstone

ffserver now runs again (sort of).

  • In the test cases, the swf, asf, jpg file formats all work
  • The avi case doesn't play in winamp. I suspect that the duration field
    of zero confuses it
  • The RM doesn't play. This always was pretty flaky.

Originally committed as revision 3795 to svn://

6ba5cbc6 08/12/2004 12:09 AM Petr Doubek

HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
tested and submitted by (Torsten Spindler <spindler at hbt dot arch dot ethz dot ch>)

Originally committed as revision 3381 to svn://

668fe04e 07/28/2004 10:24 AM Michael Niedermayer

min rate should be 0 by default

Originally committed as revision 3362 to svn://

53e2f9ca 07/25/2004 11:59 AM Michael Niedermayer

ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)

Originally committed as revision 3340 to svn://

e928649b 05/29/2004 02:06 AM Michael Niedermayer

pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://

4568325a 04/06/2004 06:31 AM Roman Shaposhnik
  • making it possible to specify recording date and time in a stream

Originally committed as revision 2971 to svn://

7906085f 03/24/2004 11:32 PM Falk Hüffner

warning patrol

Originally committed as revision 2925 to svn://

bc874dae 03/03/2004 03:41 PM Michel Bardiaux

av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)

Originally committed as revision 2840 to svn://

46026f4e 02/05/2004 05:47 PM Henning Haaland Kulander

VideoBufferSize option patch by ("Henning Haaland Kulander" <hennikul at ifi dot uio dot no>)

Originally committed as revision 2749 to svn://

d445a7e9 11/19/2003 02:23 AM Philip Gladstone

Changed a bunch of calls to sprintf to snprintf to protect against buffer

Fix streaming from non-streaming ffm files. It turned out that you
always got 'index & id do not match' errors.

Add some more error detection on getting FFM feeds

Originally committed as revision 2523 to svn://

e240a0bb 11/10/2003 07:02 PM Fabrice Bellard

simpler bandwidth allocation for RTSP streaming - use av_read_frame() - initial support for raw MPEG2 transport stream streaming using RTSP

Originally committed as revision 2506 to svn://

8bc80f8b 09/27/2003 01:23 AM Philip Gladstone

Minor bugfix to prevent segfault if a malloc fails. I have no idea what
will happen, but at least this crash is gone.

Originally committed as revision 2307 to svn://

7b7d86f1 09/11/2003 10:51 PM Fabrice Bellard

simplified version handling

Originally committed as revision 2264 to svn://

33f25681 09/08/2003 10:13 PM Fabrice Bellard

removed ctype.h

Originally committed as revision 2234 to svn://

02d504a7 08/24/2003 03:29 PM Fabrice Bellard

more sections in help - copyright fixes

Originally committed as revision 2143 to svn://

7d1c3fc1 07/29/2003 02:09 AM Michael Niedermayer

rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c

Originally committed as revision 2094 to svn://

bc351386 07/17/2003 10:31 AM Fabrice Bellard

added RTP/TCP protocol support

Originally committed as revision 2063 to svn://

1bc1cfdd 07/11/2003 10:30 PM Giancarlo Formicuccia

- Gracefully handle the case where not all the streams are requested/wanted
from the client. Simply ignore the unwanted/unasked streams.
- Don't need to pool() for every input character! (the socket is nonblocking,
so the loop is ok).
- Partially resurrect compute_send_delay for avoiding udp flood. Without a...

17705a34 07/03/2003 10:56 PM Michael Niedermayer

Missing ffserver.c format parameter fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2005 to svn://

1b52b6bd 07/03/2003 09:09 PM Michael Niedermayer

segfault fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2003 to svn://

94d9ad5f 06/29/2003 01:25 AM Giancarlo Formicuccia
  • fix for read()
    Reading 1-char per read() is the less intrusive way to fix the behaviour I observed.
    Not a nice fix, but the client requests shouldn't steal so much bandwidth
  • fix for find_rtp_session_with_url.
    Note that mplayer send one PLAY request per stream, I don't know if this should be handled...
03ff071a 04/12/2003 03:03 AM Philip Gladstone

Fix a horrible bug with the launch keyword not handling arguments of length 1!

Originally committed as revision 1761 to svn://

f0ef6240 04/12/2003 02:27 AM Philip Gladstone

Applied Roumen Petrov patch to fix crash/memory leak

Originally committed as revision 1758 to svn://

a7beab73 04/11/2003 09:43 AM Roman Shaposhnik

bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>)

Originally committed as revision 1753 to svn://

e322ea48 04/09/2003 02:16 AM Philip Gladstone
  • Add Video4MotionVector in a stream description to behave like the -4mv flag
  • Add ReadOnlyFile which behaves like File, but does not permit changing of the
    file. This can be used to prevent deleting of saved ffm files.

Originally committed as revision 1743 to svn://

0df65975 04/04/2003 01:29 PM Andriy Rysin

RTSP "OPTIONS" command patch by (Andriy Rysin <arysin at bcsii dot net>)

Originally committed as revision 1728 to svn://

b88ba823 03/26/2003 10:30 AM Mark Hills

ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)

Originally committed as revision 1704 to svn://

14bea432 03/12/2003 03:16 PM Michael Niedermayer

per context frame_rate_base, this should finally fix frame_rate related av sync issues

Originally committed as revision 1666 to svn://

ce2749d2 03/09/2003 04:07 PM Alex Beregszaszi


Originally committed as revision 1655 to svn://

87638494 03/04/2003 03:12 AM Philip Gladstone

Try to eliminate memory leak on stream termination. It doesn't crash, but I'm
not sure if it fixes the problem.

Originally committed as revision 1620 to svn://

cb275dd9 03/04/2003 02:56 AM Philip Gladstone

This should fix the negative bandwidth in use in ffserver. Turned out that
when WMP reports in, then we didn't increment the bandwidth, but we did
decrement it.

Originally committed as revision 1619 to svn://

efa04ce2 02/23/2003 08:35 PM Philip Gladstone

Make ACLs work correctly for streams. Try comparing the addresses in
host order rather than network order.

Originally committed as revision 1597 to svn://

0c1a9eda 02/11/2003 04:35 PM Zdenek Kabelac
  • UINTX -> uintx_t INTX -> intx_t

Originally committed as revision 1578 to svn://

b29f97d1 02/10/2003 09:44 AM Zdenek Kabelac
  • static,const,compiler warning cleanup

Originally committed as revision 1571 to svn://

98486a6b 01/23/2003 10:00 PM Roman Shaposhnik

zero sized malloc patch by Roman Shaposhnick

Originally committed as revision 1501 to svn://

3c27199b 01/11/2003 05:14 AM Fabrice Bellard

added av_set_parameters()

Originally committed as revision 1441 to svn://

b17d099d 01/05/2003 11:09 PM Philip Gladstone

Improve bind failure message to indicate the port that failed

Originally committed as revision 1399 to svn://

001bcd29 01/03/2003 08:00 PM Philip Gladstone

Fix a crash in ffserver when streaming to WMP from a file. However, it
still doesn't seem to work for me anyway.

Originally committed as revision 1391 to svn://

c2ce254c 12/21/2002 02:41 AM Philip Gladstone

Make asf files work again -- the match against the URL was being done incorrectly.

Originally committed as revision 1353 to svn://

c6c11cb6 12/20/2002 11:10 PM Ryutaroh Matsumoto

mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)

Originally committed as revision 1352 to svn://

a4d70941 12/11/2002 03:16 AM Philip Gladstone
  • Try and fix the crashes in ffserver associated with the coded_frame stuff.
    This code is wrong, but it is not obvious what the right code is.
  • Make sure that we reset SIGPIPE before execing ffmpeg.

Originally committed as revision 1330 to svn://

492cd3a9 12/09/2002 12:03 PM Michael Niedermayer

AVVideoFrame -> AVFrame

Originally committed as revision 1327 to svn://

1e491e29 12/04/2002 10:04 AM Michael Niedermayer

adding AVVideoFrame
moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
removing obsolete variables in AVCodecContext
skiping of MBs in b frames
correctly initalizing AVCodecContext
picture buffer cleanup

Originally committed as revision 1302 to svn://

6638d424 11/30/2002 05:18 PM Philip Gladstone

Try to make this compile on platforms with dlfcn.h

Originally committed as revision 1296 to svn://

9c938e77 11/26/2002 05:01 AM Philip Gladstone

More fixes to compile and build on more platforms.

Originally committed as revision 1280 to svn://

0fa45e19 11/20/2002 08:49 PM Fabrice Bellard

minimum handling for mpeg4 video multicast from avi files

Originally committed as revision 1262 to svn://

6edd6884 11/20/2002 06:05 PM Fabrice Bellard

RTP multicast begins to work in MPEG1 - simplified stream bandwidth computation (no need to recompute it at each request)

Originally committed as revision 1260 to svn://

829ac53d 11/20/2002 03:00 PM Fabrice Bellard

clean up of redirector code - first stage of RTP multicast support - added SDP redirector output for multicast

Originally committed as revision 1257 to svn://

58445440 11/14/2002 07:07 PM Zdenek Kabelac
  • const warning fix

Originally committed as revision 1210 to svn://

b8a78f41 11/10/2002 11:46 AM Michael Niedermayer

reversing header game

Originally committed as revision 1184 to svn://

9eb82647 11/05/2002 12:56 AM François Revol

MIN/MAX sys/param.h patch by (François Revol <revol at free dot fr>)

Originally committed as revision 1164 to svn://

d6562d2c 10/30/2002 02:15 AM Philip Gladstone

Added VideoBitRateRange and VideoBitRAteTolerance settings
Also made the Launch directive work again if you invoke ffserver with a relative

Originally committed as revision 1111 to svn://

90dca141 10/21/2002 05:44 PM Fabrice Bellard

changed write_packet API - should work as before

Originally committed as revision 1060 to svn://

6b10e6e4 10/21/2002 04:08 PM D Richard Felker III

new ffserver options patch by (D Richard Felker III <dalias at aerifal dot cx>)

Originally committed as revision 1057 to svn://

b3a391e8 09/19/2002 08:22 PM Michael Niedermayer

fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully

Originally committed as revision 959 to svn://

a782f209 09/12/2002 02:31 AM Philip Gladstone
  • Add code to pace sending a stream when it is being sent from a file.
    We limit the datarate to twice the average datarate (however the first
    few seconds are sent flat out to help with prebuffering).
  • Add the initialization of the rc_eq fields and the like for VIDEO codecs....
81e0d0b4 09/01/2002 06:07 PM Mark Hills

oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)

Originally committed as revision 896 to svn://

59eb2ed1 07/28/2002 04:19 AM Philip Gladstone
  • Now we do not delete the feed file if it was created with the same
    parameters as the currently desired codec settings. Thus it is
    important not to fiddle with the streams if you want to keep the
    old data.
  • Fix it so that the ?buffer= paramter can be larger than 40 minutes or...
f853bb11 07/27/2002 03:22 PM Philip Gladstone
  • Removed a debug printf
  • Fix the sense of the test for "-" with customlog and not closing stdout in daemon mode

Originally committed as revision 828 to svn://

8256c0a3 07/27/2002 03:03 AM Philip Gladstone
  • Make asf streaming work again. Now uses the output format asf_stream.
  • Add ip address based acls for streams. I recommend adding ACL entries
    for all feeds to control who can submit stuff. You might also want to
    consider who can get to your status page....
2effd274 07/25/2002 04:48 PM Fabrice Bellard

added RTSP and RTP server support - added daemon mode as default (use -d for foreground mode) - added module support

Originally committed as revision 812 to svn://

2c4ae653 07/25/2002 04:07 PM Fabrice Bellard

renamed gettime() av_gettime() - same for register_all()

Originally committed as revision 808 to svn://

5eb765ef 06/10/2002 02:44 AM Philip Gladstone
  • Add code to restart ffmpeg if it crashes
  • Add code to monitor the actual datarates on the http connections
  • Fix problem when ffmpeg uses more than 24 hours of CPU (display only problem)

Originally committed as revision 680 to svn://

2ac887ba 06/05/2002 02:17 AM Philip Gladstone
  • Give the max stream time configuration item a chance of working
  • Add parameters to set author/comment/copyright/title to streamed asf
  • Format the stats output a little bit better.

Originally committed as revision 663 to svn://

31def229 05/30/2002 08:37 PM Philip Gladstone
  • Bad buffer management bug. Forgot to take care of the case
    where doubling the size of the buffer is not enough.

Originally committed as revision 633 to svn://

cde25790 05/30/2002 02:49 AM Philip Gladstone
  • New stuff and bug fixes:
  • Change to dynamically allocated buffers. Should reduce memory footprint significantly
    as well as eliminate a call to av_abort!
  • Better version of WMP rate switching infrastructure. Currently turned off till
    the PTS fixes are in....
3120d2a2 05/26/2002 03:36 AM Philip Gladstone
  • Add first cut of code to handle Windows Media Player rate switching
    requests. The current state is that at startup, WMP will get the
    best stream that it can handle. However, subsequent rate switching
    only puts a message in the log saying what the new stream ought to...
773a21b8 05/25/2002 10:26 PM Fabrice Bellard

license/copyright change - fixed header mess

Originally committed as revision 588 to svn://

b582f314 05/24/2002 02:06 AM Philip Gladstone
  • Added yet more output to the status page to try and track down a problem

Originally committed as revision 579 to svn://

ec3b2232 05/24/2002 01:18 AM Philip Gladstone
  • Add support for time-limiting a live stream. (Some guy streamed one of
    my pondcam streams for 24 hours! I'll bet he wasn't watching.
  • Add code to allocate the priv_data so that the ffm header can be
    parsed again. [Fix crash]

Originally committed as revision 577 to svn://

bd7cf6ad 05/20/2002 04:33 PM Fabrice Bellard

use new api (NOT TESTED) - suppressed strlcpy

Originally committed as revision 549 to svn://

2e04edb3 05/20/2002 03:02 AM Philip Gladstone

Fix a segfault when handling errors or .asx or .ram files. Silly bug
on my part.

Originally committed as revision 536 to svn://

0f1578af 05/18/2002 11:17 PM Fabrice Bellard

use av memory functions

Originally committed as revision 531 to svn://

a6e14edd 05/18/2002 09:33 PM Philip Gladstone
  • If a stream gets stuck in WAIT_FEED, then disconnecting the other end
    will clear out the stream. I think that this is really a linux bug in
    the handling of poll, but I did a workaround anyway.
  • Improve the statistics output and prevent a buffer overrun when lots...
79c4ea3c 05/17/2002 01:53 AM Philip Gladstone
  • Change the default behaviour to start streaming as soon as possible (i.e.
    no waiting for key frames).
  • Provide StartSendOnKey paramter for a stream to wait until we get key frames
    before sending.
  • Add the codec names into the status page. May help debugging problems....
42a63c6a 05/16/2002 02:03 AM Philip Gladstone
  • Add code to configure the following: * prebuffering/preroll a live stream -- this improves startup time * videoqmin/videoqmax/videoqdiff -- codec parameters * maximum bandwidth for live streams
  • Add support for .ram and .rpm extensions mapping onto .rm...
7434ba6d 05/10/2002 02:20 AM Philip Gladstone
  • Improve logging -- now actually gives you the number of bytes sent
  • Print out the logging information that comes from WMP (you'd be suprised what
    it sends!
  • Fix a remotely exploitable buffer overflow (argh!)
  • Add support for automatically serving up .asx files. It generates an automatic...
e7f9c674 05/09/2002 07:43 AM Juanjo

- HQ option for ffserver. Thanks to D Richard Felker III.

Originally committed as revision 478 to svn://

ba9b374f 05/09/2002 02:33 AM Juanjo

- Changed default qmin = 3 as ffmpeg.c
- Less bitrate tolerance since we are streaming.

Originally committed as revision 474 to svn://

f747e6d3 05/09/2002 01:11 AM Philip Gladstone
  • Fix a nasty problem with output buffering not have enough (or large enough)
    buffers. In fact, the code was pretty much shot.
  • Try to fool WMP into thinking that we are a microsoft server.
  • When we establish a stream to a user, copy the codec information from...
10bb7023 04/07/2002 09:44 PM Juanjo

- Added force_pts to av_write_packet() to be able to force PTS, this helps
(and fix) stream copying. By now force_pts it's just honoured by the MPEG
muxer. ASF could honour this also, but it should be fixed to use Tickers
- MPEG audio decoder exports it's frame size in bytes....

68d7eef9 03/19/2002 04:31 AM Michael Niedermayer

trying to fix qscale==0

Originally committed as revision 341 to svn://

f5d1f41b 02/26/2002 11:11 PM Michael Niedermayer

fixing warning

Originally committed as revision 315 to svn://