put all integer init code to compute n^(4/3) - memory alloc and header fixes
[ffmpeg.git] / ffserver.c
index 4bece8c..3fc8250 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Multiple format streaming server
- * Copyright (c) 2000 Gerard Lantau.
+ * Copyright (c) 2000,2001 Gerard Lantau.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <stdio.h>
 #include <string.h>
 #include <netinet/in.h>
-#include <linux/videodev.h>
-#include <linux/soundcard.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/poll.h>
 #include <errno.h>
 #include <sys/time.h>
+#include <time.h>
 #include <getopt.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <ctype.h>
-#include <pthread.h>
+#include <signal.h>
+#include <assert.h>
 
-#include "mpegenc.h"
+#include "bswap.h" // needed for the bitstream writer in common.h which is included in avformat.h
+#include "avformat.h"
 
 /* maximum number of simultaneous HTTP connections */
 #define HTTP_MAX_CONNECTIONS 2000
@@ -48,15 +49,22 @@ enum HTTPState {
     HTTPSTATE_SEND_DATA_HEADER,
     HTTPSTATE_SEND_DATA,
     HTTPSTATE_SEND_DATA_TRAILER,
+    HTTPSTATE_RECEIVE_DATA,
+    HTTPSTATE_WAIT_FEED,
 };
 
-enum MasterState {
-    MASTERSTATE_RECEIVE_HEADER,
-    MASTERSTATE_RECEIVE_DATA,
+const char *http_state[] = {
+    "WAIT_REQUEST",
+    "SEND_HEADER",
+    "SEND_DATA_HEADER",
+    "SEND_DATA",
+    "SEND_DATA_TRAILER",
+    "RECEIVE_DATA",
+    "WAIT_FEED",
 };
-    
-#define IOBUFFER_MAX_SIZE 16384
-#define FIFO_MAX_SIZE (1024*1024)
+
+#define IOBUFFER_MAX_SIZE 32768
+#define PACKET_MAX_SIZE 16384
 
 /* coef for exponential mean for bitrate estimation in statistics */
 #define AVG_COEF 0.9
@@ -64,162 +72,91 @@ enum MasterState {
 /* timeouts are in ms */
 #define REQUEST_TIMEOUT (15 * 1000)
 #define SYNC_TIMEOUT (10 * 1000)
-#define MASTER_CONNECT_TIMEOUT (10 * 1000)
 
+/* 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 */
     long timeout;
-    UINT8 buffer[IOBUFFER_MAX_SIZE];
     UINT8 *buffer_ptr, *buffer_end;
     int http_error;
     struct HTTPContext *next;
-    UINT8 *rptr; /* read pointer in the fifo */
-    int got_key_frame[2]; /* for each type */
-    long long data_count;
-    long long last_http_fifo_write_count; /* used to monitor overflow in the fifo */
-    /* format handling */
+    int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */
+    INT64 data_count;
+    /* feed input */
+    int feed_fd;
+    /* input format handling */
+    AVFormatContext *fmt_in;
+    /* output format handling */
     struct FFStream *stream;
     AVFormatContext fmt_ctx;
     int last_packet_sent; /* true if last data packet was sent */
+    int suppress_log;
+    int bandwidth;
+    char protocol[16];
+    char method[16];
+    char url[128];
+    UINT8 buffer[IOBUFFER_MAX_SIZE];
+    UINT8 pbuffer[PACKET_MAX_SIZE];
 } HTTPContext;
 
 /* each generated stream is described here */
 enum StreamType {
     STREAM_TYPE_LIVE,
-    STREAM_TYPE_MASTER,
     STREAM_TYPE_STATUS,
 };
 
+/* description of each stream of the ffserver.conf file */
 typedef struct FFStream {
     enum StreamType stream_type;
-    char filename[1024];
+    char filename[1024];     /* stream filename */
+    struct FFStream *feed;
     AVFormat *fmt;
-    AVEncodeContext *audio_enc;
-    AVEncodeContext *video_enc;
+    int nb_streams;
+    int prebuffer;      /* Number of millseconds early to start */
+    int send_on_key;
+    AVStream *streams[MAX_STREAMS];
+    int feed_streams[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 */
     struct FFStream *next;
+    /* feed specific */
+    int feed_opened;     /* true if someone if writing to feed */
+    int is_feed;         /* true if it is a feed */
+    int conns_served;
+    INT64 bytes_served;
+    INT64 feed_max_size;      /* maximum storage size */
+    INT64 feed_write_index;   /* current write position in feed (it wraps round) */
+    INT64 feed_size;          /* current size of feed */
+    struct FFStream *next_feed;
 } FFStream;
 
-typedef struct FifoBuffer {
-    UINT8 *buffer;
-    UINT8 *rptr, *wptr, *end;
-} FifoBuffer;
-
-/* each codec is here */
-typedef struct FFCodec {
-    struct FFCodec *next;
-    FifoBuffer fifo;     /* for compression: one audio fifo per codec */
-    ReSampleContext resample; /* for audio resampling */
+typedef struct FeedData {
     long long data_count;
     float avg_frame_size;   /* frame size averraged over last frames with exponential mean */
-    AVEncodeContext enc;
-} FFCodec;
-
-/* packet header */
-typedef struct {
-    UINT8 codec_type;
-    UINT8 codec_id;
-    UINT8 data[4];
-    UINT16 bit_rate;
-    UINT16 payload_size;
-} PacketHeader;
+} FeedData;
 
 struct sockaddr_in my_addr;
 char logfilename[1024];
 HTTPContext *first_http_ctx;
-FFStream *first_stream;
-FFCodec *first_codec;
-
-/* master state */
-char master_url[1024];
-enum MasterState master_state;
-UINT8 *master_wptr;
-int master_count;
-
-long long http_fifo_write_count;
-static FifoBuffer http_fifo;
+FFStream *first_feed;   /* contains only feeds */
+FFStream *first_stream; /* contains all streams, including feeds */
 
 static int handle_http(HTTPContext *c, long cur_time);
 static int http_parse_request(HTTPContext *c);
 static int http_send_data(HTTPContext *c);
-static int master_receive(int fd);
 static void compute_stats(HTTPContext *c);
+static int open_input_stream(HTTPContext *c, const char *info);
+static int http_start_receive_data(HTTPContext *c);
+static int http_receive_data(HTTPContext *c);
 
 int nb_max_connections;
 int nb_connections;
 
-/* fifo handling */
-int fifo_init(FifoBuffer *f, int size)
-{
-    f->buffer = malloc(size);
-    if (!f->buffer)
-        return -1;
-    f->end = f->buffer + size;
-    f->wptr = f->rptr = f->buffer;
-    return 0;
-}
-
-static int fifo_size(FifoBuffer *f, UINT8 *rptr)
-{
-    int size;
-
-    if (f->wptr >= rptr) {
-        size = f->wptr - rptr;
-    } else {
-        size = (f->end - rptr) + (f->wptr - f->buffer);
-    }
-    return size;
-}
-
-/* get data from the fifo (return -1 if not enough data) */
-static int fifo_read(FifoBuffer *f, UINT8 *buf, int buf_size, UINT8 **rptr_ptr)
-{
-    UINT8 *rptr = *rptr_ptr;
-    int size, len;
-
-    if (f->wptr >= rptr) {
-        size = f->wptr - rptr;
-    } else {
-        size = (f->end - rptr) + (f->wptr - f->buffer);
-    }
-    
-    if (size < buf_size)
-        return -1;
-    while (buf_size > 0) {
-        len = f->end - rptr;
-        if (len > buf_size)
-            len = buf_size;
-        memcpy(buf, rptr, len);
-        buf += len;
-        rptr += len;
-        if (rptr >= f->end)
-            rptr = f->buffer;
-        buf_size -= len;
-    }
-    *rptr_ptr = rptr;
-    return 0;
-}
-
-static void fifo_write(FifoBuffer *f, UINT8 *buf, int size, UINT8 **wptr_ptr)
-{
-    int len;
-    UINT8 *wptr;
-    wptr = *wptr_ptr;
-    while (size > 0) {
-        len = f->end - wptr;
-        if (len > size)
-            len = size;
-        memcpy(wptr, buf, len);
-        wptr += len;
-        if (wptr >= f->end)
-            wptr = f->buffer;
-        buf += len;
-        size -= len;
-    }
-    *wptr_ptr = wptr;
-}
+int nb_max_bandwidth;
+int nb_bandwidth;
 
 static long gettime_ms(void)
 {
@@ -236,97 +173,35 @@ static void http_log(char *fmt, ...)
     va_list ap;
     va_start(ap, fmt);
     
-    if (logfile)
+    if (logfile) {
         vfprintf(logfile, fmt, ap);
+        fflush(logfile);
+    }
     va_end(ap);
 }
 
-
-/* connect to url 'url' and return the connected socket ready to read data */
-static int url_get(const char *url)
+static void log_connection(HTTPContext *c)
 {
-    struct sockaddr_in dest_addr;
-    struct hostent *h;
-    int s, port, size, line_size, len;
-    char hostname[1024], *q;
-    const char *p, *path;
-    char req[1024];
-    unsigned char ch;
-
-    if (!strstart(url, "http://", &p))
-        return -1;
-    q = hostname;
-    while (*p != ':' && *p != '\0' && *p != '/') {
-        if ((q - hostname) < (sizeof(hostname) - 1))
-            *q++ = *p;
-        p++;
-    }
-    port = 80;
-    if (*p == ':') {
-        p++;
-        port = strtol(p, (char **)&p, 10);
-    }
-    path = p;
-        
-    dest_addr.sin_family = AF_INET;
-    dest_addr.sin_port = htons(port);
-
-    if (!inet_aton(hostname, &dest_addr.sin_addr)) {
-       if ((h = gethostbyname(hostname)) == NULL)
-           return -1;
-       memcpy(&dest_addr.sin_addr, h->h_addr, sizeof(dest_addr.sin_addr));
-    }
-
-    s=socket(AF_INET, SOCK_STREAM, 0);
-    if (s < 0) 
-        return -1;
+    char buf1[32], buf2[32], *p;
+    time_t ti;
 
-    if (connect(s, (struct sockaddr *)&dest_addr, sizeof(dest_addr)) < 0) {
-    fail:
-       close(s);
-       return -1;
-    }
-    
-    /* send http request */
-    snprintf(req, sizeof(req), "GET %s HTTP/1.0\r\n\r\n", path);
-    p = req;
-    size = strlen(req);
-    while (size > 0) {
-        len = write(s, p, size);
-        if (len == -1) {
-            if (errno != EAGAIN && errno != EINTR)
-                goto fail;
-        } else {
-            size -= len;
-            p += len;
-        }
-    }
-    
-    /* receive answer */
-    line_size = 0;
-    for(;;) {
-        len = read(s, &ch, 1);
-        if (len == -1) {
-            if (errno != EAGAIN && errno != EINTR)
-                goto fail;
-        } else if (len == 0) {
-            goto fail;
-        } else {
-            if (ch == '\n') {
-                if (line_size == 0)
-                    break;
-                line_size = 0;
-            } else if (ch != '\r') {
-                line_size++;
-            }
-        }
-    }
+    if (c->suppress_log) 
+        return;
 
-    return s;
+    /* XXX: reentrant function ? */
+    p = inet_ntoa(c->from_addr.sin_addr);
+    strcpy(buf1, p);
+    ti = time(NULL);
+    p = ctime(&ti);
+    strcpy(buf2, p);
+    p = buf2 + strlen(p) - 1;
+    if (*p == '\n')
+        *p = '\0';
+    http_log("%s - - [%s] \"%s %s %s\" %d %lld\n", 
+             buf1, buf2, c->method, c->url, c->protocol, (c->http_error ? c->http_error : 200), c->data_count);
 }
 
-/* Each request is served by reading the input FIFO and by adding the
-   right format headers */
+/* main loop of the http server */
 static int http_server(struct sockaddr_in my_addr)
 {
     int server_fd, tmp, ret;
@@ -334,11 +209,6 @@ static int http_server(struct sockaddr_in my_addr)
     struct pollfd poll_table[HTTP_MAX_CONNECTIONS + 1], *poll_entry;
     HTTPContext *c, **cp;
     long cur_time;
-    int master_fd, master_timeout;
-
-    /* will try to connect to master as soon as possible */
-    master_fd = -1;
-    master_timeout = gettime_ms();
 
     server_fd = socket(AF_INET,SOCK_STREAM,0);
     if (server_fd < 0) {
@@ -373,12 +243,6 @@ static int http_server(struct sockaddr_in my_addr)
         poll_entry->events = POLLIN;
         poll_entry++;
 
-        if (master_fd >= 0) {
-            poll_entry->fd = master_fd;
-            poll_entry->events = POLLIN;
-            poll_entry++;
-        }
-
         /* wait for events on each HTTP handle */
         c = first_http_ctx;
         while (c != NULL) {
@@ -400,6 +264,19 @@ static int http_server(struct sockaddr_in my_addr)
                 poll_entry->events = POLLOUT;
                 poll_entry++;
                 break;
+            case HTTPSTATE_RECEIVE_DATA:
+                c->poll_entry = poll_entry;
+                poll_entry->fd = fd;
+                poll_entry->events = POLLIN;
+                poll_entry++;
+                break;
+            case HTTPSTATE_WAIT_FEED:
+                /* 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;
@@ -422,8 +299,12 @@ static int http_server(struct sockaddr_in my_addr)
             c = *cp;
             if (handle_http (c, cur_time) < 0) {
                 /* close and free the connection */
+                log_connection(c);
                 close(c->fd);
+                if (c->fmt_in)
+                    av_close_input_file(c->fmt_in);
                 *cp = c->next;
+                nb_bandwidth -= c->bandwidth;
                 free(c);
                 nb_connections--;
             } else {
@@ -437,17 +318,17 @@ static int http_server(struct sockaddr_in my_addr)
             int fd, len;
 
             len = sizeof(from_addr);
-            fd = accept(server_fd, &from_addr, &len);
+            fd = accept(server_fd, (struct sockaddr *)&from_addr, 
+                        &len);
             if (fd >= 0) {
                 fcntl(fd, F_SETFL, O_NONBLOCK);
-                /* XXX: should output a warning page when comming
+                /* XXX: should output a warning page when coming
                    close to the connection limit */
                 if (nb_connections >= nb_max_connections) {
                     close(fd);
                 } else {
                     /* add a new connection */
-                    c = malloc(sizeof(HTTPContext));
-                    memset(c, 0, sizeof(*c));
+                    c = av_mallocz(sizeof(HTTPContext));
                     c->next = first_http_ctx;
                     first_http_ctx = c;
                     c->fd = fd;
@@ -462,29 +343,6 @@ static int http_server(struct sockaddr_in my_addr)
             }
         }
         poll_entry++;
-
-        /* master events */
-        if (poll_entry->revents & POLLIN) {
-            if (master_receive(master_fd) < 0) {
-                close(master_fd);
-                master_fd = -1;
-            }
-        }
-
-        /* master (re)connection handling */
-        if (master_url[0] != '\0' && 
-            master_fd < 0 && (master_timeout - cur_time) <= 0) {
-            master_fd = url_get(master_url);
-            if (master_fd < 0) {
-                master_timeout = gettime_ms() + MASTER_CONNECT_TIMEOUT;
-                http_log("Connection to master: '%s' failed\n", master_url);
-            } else {
-                fcntl(master_fd, F_SETFL, O_NONBLOCK);
-                master_state = MASTERSTATE_RECEIVE_HEADER;
-                master_count = sizeof(PacketHeader);
-                master_wptr = http_fifo.wptr;
-            }
-        }
     }
 }
 
@@ -542,6 +400,8 @@ static int handle_http(HTTPContext *c, long cur_time)
             }
         } else {
             c->buffer_ptr += len;
+            c->stream->bytes_served += len;
+            c->data_count += len;
             if (c->buffer_ptr >= c->buffer_end) {
                 /* if error, exit */
                 if (c->http_error)
@@ -565,22 +425,44 @@ static int handle_http(HTTPContext *c, long cur_time)
         if (http_send_data(c) < 0)
             return -1;
         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;
     default:
         return -1;
     }
     return 0;
 }
 
+
 /* parse http request and prepare header */
 static int http_parse_request(HTTPContext *c)
 {
-    const char *p;
+    char *p;
+    int post;
+    int doing_asx;
+    int doing_ram;
     char cmd[32];
+    char info[1024], *filename;
     char url[1024], *q;
     char protocol[32];
     char msg[1024];
-    char *mime_type;
+    const char *mime_type;
     FFStream *stream;
+    int i;
 
     p = c->buffer;
     q = cmd;
@@ -590,7 +472,14 @@ static int http_parse_request(HTTPContext *c)
         p++;
     }
     *q = '\0';
-    if (strcmp(cmd, "GET"))
+
+    strlcpy(c->method, cmd, sizeof(c->method));
+
+    if (!strcmp(cmd, "GET"))
+        post = 0;
+    else if (!strcmp(cmd, "POST"))
+        post = 1;
+    else
         return -1;
 
     while (isspace(*p)) p++;
@@ -602,6 +491,8 @@ static int http_parse_request(HTTPContext *c)
     }
     *q = '\0';
 
