Commit Graph

90 Commits

Author SHA1 Message Date
Philip Gladstone 7c054ea7e2 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://svn.ffmpeg.org/ffmpeg/trunk
2005-01-03 02:42:02 +00:00
Petr Doubek 6ba5cbc699 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://svn.ffmpeg.org/ffmpeg/trunk
2004-08-12 00:09:32 +00:00
Michael Niedermayer 668fe04e39 min rate should be 0 by default
Originally committed as revision 3362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-28 10:24:38 +00:00
Michael Niedermayer 53e2f9caf8 ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-25 11:59:34 +00:00
Michael Niedermayer e928649b0b 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://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Roman Shaposhnik 4568325a18 * making it possible to specify recording date and time in a stream
Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-06 06:31:12 +00:00
Falk Hüffner 7906085fcc warning patrol
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-24 23:32:48 +00:00
Michel Bardiaux bc874daea8 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-03 15:41:21 +00:00
Henning Haaland Kulander 46026f4e5b VideoBufferSize option patch by ("Henning Haaland Kulander" <hennikul at ifi dot uio dot no>)
Originally committed as revision 2749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-05 17:47:24 +00:00
Philip Gladstone d445a7e9cc Changed a bunch of calls to sprintf to snprintf to protect against buffer
overflows.

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://svn.ffmpeg.org/ffmpeg/trunk
2003-11-19 02:23:17 +00:00
Fabrice Bellard e240a0bbe0 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://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 19:02:56 +00:00
Philip Gladstone 8bc80f8b24 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://svn.ffmpeg.org/ffmpeg/trunk
2003-09-27 01:23:40 +00:00
Fabrice Bellard 7b7d86f120 simplified version handling
Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-11 22:51:05 +00:00
Fabrice Bellard 33f25681ae removed ctype.h
Originally committed as revision 2234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:13:17 +00:00
Fabrice Bellard 02d504a7d3 more sections in help - copyright fixes
Originally committed as revision 2143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 15:29:48 +00:00
Michael Niedermayer 7d1c3fc1d6 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://svn.ffmpeg.org/ffmpeg/trunk
2003-07-29 02:09:12 +00:00
Fabrice Bellard bc3513865a added RTP/TCP protocol support
Originally committed as revision 2063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:31:23 +00:00
Giancarlo Formicuccia 1bc1cfdddf - 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
similar patch, udp transmission is seriously unreliable.
(note that we don't link to a specific input reference stream, it's not needed
as the pts values should be coherent anyway. Also, non-monotonic pts
progression is unimportant in the long term).
- rtsp_cmd_pause must reset the time reference
patch by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 2034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-11 22:30:12 +00:00
Michael Niedermayer 17705a3420 Missing ffserver.c format parameter fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)
Originally committed as revision 2005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-03 22:56:54 +00:00
Michael Niedermayer 1b52b6bd6b segfault fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)
Originally committed as revision 2003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-03 21:09:06 +00:00
Giancarlo Formicuccia 94d9ad5f80 *** 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
more gracefully
patch by (Giancarlo Formicuccia <ilsensine at inwind dot it>)

Originally committed as revision 1998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-29 01:25:41 +00:00
Philip Gladstone 03ff071af9 Fix a horrible bug with the launch keyword not handling arguments of length 1!
Originally committed as revision 1761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-12 03:03:26 +00:00
Philip Gladstone f0ef624057 Applied Roumen Petrov patch to fix crash/memory leak
Originally committed as revision 1758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-12 02:27:54 +00:00
Roman Shaposhnik a7beab731d bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>)
Originally committed as revision 1753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-11 09:43:05 +00:00
Philip Gladstone e322ea480b * 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://svn.ffmpeg.org/ffmpeg/trunk
2003-04-09 02:16:01 +00:00
Andriy Rysin 0df65975ba RTSP "OPTIONS" command patch by (Andriy Rysin <arysin at bcsii dot net>)
Originally committed as revision 1728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-04 13:29:58 +00:00
Mark Hills b88ba82315 ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)
Originally committed as revision 1704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-26 10:30:08 +00:00
Michael Niedermayer 14bea432f1 per context frame_rate_base, this should finally fix frame_rate related av sync issues
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 15:16:19 +00:00
Alex Beregszaszi ce2749d2c4 simplified
Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-09 16:07:19 +00:00
Philip Gladstone 87638494ca 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://svn.ffmpeg.org/ffmpeg/trunk
2003-03-04 03:12:32 +00:00
Philip Gladstone cb275dd9eb 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://svn.ffmpeg.org/ffmpeg/trunk
2003-03-04 02:56:51 +00:00
Philip Gladstone efa04ce296 Make ACLs work correctly for streams. Try comparing the addresses in
host order rather than network order.

Originally committed as revision 1597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-23 20:35:47 +00:00
Zdenek Kabelac 0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Zdenek Kabelac b29f97d136 * static,const,compiler warning cleanup
Originally committed as revision 1571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-10 09:44:47 +00:00
Roman Shaposhnik 98486a6bc0 zero sized malloc patch by Roman Shaposhnick
Originally committed as revision 1501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-23 22:00:57 +00:00
Fabrice Bellard 3c27199b8f added av_set_parameters()
Originally committed as revision 1441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-11 05:14:28 +00:00
Philip Gladstone b17d099db4 Improve bind failure message to indicate the port that failed
Originally committed as revision 1399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-05 23:09:01 +00:00
Philip Gladstone 001bcd2955 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://svn.ffmpeg.org/ffmpeg/trunk
2003-01-03 20:00:49 +00:00
Philip Gladstone c2ce254cab Make asf files work again -- the match against the URL was being done incorrectly.
Originally committed as revision 1353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-21 02:41:22 +00:00
Ryutaroh Matsumoto c6c11cb6c6 mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
Originally committed as revision 1352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-20 23:10:58 +00:00
Philip Gladstone a4d70941cd * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-12-11 03:16:51 +00:00
Michael Niedermayer 492cd3a920 AVVideoFrame -> AVFrame
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-09 12:03:43 +00:00
Michael Niedermayer 1e491e29c2 cleanup
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://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 10:04:03 +00:00
Philip Gladstone 6638d424d4 Try to make this compile on platforms with dlfcn.h
Originally committed as revision 1296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-30 17:18:59 +00:00
Philip Gladstone 9c938e77e8 More fixes to compile and build on more platforms.
Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-26 05:01:36 +00:00
Fabrice Bellard 0fa45e19ce minimum handling for mpeg4 video multicast from avi files
Originally committed as revision 1262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-20 20:49:47 +00:00
Fabrice Bellard 6edd6884b5 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://svn.ffmpeg.org/ffmpeg/trunk
2002-11-20 18:05:45 +00:00
Fabrice Bellard 829ac53d98 clean up of redirector code - first stage of RTP multicast support - added SDP redirector output for multicast
Originally committed as revision 1257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-20 15:00:05 +00:00
Zdenek Kabelac 5844544064 * const warning fix
Originally committed as revision 1210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-14 19:07:25 +00:00
Michael Niedermayer b8a78f419d reversing header game
MIN/MAX -> FFMIN/FFMAX

Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-10 11:46:59 +00:00