Commit Graph

69 Commits

Author SHA1 Message Date
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
François Revol
9eb826478c MIN/MAX sys/param.h patch by (François Revol <revol at free dot fr>)
Originally committed as revision 1164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-05 00:56:08 +00:00
Philip Gladstone
d6562d2cfa Added VideoBitRateRange and VideoBitRAteTolerance settings
Also made the Launch directive work again if you invoke ffserver with a relative
path.

Originally committed as revision 1111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-30 02:15:07 +00:00
Fabrice Bellard
90dca1411d changed write_packet API - should work as before
Originally committed as revision 1060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-21 17:44:43 +00:00
D Richard Felker III
6b10e6e48c new ffserver options patch by (D Richard Felker III <dalias at aerifal dot cx>)
Originally committed as revision 1057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-21 16:08:39 +00:00
Michael Niedermayer
b3a391e8b8 fixing i_quant_factor, this should finally fix the bitrate bug with ffserver hopefully
Originally committed as revision 959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-19 20:22:39 +00:00
Philip Gladstone
a782f209df * 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.
* Add the missing get_arg calls for VideoQxxxx

Originally committed as revision 920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-12 02:31:11 +00:00
Mark Hills
81e0d0b412 oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
Originally committed as revision 896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-01 18:07:56 +00:00
Philip Gladstone
59eb2ed1f3 * 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
  so. Why is this good? So I can use ?buffer=43200 and get video from
  12 hours ago (i.e. when it is daylight outside)

Originally committed as revision 829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-28 04:19:46 +00:00
Philip Gladstone
f853bb1128 * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-07-27 15:22:17 +00:00
Philip Gladstone
8256c0a341 * 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.
* Make logging work again if customlog == "-"

Originally committed as revision 821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-27 03:03:04 +00:00
Fabrice Bellard
2effd27446 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://svn.ffmpeg.org/ffmpeg/trunk
2002-07-25 16:48:44 +00:00
Fabrice Bellard
2c4ae653af renamed gettime() av_gettime() - same for register_all()
Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-25 16:07:39 +00:00
Philip Gladstone
5eb765ef34 * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-06-10 02:44:36 +00:00
Philip Gladstone
2ac887bae9 * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-06-05 02:17:06 +00:00
Philip Gladstone
31def22984 * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-05-30 20:37:51 +00:00
Philip Gladstone
cde25790ec * 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.
* Added a Redirect type feature. This allows URLs served by ffserver to just
  redirect to somewhere else. You might want to do this. Really this needs to
  be enhanced -- say to handle all 404 pages.
* Add mechanism to automatically fire up ffmpeg on ffserver start. This is turned
  on by adding the Launch keyword to the <feed> definition.
* Add logic to take care of non-wmp user agents requesting .asf files. They now get
  a [reference] file with an appropriate mime type. This fixes the mplayer problem.
* Make sure that we have a large buffer for the stats page.
* Add a FaviconURL keyword to the status stream definition. If set, then it
  generates the appropriate HTML so that IE and Mozilla will display the favicon
  as appropriate. OK -- this is a pretty random feature.
* If the ffmpeg is running as a child of ffserver, then report it's CPU usage
  on the status page. [This is linux only -- maybe somebody could do the work for
  another OS. The tricky thing is getting the 'ps' command right.]

Originally committed as revision 630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-30 02:49:07 +00:00
Philip Gladstone
3120d2a265 * 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
  be. Solving this will be tricky. I guess that we would have to wait for
  key frames to appear in the new stream, and then switch over to it.
  Some care would be needed to deal with the PTS of the new stream
  versus the old stream.

Originally committed as revision 602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-26 03:36:34 +00:00
Fabrice Bellard
773a21b8fe license/copyright change - fixed header mess
Originally committed as revision 588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-25 22:26:19 +00:00
Philip Gladstone
b582f314f7 * Added yet more output to the status page to try and track down a problem
Originally committed as revision 579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-24 02:06:15 +00:00
Philip Gladstone
ec3b22326d * 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://svn.ffmpeg.org/ffmpeg/trunk
2002-05-24 01:18:19 +00:00
Fabrice Bellard
bd7cf6ad3a use new api (NOT TESTED) - suppressed strlcpy
Originally committed as revision 549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-20 16:33:46 +00:00