+    strlcpy(c->url, url, sizeof(c->url));
+
     while (isspace(*p)) p++;
     q = protocol;
     while (!isspace(*p) && *p != '\0') {
@@ -612,15 +503,41 @@ static int http_parse_request(HTTPContext *c)
     *q = '\0';
     if (strcmp(protocol, "HTTP/1.0") && strcmp(protocol, "HTTP/1.1"))
         return -1;
+
+    strlcpy(c->protocol, protocol, sizeof(c->protocol));
     
-    /* find the filename in the request */
+    /* find the filename and the optional info string in the request */
     p = url;
     if (*p == '/')
         p++;
+    filename = p;
+    p = strchr(p, '?');
+    if (p) {
+        strlcpy(info, p, sizeof(info));
+        *p = '\0';
+    } else {
+        info[0] = '\0';
+    }
+
+    if (strlen(filename) > 4 && strcmp(".asx", filename + strlen(filename) - 4) == 0) {
+        doing_asx = 1;
+        filename[strlen(filename)-1] = 'f';
+    } else {
+        doing_asx = 0;
+    }
+
+    if (strlen(filename) > 4 && 
+        (strcmp(".rpm", filename + strlen(filename) - 4) == 0 ||
+         strcmp(".ram", filename + strlen(filename) - 4) == 0)) {
+        doing_ram = 1;
+        strcpy(filename + strlen(filename)-2, "m");
+    } else {
+        doing_ram = 0;
+    }
 
     stream = first_stream;
     while (stream != NULL) {
-        if (!strcmp(stream->filename, p))
+        if (!strcmp(stream->filename, filename))
             break;
         stream = stream->next;
     }
@@ -628,42 +545,188 @@ static int http_parse_request(HTTPContext *c)
         sprintf(msg, "File '%s' not found", url);
         goto send_error;
     }
-    c->stream = stream;
+
+    if (post == 0 && stream->stream_type == STREAM_TYPE_LIVE) {
+        /* See if we meet the bandwidth requirements */
+        for(i=0;i<stream->nb_streams;i++) {
+            AVStream *st = stream->streams[i];
+            switch(st->codec.codec_type) {
+            case CODEC_TYPE_AUDIO:
+                c->bandwidth += st->codec.bit_rate;
+                break;
+            case CODEC_TYPE_VIDEO:
+                c->bandwidth += st->codec.bit_rate;
+                break;
+            default:
+                abort();
+            }
+        }
+    }
+
+    c->bandwidth /= 1000;
+    nb_bandwidth += c->bandwidth;
+
+    if (post == 0 && nb_max_bandwidth < nb_bandwidth) {
+        c->http_error = 200;
+        q = c->buffer;
+        q += sprintf(q, "HTTP/1.0 200 Server too busy\r\n");
+        q += sprintf(q, "Content-type: text/html\r\n");
+        q += sprintf(q, "\r\n");
+        q += sprintf(q, "<html><head><title>Too busy</title></head><body>\r\n");
+        q += sprintf(q, "The server is too busy to serve your request at this time.<p>\r\n");
+        q += sprintf(q, "The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec\r\n",
+            nb_bandwidth, nb_max_bandwidth);
+        q += sprintf(q, "</body></html>\r\n");
+
+        /* prepare output buffer */
+        c->buffer_ptr = c->buffer;
+        c->buffer_end = q;
+        c->state = HTTPSTATE_SEND_HEADER;
+        return 0;
+    }
     
