summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Collapse)AuthorAge
...
* renamed gettime() av_gettime() - same for register_all()Fabrice Bellard2002-07-25
| | | | Originally committed as revision 808 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add code to restart ffmpeg if it crashesPhilip Gladstone2002-06-10
| | | | | | | * 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
* * Give the max stream time configuration item a chance of workingPhilip Gladstone2002-06-05
| | | | | | | * 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
* * Bad buffer management bug. Forgot to take care of the casePhilip Gladstone2002-05-30
| | | | | | where doubling the size of the buffer is not enough. Originally committed as revision 633 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * New stuff and bug fixes:Philip Gladstone2002-05-30
| | | | | | | | | | | | | | | | | | | | | | | * 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
* * Add first cut of code to handle Windows Media Player rate switchingPhilip Gladstone2002-05-26
| | | | | | | | | | | | 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
* license/copyright change - fixed header messFabrice Bellard2002-05-25
| | | | Originally committed as revision 588 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Added yet more output to the status page to try and track down a problemPhilip Gladstone2002-05-24
| | | | Originally committed as revision 579 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add support for time-limiting a live stream. (Some guy streamed one ofPhilip Gladstone2002-05-24
| | | | | | | | 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
* use new api (NOT TESTED) - suppressed strlcpyFabrice Bellard2002-05-20
| | | | Originally committed as revision 549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a segfault when handling errors or .asx or .ram files. Silly bugPhilip Gladstone2002-05-20
| | | | | | on my part. Originally committed as revision 536 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use av memory functionsFabrice Bellard2002-05-18
| | | | Originally committed as revision 531 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * If a stream gets stuck in WAIT_FEED, then disconnecting the other endPhilip Gladstone2002-05-18
| | | | | | | | | | | | 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 of clients are connected. * Process ffm input when it is received and don't always be one ffm packet behind. * Try to avoid going through the poll loop when not required. Originally committed as revision 514 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Change the default behaviour to start streaming as soon as possible (i.e.Philip Gladstone2002-05-17
| | | | | | | | | 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. Originally committed as revision 507 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Add code to configure the following:Philip Gladstone2002-05-16
| | | | | | | | | | | | | | | | * 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 * Make the status page show bandwidth. Also make the .asf and .rm links go to .asx and .ram files. * Make a stream only start streaming when it gets a keyframe on each stream. This is arguable, and it maybe ought to be restricted to live streams. However, since I don't think that file streams work, this is a step in the right direction. It improves the startup delay. * Log an error if we are unable to delete the temp feed file. Originally committed as revision 501 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Improve logging -- now actually gives you the number of bytes sentPhilip Gladstone2002-05-10
| | | | | | | | | | | * 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 redirect to the associated .asf file (with the same parameters). I guess that someone who understands the realaudio equivalent could hack that it as well. Originally committed as revision 482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - HQ option for ffserver. Thanks to D Richard Felker III.Juanjo2002-05-09
| | | | Originally committed as revision 478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - Changed default qmin = 3 as ffmpeg.cJuanjo2002-05-09
| | | | | | - Less bitrate tolerance since we are streaming. Originally committed as revision 474 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Fix a nasty problem with output buffering not have enough (or large enough)Philip Gladstone2002-05-09
| | | | | | | | | | | | | | | | | 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 that saved as part of the stream. This gives us the real frame_size and other important parameters. * ASF needs to know about key frames, so add some logic to copy this information around. * When we get the data from ffmpeg as part of a feed, make sure that we save the actual codec parameters. * Allow configuration of AudioCodec and VideoCodec * Make sure that we delete the feed file before starting. This is not ideal but it makes things work a whole lot better! Originally committed as revision 454 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - Added force_pts to av_write_packet() to be able to force PTS, this helpsJuanjo2002-04-07
| | | | | | | | | | (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 first. - MPEG audio decoder exports it's frame size in bytes. - Hope this fix the floating point exception found in ffserver. Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
* trying to fix qscale==0Michael Niedermayer2002-03-19
| | | | Originally committed as revision 341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fixing warningMichael Niedermayer2002-02-26
| | | | Originally committed as revision 315 to svn://svn.ffmpeg.org/ffmpeg/trunk
* * Also include time.h for nanosleep()Zdenek Kabelac2002-02-18
| | | | | | by: Philipp Matthias Hahn <pmhahn@titan.lahn.de> Originally committed as revision 309 to svn://svn.ffmpeg.org/ffmpeg/trunk
* optimized the normal bitstream writer, its faster than the alternative one ↵Michael Niedermayer2002-02-15
| | | | | | on p3 now ... lets hope its at least not slower on p4 & k7 Originally committed as revision 299 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fixed prototype changeFabrice Bellard2001-09-25
| | | | Originally committed as revision 150 to svn://svn.ffmpeg.org/ffmpeg/trunk
* jpeg hackFabrice Bellard2001-08-15
| | | | Originally committed as revision 89 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mergeFabrice Bellard2001-07-22
| | | | Originally committed as revision 6 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removing old filesFabrice Bellard2001-07-19
| | | | Originally committed as revision 4 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Initial revisionFabrice Bellard2000-12-20
Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 12:11:22 +0000