-    /* should do it after so that the size can be computed */
-    {
-        char buf1[32], buf2[32], *p;
-        time_t ti;
-        /* XXX: reentrant function ? */
-        p = inet_ntoa(c->from_addr.sin_addr);
-        strcpy(buf1, p);
-        ti = time(NULL);
-        p = ctime(&ti);
-        strcpy(buf2, p);
-        p = buf2 + strlen(p) - 1;
-        if (*p == '\n')
-            *p = '\0';
-        http_log("%s - - [%s] \"%s %s %s\" %d %d\n", 
-                 buf1, buf2, cmd, url, protocol, 200, 1024);
+    if (doing_asx || doing_ram) {
+        char *hostinfo = 0;
+        
+        for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
+            if (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 (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;
+                    if (doing_asx) {
+                        q += sprintf(q, "HTTP/1.0 200 ASX Follows\r\n");
+                        q += sprintf(q, "Content-type: video/x-ms-asf\r\n");
+                        q += sprintf(q, "\r\n");
+                        q += sprintf(q, "<ASX Version=\"3\">\r\n");
+                        q += sprintf(q, "<!-- Autogenerated by ffserver -->\r\n");
+                        q += sprintf(q, "<ENTRY><REF HREF=\"http://%s/%s%s\"/></ENTRY>\r\n", 
+                                hostbuf, filename, info);
+                        q += sprintf(q, "</ASX>\r\n");
+                    } else if (doing_ram) {
+                        q += sprintf(q, "HTTP/1.0 200 RAM Follows\r\n");
+                        q += sprintf(q, "Content-type: audio/x-pn-realaudio\r\n");
+                        q += sprintf(q, "\r\n");
+                        q += sprintf(q, "# Autogenerated by ffserver\r\n");
+                        q += sprintf(q, "http://%s/%s%s\r\n", 
+                                hostbuf, filename, info);
+                    } else
+                        abort();
+
+                    /* prepare output buffer */
+                    c->buffer_ptr = c->buffer;
+                    c->buffer_end = q;
+                    c->state = HTTPSTATE_SEND_HEADER;
+                    return 0;
+                }
+            }
+        }
+
+        sprintf(msg, "ASX/RAM file not handled");
+        goto send_error;
+    }
+
+    c->stream = stream;
+    stream->conns_served++;
+
+    /* XXX: add there authenticate and IP match */
+
+    if (post) {
+        /* if post, it means a feed is being sent */
+        if (!stream->is_feed) {
+            /* However it might be a status report from WMP! Lets log the data
+             * as it might come in handy one day
+             */
+            char *logline = 0;
+            
+            for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
+                if (strncasecmp(p, "Pragma: log-line=", 17) == 0) {
+                    logline = p;
+                    break;
+                }
+                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", eol - logline, logline);
+                    c->suppress_log = 1;
+                }
+            }
+            
+            sprintf(msg, "POST command not handled");
+            goto send_error;
+        }
+        if (http_start_receive_data(c) < 0) {
+            sprintf(msg, "could not open feed");
+            goto send_error;
+        }
+        c->http_error = 0;
+        c->state = HTTPSTATE_RECEIVE_DATA;
+        return 0;
     }
 
     if (c->stream->stream_type == STREAM_TYPE_STATUS)
         goto send_stats;
 
+    /* open input stream */
+    if (open_input_stream(c, info) < 0) {
+        sprintf(msg, "Input stream corresponding to '%s' not found", url);
+        goto send_error;
+    }
+
     /* prepare http header */
     q = c->buffer;
     q += sprintf(q, "HTTP/1.0 200 OK\r\n");
     mime_type = c->stream->fmt->mime_type;
     if (!mime_type)
         mime_type = "application/x-octet_stream";
-    q += sprintf(q, "Content-type: %s\r\n", mime_type);
     q += sprintf(q, "Pragma: no-cache\r\n");
+
     /* for asf, we need extra headers */
     if (!strcmp(c->stream->fmt->name,"asf")) {
-        q += sprintf(q, "Pragma: features=broadcast\r\n");
+        q += sprintf(q, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=1234\r\nPragma: features=\"broadcast\"\r\n");
+        /* mime_type = "application/octet-stream"; */
+        /* video/x-ms-asf seems better -- netscape doesn't crash any more! */
+        mime_type = "video/x-ms-asf";
     }
+    q += sprintf(q, "Content-Type: %s\r\n", mime_type);
     q += sprintf(q, "\r\n");
-
+    
     /* prepare output buffer */
     c->http_error = 0;
     c->buffer_ptr = c->buffer;
@@ -696,12 +759,9 @@ static int http_parse_request(HTTPContext *c)
 
 static void compute_stats(HTTPContext *c)
 {
-    AVEncodeContext *enc;
     HTTPContext *c1;
-    FFCodec *ffenc;
     FFStream *stream;
-    float avg;
-    char buf[1024], *q, *p;
+    char *q, *p;
     time_t ti;
     int i;
 
@@ -714,73 +774,167 @@ static void compute_stats(HTTPContext *c)
     q += sprintf(q, "<HEAD><TITLE>FFServer Status</TITLE></HEAD>\n<BODY>");
     q += sprintf(q, "<H1>FFServer Status</H1>\n");
     /* format status */
-    q += sprintf(q, "<H1>Available Streams</H1>\n");
-    q += sprintf(q, "<TABLE>\n");
-    q += sprintf(q, "<TR><TD>Path<TD>Format<TD>Bit rate (kbits/s)<TD>Video<TD>Audio\n");
+    q += sprintf(q, "<H2>Available Streams</H2>\n");
+    q += sprintf(q, "<TABLE cellspacing=0 cellpadding=4>\n");
+    q += sprintf(q, "<TR><Th valign=top>Path<th align=left>Served<br>Conns<Th><br>kbytes<Th valign=top>Format<Th>Bit rate<br>kbits/s<Th align=left>Video<br>kbits/s<th><br>Codec<Th align=left>Audio<br>kbits/s<th><br>Codec<Th align=left valign=top>Feed\n");
     stream = first_stream;
     while (stream != NULL) {
-        q += sprintf(q, "<TR><TD><A HREF=\"/%s\">%s</A> ", 
-                     stream->filename, stream->filename);
-        switch(stream->stream_type) {
-        case STREAM_TYPE_LIVE:
-            {
-                int audio_bit_rate = 0;
-                int video_bit_rate = 0;
-                if (stream->audio_enc)
-                    audio_bit_rate = stream->audio_enc->bit_rate;
-                if (stream->video_enc)
-                    video_bit_rate = stream->video_enc->bit_rate;
-                
-                q += sprintf(q, "<TD> %s <TD> %d <TD> %d <TD> %d\n", 
-                             stream->fmt->name,
-                             (audio_bit_rate + video_bit_rate) / 1000,
-                             video_bit_rate / 1000, audio_bit_rate / 1000);
+        char sfilename[1024];
+        char *eosf;
+
+        if (stream->feed != stream) {
+            strlcpy(sfilename, stream->filename, sizeof(sfilename) - 1);
+            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");
+                }
+            }
+            
+            q += sprintf(q, "<TR><TD><A HREF=\"/%s\">%s</A> ", 
+                         sfilename, stream->filename);
+            q += sprintf(q, "<td align=right> %d <td align=right> %lld",
+                        stream->conns_served, stream->bytes_served / 1000);
+            switch(stream->stream_type) {
+            case STREAM_TYPE_LIVE:
+                {
+                    int audio_bit_rate = 0;
+                    int video_bit_rate = 0;
+                    char *audio_codec_name = "";
+                    char *video_codec_name = "";
+                    char *audio_codec_name_extra = "";
+                    char *video_codec_name_extra = "";
+
+                    for(i=0;i<stream->nb_streams;i++) {
+                        AVStream *st = stream->streams[i];
+                        AVCodec *codec = avcodec_find_encoder(st->codec.codec_id);
+                        switch(st->codec.codec_type) {
+                        case CODEC_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 CODEC_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;
+                        default:
+                            abort();
+                        }
+                    }
+                    q += sprintf(q, "<TD align=center> %s <TD align=right> %d <TD align=right> %d <TD> %s %s <TD align=right> %d <TD> %s %s", 
+                                 stream->fmt->name,
+                                 (audio_bit_rate + video_bit_rate) / 1000,
+                                 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) {
+                        q += sprintf(q, "<TD>%s", stream->feed->filename);
+                    } else {
+                        q += sprintf(q, "<TD>%s", stream->feed_filename);
+                    }
+                    q += sprintf(q, "\n");
+                }
+                break;
+            default:
+                q += sprintf(q, "<TD align=center> - <TD align=right> - <TD align=right> - <td><td align=right> - <TD>\n");
+                break;
             }
-            break;
-        case STREAM_TYPE_MASTER:
-            q += sprintf(q, "<TD> %s <TD> - <TD> - <TD> -\n",
-                         "master");
-            break;
-        default:
-            q += sprintf(q, "<TD> - <TD> - <TD> - <TD> -\n");
-            break;
         }
         stream = stream->next;
     }
     q += sprintf(q, "</TABLE>\n");
+
+    stream = first_stream;
+    while (stream != NULL) {
+        if (stream->feed == stream) {
+            q += sprintf(q, "<h2>Feed %s</h2>", stream->filename);
+            q += sprintf(q, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec\n");
+
+            for (i = 0; i < stream->nb_streams; i++) {
+                AVStream *st = stream->streams[i];
+                AVCodec *codec = avcodec_find_encoder(st->codec.codec_id);
+                char *type = "unknown";
+
+                switch(st->codec.codec_type) {
+                case CODEC_TYPE_AUDIO:
+                    type = "audio";
+                    break;
+                case CODEC_TYPE_VIDEO:
+                    type = "video";
+                    break;
+                default:
+                    abort();
+                }
+                q += sprintf(q, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s\n",
+                        i, type, st->codec.bit_rate/1000, codec ? codec->name : "");
+            }
+            q += sprintf(q, "</table>\n");
+
+        }       
+        stream = stream->next;
+    }
     
-    /* codec status */
-    q += sprintf(q, "<H1>Codec Status</H1>\n");
-    q += sprintf(q, "<TABLE>\n");
-    q += sprintf(q, "<TR><TD>Parameters<TD>Frame count<TD>Size<TD>Avg bitrate (kbits/s)\n");
-    ffenc = first_codec;
-    while (ffenc != NULL) {
-        enc = &ffenc->enc;
-        avencoder_string(buf, sizeof(buf), enc);
-        avg = ffenc->avg_frame_size * (float)enc->rate * 8.0;
-        if (enc->codec->type == CODEC_TYPE_AUDIO && enc->frame_size > 0)
-            avg /= enc->frame_size;
-        q += sprintf(q, "<TR><TD>%s <TD> %d <TD> %Ld <TD> %0.1f\n", 
-                     buf, enc->frame_number, ffenc->data_count, avg / 1000.0);
-        ffenc = ffenc->next;
+#if 0
+    {
+        float avg;
+        AVCodecContext *enc;
+        char buf[1024];
+        
+        /* feed status */
+        stream = first_feed;
+        while (stream != NULL) {
+            q += sprintf(q, "<H1>Feed '%s'</H1>\n", stream->filename);
+            q += sprintf(q, "<TABLE>\n");
+            q += sprintf(q, "<TR><TD>Parameters<TD>Frame count<TD>Size<TD>Avg bitrate (kbits/s)\n");
+            for(i=0;i<stream->nb_streams;i++) {
+                AVStream *st = stream->streams[i];
+                FeedData *fdata = st->priv_data;
+                enc = &st->codec;
+            
+                avcodec_string(buf, sizeof(buf), enc);
+                avg = fdata->avg_frame_size * (float)enc->rate * 8.0;
+                if (enc->codec->type == CODEC_TYPE_AUDIO && enc->frame_size > 0)
+                    avg /= enc->frame_size;
+                q += sprintf(q, "<TR><TD>%s <TD> %d <TD> %Ld <TD> %0.1f\n", 
+                             buf, enc->frame_number, fdata->data_count, avg / 1000.0);
+            }
+            q += sprintf(q, "</TABLE>\n");
+            stream = stream->next_feed;
+        }
     }
-    q += sprintf(q, "</TABLE>\n");
+#endif
+
+    /* connection status */
+    q += sprintf(q, "<H2>Connection Status</H2>\n");
 
-    /* exclude the stat connection */
     q += sprintf(q, "Number of connections: %d / %d<BR>\n",
                  nb_connections, nb_max_connections);
 
-    /* connection status */
-    q += sprintf(q, "<H1>Connection Status</H1>\n");
+    q += sprintf(q, "Bandwidth in use: %dk / %dk<BR>\n",
+                 nb_bandwidth, nb_max_bandwidth);
+
     q += sprintf(q, "<TABLE>\n");
-    q += sprintf(q, "<TR><TD>#<TD>File<TD>IP<TD>Size\n");
+    q += sprintf(q, "<TR><TD>#<TD>File<TD>IP<TD>State<TD>Size\n");
     c1 = first_http_ctx;
     i = 0;
-    while (c1 != NULL) {
+    while (c1 != NULL && q < (char *) c->buffer + sizeof(c->buffer) - 2048) {
         i++;
         p = inet_ntoa(c1->from_addr.sin_addr);
-        q += sprintf(q, "<TR><TD><B>%d</B><TD>%s <TD> %s <TD> %Ld\n", 
-                     i, c1->stream->filename, p, c1->data_count);
+        q += sprintf(q, "<TR><TD><B>%d</B><TD>%s%s <TD> %s <TD> %s <TD> %Ld\n", 
+                     i, c1->stream->filename, 
+                     c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "",
+                     p, 
+                     http_state[c1->state],
+                     c1->data_count);
         c1 = c1->next;
     }
     q += sprintf(q, "</TABLE>\n");
@@ -788,7 +942,7 @@ static void compute_stats(HTTPContext *c)
     /* date */
     ti = time(NULL);
     p = ctime(&ti);
-    q += sprintf(q, "<HR>Generated at %s", p);
+    q += sprintf(q, "<HR size=1 noshade>Generated at %s", p);
     q += sprintf(q, "</BODY>\n</HTML>\n");
 
     c->buffer_ptr = c->buffer;
@@ -800,112 +954,120 @@ static void http_write_packet(void *opaque,
                               unsigned char *buf, int size)
 {
     HTTPContext *c = opaque;
-    if (size > IOBUFFER_MAX_SIZE)
+
+    if (c->buffer_ptr == c->buffer_end || !c->buffer_ptr)
+        c->buffer_ptr = c->buffer_end = c->buffer;
+
+    if (c->buffer_end - c->buffer + size > IOBUFFER_MAX_SIZE)
         abort();
-    memcpy(c->buffer, buf, size);
-    c->buffer_ptr = c->buffer;
-    c->buffer_end = c->buffer + size;
-}
 
-/* this headers are used to identify a packet for a given codec */
-void mk_header(PacketHeader *h, AVEncodeContext *c, int payload_size)
-{
-    h->codec_type = c->codec->type;
-    h->codec_id = c->codec->id;
-    h->bit_rate = htons(c->bit_rate / 1000);
-    switch(c->codec->type) {
-    case CODEC_TYPE_VIDEO:
-        h->data[0] = c->rate;
-        h->data[1] = c->width / 16;
-        h->data[2] = c->height / 16;
-        break;
-    case CODEC_TYPE_AUDIO:
-        h->data[0] = c->rate / 1000;
-        h->data[1] = c->channels;
-        h->data[2] = 0;
-        break;
-    }
-    h->data[3] = c->key_frame;
-    h->payload_size = htons(payload_size);
+    memcpy(c->buffer_end, buf, size);
+    c->buffer_end += size;
 }
 
-int test_header(PacketHeader *h, AVEncodeContext *c)
+static int open_input_stream(HTTPContext *c, const char *info)
 {
-    if (!c)
-        return 0;
+    char buf[128];
+    char input_filename[1024];
+    AVFormatContext *s;
+    int buf_size;
+    INT64 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 (find_info_tag(buf, sizeof(buf), "date", info)) {
+            stream_pos = parse_date(buf, 0);
+        } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) {
+            int prebuffer = strtol(buf, 0, 10);
+            stream_pos = gettime() - prebuffer * 1000000;
+        } else {
+            stream_pos = gettime() - c->stream->prebuffer * 1000;
+        }
+    } else {
+        strcpy(input_filename, c->stream->feed_filename);
+        buf_size = 0;
+        /* compute position (relative time) */
+        if (find_info_tag(buf, sizeof(buf), "date", info)) {
+            stream_pos = parse_date(buf, 1);
+        } else {
+            stream_pos = 0;
+        }
+    }
+    if (input_filename[0] == '\0')
+        return -1;
 
-    if (h->codec_type == c->codec->type &&
-        h->codec_id == c->codec->id &&
-        h->bit_rate == htons(c->bit_rate / 1000)) {
+    /* open stream */
+    s = av_open_input_file(input_filename, NULL, buf_size, NULL);
+    if (!s)
+        return -1;
+    c->fmt_in = s;
 
-        switch(c->codec->type) {
-        case CODEC_TYPE_VIDEO:
-            if (h->data[0] == c->rate &&
-                h->data[1] == (c->width / 16) &&
-                h->data[2] == (c->height / 16))
-                goto found;
-            break;
-        case CODEC_TYPE_AUDIO:
-            if (h->data[0] == (c->rate / 1000) &&
-                (h->data[1] == c->channels))
-                goto found;
-            break;
-        }
+    if (c->fmt_in->format->read_seek) {
+        c->fmt_in->format->read_seek(c->fmt_in, stream_pos);
     }
+    
+    //    printf("stream %s opened pos=%0.6f\n", input_filename, stream_pos / 1000000.0);
     return 0;
- found:
-    c->frame_number++;
-    c->key_frame = h->data[3];
-    return 1;
 }
 
 static int http_prepare_data(HTTPContext *c)
 {
-    PacketHeader hdr;
-    UINT8 *start_rptr, *payload;
-    int payload_size, ret;
-    long long fifo_total_size;
+    int i;
 
     switch(c->state) {
     case HTTPSTATE_SEND_DATA_HEADER:
-        if (c->stream->stream_type != STREAM_TYPE_MASTER) {            
-            memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
+        memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
+        if (c->stream->feed) {
+            /* open output stream by using specified codecs */
             c->fmt_ctx.format = c->stream->fmt;
-            if (c->fmt_ctx.format->audio_codec != CODEC_ID_NONE) {
-                /* create a fake new codec instance */
-                c->fmt_ctx.audio_enc = malloc(sizeof(AVEncodeContext));
-                memcpy(c->fmt_ctx.audio_enc, c->stream->audio_enc, 
-                       sizeof(AVEncodeContext));
-                c->fmt_ctx.audio_enc->frame_number = 0;
+            c->fmt_ctx.nb_streams = c->stream->nb_streams;
+            for(i=0;i<c->fmt_ctx.nb_streams;i++) {
+                AVStream *st;
+                st = av_mallocz(sizeof(AVStream));
+                c->fmt_ctx.streams[i] = st;
+                if (c->stream->feed == c->stream)
+                    memcpy(st, c->stream->streams[i], sizeof(AVStream));
+                else
+                    memcpy(st, c->stream->feed->streams[c->stream->feed_streams[i]], sizeof(AVStream));
+
+                st->codec.frame_number = 0; /* XXX: should be done in
+                                               AVStream, not in codec */
             }
-            if (c->fmt_ctx.format->video_codec != CODEC_ID_NONE) {
-                c->fmt_ctx.video_enc = malloc(sizeof(AVEncodeContext));
-                memcpy(c->fmt_ctx.video_enc, c->stream->video_enc, 
-                       sizeof(AVEncodeContext));
-                c->fmt_ctx.video_enc->frame_number = 0;
+            c->got_key_frame = 0;
+        } else {
+            /* open output stream by using codecs in specified file */
+            c->fmt_ctx.format = c->stream->fmt;
+            c->fmt_ctx.nb_streams = c->fmt_in->nb_streams;
+            for(i=0;i<c->fmt_ctx.nb_streams;i++) {
+                AVStream *st;
+                st = av_mallocz(sizeof(AVStream));
+                c->fmt_ctx.streams[i] = st;
+                memcpy(st, c->fmt_in->streams[i], sizeof(AVStream));
+                st->codec.frame_number = 0; /* XXX: should be done in
+                                               AVStream, not in codec */
             }
-            init_put_byte(&c->fmt_ctx.pb, c->buffer, IOBUFFER_MAX_SIZE,
-                          c, http_write_packet, NULL);
-            c->fmt_ctx.is_streamed = 1;
-            c->got_key_frame[0] = 0;
-            c->got_key_frame[1] = 0;
-            /* prepare header */
-            c->fmt_ctx.format->write_header(&c->fmt_ctx);
+            c->got_key_frame = 0;
         }
+        init_put_byte(&c->fmt_ctx.pb, c->pbuffer, PACKET_MAX_SIZE,
+                      1, c, NULL, http_write_packet, NULL);
+        c->fmt_ctx.pb.is_streamed = 1;
+        /* prepare header */
+        c->fmt_ctx.format->write_header(&c->fmt_ctx);
         c->state = HTTPSTATE_SEND_DATA;
         c->last_packet_sent = 0;
-        c->rptr = http_fifo.wptr;
-        c->last_http_fifo_write_count = http_fifo_write_count;
         break;
     case HTTPSTATE_SEND_DATA:
         /* find a new packet */
+#if 0
         fifo_total_size = http_fifo_write_count - c->last_http_fifo_write_count;
         if (fifo_total_size >= ((3 * FIFO_MAX_SIZE) / 4)) {
             /* overflow : resync. We suppose that wptr is at this
                point a pointer to a valid packet */
             c->rptr = http_fifo.wptr;
-            c->got_key_frame[0] = 0;
-            c->got_key_frame[1] = 0;
+            c->got_key_frame = 0;
         }
         
         start_rptr = c->rptr;
@@ -926,20 +1088,17 @@ static int http_prepare_data(HTTPContext *c)
         if (c->stream->stream_type != STREAM_TYPE_MASTER) {
             /* test if the packet can be handled by this format */
             ret = 0;
-            if (test_header(&hdr, c->fmt_ctx.audio_enc)) {
-                /* only begin sending when got a key frame */
-                if (c->fmt_ctx.audio_enc->key_frame)
-                    c->got_key_frame[1] = 1;
-                if (c->got_key_frame[1]) {
-                    ret = c->fmt_ctx.format->write_audio_frame(&c->fmt_ctx, 
-                                                               payload, payload_size);
-                }
-            } else if (test_header(&hdr, c->fmt_ctx.video_enc)) {
-                if (c->fmt_ctx.video_enc->key_frame)
-                    c->got_key_frame[0] = 1;
-                if (c->got_key_frame[0]) {
-                    ret = c->fmt_ctx.format->write_video_picture(&c->fmt_ctx, 
-                                                                 payload, payload_size);
+            for(i=0;i<c->fmt_ctx.nb_streams;i++) {
+                AVStream *st = c->fmt_ctx.streams[i];
+                if (test_header(&hdr, &st->codec)) {
+                    /* only begin sending when got a key frame */
+                    if (st->codec.key_frame)
+                        c->got_key_frame |= 1 << i;
+                    if (c->got_key_frame & (1 << i)) {
+                        ret = c->fmt_ctx.format->write_packet(&c->fmt_ctx, i,
+                                                                   payload, payload_size);
+                    }
+                    break;
                 }
             }
             if (ret) {
@@ -958,6 +1117,73 @@ static int http_prepare_data(HTTPContext *c)
             c->buffer_end = q;
         }
         free(payload);
+#endif
+        {
+            AVPacket pkt;
+
+            /* 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 (av_read_packet(c->fmt_in, &pkt) < 0) {
+                if (c->stream->feed && c->stream->feed->feed_opened) {
+                    /* 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 */
+                } else {
+                    /* must send trailer now because eof or error */
+                    c->state = HTTPSTATE_SEND_DATA_TRAILER;
+                }
+            } else {
+                /* send it to the appropriate stream */
+                if (c->stream->feed) {
+                    /* if coming from a feed, select the right stream */
+                    for(i=0;i<c->stream->nb_streams;i++) {
+                        if (c->stream->feed_streams[i] == pkt.stream_index) {
+                            pkt.stream_index = i;
+                            if (pkt.flags & PKT_FLAG_KEY) {
+                                c->got_key_frame |= 1 << i;
+                            }
+                            /* See if we have all the key frames, then 
+                             * we start to send. This logic is not quite
+                             * right, but it works for the case of a 
+                             * single video stream with one or more
+                             * audio streams (for which every frame is 
+                             * typically a key frame). 
+                             */
+                            if (!c->stream->send_on_key || ((c->got_key_frame + 1) >> c->stream->nb_streams)) {
+                                goto send_it;
+                            }
+                        }
+                    }
+                } else {
+                    AVCodecContext *codec;
+                send_it:
+                    /* Fudge here */
+                    codec = &c->fmt_ctx.streams[pkt.stream_index]->codec;
+
+                    codec->key_frame = ((pkt.flags & PKT_FLAG_KEY) != 0);
+
+#ifdef PJSG
+                    if (codec->codec_type == CODEC_TYPE_AUDIO) {
+                        codec->frame_size = (codec->sample_rate * pkt.duration + 500000) / 1000000;
+                        /* printf("Calculated size %d, from sr %d, duration %d\n", codec->frame_size, codec->sample_rate, pkt.duration); */
+                    }
+#endif
+
+                    if (av_write_packet(&c->fmt_ctx, &pkt, 0))
+                        c->state = HTTPSTATE_SEND_DATA_TRAILER;
+
+                    codec->frame_number++;
+                }
+
+                av_free_packet(&pkt);
+            }
+        }
         break;
     default:
     case HTTPSTATE_SEND_DATA_TRAILER:
@@ -972,162 +1198,371 @@ static int http_prepare_data(HTTPContext *c)
     return 0;
 }
 
-
 /* should convert the format at the same time */
 static int http_send_data(HTTPContext *c)
 {
-    int len;
+    int len, ret;
 
     while (c->buffer_ptr >= c->buffer_end) {
-        if (http_prepare_data(c) < 0)
+        ret = http_prepare_data(c);
+        if (ret < 0)
             return -1;
+        else if (ret == 0) {
+            continue;
+        } else {
+            /* state change requested */
+            return 0;
+        }
     }
 
-    len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
-    if (len < 0) {
-        if (errno != EAGAIN && errno != EINTR) {
-            /* error : close connection */
-            return -1;
+    if (c->buffer_end > c->buffer_ptr) {
+        len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+        if (len < 0) {
+            if (errno != EAGAIN && errno != EINTR) {
+                /* error : close connection */
+                return -1;
+            }
+        } else {
+            c->buffer_ptr += len;
+            c->data_count += len;
+            c->stream->bytes_served += len;
         }
-    } else {
-        c->buffer_ptr += len;
-        c->data_count += len;
     }
     return 0;
 }
 
-static int master_receive(int fd)
+static int http_start_receive_data(HTTPContext *c)
 {
-    int len, size;
-    FifoBuffer *f = &http_fifo;
-    UINT8 *rptr;
-
-    size = f->end - f->wptr;
-    if (size > master_count)
-        size = master_count;
-    len = read(fd, f->wptr, size);
-    if (len == -1) {
-        if (errno != EAGAIN && errno != EINTR) 
-            return -1;
-    } else if (len == 0) {
+    int fd;
+
+    if (c->stream->feed_opened)
         return -1;
-    } else {
-        master_wptr += len;
-        if (master_wptr >= f->end)
-            master_wptr = f->buffer;
-        master_count -= len;
-        if (master_count == 0) {
-            if (master_state == MASTERSTATE_RECEIVE_HEADER) {
-                /* XXX: use generic fifo read to extract packet header */
-                rptr = master_wptr;
-                if (rptr == f->buffer)
-                    rptr = f->end - 1;
-                else
-                    rptr--;
-                master_count = *rptr;
-                if (rptr == f->buffer)
-                    rptr = f->end - 1;
-                else
-                    rptr--;
-                master_count |= *rptr << 8;
-                master_state = MASTERSTATE_RECEIVE_DATA;
-            } else {
-                /* update fifo wptr */
-                f->wptr = master_wptr;
-                master_state = MASTERSTATE_RECEIVE_HEADER;
+
+    /* open feed */
+    fd = open(c->stream->feed_filename, O_RDWR);
+    if (fd < 0)
+        return -1;
+    c->feed_fd = fd;
+    
+    c->stream->feed_write_index = ffm_read_write_index(fd);
+    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;
+    return 0;
+}
+    
+static int http_receive_data(HTTPContext *c)
+{
+    HTTPContext *c1;
+
+    if (c->buffer_end > c->buffer_ptr) {
+        int len;
+
+        len = read(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+        if (len < 0) {
+            if (errno != EAGAIN && errno != EINTR) {
+                /* error : close connection */
+                goto fail;
             }
+        } else if (len == 0) {
+            /* end of connection : close it */
+            goto fail;
+        } else {
+            c->buffer_ptr += len;
+            c->data_count += len;
+        }
+    }
+
+    if (c->buffer_ptr >= c->buffer_end) {
+        FFStream *feed = c->stream;
+        /* a packet has been received : write it in the store, except
+           if header */
+        if (c->data_count > FFM_PACKET_SIZE) {
+            
+            //            printf("writing pos=0x%Lx size=0x%Lx\n", feed->feed_write_index, feed->feed_size);
+            /* XXX: use llseek or url_seek */
+            lseek(c->feed_fd, feed->feed_write_index, SEEK_SET);
+            write(c->feed_fd, c->buffer, FFM_PACKET_SIZE);
+            
+            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 (feed->feed_write_index >= c->stream->feed_max_size)
+                feed->feed_write_index = FFM_PACKET_SIZE;
+
+            /* write index */
+            ffm_write_write_index(c->feed_fd, feed->feed_write_index);
+
+            /* wake up any waiting connections */
+            for(c1 = first_http_ctx; c1 != NULL; 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;
+            ByteIOContext *pb = &s.pb;
+            int i;
+
+            memset(&s, 0, sizeof(s));
+
+            url_open_buf(pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY);
+            pb->buf_end = c->buffer_end;        /* ?? */
+            pb->is_streamed = 1;
+
+            if (feed->fmt->read_header(&s, 0) < 0) {
+                goto fail;
+            }
+
+            /* Now we have the actual streams */
+            if (s.nb_streams != feed->nb_streams) {
+                goto fail;
+            }
+            for (i = 0; i < s.nb_streams; i++) {
+                memcpy(&feed->streams[i]->codec, &s.streams[i]->codec, sizeof(AVCodecContext));
+            } 
         }
+        c->buffer_ptr = c->buffer;
     }
+
     return 0;
+ fail:
+    c->stream->feed_opened = 0;
+    close(c->feed_fd);
+    return -1;
+}
+
+/* return the stream number in the feed */
+int add_av_stream(FFStream *feed,
+                  AVStream *st)
+{
+    AVStream *fst;
+    AVCodecContext *av, *av1;
+    int i;
+
+    av = &st->codec;
+    for(i=0;i<feed->nb_streams;i++) {
+        st = feed->streams[i];
+        av1 = &st->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 CODEC_TYPE_AUDIO:
+                if (av1->channels == av->channels &&
+                    av1->sample_rate == av->sample_rate)
+                    goto found;
+                break;
+            case CODEC_TYPE_VIDEO:
+                if (av1->width == av->width &&
+                    av1->height == av->height &&
+                    av1->frame_rate == av->frame_rate &&
+                    av1->gop_size == av->gop_size)
+                    goto found;
+                break;
+            default:
+                abort();
+            }
+        }
+    }
+    
+    fst = av_mallocz(sizeof(AVStream));
+    if (!fst)
+        return -1;
+    fst->priv_data = av_mallocz(sizeof(FeedData));
+    memcpy(&fst->codec, av, sizeof(AVCodecContext));
+    feed->streams[feed->nb_streams++] = fst;
+    return feed->nb_streams - 1;
+ found:
+    return i;
+}
+
+/* compute the needed AVStream for each feed */
+void build_feed_streams(void)
+{
+    FFStream *stream, *feed;
+    int i;
+
+    /* gather all streams */
+    for(stream = first_stream; stream != NULL; stream = stream->next) {
+        feed = stream->feed;
+        if (feed) {
+            if (!stream->is_feed) {
+                for(i=0;i<stream->nb_streams;i++) {
+                    stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
+                }
+            } else {
+                for(i=0;i<stream->nb_streams;i++) {
+                    stream->feed_streams[i] = i;
+                }
+            }
+        }
+    }
+
+    /* create feed files if needed */
+    for(feed = first_feed; feed != NULL; feed = feed->next_feed) {
+        int fd;
+
+        if (!url_exist(feed->feed_filename)) {
+            AVFormatContext s1, *s = &s1;
+
+            /* only write the header of the ffm file */
+            if (url_fopen(&s->pb, feed->feed_filename, URL_WRONLY) < 0) {
+                fprintf(stderr, "Could not open output feed file '%s'\n",
+                        feed->feed_filename);
+                exit(1);
+            }
+            s->format = feed->fmt;
+            s->nb_streams = feed->nb_streams;
+            for(i=0;i<s->nb_streams;i++) {
+                AVStream *st;
+                st = feed->streams[i];
+                s->streams[i] = st;
+            }
+            s->format->write_header(s);
+
+            url_fclose(&s->pb);
+        }
+        /* get feed size and write index */
+        fd = open(feed->feed_filename, O_RDONLY);
+        if (fd < 0) {
+            fprintf(stderr, "Could not open output feed file '%s'\n",
+                    feed->feed_filename);
+            exit(1);
+        }
+
+        feed->feed_write_index = ffm_read_write_index(fd);
+        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_size)
+            feed->feed_max_size = feed->feed_size;
+
+        close(fd);
+    }
 }
 
 static void get_arg(char *buf, int buf_size, const char **pp)
 {
     const char *p;
     char *q;
+    int quote;
 
     p = *pp;
     while (isspace(*p)) p++;
     q = buf;
-    while (!isspace(*p) && *p != '\0') {
+    quote = 0;
+    if (*p == '\"' || *p == '\'')
+        quote = *p++;
+    for(;;) {
+        if (quote) {
+            if (*p == quote)
+                break;
+        } else {
+            if (isspace(*p))
+                break;
+        }
+        if (*p == '\0')
+            break;
         if ((q - buf) < buf_size - 1)
             *q++ = *p;
         p++;
     }
     *q = '\0';
+    if (quote && *p == quote)
+        p++;
     *pp = p;
 }
 
-/* add a codec and check if it does not already exists */
-AVEncodeContext *add_codec(int codec_id,
-                           AVEncodeContext *av)
+/* add a codec and set the default parameters */
+void add_codec(FFStream *stream, AVCodecContext *av)
 {
-    AVEncoder *codec;
-    FFCodec *ctx, **pctx;
-    AVEncodeContext *av1;
-
-    codec = avencoder_find(codec_id);
-    if (!codec)
-        return NULL;
+    AVStream *st;
 
     /* compute default parameters */
-    av->codec = codec;
-    switch(codec->type) {
+    switch(av->codec_type) {
     case CODEC_TYPE_AUDIO:
         if (av->bit_rate == 0)
             av->bit_rate = 64000;
-        if (av->rate == 0)
-            av->rate = 22050;
+        if (av->sample_rate == 0)
+            av->sample_rate = 22050;
         if (av->channels == 0)
             av->channels = 1;
         break;
     case CODEC_TYPE_VIDEO:
         if (av->bit_rate == 0)
             av->bit_rate = 64000;
-        if (av->rate == 0)
-            av->rate = 5;
+        if (av->frame_rate == 0)
+            av->frame_rate = 5 * FRAME_RATE_BASE;
         if (av->width == 0 || av->height == 0) {
             av->width = 160;
             av->height = 128;
         }
+        /* Bitrate tolerance is less for streaming */
+        if (av->bit_rate_tolerance == 0)
+            av->bit_rate_tolerance = av->bit_rate / 4;
+        if (av->qmin == 0)
+            av->qmin = 3;
+        if (av->qmax == 0)
+            av->qmax = 31;
+        if (av->max_qdiff == 0)
+            av->max_qdiff = 3;
+        av->qcompress = 0.5;
+        av->qblur = 0.5;
+
         break;
+    default:
+        abort();
     }
 
-    /* find if the codec already exists */
-    pctx = &first_codec;
-    while (*pctx != NULL) {
-        av1 = &(*pctx)->enc;
-        if (av1->codec == av->codec &&
-            av1->bit_rate == av->bit_rate &&
-            av1->rate == av->rate) {
+    st = av_mallocz(sizeof(AVStream));
+    if (!st)
+        return;
+    stream->streams[stream->nb_streams++] = st;
+    memcpy(&st->codec, av, sizeof(AVCodecContext));
+}
 
-            switch(av->codec->type) {
-            case CODEC_TYPE_AUDIO:
-                if (av1->channels == av->channels)
-                    goto found;
-                break;
-            case CODEC_TYPE_VIDEO:
-                if (av1->width == av->width &&
-                    av1->height == av->height &&
-                    av1->gop_size == av->gop_size)
-                    goto found;
-                break;
-            }
-        }
-        pctx = &(*pctx)->next;
+int opt_audio_codec(const char *arg)
+{
+    AVCodec *p;
+
+    p = first_avcodec;
+    while (p) {
+        if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_AUDIO)
+            break;
+        p = p->next;
+    }
+    if (p == NULL) {
+        return CODEC_ID_NONE;
     }
 
-    ctx = malloc(sizeof(FFCodec));
-    if (!ctx)
-        return NULL;
-    memset(ctx, 0, sizeof(FFCodec));
-    *pctx = ctx;
-    
-    memcpy(&ctx->enc, av, sizeof(AVEncodeContext));
-    return &ctx->enc;
- found:
-    ctx = *pctx;
-    return &ctx->enc;
+    return p->id;
+}
+
+int opt_video_codec(const char *arg)
+{
+    AVCodec *p;
+
+    p = first_avcodec;
+    while (p) {
+        if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_VIDEO)
+            break;
+        p = p->next;
+    }
+    if (p == NULL) {
+        return CODEC_ID_NONE;
+    }
+
+    return p->id;
 }
 
 int parse_ffconfig(const char *filename)
@@ -1139,7 +1574,9 @@ int parse_ffconfig(const char *filename)
     const char *p;
     int val, errors, line_num;
     FFStream **last_stream, *stream;
-    AVEncodeContext audio_enc, video_enc;
+    FFStream **last_feed, *feed;
+    AVCodecContext audio_enc, video_enc;
+    int audio_id, video_id;
 
     f = fopen(filename, "r");
     if (!f) {
@@ -1150,9 +1587,13 @@ int parse_ffconfig(const char *filename)
     errors = 0;
     line_num = 0;
     first_stream = NULL;
-    first_codec = NULL;
     last_stream = &first_stream;
+    first_feed = NULL;
+    last_feed = &first_feed;
     stream = NULL;
+    feed = NULL;
+    audio_id = CODEC_ID_NONE;
+    video_id = CODEC_ID_NONE;
     for(;;) {
         if (fgets(line, sizeof(line), f) == NULL)
             break;
@@ -1175,13 +1616,6 @@ int parse_ffconfig(const char *filename)
                         filename, line_num, arg);
                 errors++;
             }
-        } else if (!strcasecmp(cmd, "MasterServer")) {
-            get_arg(master_url, sizeof(master_url), &p);
-            if (!strstart(master_url, "http://", NULL)) {
-                fprintf(stderr, "%s:%d: Invalid URL for master server: %s\n", 
-                        filename, line_num, master_url);
-                errors++;
-            }
         } else if (!strcasecmp(cmd, "MaxClients")) {
             get_arg(arg, sizeof(arg), &p);
             val = atoi(arg);
@@ -1192,16 +1626,97 @@ int parse_ffconfig(const char *filename)
             } else {
                 nb_max_connections = val;
             }
+        } else if (!strcasecmp(cmd, "MaxBandwidth")) {
+            get_arg(arg, sizeof(arg), &p);
+            val = atoi(arg);
+            if (val < 10 || val > 100000) {
+                fprintf(stderr, "%s:%d: Invalid MaxBandwidth: %s\n", 
+                        filename, line_num, arg);
+                errors++;
+            } else {
+                nb_max_bandwidth = val;
+            }
         } else if (!strcasecmp(cmd, "CustomLog")) {
             get_arg(logfilename, sizeof(logfilename), &p);
+        } else if (!strcasecmp(cmd, "<Feed")) {
+            /*********************************************/
+            /* Feed related options */
+            char *q;
+            if (stream || feed) {
+                fprintf(stderr, "%s:%d: Already in a tag\n",
+                        filename, line_num);
+            } else {
+                feed = av_mallocz(sizeof(FFStream));
+                /* add in stream list */
+                *last_stream = feed;
+                last_stream = &feed->next;
+                /* add in feed list */
+                *last_feed = feed;
+                last_feed = &feed->next_feed;
+                
+                get_arg(feed->filename, sizeof(feed->filename), &p);
+                q = strrchr(feed->filename, '>');
+                if (*q)
+                    *q = '\0';
+                feed->fmt = guess_format("ffm", NULL, NULL);
+                /* defaut 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 :-) */
+            }
+        } else if (!strcasecmp(cmd, "File")) {
+            if (feed) {
+                get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p);
+            } else if (stream) {
+                get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p);
+            }
+        } else if (!strcasecmp(cmd, "FileMaxSize")) {
+            if (feed) {
+                const char *p1;
+                double fsize;
+
+                get_arg(arg, sizeof(arg), &p);
+                p1 = arg;
+                fsize = strtod(p1, (char **)&p1);
+                switch(toupper(*p1)) {
+                case 'K':
+                    fsize *= 1024;
+                    break;
+                case 'M':
+                    fsize *= 1024 * 1024;
+                    break;
+                case 'G':
+                    fsize *= 1024 * 1024 * 1024;
+                    break;
+                }
+                feed->feed_max_size = (INT64)fsize;
+            }
+        } else if (!strcasecmp(cmd, "</Feed>")) {
+            if (!feed) {
+                fprintf(stderr, "%s:%d: No corresponding <Feed> for </Feed>\n",
+                        filename, line_num);
+                errors++;
+            } else {
+                /* Make sure that we start out clean */
+                if (unlink(feed->feed_filename) < 0 
+                    && errno != ENOENT) {
+                    fprintf(stderr, "%s:%d: Unable to clean old feed file '%s': %s\n",
+                        filename, line_num, feed->feed_filename, strerror(errno));
+                    errors++;
+                }
+            }
+            feed = NULL;
         } else if (!strcasecmp(cmd, "<Stream")) {
+            /*********************************************/
+            /* Stream related options */
             char *q;
-            if (stream) {
-                fprintf(stderr, "%s:%d: Already in a stream tag\n",
+            if (stream || feed) {
+                fprintf(stderr, "%s:%d: Already in a tag\n",
                         filename, line_num);
             } else {
-                stream = malloc(sizeof(FFStream));
-                memset(stream, 0, sizeof(FFStream));
+                stream = av_mallocz(sizeof(FFStream));
                 *last_stream = stream;
                 last_stream = &stream->next;
 
@@ -1210,19 +1725,43 @@ int parse_ffconfig(const char *filename)
                 if (*q)
                     *q = '\0';
                 stream->fmt = guess_format(NULL, stream->filename, NULL);
-                memset(&audio_enc, 0, sizeof(AVEncodeContext));
-                memset(&video_enc, 0, sizeof(AVEncodeContext));
+                memset(&audio_enc, 0, sizeof(AVCodecContext));
+                memset(&video_enc, 0, sizeof(AVCodecContext));
+                audio_id = CODEC_ID_NONE;
+                video_id = CODEC_ID_NONE;
+                if (stream->fmt) {
+                    audio_id = stream->fmt->audio_codec;
+                    video_id = stream->fmt->video_codec;
+                }
+            }
+        } else if (!strcasecmp(cmd, "Feed")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                FFStream *sfeed;
+                
+                sfeed = first_feed;
+                while (sfeed != NULL) {
+                    if (!strcmp(sfeed->filename, arg))
+                        break;
+                    sfeed = sfeed->next_feed;
+                }
+                if (!sfeed) {
+                    fprintf(stderr, "%s:%d: feed '%s' not defined\n",
+                            filename, line_num, arg);
+                } else {
+                    stream->feed = sfeed;
+                }
             }
         } else if (!strcasecmp(cmd, "Format")) {
             get_arg(arg, sizeof(arg), &p);
-            if (!strcmp(arg, "master")) {
-                stream->stream_type = STREAM_TYPE_MASTER;
-                stream->fmt = NULL;
-            } else if (!strcmp(arg, "status")) {
+            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 jpeg */
+                if (!strcmp(arg, "jpeg"))
+                    strcpy(arg, "singlejpeg");
                 stream->fmt = guess_format(arg, NULL, NULL);
                 if (!stream->fmt) {
                     fprintf(stderr, "%s:%d: Unknown Format: %s\n", 
@@ -1230,6 +1769,35 @@ int parse_ffconfig(const char *filename)
                     errors++;
                 }
             }
+            if (stream->fmt) {
+                audio_id = stream->fmt->audio_codec;
+                video_id = stream->fmt->video_codec;
+            }
+        } else if (!strcasecmp(cmd, "Preroll")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                stream->prebuffer = atoi(arg) * 1000;
+            }
+        } else if (!strcasecmp(cmd, "StartSendOnKey")) {
+            if (stream) {
+                stream->send_on_key = 1;
+            }
+        } else if (!strcasecmp(cmd, "AudioCodec")) {
+            get_arg(arg, sizeof(arg), &p);
+            audio_id = opt_audio_codec(arg);
+            if (audio_id == CODEC_ID_NONE) {
+                fprintf(stderr, "%s:%d: Unknown AudioCodec: %s\n", 
+                        filename, line_num, arg);
+                errors++;
+            }
+        } else if (!strcasecmp(cmd, "VideoCodec")) {
+            get_arg(arg, sizeof(arg), &p);
+            video_id = opt_video_codec(arg);
+            if (video_id == CODEC_ID_NONE) {
+                fprintf(stderr, "%s:%d: Unknown VideoCodec: %s\n", 
+                        filename, line_num, arg);
+                errors++;
+            }
         } else if (!strcasecmp(cmd, "AudioBitRate")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream) {
@@ -1243,17 +1811,28 @@ int parse_ffconfig(const char *filename)
         } else if (!strcasecmp(cmd, "AudioSampleRate")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream) {
-                audio_enc.rate = atoi(arg);
+                audio_enc.sample_rate = atoi(arg);
             }
         } else if (!strcasecmp(cmd, "VideoBitRate")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream) {
                 video_enc.bit_rate = atoi(arg) * 1000;
             }
+        } else if (!strcasecmp(cmd, "VideoSize")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                parse_image_size(&video_enc.width, &video_enc.height, arg);
+                if ((video_enc.width % 16) != 0 ||
+                    (video_enc.height % 16) != 0) {
+                    fprintf(stderr, "%s:%d: Image size must be a multiple of 16\n",
+                            filename, line_num);
+                    errors++;
+                }
+            }
         } else if (!strcasecmp(cmd, "VideoFrameRate")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream) {
-                video_enc.rate = atoi(arg);
+                video_enc.frame_rate = (int)(strtod(arg, NULL) * FRAME_RATE_BASE);
             }
         } else if (!strcasecmp(cmd, "VideoGopSize")) {
             get_arg(arg, sizeof(arg), &p);
@@ -1264,21 +1843,58 @@ int parse_ffconfig(const char *filename)
             if (stream) {
                 video_enc.gop_size = 1;
             }
+        } else if (!strcasecmp(cmd, "VideoHighQuality")) {
+            if (stream) {
+                video_enc.flags |= CODEC_FLAG_HQ;
+            }
+        } else if (!strcasecmp(cmd, "VideoQDiff")) {
+            if (stream) {
+                video_enc.max_qdiff = atoi(arg);
+                if (video_enc.max_qdiff < 1 || video_enc.max_qdiff > 31) {
+                    fprintf(stderr, "%s:%d: VideoQDiff out of range\n",
+                            filename, line_num);
+                    errors++;
+                }
+            }
+        } else if (!strcasecmp(cmd, "VideoQMax")) {
+            if (stream) {
+                video_enc.qmax = atoi(arg);
+                if (video_enc.qmax < 1 || video_enc.qmax > 31) {
+                    fprintf(stderr, "%s:%d: VideoQMax out of range\n",
+                            filename, line_num);
+                    errors++;
+                }
+            }
+        } else if (!strcasecmp(cmd, "VideoQMin")) {
+            if (stream) {
+                video_enc.qmin = atoi(arg);
+                if (video_enc.qmin < 1 || video_enc.qmin > 31) {
+                    fprintf(stderr, "%s:%d: VideoQMin out of range\n",
+                            filename, line_num);
+                    errors++;
+                }
+            }
+        } else if (!strcasecmp(cmd, "NoVideo")) {
+            video_id = CODEC_ID_NONE;
+        } else if (!strcasecmp(cmd, "NoAudio")) {
+            audio_id = CODEC_ID_NONE;
         } else if (!strcasecmp(cmd, "</Stream>")) {
             if (!stream) {
                 fprintf(stderr, "%s:%d: No corresponding <Stream> for </Stream>\n",
                         filename, line_num);
                 errors++;
             }
-            if (stream->fmt) {
-                if (stream->fmt->audio_codec != CODEC_ID_NONE) {
-                    stream->audio_enc = add_codec(stream->fmt->audio_codec,
-                                                  &audio_enc);
+            if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) {
+                if (audio_id != CODEC_ID_NONE) {
+                    audio_enc.codec_type = CODEC_TYPE_AUDIO;
+                    audio_enc.codec_id = audio_id;
+                    add_codec(stream, &audio_enc);
+                }
+                if (video_id != CODEC_ID_NONE) {
+                    video_enc.codec_type = CODEC_TYPE_VIDEO;
+                    video_enc.codec_id = video_id;
+                    add_codec(stream, &video_enc);
                 }
-                
-                if (stream->fmt->video_codec != CODEC_ID_NONE)
-                    stream->video_enc = add_codec(stream->fmt->video_codec,
-                                                  &video_enc);
             }
             stream = NULL;
         } else {
@@ -1302,11 +1918,12 @@ void *http_server_thread(void *arg)
     return NULL;
 }
 
+#if 0
 static void write_packet(FFCodec *ffenc,
                          UINT8 *buf, int size)
 {
     PacketHeader hdr;
-    AVEncodeContext *enc = &ffenc->enc;
+    AVCodecContext *enc = &ffenc->enc;
     UINT8 *wptr;
     mk_header(&hdr, enc, size);
     wptr = http_fifo.wptr;
@@ -1317,197 +1934,11 @@ static void write_packet(FFCodec *ffenc,
     ffenc->data_count += size;
     ffenc->avg_frame_size = ffenc->avg_frame_size * AVG_COEF + size * (1.0 - AVG_COEF);
 }
-
-#define AUDIO_FIFO_SIZE 8192
-
-int av_grab(void)
-{
-    UINT8 audio_buf[AUDIO_FIFO_SIZE/2];
-    UINT8 audio_buf1[AUDIO_FIFO_SIZE/2];
-    UINT8 audio_out[AUDIO_FIFO_SIZE/2];
-    UINT8 video_buffer[128*1024];
-    char buf[256];
-    short *samples;
-    int ret;
-    int audio_fd;
-    FFCodec *ffenc;
-    AVEncodeContext *enc;
-    int frame_size, frame_bytes;
-    int use_audio, use_video;
-    int frame_rate, sample_rate, channels;
-    int width, height, frame_number;
-    UINT8 *picture[3];
-
-    use_audio = 0;
-    use_video = 0;
-    frame_rate = 0;
-    sample_rate = 0;
-    frame_size = 0;
-    channels = 1;
-    width = 0;
-    height = 0;
-    frame_number = 0;
-    ffenc = first_codec;
-    while (ffenc != NULL) {
-        enc = &ffenc->enc;
-        avencoder_string(buf, sizeof(buf), enc);
-        fprintf(stderr, "  %s\n", buf);
-        if (avencoder_open(enc, enc->codec) < 0) {
-            fprintf(stderr, "Incorrect encode parameters\n");
-            return -1;
-        }
-        switch(enc->codec->type) {
-        case CODEC_TYPE_AUDIO:
-            use_audio = 1;
-            if (enc->rate > sample_rate)
-                sample_rate = enc->rate;
-            if (enc->frame_size > frame_size)
-                frame_size = enc->frame_size;
-            if (enc->channels > channels)
-                channels = enc->channels;
-            fifo_init(&ffenc->fifo, AUDIO_FIFO_SIZE);
-            break;
-        case CODEC_TYPE_VIDEO:
-            use_video = 1;
-            if (enc->rate > frame_rate)
-                frame_rate = enc->rate;
-            if (enc->width > width)
-                width = enc->width;
-            if (enc->height > height)
-                height = enc->height;
-            break;
-        }
-        ffenc = ffenc->next;
-    }
-
-    /* audio */
-    samples = NULL;
-    audio_fd = -1;
-    if (use_audio) {
-        printf("Audio sampling: %d Hz, %s\n", 
-               sample_rate, channels == 2 ? "stereo" : "mono");
-        audio_fd = audio_open(sample_rate, channels);
-        if (audio_fd < 0) {
-            fprintf(stderr, "Could not open audio device\n");
-            exit(1);
-        }
-    }
-    
-    ffenc = first_codec;
-    while (ffenc != NULL) {
-        enc = &ffenc->enc;
-        if (enc->codec->type == CODEC_TYPE_AUDIO &&
-            (enc->channels != channels ||
-             enc->rate != sample_rate)) {
-            audio_resample_init(&ffenc->resample, enc->channels, channels,
-                                enc->rate, sample_rate);
-        }
-        ffenc = ffenc->next;
-    }
-
-    /* video */
-    if (use_video) {
-        printf("Video sampling: %dx%d, %d fps\n", 
-               width, height, frame_rate);
-        ret = v4l_init(frame_rate, width, height);
-        if (ret < 0) {
-            fprintf(stderr,"Could not init video 4 linux capture\n");
-            exit(1);
-        }
-    }
-
-    for(;;) {
-        /* read & compress audio frames */
-        if (use_audio) {
-            int ret, nb_samples, nb_samples_out;
-            UINT8 *buftmp;
-
-            for(;;) {
-                ret = read(audio_fd, audio_buf, AUDIO_FIFO_SIZE/2);
-                if (ret <= 0)
-                    break;
-                /* fill each codec fifo by doing the right sample
-                   rate conversion. This is not optimal because we
-                   do too much work, but it is easy to do */
-                nb_samples = ret / (channels * 2);
-                ffenc = first_codec;
-                while (ffenc != NULL) {
-                    enc = &ffenc->enc;
-                    if (enc->codec->type == CODEC_TYPE_AUDIO) {
-                        /* rate & stereo convertion */
-                        if (enc->channels == channels &&
-                            enc->rate == sample_rate) {
-                            buftmp = audio_buf;
-                            nb_samples_out = nb_samples;
-                        } else {
-                            buftmp = audio_buf1;
-                            nb_samples_out = audio_resample(&ffenc->resample, 
-                                                            (short *)buftmp, (short *)audio_buf,
-                                                            nb_samples);
-                            
-                        }
-                        fifo_write(&ffenc->fifo, buftmp, nb_samples_out * enc->channels * 2, 
-                                   &ffenc->fifo.wptr);
-                    }
-                    ffenc = ffenc->next;
-                }
-                
-                /* compress as many frame as possible with each audio codec */
-                ffenc = first_codec;
-                while (ffenc != NULL) {
-                    enc = &ffenc->enc;
-                    if (enc->codec->type == CODEC_TYPE_AUDIO) {
-                        frame_bytes = enc->frame_size * 2 * enc->channels;
-                        
-                        while (fifo_read(&ffenc->fifo, audio_buf, frame_bytes, &ffenc->fifo.rptr) == 0) {
-                            ret = avencoder_encode(enc,
-                                                   audio_out, sizeof(audio_out), audio_buf);
-                            write_packet(ffenc, audio_out, ret);
-                        }
-                    }
-                    ffenc = ffenc->next;
-                }
-            }
-        }
-
-        if (use_video) {
-            ret = v4l_read_picture (picture, width, height, 
-                                    frame_number);
-            if (ret < 0)
-                break;
-            ffenc = first_codec;
-            while (ffenc != NULL) {
-                enc = &ffenc->enc;
-                if (enc->codec->type == CODEC_TYPE_VIDEO) {
-                    int n1, n2;
-                    /* feed each codec with its requested frame rate */
-                    n1 = (frame_number * enc->rate) / frame_rate;
-                    n2 = ((frame_number + 1) * enc->rate) / frame_rate;
-                    if (n2 > n1) {
-                        ret = avencoder_encode(enc, video_buffer, sizeof(video_buffer), picture);
-                        write_packet(ffenc, video_buffer, ret);
-                    }
-                }
-                ffenc = ffenc->next;
-            }
-            frame_number++;
-        }
-    }
-    
-    ffenc = first_codec;
-    while (ffenc != NULL) {
-        enc = &ffenc->enc;
-        avencoder_close(enc);
-        ffenc = ffenc->next;
-    }
-    close(audio_fd);
-    return 0;
-}
-
+#endif
 
 void help(void)
 {
-    printf("ffserver version 1.0, Copyright (c) 2000 Gerard Lantau\n"
+    printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000,2001 Gerard Lantau\n"
            "usage: ffserver [-L] [-h] [-f configfile]\n"
            "Hyper fast multi format Audio/Video streaming server\n"
            "\n"
@@ -1520,8 +1951,8 @@ void help(void)
 void licence(void)
 {
     printf(
-    "ffserver version 1.0\n"
-    "Copyright (c) 2000 Gerard Lantau\n"
+    "ffserver version " FFMPEG_VERSION "\n"
+    "Copyright (c) 2000,2001 Gerard Lantau\n"
     "This program is free software; you can redistribute it and/or modify\n"
     "it under the terms of the GNU General Public License as published by\n"
     "the Free Software Foundation; either version 2 of the License, or\n"
@@ -1540,30 +1971,10 @@ void licence(void)
 
 int main(int argc, char **argv)
 {
-    pthread_t http_server_tid;
     const char *config_filename;
     int c;
 
-    /* codecs */
-    register_avencoder(&ac3_encoder);
-    register_avencoder(&mp2_encoder);
-    register_avencoder(&mpeg1video_encoder);
-    register_avencoder(&h263_encoder);
-    register_avencoder(&rv10_encoder);
-    register_avencoder(&mjpeg_encoder);
-
-    /* audio video formats */
-    register_avformat(&mp2_format);
-    register_avformat(&ac3_format);
-    register_avformat(&mpeg_mux_format);
-    register_avformat(&mpeg1video_format);
-    register_avformat(&h263_format);
-    register_avformat(&rm_format);
-    register_avformat(&ra_format);
-    register_avformat(&asf_format);
-    register_avformat(&mpjpeg_format);
-    register_avformat(&jpeg_format);
-    register_avformat(&swf_format);
+    register_all();
 
     config_filename = "/etc/ffserver.conf";
 
@@ -1592,6 +2003,7 @@ int main(int argc, char **argv)
     my_addr.sin_port = htons (8080);
     my_addr.sin_addr.s_addr = htonl (INADDR_ANY);
     nb_max_connections = 5;
+    nb_max_bandwidth = 1000;
     first_stream = NULL;
     logfilename[0] = '\0';
 
@@ -1600,6 +2012,11 @@ int main(int argc, char **argv)
         exit(1);
     }
 
+    build_feed_streams();
+
+    /* signal init */
+    signal(SIGPIPE, SIG_IGN);
+
     /* open log file if needed */
     if (logfilename[0] != '\0') {
         if (!strcmp(logfilename, "-"))
@@ -1608,35 +2025,10 @@ int main(int argc, char **argv)
             logfile = fopen(logfilename, "w");
     }
 
-    /* init fifo */
-    http_fifo_write_count = 0;
-    if (fifo_init(&http_fifo, FIFO_MAX_SIZE) < 0) {
-        fprintf(stderr, "Could not allow receive fifo\n");
+    if (http_server(my_addr) < 0) {
+        fprintf(stderr, "Could start http server\n");
         exit(1);
     }
 
-    if (master_url[0] == '\0') {
-        /* no master server: we grab ourself */
-
-        /* launch server thread */
-        if (pthread_create(&http_server_tid, NULL, 
-                           http_server_thread, NULL) != 0) {
-            fprintf(stderr, "Could not create http server thread\n");
-            exit(1);
-        }
-
-        /* launch the audio / video grab */
-        if (av_grab() < 0) {
-            fprintf(stderr, "Could not start audio/video grab\n");
-            exit(1);
-        }
-    } else {
-        /* master server : no thread are needed */
-        if (http_server(my_addr) < 0) {
-            fprintf(stderr, "Could start http server\n");
-            exit(1);
-        }
-    }
-
     return 0;
 }