X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver.c;h=7423abc07b40f85c33f2aea064eb92ffde714929;hb=0bd586c50dc27ec38ca94e58f50030544d729463;hp=d2390f27eaff657cf91037faa88c1cd44e041af2;hpb=2c4ae653afbd5903976b69f0306331daa3d5d2f6;p=ffmpeg diff --git a/ffserver.c b/ffserver.c index d2390f27eaf..7423abc07b4 100644 --- a/ffserver.c +++ b/ffserver.c @@ -20,22 +20,26 @@ #include "avformat.h" #include -#include #include #include #include #include #include #include +#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include -#include #include #include #include +#include #include #include -#include #include +#ifdef CONFIG_HAVE_DLFCN +#include +#endif + +#include "ffserver.h" /* maximum number of simultaneous HTTP connections */ #define HTTP_MAX_CONNECTIONS 2000 @@ -44,34 +48,46 @@ enum HTTPState { HTTPSTATE_WAIT_REQUEST, HTTPSTATE_SEND_HEADER, HTTPSTATE_SEND_DATA_HEADER, - HTTPSTATE_SEND_DATA, + HTTPSTATE_SEND_DATA, /* sending TCP or UDP data */ HTTPSTATE_SEND_DATA_TRAILER, - HTTPSTATE_RECEIVE_DATA, - HTTPSTATE_WAIT_FEED, + HTTPSTATE_RECEIVE_DATA, + HTTPSTATE_WAIT_FEED, /* wait for data from the feed */ + HTTPSTATE_READY, + + RTSPSTATE_WAIT_REQUEST, + RTSPSTATE_SEND_REPLY, + RTSPSTATE_SEND_PACKET, }; const char *http_state[] = { - "WAIT_REQUEST", - "SEND_HEADER", + "HTTP_WAIT_REQUEST", + "HTTP_SEND_HEADER", + "SEND_DATA_HEADER", "SEND_DATA", "SEND_DATA_TRAILER", "RECEIVE_DATA", "WAIT_FEED", + "READY", + + "RTSP_WAIT_REQUEST", + "RTSP_SEND_REPLY", + "RTSP_SEND_PACKET", }; #define IOBUFFER_INIT_SIZE 8192 -#define PBUFFER_INIT_SIZE 8192 /* coef for exponential mean for bitrate estimation in statistics */ #define AVG_COEF 0.9 /* timeouts are in ms */ -#define REQUEST_TIMEOUT (15 * 1000) +#define HTTP_REQUEST_TIMEOUT (15 * 1000) +#define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000) + #define SYNC_TIMEOUT (10 * 1000) typedef struct { - INT64 count1, count2; + int64_t count1, count2; long time1, time2; } DataRateData; @@ -82,37 +98,63 @@ typedef struct HTTPContext { struct sockaddr_in from_addr; /* origin */ struct pollfd *poll_entry; /* used when polling */ long timeout; - UINT8 *buffer_ptr, *buffer_end; + uint8_t *buffer_ptr, *buffer_end; int http_error; struct HTTPContext *next; int got_key_frame; /* stream 0 => 1, stream 1 => 2, stream 2=> 4 */ - INT64 data_count; + int64_t data_count; /* feed input */ int feed_fd; /* input format handling */ AVFormatContext *fmt_in; + long start_time; /* In milliseconds - this wraps fairly often */ + int64_t first_pts; /* initial pts value */ + int64_t cur_pts; /* current pts value from the stream in us */ + int64_t cur_frame_duration; /* duration of the current frame in us */ + int cur_frame_bytes; /* output frame size, needed to compute + the time at which we send each + packet */ + int pts_stream_index; /* stream we choose as clock reference */ + int64_t cur_clock; /* current clock reference value in us */ /* output format handling */ struct FFStream *stream; /* -1 is invalid stream */ int feed_streams[MAX_STREAMS]; /* index of streams in the feed */ int switch_feed_streams[MAX_STREAMS]; /* index of streams in the feed */ int switch_pending; - AVFormatContext fmt_ctx; + AVFormatContext fmt_ctx; /* instance of FFStream for one user */ int last_packet_sent; /* true if last data packet was sent */ int suppress_log; - int bandwidth; - long start_time; /* In milliseconds - this wraps fairly often */ DataRateData datarate; int wmp_client_id; char protocol[16]; char method[16]; char url[128]; int buffer_size; - UINT8 *buffer; - int pbuffer_size; - UINT8 *pbuffer; + uint8_t *buffer; + int is_packetized; /* if true, the stream is packetized */ + int packet_stream_index; /* current stream for output in state machine */ + + /* RTSP state specific */ + uint8_t *pb_buffer; /* XXX: use that in all the code */ + ByteIOContext *pb; + int seq; /* RTSP sequence number */ + + /* RTP state specific */ + enum RTSPProtocol rtp_protocol; + char session_id[32]; /* session id */ + AVFormatContext *rtp_ctx[MAX_STREAMS]; + + /* RTP/UDP specific */ + URLContext *rtp_handles[MAX_STREAMS]; + + /* RTP/TCP specific */ + struct HTTPContext *rtsp_c; + uint8_t *packet_buffer, *packet_buffer_ptr, *packet_buffer_end; } HTTPContext; +static AVFrame dummy_frame; + /* each generated stream is described here */ enum StreamType { STREAM_TYPE_LIVE, @@ -120,12 +162,29 @@ enum StreamType { STREAM_TYPE_REDIRECT, }; +enum IPAddressAction { + IP_ALLOW = 1, + IP_DENY, +}; + +typedef struct IPAddressACL { + struct IPAddressACL *next; + enum IPAddressAction action; + /* These are in host order */ + struct in_addr first; + struct in_addr last; +} IPAddressACL; + /* description of each stream of the ffserver.conf file */ typedef struct FFStream { enum StreamType stream_type; char filename[1024]; /* stream filename */ - struct FFStream *feed; + struct FFStream *feed; /* feed we are using (can be null if + coming from file) */ + AVFormatParameters *ap_in; /* input parameters */ + AVInputFormat *ifmt; /* if non NULL, force input format */ AVOutputFormat *fmt; + IPAddressACL *acl; int nb_streams; int prebuffer; /* Number of millseconds early to start */ long max_time; /* Number of milliseconds to run */ @@ -142,14 +201,25 @@ typedef struct FFStream { time_t pid_start; /* Of ffmpeg process */ char **child_argv; struct FFStream *next; + int bandwidth; /* bandwidth, in kbits/s */ + /* RTSP options */ + char *rtsp_option; + /* multicast specific */ + int is_multicast; + struct in_addr multicast_ip; + int multicast_port; /* first port used for multicast */ + int multicast_ttl; + int loop; /* if true, send the stream in loops (only meaningful if file) */ + /* feed specific */ - int feed_opened; /* true if someone if writing to feed */ + int feed_opened; /* true if someone is writing to the feed */ int is_feed; /* true if it is a feed */ + int readonly; /* True if writing is prohibited to the file */ 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 */ + int64_t bytes_served; + int64_t feed_max_size; /* maximum storage size */ + int64_t feed_write_index; /* current write position in feed (it wraps round) */ + int64_t feed_size; /* current size of feed */ struct FFStream *next_feed; } FFStream; @@ -158,13 +228,19 @@ typedef struct FeedData { float avg_frame_size; /* frame size averraged over last frames with exponential mean */ } FeedData; -struct sockaddr_in my_addr; +struct sockaddr_in my_http_addr; +struct sockaddr_in my_rtsp_addr; + char logfilename[1024]; HTTPContext *first_http_ctx; FFStream *first_feed; /* contains only feeds */ FFStream *first_stream; /* contains all streams, including feeds */ -static int handle_http(HTTPContext *c); +static void new_connection(int server_fd, int is_rtsp); +static void close_connection(HTTPContext *c); + +/* HTTP handling */ +static int handle_connection(HTTPContext *c); static int http_parse_request(HTTPContext *c); static int http_send_data(HTTPContext *c); static void compute_stats(HTTPContext *c); @@ -172,17 +248,40 @@ 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); +/* RTSP handling */ +static int rtsp_parse_request(HTTPContext *c); +static void rtsp_cmd_describe(HTTPContext *c, const char *url); +static void rtsp_cmd_options(HTTPContext *c, const char *url); +static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPHeader *h); +static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPHeader *h); +static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPHeader *h); +static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPHeader *h); + +/* SDP handling */ +static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, + struct in_addr my_ip); + +/* RTP handling */ +static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, + FFStream *stream, const char *session_id, + enum RTSPProtocol rtp_protocol); +static int rtp_new_av_stream(HTTPContext *c, + int stream_index, struct sockaddr_in *dest_addr, + HTTPContext *rtsp_c); + static const char *my_program_name; +static const char *my_program_dir; static int ffserver_debug; +static int ffserver_daemon; static int no_launch; static int need_to_start_children; int nb_max_connections; int nb_connections; -int nb_max_bandwidth; -int nb_bandwidth; +int max_bandwidth; +int current_bandwidth; static long cur_time; // Making this global saves on passing it around everywhere @@ -196,7 +295,7 @@ static long gettime_ms(void) static FILE *logfile = NULL; -static void http_log(char *fmt, ...) +static void __attribute__ ((format (printf, 1, 2))) http_log(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -208,28 +307,34 @@ static void http_log(char *fmt, ...) va_end(ap); } -static void log_connection(HTTPContext *c) +static char *ctime1(char *buf2) { - char buf1[32], buf2[32], *p; time_t ti; + char *p; - if (c->suppress_log) - return; - - /* 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'; + return buf2; +} + +static void log_connection(HTTPContext *c) +{ + char buf2[32]; + + if (c->suppress_log) + return; + 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); + inet_ntoa(c->from_addr.sin_addr), + ctime1(buf2), c->method, c->url, + c->protocol, (c->http_error ? c->http_error : 200), c->data_count); } -static void update_datarate(DataRateData *drd, INT64 count) +static void update_datarate(DataRateData *drd, int64_t count) { if (!drd->time1 && !drd->count1) { drd->time1 = drd->time2 = cur_time; @@ -245,14 +350,23 @@ static void update_datarate(DataRateData *drd, INT64 count) } /* In bytes per second */ -static int compute_datarate(DataRateData *drd, INT64 count) +static int compute_datarate(DataRateData *drd, int64_t count) { if (cur_time == drd->time1) return 0; - + return ((count - drd->count1) * 1000) / (cur_time - drd->time1); } +static int get_longterm_datarate(DataRateData *drd, int64_t count) +{ + /* You get the first 3 seconds flat out */ + if (cur_time - drd->time1 < 3000) + return 0; + return compute_datarate(drd, count); +} + + static void start_children(FFStream *feed) { if (no_launch) @@ -298,6 +412,11 @@ static void start_children(FFStream *feed) } strcpy(slash, "ffmpeg"); + /* This is needed to make relative pathnames work */ + chdir(my_program_dir); + + signal(SIGPIPE, SIG_DFL); + execvp(pathname, feed->child_argv); _exit(1); @@ -306,13 +425,10 @@ static void start_children(FFStream *feed) } } -/* main loop of the http server */ -static int http_server(struct sockaddr_in my_addr) +/* open a listening socket */ +static int socket_open_listen(struct sockaddr_in *my_addr) { - int server_fd, tmp, ret; - struct sockaddr_in from_addr; - struct pollfd poll_table[HTTP_MAX_CONNECTIONS + 1], *poll_entry; - HTTPContext *c, **cp; + int server_fd, tmp; server_fd = socket(AF_INET,SOCK_STREAM,0); if (server_fd < 0) { @@ -323,8 +439,10 @@ static int http_server(struct sockaddr_in my_addr) tmp = 1; setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp)); - if (bind (server_fd, (struct sockaddr *) &my_addr, sizeof (my_addr)) < 0) { - perror ("bind"); + if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) { + char bindmsg[32]; + snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port)); + perror (bindmsg); close(server_fd); return -1; } @@ -334,49 +452,137 @@ static int http_server(struct sockaddr_in my_addr) close(server_fd); return -1; } + fcntl(server_fd, F_SETFL, O_NONBLOCK); + + return server_fd; +} + +/* start all multicast streams */ +static void start_multicast(void) +{ + FFStream *stream; + char session_id[32]; + HTTPContext *rtp_c; + struct sockaddr_in dest_addr; + int default_port, stream_index; + + default_port = 6000; + for(stream = first_stream; stream != NULL; stream = stream->next) { + if (stream->is_multicast) { + /* open the RTP connection */ + snprintf(session_id, sizeof(session_id), + "%08x%08x", (int)random(), (int)random()); + + /* choose a port if none given */ + if (stream->multicast_port == 0) { + stream->multicast_port = default_port; + default_port += 100; + } + + dest_addr.sin_family = AF_INET; + dest_addr.sin_addr = stream->multicast_ip; + dest_addr.sin_port = htons(stream->multicast_port); + + rtp_c = rtp_new_connection(&dest_addr, stream, session_id, + RTSP_PROTOCOL_RTP_UDP_MULTICAST); + if (!rtp_c) { + continue; + } + if (open_input_stream(rtp_c, "") < 0) { + fprintf(stderr, "Could not open input stream for stream '%s'\n", + stream->filename); + continue; + } + + /* open each RTP stream */ + for(stream_index = 0; stream_index < stream->nb_streams; + stream_index++) { + dest_addr.sin_port = htons(stream->multicast_port + + 2 * stream_index); + if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, NULL) < 0) { + fprintf(stderr, "Could not open output stream '%s/streamid=%d'\n", + stream->filename, stream_index); + exit(1); + } + } + + /* change state to send data */ + rtp_c->state = HTTPSTATE_SEND_DATA; + } + } +} + +/* main loop of the http server */ +static int http_server(void) +{ + int server_fd, ret, rtsp_server_fd, delay, delay1; + struct pollfd poll_table[HTTP_MAX_CONNECTIONS + 2], *poll_entry; + HTTPContext *c, *c_next; + + server_fd = socket_open_listen(&my_http_addr); + if (server_fd < 0) + return -1; + rtsp_server_fd = socket_open_listen(&my_rtsp_addr); + if (rtsp_server_fd < 0) + return -1; + http_log("ffserver started.\n"); start_children(first_feed); - fcntl(server_fd, F_SETFL, O_NONBLOCK); first_http_ctx = NULL; nb_connections = 0; - first_http_ctx = NULL; + + start_multicast(); + for(;;) { poll_entry = poll_table; poll_entry->fd = server_fd; poll_entry->events = POLLIN; poll_entry++; + poll_entry->fd = rtsp_server_fd; + poll_entry->events = POLLIN; + poll_entry++; + /* wait for events on each HTTP handle */ c = first_http_ctx; + delay = 1000; while (c != NULL) { int fd; fd = c->fd; switch(c->state) { - case HTTPSTATE_WAIT_REQUEST: + case HTTPSTATE_SEND_HEADER: + case RTSPSTATE_SEND_REPLY: + case RTSPSTATE_SEND_PACKET: c->poll_entry = poll_entry; poll_entry->fd = fd; - poll_entry->events = POLLIN; + poll_entry->events = POLLOUT; poll_entry++; break; - case HTTPSTATE_SEND_HEADER: case HTTPSTATE_SEND_DATA_HEADER: case HTTPSTATE_SEND_DATA: case HTTPSTATE_SEND_DATA_TRAILER: - c->poll_entry = poll_entry; - poll_entry->fd = fd; - poll_entry->events = POLLOUT; - poll_entry++; + if (!c->is_packetized) { + /* for TCP, we output as much as we can (may need to put a limit) */ + c->poll_entry = poll_entry; + poll_entry->fd = fd; + poll_entry->events = POLLOUT; + poll_entry++; + } else { + /* when ffserver is doing the timing, we work by + looking at which packet need to be sent every + 10 ms */ + delay1 = 10; /* one tick wait XXX: 10 ms assumed */ + if (delay1 < delay) + delay = delay1; + } break; + case HTTPSTATE_WAIT_REQUEST: case HTTPSTATE_RECEIVE_DATA: - c->poll_entry = poll_entry; - poll_entry->fd = fd; - poll_entry->events = POLLIN; - poll_entry++; - break; case HTTPSTATE_WAIT_FEED: + case RTSPSTATE_WAIT_REQUEST: /* need to catch errors */ c->poll_entry = poll_entry; poll_entry->fd = fd; @@ -393,7 +599,7 @@ static int http_server(struct sockaddr_in my_addr) /* wait for an event on one connection. We poll at least every second to handle timeouts */ do { - ret = poll(poll_table, poll_entry - poll_table, 1000); + ret = poll(poll_table, poll_entry - poll_table, delay); } while (ret == -1); cur_time = gettime_ms(); @@ -404,81 +610,177 @@ static int http_server(struct sockaddr_in my_addr) } /* now handle the events */ - - cp = &first_http_ctx; - while ((*cp) != NULL) { - c = *cp; - if (handle_http (c) < 0) { + for(c = first_http_ctx; c != NULL; c = c_next) { + c_next = c->next; + if (handle_connection(c) < 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; - av_free(c->buffer); - av_free(c->pbuffer); - av_free(c); - nb_connections--; - } else { - cp = &c->next; + close_connection(c); } } - /* new connection request ? */ poll_entry = poll_table; + /* new HTTP connection request ? */ if (poll_entry->revents & POLLIN) { - int fd, len; - - len = sizeof(from_addr); - 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 coming - close to the connection limit */ - if (nb_connections >= nb_max_connections) { - c = NULL; - } else { - /* add a new connection */ - c = av_mallocz(sizeof(HTTPContext)); - if (c) { - c->next = first_http_ctx; - first_http_ctx = c; - c->fd = fd; - c->poll_entry = NULL; - c->from_addr = from_addr; - c->state = HTTPSTATE_WAIT_REQUEST; - c->buffer = av_malloc(c->buffer_size = IOBUFFER_INIT_SIZE); - c->pbuffer = av_malloc(c->pbuffer_size = PBUFFER_INIT_SIZE); - if (!c->buffer || !c->pbuffer) { - av_free(c->buffer); - av_free(c->pbuffer); - av_freep(&c); - } else { - c->buffer_ptr = c->buffer; - c->buffer_end = c->buffer + c->buffer_size; - c->timeout = cur_time + REQUEST_TIMEOUT; - c->start_time = cur_time; - nb_connections++; - } - } - } - if (!c) { - close(fd); - } - } + new_connection(server_fd, 0); } poll_entry++; + /* new RTSP connection request ? */ + if (poll_entry->revents & POLLIN) { + new_connection(rtsp_server_fd, 1); + } } } -static int handle_http(HTTPContext *c) +/* start waiting for a new HTTP/RTSP request */ +static void start_wait_request(HTTPContext *c, int is_rtsp) { - int len; + c->buffer_ptr = c->buffer; + c->buffer_end = c->buffer + c->buffer_size - 1; /* leave room for '\0' */ + + if (is_rtsp) { + c->timeout = cur_time + RTSP_REQUEST_TIMEOUT; + c->state = RTSPSTATE_WAIT_REQUEST; + } else { + c->timeout = cur_time + HTTP_REQUEST_TIMEOUT; + c->state = HTTPSTATE_WAIT_REQUEST; + } +} + +static void new_connection(int server_fd, int is_rtsp) +{ + struct sockaddr_in from_addr; + int fd, len; + HTTPContext *c = NULL; + + len = sizeof(from_addr); + fd = accept(server_fd, (struct sockaddr *)&from_addr, + &len); + if (fd < 0) + return; + fcntl(fd, F_SETFL, O_NONBLOCK); + + /* XXX: should output a warning page when coming + close to the connection limit */ + if (nb_connections >= nb_max_connections) + goto fail; + + /* add a new connection */ + c = av_mallocz(sizeof(HTTPContext)); + if (!c) + goto fail; + + c->fd = fd; + c->poll_entry = NULL; + c->from_addr = from_addr; + c->buffer_size = IOBUFFER_INIT_SIZE; + c->buffer = av_malloc(c->buffer_size); + if (!c->buffer) + goto fail; + + c->next = first_http_ctx; + first_http_ctx = c; + nb_connections++; + + start_wait_request(c, is_rtsp); + + return; + + fail: + if (c) { + av_free(c->buffer); + av_free(c); + } + close(fd); +} + +static void close_connection(HTTPContext *c) +{ + HTTPContext **cp, *c1; + int i, nb_streams; + AVFormatContext *ctx; + URLContext *h; + AVStream *st; + + /* remove connection from list */ + cp = &first_http_ctx; + while ((*cp) != NULL) { + c1 = *cp; + if (c1 == c) { + *cp = c->next; + } else { + cp = &c1->next; + } + } + + /* remove references, if any (XXX: do it faster) */ + for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) { + if (c1->rtsp_c == c) + c1->rtsp_c = NULL; + } + + /* remove connection associated resources */ + if (c->fd >= 0) + close(c->fd); + if (c->fmt_in) { + /* close each frame parser */ + for(i=0;ifmt_in->nb_streams;i++) { + st = c->fmt_in->streams[i]; + if (st->codec.codec) { + avcodec_close(&st->codec); + } + } + av_close_input_file(c->fmt_in); + } + + /* free RTP output streams if any */ + nb_streams = 0; + if (c->stream) + nb_streams = c->stream->nb_streams; + + for(i=0;irtp_ctx[i]; + if (ctx) { + av_write_trailer(ctx); + av_free(ctx); + } + h = c->rtp_handles[i]; + if (h) { + url_close(h); + } + } + + ctx = &c->fmt_ctx; + + if (!c->last_packet_sent) { + if (ctx->oformat) { + /* prepare header */ + if (url_open_dyn_buf(&ctx->pb) >= 0) { + av_write_trailer(ctx); + url_close_dyn_buf(&ctx->pb, &c->pb_buffer); + } + } + } + + for(i=0; inb_streams; i++) + av_free(ctx->streams[i]) ; + + if (c->stream) + current_bandwidth -= c->stream->bandwidth; + av_freep(&c->pb_buffer); + av_freep(&c->packet_buffer); + av_free(c->buffer); + av_free(c); + nb_connections--; +} + +static int handle_connection(HTTPContext *c) +{ + int len, ret; switch(c->state) { case HTTPSTATE_WAIT_REQUEST: + case RTSPSTATE_WAIT_REQUEST: /* timeout ? */ if ((c->timeout - cur_time) < 0) return -1; @@ -489,26 +791,32 @@ static int handle_http(HTTPContext *c) if (!(c->poll_entry->revents & POLLIN)) return 0; /* read the data */ - len = read(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr); + read_loop: + len = read(c->fd, c->buffer_ptr, 1); if (len < 0) { if (errno != EAGAIN && errno != EINTR) return -1; } else if (len == 0) { return -1; } else { - /* search for end of request. XXX: not fully correct since garbage could come after the end */ - UINT8 *ptr; + /* search for end of request. */ + uint8_t *ptr; c->buffer_ptr += len; ptr = c->buffer_ptr; if ((ptr >= c->buffer + 2 && !memcmp(ptr-2, "\n\n", 2)) || (ptr >= c->buffer + 4 && !memcmp(ptr-4, "\r\n\r\n", 4))) { /* request found : parse it and reply */ - if (http_parse_request(c) < 0) + if (c->state == HTTPSTATE_WAIT_REQUEST) { + ret = http_parse_request(c); + } else { + ret = rtsp_parse_request(c); + } + if (ret < 0) return -1; } else if (ptr >= c->buffer_end) { /* request too long: cannot do anything */ return -1; - } + } else goto read_loop; } break; @@ -516,13 +824,14 @@ static int handle_http(HTTPContext *c) if (c->poll_entry->revents & (POLLERR | POLLHUP)) return -1; - /* no need to read if no events */ + /* no need to write if no events */ if (!(c->poll_entry->revents & POLLOUT)) 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 */ + av_freep(&c->pb_buffer); return -1; } } else { @@ -531,10 +840,12 @@ static int handle_http(HTTPContext *c) c->stream->bytes_served += len; c->data_count += len; if (c->buffer_ptr >= c->buffer_end) { + av_freep(&c->pb_buffer); /* if error, exit */ - if (c->http_error) + if (c->http_error) { return -1; - /* all the buffer was send : synchronize to the incoming stream */ + } + /* all the buffer was sent : synchronize to the incoming stream */ c->state = HTTPSTATE_SEND_DATA_HEADER; c->buffer_ptr = c->buffer_end = c->buffer; } @@ -544,12 +855,17 @@ static int handle_http(HTTPContext *c) case HTTPSTATE_SEND_DATA: case HTTPSTATE_SEND_DATA_HEADER: case HTTPSTATE_SEND_DATA_TRAILER: - /* no need to read if no events */ - if (c->poll_entry->revents & (POLLERR | POLLHUP)) - return -1; - - if (!(c->poll_entry->revents & POLLOUT)) - return 0; + /* for packetized output, we consider we can always write (the + input streams sets the speed). It may be better to verify + that we do not rely too much on the kernel queues */ + if (!c->is_packetized) { + if (c->poll_entry->revents & (POLLERR | POLLHUP)) + return -1; + + /* no need to read if no events */ + if (!(c->poll_entry->revents & POLLOUT)) + return 0; + } if (http_send_data(c) < 0) return -1; break; @@ -569,6 +885,60 @@ static int handle_http(HTTPContext *c) /* nothing to do, we'll be waken up by incoming feed packets */ break; + + case RTSPSTATE_SEND_REPLY: + if (c->poll_entry->revents & (POLLERR | POLLHUP)) { + av_freep(&c->pb_buffer); + return -1; + } + /* no need to write if no events */ + if (!(c->poll_entry->revents & POLLOUT)) + 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 */ + av_freep(&c->pb_buffer); + return -1; + } + } else { + c->buffer_ptr += len; + c->data_count += len; + if (c->buffer_ptr >= c->buffer_end) { + /* all the buffer was sent : wait for a new request */ + av_freep(&c->pb_buffer); + start_wait_request(c, 1); + } + } + break; + case RTSPSTATE_SEND_PACKET: + if (c->poll_entry->revents & (POLLERR | POLLHUP)) { + av_freep(&c->packet_buffer); + return -1; + } + /* no need to write if no events */ + if (!(c->poll_entry->revents & POLLOUT)) + return 0; + len = write(c->fd, c->packet_buffer_ptr, + c->packet_buffer_end - c->packet_buffer_ptr); + if (len < 0) { + if (errno != EAGAIN && errno != EINTR) { + /* error : close connection */ + av_freep(&c->packet_buffer); + return -1; + } + } else { + c->packet_buffer_ptr += len; + if (c->packet_buffer_ptr >= c->packet_buffer_end) { + /* all the buffer was sent : wait for a new request */ + av_freep(&c->packet_buffer); + c->state = RTSPSTATE_WAIT_REQUEST; + } + } + break; + case HTTPSTATE_READY: + /* nothing to do */ + break; default: return -1; } @@ -667,6 +1037,10 @@ static int modify_current_stream(HTTPContext *c, char *rates) FFStream *req = c->stream; int action_required = 0; + /* Not much we can do for a feed */ + if (!req->feed) + return 0; + for (i = 0; i < req->nb_streams; i++) { AVCodecContext *codec = &req->streams[i]->codec; @@ -708,14 +1082,94 @@ static void do_switch_stream(HTTPContext *c, int i) c->switch_feed_streams[i] = -1; } +/* XXX: factorize in utils.c ? */ +/* XXX: take care with different space meaning */ +static void skip_spaces(const char **pp) +{ + const char *p; + p = *pp; + while (*p == ' ' || *p == '\t') + p++; + *pp = p; +} + +static void get_word(char *buf, int buf_size, const char **pp) +{ + const char *p; + char *q; + + p = *pp; + skip_spaces(&p); + q = buf; + while (!isspace(*p) && *p != '\0') { + if ((q - buf) < buf_size - 1) + *q++ = *p; + p++; + } + if (buf_size > 0) + *q = '\0'; + *pp = p; +} + +static int validate_acl(FFStream *stream, HTTPContext *c) +{ + enum IPAddressAction last_action = IP_DENY; + IPAddressACL *acl; + struct in_addr *src = &c->from_addr.sin_addr; + unsigned long src_addr = ntohl(src->s_addr); + + for (acl = stream->acl; acl; acl = acl->next) { + if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr) { + return (acl->action == IP_ALLOW) ? 1 : 0; + } + last_action = acl->action; + } + + /* Nothing matched, so return not the last action */ + return (last_action == IP_DENY) ? 1 : 0; +} + +/* compute the real filename of a file by matching it without its + extensions to all the stream filenames */ +static void compute_real_filename(char *filename, int max_size) +{ + char file1[1024]; + char file2[1024]; + char *p; + FFStream *stream; + + /* compute filename by matching without the file extensions */ + pstrcpy(file1, sizeof(file1), filename); + p = strrchr(file1, '.'); + if (p) + *p = '\0'; + for(stream = first_stream; stream != NULL; stream = stream->next) { + pstrcpy(file2, sizeof(file2), stream->filename); + p = strrchr(file2, '.'); + if (p) + *p = '\0'; + if (!strcmp(file1, file2)) { + pstrcpy(filename, max_size, stream->filename); + break; + } + } +} + +enum RedirType { + REDIR_NONE, + REDIR_ASX, + REDIR_RAM, + REDIR_ASF, + REDIR_RTSP, + REDIR_SDP, +}; + /* parse http request and prepare header */ static int http_parse_request(HTTPContext *c) { char *p; int post; - int doing_asx; - int doing_asf_redirector; - int doing_ram; + enum RedirType redir_type; char cmd[32]; char info[1024], *filename; char url[1024], *q; @@ -728,14 +1182,7 @@ static int http_parse_request(HTTPContext *c) char *useragent = 0; p = c->buffer; - q = cmd; - while (!isspace(*p) && *p != '\0') { - if ((q - cmd) < sizeof(cmd) - 1) - *q++ = *p; - p++; - } - *q = '\0'; - + get_word(cmd, sizeof(cmd), (const char **)&p); pstrcpy(c->method, sizeof(c->method), cmd); if (!strcmp(cmd, "GET")) @@ -745,25 +1192,10 @@ static int http_parse_request(HTTPContext *c) else return -1; - while (isspace(*p)) p++; - q = url; - while (!isspace(*p) && *p != '\0') { - if ((q - url) < sizeof(url) - 1) - *q++ = *p; - p++; - } - *q = '\0'; - + get_word(url, sizeof(url), (const char **)&p); pstrcpy(c->url, sizeof(c->url), url); - while (isspace(*p)) p++; - q = protocol; - while (!isspace(*p) && *p != '\0') { - if ((q - protocol) < sizeof(protocol) - 1) - *q++ = *p; - p++; - } - *q = '\0'; + get_word(protocol, sizeof(protocol), (const char **)&p); if (strcmp(protocol, "HTTP/1.0") && strcmp(protocol, "HTTP/1.1")) return -1; @@ -796,38 +1228,33 @@ static int http_parse_request(HTTPContext *c) p++; } - if (strlen(filename) > 4 && strcmp(".asx", filename + strlen(filename) - 4) == 0) { - doing_asx = 1; + redir_type = REDIR_NONE; + if (match_ext(filename, "asx")) { + redir_type = REDIR_ASX; filename[strlen(filename)-1] = 'f'; - } else { - doing_asx = 0; - } - - if (strlen(filename) > 4 && strcmp(".asf", filename + strlen(filename) - 4) == 0 && + } else if (match_ext(filename, "asf") && (!useragent || strncasecmp(useragent, "NSPlayer", 8) != 0)) { /* if this isn't WMP or lookalike, return the redirector file */ - doing_asf_redirector = 1; - } else { - doing_asf_redirector = 0; - } - - if (strlen(filename) > 4 && - (strcmp(".rpm", filename + strlen(filename) - 4) == 0 || - strcmp(".ram", filename + strlen(filename) - 4) == 0)) { - doing_ram = 1; + redir_type = REDIR_ASF; + } else if (match_ext(filename, "rpm,ram")) { + redir_type = REDIR_RAM; strcpy(filename + strlen(filename)-2, "m"); - } else { - doing_ram = 0; + } else if (match_ext(filename, "rtsp")) { + redir_type = REDIR_RTSP; + compute_real_filename(filename, sizeof(url) - 1); + } else if (match_ext(filename, "sdp")) { + redir_type = REDIR_SDP; + compute_real_filename(filename, sizeof(url) - 1); } - + stream = first_stream; while (stream != NULL) { - if (!strcmp(stream->filename, filename)) + if (!strcmp(stream->filename, filename) && validate_acl(stream, c)) break; stream = stream->next; } if (stream == NULL) { - sprintf(msg, "File '%s' not found", url); + snprintf(msg, sizeof(msg), "File '%s' not found", url); goto send_error; } @@ -838,13 +1265,13 @@ static int http_parse_request(HTTPContext *c) if (stream->stream_type == STREAM_TYPE_REDIRECT) { c->http_error = 301; q = c->buffer; - q += sprintf(q, "HTTP/1.0 301 Moved\r\n"); - q += sprintf(q, "Location: %s\r\n", stream->feed_filename); - q += sprintf(q, "Content-type: text/html\r\n"); - q += sprintf(q, "\r\n"); - q += sprintf(q, "Moved\r\n"); - q += sprintf(q, "You should be redirected.\r\n", stream->feed_filename); - q += sprintf(q, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 301 Moved\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Location: %s\r\n", stream->feed_filename); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: text/html\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Moved\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "You should be redirected.\r\n", stream->feed_filename); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -864,36 +1291,20 @@ static int http_parse_request(HTTPContext *c) } if (post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { - /* See if we meet the bandwidth requirements */ - for(i=0;inb_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: - av_abort(); - } - } + current_bandwidth += stream->bandwidth; } - - c->bandwidth /= 1000; - nb_bandwidth += c->bandwidth; - - if (post == 0 && nb_max_bandwidth < nb_bandwidth) { + + if (post == 0 && max_bandwidth < current_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, "Too busy\r\n"); - q += sprintf(q, "The server is too busy to serve your request at this time.

\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, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 Server too busy\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: text/html\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Too busy\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The server is too busy to serve your request at this time.

\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "The bandwidth being served (including your stream) is %dkbit/sec, and this exceeds the limit of %dkbit/sec\r\n", + current_bandwidth, max_bandwidth); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -902,7 +1313,7 @@ static int http_parse_request(HTTPContext *c) return 0; } - if (doing_asx || doing_ram || doing_asf_redirector) { + if (redir_type != REDIR_NONE) { char *hostinfo = 0; for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { @@ -935,31 +1346,79 @@ static int http_parse_request(HTTPContext *c) 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, "\r\n"); - q += sprintf(q, "\r\n"); - q += sprintf(q, "\r\n", + switch(redir_type) { + case REDIR_ASX: + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 ASX Follows\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: video/x-ms-asf\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n", hostbuf, filename, info); - q += sprintf(q, "\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", + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + break; + case REDIR_RAM: + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 RAM Follows\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: audio/x-pn-realaudio\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "# Autogenerated by ffserver\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "http://%s/%s%s\r\n", hostbuf, filename, info); - } else if (doing_asf_redirector) { - q += sprintf(q, "HTTP/1.0 200 ASF Redirect follows\r\n"); - q += sprintf(q, "Content-type: video/x-ms-asf\r\n"); - q += sprintf(q, "\r\n"); - q += sprintf(q, "[Reference]\r\n"); - q += sprintf(q, "Ref1=http://%s/%s%s\r\n", + break; + case REDIR_ASF: + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 ASF Redirect follows\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: video/x-ms-asf\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "[Reference]\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Ref1=http://%s/%s%s\r\n", hostbuf, filename, info); - } else + break; + case REDIR_RTSP: + { + char hostname[256], *p; + /* extract only hostname */ + pstrcpy(hostname, sizeof(hostname), hostbuf); + p = strrchr(hostname, ':'); + if (p) + *p = '\0'; + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 RTSP Redirect follows\r\n"); + /* XXX: incorrect mime type ? */ + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: application/x-rtsp\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "rtsp://%s:%d/%s\r\n", + hostname, ntohs(my_rtsp_addr.sin_port), + filename); + } + break; + case REDIR_SDP: + { + uint8_t *sdp_data; + int sdp_data_size, len; + struct sockaddr_in my_addr; + + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 OK\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: application/sdp\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + + len = sizeof(my_addr); + getsockname(c->fd, (struct sockaddr *)&my_addr, &len); + + /* XXX: should use a dynamic buffer */ + sdp_data_size = prepare_sdp_description(stream, + &sdp_data, + my_addr.sin_addr); + if (sdp_data_size > 0) { + memcpy(q, sdp_data, sdp_data_size); + q += sdp_data_size; + *q = '\0'; + av_free(sdp_data); + } + } + break; + default: av_abort(); + break; + } /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -970,7 +1429,7 @@ static int http_parse_request(HTTPContext *c) } } - sprintf(msg, "ASX/RAM file not handled"); + snprintf(msg, sizeof(msg), "ASX/RAM file not handled"); goto send_error; } @@ -1010,7 +1469,7 @@ static int http_parse_request(HTTPContext *c) if (eol) { if (eol[-1] == '\r') eol--; - http_log("%.*s\n", eol - logline, logline); + http_log("%.*s\n", (int) (eol - logline), logline); c->suppress_log = 1; } } @@ -1035,11 +1494,12 @@ static int http_parse_request(HTTPContext *c) } } - sprintf(msg, "POST command not handled"); + snprintf(msg, sizeof(msg), "POST command not handled"); + c->stream = 0; goto send_error; } if (http_start_receive_data(c) < 0) { - sprintf(msg, "could not open feed"); + snprintf(msg, sizeof(msg), "could not open feed"); goto send_error; } c->http_error = 0; @@ -1058,33 +1518,28 @@ static int http_parse_request(HTTPContext *c) /* open input stream */ if (open_input_stream(c, info) < 0) { - sprintf(msg, "Input stream corresponding to '%s' not found", url); + snprintf(msg, sizeof(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"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "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, "Pragma: no-cache\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Pragma: no-cache\r\n"); /* for asf, we need extra headers */ - if (!strcmp(c->stream->fmt->name,"asf")) { + if (!strcmp(c->stream->fmt->name,"asf_stream")) { /* Need to allocate a client id */ - static int wmp_session; - if (!wmp_session) - wmp_session = time(0) & 0xffffff; + c->wmp_client_id = random() & 0x7fffffff; - c->wmp_client_id = ++wmp_session; - - q += sprintf(q, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id); - mime_type = "application/octet-stream"; + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id); } - q += sprintf(q, "Content-Type: %s\r\n", mime_type); - q += sprintf(q, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-Type: %s\r\n", mime_type); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); /* prepare output buffer */ c->http_error = 0; @@ -1095,13 +1550,13 @@ static int http_parse_request(HTTPContext *c) send_error: c->http_error = 404; q = c->buffer; - q += sprintf(q, "HTTP/1.0 404 Not Found\r\n"); - q += sprintf(q, "Content-type: %s\r\n", "text/html"); - q += sprintf(q, "\r\n"); - q += sprintf(q, "\n"); - q += sprintf(q, "404 Not Found\n"); - q += sprintf(q, "%s\n", msg); - q += sprintf(q, "\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 404 Not Found\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "Content-type: %s\r\n", "text/html"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "404 Not Found\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "%s\n", msg); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\n"); /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -1116,7 +1571,7 @@ static int http_parse_request(HTTPContext *c) return 0; } -static int fmt_bytecount(char *q, INT64 count) +static void fmt_bytecount(ByteIOContext *pb, int64_t count) { static const char *suffix = " kMGTP"; const char *s; @@ -1124,73 +1579,81 @@ static int fmt_bytecount(char *q, INT64 count) for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++) { } - return sprintf(q, "%lld%c", count, *s); + url_fprintf(pb, "%lld%c", count, *s); } static void compute_stats(HTTPContext *c) { HTTPContext *c1; FFStream *stream; - char *q, *p; + char *p; time_t ti; - int i; - char *new_buffer; + int i, len; + ByteIOContext pb1, *pb = &pb1; - new_buffer = av_malloc(65536); - if (new_buffer) { - av_free(c->buffer); - c->buffer_size = 65536; - c->buffer = new_buffer; + if (url_open_dyn_buf(pb) < 0) { + /* XXX: return an error ? */ c->buffer_ptr = c->buffer; - c->buffer_end = c->buffer + c->buffer_size; + c->buffer_end = c->buffer; + return; } - q = c->buffer; - q += sprintf(q, "HTTP/1.0 200 OK\r\n"); - q += sprintf(q, "Content-type: %s\r\n", "text/html"); - q += sprintf(q, "Pragma: no-cache\r\n"); - q += sprintf(q, "\r\n"); + url_fprintf(pb, "HTTP/1.0 200 OK\r\n"); + url_fprintf(pb, "Content-type: %s\r\n", "text/html"); + url_fprintf(pb, "Pragma: no-cache\r\n"); + url_fprintf(pb, "\r\n"); - q += sprintf(q, "FFServer Status\n"); + url_fprintf(pb, "FFServer Status\n"); if (c->stream->feed_filename) { - q += sprintf(q, "\n", c->stream->feed_filename); + url_fprintf(pb, "\n", c->stream->feed_filename); } - q += sprintf(q, "\n"); - q += sprintf(q, "

FFServer Status

\n"); + url_fprintf(pb, "\n"); + url_fprintf(pb, "

FFServer Status

\n"); /* format status */ - q += sprintf(q, "

Available Streams

\n"); - q += sprintf(q, "\n"); - q += sprintf(q, "
PathServed
Conns
bytes		FormatBit rate
kbits/s		Video
kbits/s
Codec		Audio
kbits/s
Codec		Feed\n"); + url_fprintf(pb, "

Available Streams

\n"); + url_fprintf(pb, "\n"); + url_fprintf(pb, "
PathServed
Conns
bytes		FormatBit rate
kbits/s		Video
kbits/s
Codec		Audio
kbits/s
Codec		Feed\n"); stream = first_stream; while (stream != NULL) { char sfilename[1024]; char *eosf; if (stream->feed != stream) { - pstrcpy(sfilename, sizeof(sfilename) - 1, stream->filename); + pstrcpy(sfilename, sizeof(sfilename) - 10, stream->filename); 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"); + } else if (stream->fmt == &rtp_mux) { + /* generate a sample RTSP director if + unicast. Generate an SDP redirector if + multicast */ + eosf = strrchr(sfilename, '.'); + if (!eosf) + eosf = sfilename + strlen(sfilename); + if (stream->is_multicast) + strcpy(eosf, ".sdp"); + else + strcpy(eosf, ".rtsp"); } } - q += sprintf(q, "
%s ", + url_fprintf(pb, "
%s ", sfilename, stream->filename); - q += sprintf(q, " %d ", + url_fprintf(pb, " %d ", stream->conns_served); - q += fmt_bytecount(q, stream->bytes_served); + fmt_bytecount(pb, stream->bytes_served); 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 = ""; + const char *audio_codec_name = ""; + const char *video_codec_name = ""; + const char *audio_codec_name_extra = ""; + const char *video_codec_name_extra = ""; for(i=0;inb_streams;i++) { AVStream *st = stream->streams[i]; @@ -1212,67 +1675,75 @@ static void compute_stats(HTTPContext *c) video_codec_name = codec->name; } break; + case CODEC_TYPE_DATA: + video_bit_rate += st->codec.bit_rate; + break; default: av_abort(); } } - q += sprintf(q, " %s %d %d %s %s %d %s %s", + url_fprintf(pb, " %s %d %d %s %s %d %s %s", stream->fmt->name, - (audio_bit_rate + video_bit_rate) / 1000, + stream->bandwidth, 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, "%s", stream->feed->filename); + url_fprintf(pb, "%s", stream->feed->filename); } else { - q += sprintf(q, "%s", stream->feed_filename); + url_fprintf(pb, "%s", stream->feed_filename); } - q += sprintf(q, "\n"); + url_fprintf(pb, "\n"); } break; default: - q += sprintf(q, " - - - - \n"); + url_fprintf(pb, " - - - - \n"); break; } } stream = stream->next; } - q += sprintf(q, "
\n"); + url_fprintf(pb, "
\n"); stream = first_stream; while (stream != NULL) { if (stream->feed == stream) { - q += sprintf(q, "

Feed %s

", stream->filename); + url_fprintf(pb, "

Feed %s

", stream->filename); if (stream->pid) { - FILE *pid_stat; - char ps_cmd[64]; - - q += sprintf(q, "Running as pid %d.\n", stream->pid); - -#ifdef linux - /* This is somewhat linux specific I guess */ - snprintf(ps_cmd, sizeof(ps_cmd), "ps -o \"%%cpu,bsdtime\" --no-headers %d", stream->pid); + url_fprintf(pb, "Running as pid %d.\n", stream->pid); - pid_stat = popen(ps_cmd, "r"); - if (pid_stat) { - char cpuperc[10]; - char cpuused[64]; - - if (fscanf(pid_stat, "%10s %64s", cpuperc, cpuused) == 2) { - q += sprintf(q, "Currently using %s%% of the cpu. Total time used %s.\n", - cpuperc, cpuused); +#if defined(linux) && !defined(CONFIG_NOCUTILS) + { + FILE *pid_stat; + char ps_cmd[64]; + + /* This is somewhat linux specific I guess */ + snprintf(ps_cmd, sizeof(ps_cmd), + "ps -o \"%%cpu,cputime\" --no-headers %d", + stream->pid); + + pid_stat = popen(ps_cmd, "r"); + if (pid_stat) { + char cpuperc[10]; + char cpuused[64]; + + if (fscanf(pid_stat, "%10s %64s", cpuperc, + cpuused) == 2) { + url_fprintf(pb, "Currently using %s%% of the cpu. Total time used %s.\n", + cpuperc, cpuused); + } + fclose(pid_stat); } - fclose(pid_stat); } #endif - q += sprintf(q, "

"); + url_fprintf(pb, "

"); } - q += sprintf(q, "
Streamtypekbits/scodecParameters\n"); + url_fprintf(pb, "
Streamtypekbits/scodecParameters\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"; + const char *type = "unknown"; char parameters[64]; parameters[0] = 0; @@ -1283,16 +1754,16 @@ static void compute_stats(HTTPContext *c) break; case CODEC_TYPE_VIDEO: type = "video"; - sprintf(parameters, "%dx%d, q=%d-%d, fps=%d", st->codec.width, st->codec.height, - st->codec.qmin, st->codec.qmax, st->codec.frame_rate / FRAME_RATE_BASE); + snprintf(parameters, sizeof(parameters), "%dx%d, q=%d-%d, fps=%d", st->codec.width, st->codec.height, + st->codec.qmin, st->codec.qmax, st->codec.frame_rate / st->codec.frame_rate_base); break; default: av_abort(); } - q += sprintf(q, "
%d%s%d%s%s\n", + url_fprintf(pb, "
%d%s%d%s%s\n", i, type, st->codec.bit_rate/1000, codec ? codec->name : "", parameters); } - q += sprintf(q, "
\n"); + url_fprintf(pb, "
\n"); } stream = stream->next; @@ -1307,9 +1778,9 @@ static void compute_stats(HTTPContext *c) /* feed status */ stream = first_feed; while (stream != NULL) { - q += sprintf(q, "

Feed '%s'

\n", stream->filename); - q += sprintf(q, "\n"); - q += sprintf(q, "
ParametersFrame countSizeAvg bitrate (kbits/s)\n"); + url_fprintf(pb, "

Feed '%s'

\n", stream->filename); + url_fprintf(pb, "\n"); + url_fprintf(pb, "
ParametersFrame countSizeAvg bitrate (kbits/s)\n"); for(i=0;inb_streams;i++) { AVStream *st = stream->streams[i]; FeedData *fdata = st->priv_data; @@ -1319,98 +1790,90 @@ static void compute_stats(HTTPContext *c) 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, "
%s %d %Ld %0.1f\n", + url_fprintf(pb, "
%s %d %Ld %0.1f\n", buf, enc->frame_number, fdata->data_count, avg / 1000.0); } - q += sprintf(q, "
\n"); + url_fprintf(pb, "
\n"); stream = stream->next_feed; } } #endif /* connection status */ - q += sprintf(q, "

Connection Status

\n"); + url_fprintf(pb, "

Connection Status

\n"); - q += sprintf(q, "Number of connections: %d / %d
\n", + url_fprintf(pb, "Number of connections: %d / %d
\n", nb_connections, nb_max_connections); - q += sprintf(q, "Bandwidth in use: %dk / %dk
\n", - nb_bandwidth, nb_max_bandwidth); + url_fprintf(pb, "Bandwidth in use: %dk / %dk
\n", + current_bandwidth, max_bandwidth); - q += sprintf(q, "\n"); - q += sprintf(q, "
#FileIPStateTarget bits/secActual bits/secBytes transferred\n"); + url_fprintf(pb, "\n"); + url_fprintf(pb, "
#FileIPProtoStateTarget bits/secActual bits/secBytes transferred\n"); c1 = first_http_ctx; i = 0; - while (c1 != NULL && q < (char *) c->buffer + c->buffer_size - 2048) { + while (c1 != NULL) { int bitrate; int j; bitrate = 0; - for (j = 0; j < c1->stream->nb_streams; j++) { - if (c1->feed_streams[j] >= 0) { - bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec.bit_rate; + if (c1->stream) { + for (j = 0; j < c1->stream->nb_streams; j++) { + if (!c1->stream->feed) { + bitrate += c1->stream->streams[j]->codec.bit_rate; + } else { + if (c1->feed_streams[j] >= 0) { + bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec.bit_rate; + } + } } } i++; p = inet_ntoa(c1->from_addr.sin_addr); - q += sprintf(q, "
%d%s%s %s %s ", - i, c1->stream->filename, - c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", - p, - http_state[c1->state]); - q += fmt_bytecount(q, bitrate); - q += sprintf(q, ""); - q += fmt_bytecount(q, compute_datarate(&c1->datarate, c1->data_count) * 8); - q += sprintf(q, ""); - q += fmt_bytecount(q, c1->data_count); - *q++ = '\n'; + url_fprintf(pb, "
%d%s%s%s%s%s", + i, + c1->stream ? c1->stream->filename : "", + c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", + p, + c1->protocol, + http_state[c1->state]); + fmt_bytecount(pb, bitrate); + url_fprintf(pb, ""); + fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8); + url_fprintf(pb, ""); + fmt_bytecount(pb, c1->data_count); + url_fprintf(pb, "\n"); c1 = c1->next; } - q += sprintf(q, "
\n"); + url_fprintf(pb, "
\n"); /* date */ ti = time(NULL); p = ctime(&ti); - q += sprintf(q, "
Generated at %s", p); - q += sprintf(q, "\n\n"); + url_fprintf(pb, "
Generated at %s", p); + url_fprintf(pb, "\n\n"); - c->buffer_ptr = c->buffer; - c->buffer_end = q; + len = url_close_dyn_buf(pb, &c->pb_buffer); + c->buffer_ptr = c->pb_buffer; + c->buffer_end = c->pb_buffer + len; } - -static void http_write_packet(void *opaque, - unsigned char *buf, int size) +/* check if the parser needs to be opened for stream i */ +static void open_parser(AVFormatContext *s, int i) { - HTTPContext *c = opaque; - - 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 > c->buffer_size) { - int new_buffer_size = c->buffer_size * 2; - UINT8 *new_buffer; - - if (new_buffer_size <= c->buffer_end - c->buffer + size) { - new_buffer_size = c->buffer_end - c->buffer + size + c->buffer_size; - } - - new_buffer = av_malloc(new_buffer_size); - if (new_buffer) { - memcpy(new_buffer, c->buffer, c->buffer_end - c->buffer); - c->buffer_end += (new_buffer - c->buffer); - c->buffer_ptr += (new_buffer - c->buffer); - av_free(c->buffer); - c->buffer = new_buffer; - c->buffer_size = new_buffer_size; - } else { - av_abort(); + AVStream *st = s->streams[i]; + AVCodec *codec; + + if (!st->codec.codec) { + codec = avcodec_find_decoder(st->codec.codec_id); + if (codec && (codec->capabilities & CODEC_CAP_PARSE_ONLY)) { + st->codec.parse_only = 1; + if (avcodec_open(&st->codec, codec) < 0) { + st->codec.parse_only = 0; + } } } - - memcpy(c->buffer_end, buf, size); - c->buffer_end += size; } static int open_input_stream(HTTPContext *c, const char *info) @@ -1418,8 +1881,8 @@ static int open_input_stream(HTTPContext *c, const char *info) char buf[128]; char input_filename[1024]; AVFormatContext *s; - int buf_size; - INT64 stream_pos; + int buf_size, i; + int64_t stream_pos; /* find file name */ if (c->stream->feed) { @@ -1430,9 +1893,9 @@ static int open_input_stream(HTTPContext *c, const char *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 = av_gettime() - prebuffer * 1000000; + stream_pos = av_gettime() - prebuffer * (int64_t)1000000; } else { - stream_pos = av_gettime() - c->stream->prebuffer * 1000; + stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000; } } else { strcpy(input_filename, c->stream->feed_filename); @@ -1447,132 +1910,132 @@ static int open_input_stream(HTTPContext *c, const char *info) if (input_filename[0] == '\0') return -1; +#if 0 + { time_t when = stream_pos / 1000000; + http_log("Stream pos = %lld, time=%s", stream_pos, ctime(&when)); + } +#endif + /* open stream */ - if (av_open_input_file(&s, input_filename, NULL, buf_size, NULL) < 0) + if (av_open_input_file(&s, input_filename, c->stream->ifmt, + buf_size, c->stream->ap_in) < 0) { + http_log("%s not found", input_filename); return -1; + } c->fmt_in = s; + + /* open each parser */ + for(i=0;inb_streams;i++) + open_parser(s, i); + + /* choose stream as clock source (we favorize video stream if + present) for packet sending */ + c->pts_stream_index = 0; + for(i=0;istream->nb_streams;i++) { + if (c->pts_stream_index == 0 && + c->stream->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO) { + c->pts_stream_index = i; + } + } +#if 0 if (c->fmt_in->iformat->read_seek) { c->fmt_in->iformat->read_seek(c->fmt_in, stream_pos); } - - // printf("stream %s opened pos=%0.6f\n", input_filename, stream_pos / 1000000.0); +#endif + /* set the start time (needed for maxtime and RTP packet timing) */ + c->start_time = cur_time; + c->first_pts = AV_NOPTS_VALUE; return 0; } +/* return the server clock (in us) */ +static int64_t get_server_clock(HTTPContext *c) +{ + /* compute current pts value from system time */ + return (int64_t)(cur_time - c->start_time) * 1000LL; +} + +/* return the estimated time at which the current packet must be sent + (in us) */ +static int64_t get_packet_send_clock(HTTPContext *c) +{ + int bytes_left, bytes_sent, frame_bytes; + + frame_bytes = c->cur_frame_bytes; + if (frame_bytes <= 0) { + return c->cur_pts; + } else { + bytes_left = c->buffer_end - c->buffer_ptr; + bytes_sent = frame_bytes - bytes_left; + return c->cur_pts + (c->cur_frame_duration * bytes_sent) / frame_bytes; + } +} + + static int http_prepare_data(HTTPContext *c) { - int i; + int i, len, ret; + AVFormatContext *ctx; + av_freep(&c->pb_buffer); switch(c->state) { case HTTPSTATE_SEND_DATA_HEADER: memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx)); - pstrcpy(c->fmt_ctx.author, sizeof(c->fmt_ctx.author), c->stream->author); - pstrcpy(c->fmt_ctx.comment, sizeof(c->fmt_ctx.comment), c->stream->comment); - pstrcpy(c->fmt_ctx.copyright, sizeof(c->fmt_ctx.copyright), c->stream->copyright); - pstrcpy(c->fmt_ctx.title, sizeof(c->fmt_ctx.title), c->stream->title); - - if (c->stream->feed) { - /* open output stream by using specified codecs */ - c->fmt_ctx.oformat = c->stream->fmt; - c->fmt_ctx.nb_streams = c->stream->nb_streams; - for(i=0;ifmt_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)); + pstrcpy(c->fmt_ctx.author, sizeof(c->fmt_ctx.author), + c->stream->author); + pstrcpy(c->fmt_ctx.comment, sizeof(c->fmt_ctx.comment), + c->stream->comment); + pstrcpy(c->fmt_ctx.copyright, sizeof(c->fmt_ctx.copyright), + c->stream->copyright); + pstrcpy(c->fmt_ctx.title, sizeof(c->fmt_ctx.title), + c->stream->title); + + /* open output stream by using specified codecs */ + c->fmt_ctx.oformat = c->stream->fmt; + c->fmt_ctx.nb_streams = c->stream->nb_streams; + for(i=0;ifmt_ctx.nb_streams;i++) { + AVStream *st; + st = av_mallocz(sizeof(AVStream)); + c->fmt_ctx.streams[i] = st; + /* if file or feed, then just take streams from FFStream struct */ + if (!c->stream->feed || + 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 */ + /* I'm pretty sure that this is not correct... + * However, without it, we crash + */ + st->codec.coded_frame = &dummy_frame; + } + c->got_key_frame = 0; - st->codec.frame_number = 0; /* XXX: should be done in - AVStream, not in codec */ - } - c->got_key_frame = 0; - } else { - /* open output stream by using codecs in specified file */ - c->fmt_ctx.oformat = c->stream->fmt; - c->fmt_ctx.nb_streams = c->fmt_in->nb_streams; - for(i=0;ifmt_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 */ - } - c->got_key_frame = 0; + /* prepare header and save header data in a stream */ + if (url_open_dyn_buf(&c->fmt_ctx.pb) < 0) { + /* XXX: potential leak */ + return -1; } - init_put_byte(&c->fmt_ctx.pb, c->pbuffer, c->pbuffer_size, - 1, c, NULL, http_write_packet, NULL); c->fmt_ctx.pb.is_streamed = 1; - /* prepare header */ + + av_set_parameters(&c->fmt_ctx, NULL); av_write_header(&c->fmt_ctx); + + len = url_close_dyn_buf(&c->fmt_ctx.pb, &c->pb_buffer); + c->buffer_ptr = c->pb_buffer; + c->buffer_end = c->pb_buffer + len; + c->state = HTTPSTATE_SEND_DATA; c->last_packet_sent = 0; 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; - } - - start_rptr = c->rptr; - if (fifo_read(&http_fifo, (UINT8 *)&hdr, sizeof(hdr), &c->rptr) < 0) - return 0; - payload_size = ntohs(hdr.payload_size); - payload = av_malloc(payload_size); - if (fifo_read(&http_fifo, payload, payload_size, &c->rptr) < 0) { - /* cannot read all the payload */ - av_free(payload); - c->rptr = start_rptr; - return 0; - } - - c->last_http_fifo_write_count = http_fifo_write_count - - fifo_size(&http_fifo, c->rptr); - - if (c->stream->stream_type != STREAM_TYPE_MASTER) { - /* test if the packet can be handled by this format */ - ret = 0; - for(i=0;ifmt_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) { - /* must send trailer now */ - c->state = HTTPSTATE_SEND_DATA_TRAILER; - } - } else { - /* master case : send everything */ - char *q; - q = c->buffer; - memcpy(q, &hdr, sizeof(hdr)); - q += sizeof(hdr); - memcpy(q, payload, payload_size); - q += payload_size; - c->buffer_ptr = c->buffer; - c->buffer_end = q; - } - av_free(payload); -#endif { AVPacket pkt; - + /* read a packet from the input stream */ if (c->stream->feed) { ffm_set_write_index(c->fmt_in, @@ -1584,121 +2047,288 @@ static int http_prepare_data(HTTPContext *c) c->stream->max_time + c->start_time - cur_time < 0) { /* We have timed out */ c->state = HTTPSTATE_SEND_DATA_TRAILER; - } else 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 */ - if (c->switch_pending) { - c->switch_pending = 0; + redo: + if (av_read_frame(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 { + if (c->stream->loop) { + av_close_input_file(c->fmt_in); + c->fmt_in = NULL; + if (open_input_stream(c, "") < 0) + goto no_loop; + goto redo; + } else { + no_loop: + /* must send trailer now because eof or error */ + c->state = HTTPSTATE_SEND_DATA_TRAILER; + } + } + } else { + /* update first pts if needed */ + if (c->first_pts == AV_NOPTS_VALUE) { + c->first_pts = pkt.dts; + c->start_time = cur_time; + } + /* send it to the appropriate stream */ + if (c->stream->feed) { + /* if coming from a feed, select the right stream */ + if (c->switch_pending) { + c->switch_pending = 0; + for(i=0;istream->nb_streams;i++) { + if (c->switch_feed_streams[i] == pkt.stream_index) { + if (pkt.flags & PKT_FLAG_KEY) { + do_switch_stream(c, i); + } + } + if (c->switch_feed_streams[i] >= 0) { + c->switch_pending = 1; + } + } + } for(i=0;istream->nb_streams;i++) { - if (c->switch_feed_streams[i] == pkt.stream_index) { + if (c->feed_streams[i] == pkt.stream_index) { + pkt.stream_index = i; if (pkt.flags & PKT_FLAG_KEY) { - do_switch_stream(c, i); + 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; } - } - if (c->switch_feed_streams[i] >= 0) { - c->switch_pending = 1; } } - } - for(i=0;istream->nb_streams;i++) { - if (c->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: + /* specific handling for RTP: we use several + output stream (one for each RTP + connection). XXX: need more abstract handling */ + if (c->is_packetized) { + AVStream *st; + /* compute send time and duration */ + st = c->fmt_in->streams[pkt.stream_index]; + c->cur_pts = pkt.dts; + if (st->start_time != AV_NOPTS_VALUE) + c->cur_pts -= st->start_time; + c->cur_frame_duration = pkt.duration; +#if 0 + printf("index=%d pts=%0.3f duration=%0.6f\n", + pkt.stream_index, + (double)c->cur_pts / + AV_TIME_BASE, + (double)c->cur_frame_duration / + AV_TIME_BASE); +#endif + /* find RTP context */ + c->packet_stream_index = pkt.stream_index; + ctx = c->rtp_ctx[c->packet_stream_index]; + if(!ctx) { + av_free_packet(&pkt); + break; } + codec = &ctx->streams[0]->codec; + /* only one stream per RTP connection */ + pkt.stream_index = 0; + } else { + ctx = &c->fmt_ctx; + /* Fudge here */ + codec = &ctx->streams[pkt.stream_index]->codec; } + + codec->coded_frame->key_frame = ((pkt.flags & PKT_FLAG_KEY) != 0); + if (c->is_packetized) { + int max_packet_size; + if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) + max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; + else + max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); + ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size); + } else { + ret = url_open_dyn_buf(&ctx->pb); + } + if (ret < 0) { + /* XXX: potential leak */ + return -1; + } + if (av_write_frame(ctx, &pkt)) { + c->state = HTTPSTATE_SEND_DATA_TRAILER; + } + + len = url_close_dyn_buf(&ctx->pb, &c->pb_buffer); + c->cur_frame_bytes = len; + c->buffer_ptr = c->pb_buffer; + c->buffer_end = c->pb_buffer + len; + + codec->frame_number++; + if (len == 0) + goto redo; } - } 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); } - - av_free_packet(&pkt); } } break; default: case HTTPSTATE_SEND_DATA_TRAILER: /* last packet test ? */ - if (c->last_packet_sent) + if (c->last_packet_sent || c->is_packetized) return -1; + ctx = &c->fmt_ctx; /* prepare header */ - av_write_trailer(&c->fmt_ctx); + if (url_open_dyn_buf(&ctx->pb) < 0) { + /* XXX: potential leak */ + return -1; + } + av_write_trailer(ctx); + len = url_close_dyn_buf(&ctx->pb, &c->pb_buffer); + c->buffer_ptr = c->pb_buffer; + c->buffer_end = c->pb_buffer + len; + c->last_packet_sent = 1; break; } return 0; } +/* in bit/s */ +#define SHORT_TERM_BANDWIDTH 8000000 + /* should convert the format at the same time */ +/* send data starting at c->buffer_ptr to the output connection + (either UDP or TCP connection) */ static int http_send_data(HTTPContext *c) { int len, ret; - while (c->buffer_ptr >= c->buffer_end) { - ret = http_prepare_data(c); - if (ret < 0) - return -1; - else if (ret == 0) { - continue; - } else { - /* state change requested */ - return 0; - } - } - - 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 */ + for(;;) { + if (c->buffer_ptr >= c->buffer_end) { + ret = http_prepare_data(c); + if (ret < 0) return -1; + else if (ret != 0) { + /* state change requested */ + break; } } else { - c->buffer_ptr += len; - c->data_count += len; - update_datarate(&c->datarate, c->data_count); - if (c->stream) - c->stream->bytes_served += len; + if (c->is_packetized) { + /* RTP data output */ + len = c->buffer_end - c->buffer_ptr; + if (len < 4) { + /* fail safe - should never happen */ + fail1: + c->buffer_ptr = c->buffer_end; + return 0; + } + len = (c->buffer_ptr[0] << 24) | + (c->buffer_ptr[1] << 16) | + (c->buffer_ptr[2] << 8) | + (c->buffer_ptr[3]); + if (len > (c->buffer_end - c->buffer_ptr)) + goto fail1; + if ((get_packet_send_clock(c) - get_server_clock(c)) > 0) { + /* nothing to send yet: we can wait */ + return 0; + } + + c->data_count += len; + update_datarate(&c->datarate, c->data_count); + if (c->stream) + c->stream->bytes_served += len; + + if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) { + /* RTP packets are sent inside the RTSP TCP connection */ + ByteIOContext pb1, *pb = &pb1; + int interleaved_index, size; + uint8_t header[4]; + HTTPContext *rtsp_c; + + rtsp_c = c->rtsp_c; + /* if no RTSP connection left, error */ + if (!rtsp_c) + return -1; + /* if already sending something, then wait. */ + if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST) { + break; + } + if (url_open_dyn_buf(pb) < 0) + goto fail1; + interleaved_index = c->packet_stream_index * 2; + /* RTCP packets are sent at odd indexes */ + if (c->buffer_ptr[1] == 200) + interleaved_index++; + /* write RTSP TCP header */ + header[0] = '$'; + header[1] = interleaved_index; + header[2] = len >> 8; + header[3] = len; + put_buffer(pb, header, 4); + /* write RTP packet data */ + c->buffer_ptr += 4; + put_buffer(pb, c->buffer_ptr, len); + size = url_close_dyn_buf(pb, &c->packet_buffer); + /* prepare asynchronous TCP sending */ + rtsp_c->packet_buffer_ptr = c->packet_buffer; + rtsp_c->packet_buffer_end = c->packet_buffer + size; + c->buffer_ptr += len; + + /* send everything we can NOW */ + len = write(rtsp_c->fd, rtsp_c->packet_buffer_ptr, + rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr); + if (len > 0) { + rtsp_c->packet_buffer_ptr += len; + } + if (rtsp_c->packet_buffer_ptr < rtsp_c->packet_buffer_end) { + /* if we could not send all the data, we will + send it later, so a new state is needed to + "lock" the RTSP TCP connection */ + rtsp_c->state = RTSPSTATE_SEND_PACKET; + break; + } else { + /* all data has been sent */ + av_freep(&c->packet_buffer); + } + } else { + /* send RTP packet directly in UDP */ + c->buffer_ptr += 4; + url_write(c->rtp_handles[c->packet_stream_index], + c->buffer_ptr, len); + c->buffer_ptr += len; + /* here we continue as we can send several packets per 10 ms slot */ + } + } else { + /* TCP data output */ + 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 { + return 0; + } + } else { + c->buffer_ptr += len; + } + c->data_count += len; + update_datarate(&c->datarate, c->data_count); + if (c->stream) + c->stream->bytes_served += len; + break; + } } - } + } /* for(;;) */ return 0; } @@ -1709,6 +2339,10 @@ static int http_start_receive_data(HTTPContext *c) if (c->stream->feed_opened) return -1; + /* Don't permit writing to this one */ + if (c->stream->readonly) + return -1; + /* open feed */ fd = open(c->stream->feed_filename, O_RDWR); if (fd < 0) @@ -1749,6 +2383,14 @@ static int http_receive_data(HTTPContext *c) } } + if (c->buffer_ptr - c->buffer >= 2 && c->data_count > FFM_PACKET_SIZE) { + if (c->buffer[0] != 'f' || + c->buffer[1] != 'm') { + http_log("Feed stream has become desynchronized -- disconnecting\n"); + goto fail; + } + } + if (c->buffer_ptr >= c->buffer_end) { FFStream *feed = c->stream; /* a packet has been received : write it in the store, except @@ -1797,39 +2439,793 @@ static int http_receive_data(HTTPContext *c) if (!fmt_in) goto fail; - s.priv_data = av_mallocz(fmt_in->priv_data_size); - if (!s.priv_data) + if (fmt_in->priv_data_size > 0) { + s.priv_data = av_mallocz(fmt_in->priv_data_size); + if (!s.priv_data) + goto fail; + } else + s.priv_data = NULL; + + if (fmt_in->read_header(&s, 0) < 0) { + av_freep(&s.priv_data); + goto fail; + } + + /* Now we have the actual streams */ + if (s.nb_streams != feed->nb_streams) { + av_freep(&s.priv_data); + goto fail; + } + for (i = 0; i < s.nb_streams; i++) { + memcpy(&feed->streams[i]->codec, + &s.streams[i]->codec, sizeof(AVCodecContext)); + } + av_freep(&s.priv_data); + } + c->buffer_ptr = c->buffer; + } + + return 0; + fail: + c->stream->feed_opened = 0; + close(c->feed_fd); + return -1; +} + +/********************************************************************/ +/* RTSP handling */ + +static void rtsp_reply_header(HTTPContext *c, enum RTSPStatusCode error_number) +{ + const char *str; + time_t ti; + char *p; + char buf2[32]; + + switch(error_number) { +#define DEF(n, c, s) case c: str = s; break; +#include "rtspcodes.h" +#undef DEF + default: + str = "Unknown Error"; + break; + } + + url_fprintf(c->pb, "RTSP/1.0 %d %s\r\n", error_number, str); + url_fprintf(c->pb, "CSeq: %d\r\n", c->seq); + + /* output GMT time */ + ti = time(NULL); + p = ctime(&ti); + strcpy(buf2, p); + p = buf2 + strlen(p) - 1; + if (*p == '\n') + *p = '\0'; + url_fprintf(c->pb, "Date: %s GMT\r\n", buf2); +} + +static void rtsp_reply_error(HTTPContext *c, enum RTSPStatusCode error_number) +{ + rtsp_reply_header(c, error_number); + url_fprintf(c->pb, "\r\n"); +} + +static int rtsp_parse_request(HTTPContext *c) +{ + const char *p, *p1, *p2; + char cmd[32]; + char url[1024]; + char protocol[32]; + char line[1024]; + ByteIOContext pb1; + int len; + RTSPHeader header1, *header = &header1; + + c->buffer_ptr[0] = '\0'; + p = c->buffer; + + get_word(cmd, sizeof(cmd), &p); + get_word(url, sizeof(url), &p); + get_word(protocol, sizeof(protocol), &p); + + pstrcpy(c->method, sizeof(c->method), cmd); + pstrcpy(c->url, sizeof(c->url), url); + pstrcpy(c->protocol, sizeof(c->protocol), protocol); + + c->pb = &pb1; + if (url_open_dyn_buf(c->pb) < 0) { + /* XXX: cannot do more */ + c->pb = NULL; /* safety */ + return -1; + } + + /* check version name */ + if (strcmp(protocol, "RTSP/1.0") != 0) { + rtsp_reply_error(c, RTSP_STATUS_VERSION); + goto the_end; + } + + /* parse each header line */ + memset(header, 0, sizeof(RTSPHeader)); + /* skip to next line */ + while (*p != '\n' && *p != '\0') + p++; + if (*p == '\n') + p++; + while (*p != '\0') { + p1 = strchr(p, '\n'); + if (!p1) + break; + p2 = p1; + if (p2 > p && p2[-1] == '\r') + p2--; + /* skip empty line */ + if (p2 == p) + break; + len = p2 - p; + if (len > sizeof(line) - 1) + len = sizeof(line) - 1; + memcpy(line, p, len); + line[len] = '\0'; + rtsp_parse_line(header, line); + p = p1 + 1; + } + + /* handle sequence number */ + c->seq = header->seq; + + if (!strcmp(cmd, "DESCRIBE")) { + rtsp_cmd_describe(c, url); + } else if (!strcmp(cmd, "OPTIONS")) { + rtsp_cmd_options(c, url); + } else if (!strcmp(cmd, "SETUP")) { + rtsp_cmd_setup(c, url, header); + } else if (!strcmp(cmd, "PLAY")) { + rtsp_cmd_play(c, url, header); + } else if (!strcmp(cmd, "PAUSE")) { + rtsp_cmd_pause(c, url, header); + } else if (!strcmp(cmd, "TEARDOWN")) { + rtsp_cmd_teardown(c, url, header); + } else { + rtsp_reply_error(c, RTSP_STATUS_METHOD); + } + the_end: + len = url_close_dyn_buf(c->pb, &c->pb_buffer); + c->pb = NULL; /* safety */ + if (len < 0) { + /* XXX: cannot do more */ + return -1; + } + c->buffer_ptr = c->pb_buffer; + c->buffer_end = c->pb_buffer + len; + c->state = RTSPSTATE_SEND_REPLY; + return 0; +} + +/* XXX: move that to rtsp.c, but would need to replace FFStream by + AVFormatContext */ +static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, + struct in_addr my_ip) +{ + ByteIOContext pb1, *pb = &pb1; + int i, payload_type, port, private_payload_type, j; + const char *ipstr, *title, *mediatype; + AVStream *st; + + if (url_open_dyn_buf(pb) < 0) + return -1; + + /* general media info */ + + url_fprintf(pb, "v=0\n"); + ipstr = inet_ntoa(my_ip); + url_fprintf(pb, "o=- 0 0 IN IP4 %s\n", ipstr); + title = stream->title; + if (title[0] == '\0') + title = "No Title"; + url_fprintf(pb, "s=%s\n", title); + if (stream->comment[0] != '\0') + url_fprintf(pb, "i=%s\n", stream->comment); + if (stream->is_multicast) { + url_fprintf(pb, "c=IN IP4 %s\n", inet_ntoa(stream->multicast_ip)); + } + /* for each stream, we output the necessary info */ + private_payload_type = RTP_PT_PRIVATE; + for(i = 0; i < stream->nb_streams; i++) { + st = stream->streams[i]; + if (st->codec.codec_id == CODEC_ID_MPEG2TS) { + mediatype = "video"; + } else { + switch(st->codec.codec_type) { + case CODEC_TYPE_AUDIO: + mediatype = "audio"; + break; + case CODEC_TYPE_VIDEO: + mediatype = "video"; + break; + default: + mediatype = "application"; + break; + } + } + /* NOTE: the port indication is not correct in case of + unicast. It is not an issue because RTSP gives it */ + payload_type = rtp_get_payload_type(&st->codec); + if (payload_type < 0) + payload_type = private_payload_type++; + if (stream->is_multicast) { + port = stream->multicast_port + 2 * i; + } else { + port = 0; + } + url_fprintf(pb, "m=%s %d RTP/AVP %d\n", + mediatype, port, payload_type); + if (payload_type >= RTP_PT_PRIVATE) { + /* for private payload type, we need to give more info */ + switch(st->codec.codec_id) { + case CODEC_ID_MPEG4: + { + uint8_t *data; + url_fprintf(pb, "a=rtpmap:%d MP4V-ES/%d\n", + payload_type, 90000); + /* we must also add the mpeg4 header */ + data = st->codec.extradata; + if (data) { + url_fprintf(pb, "a=fmtp:%d config=", payload_type); + for(j=0;jcodec.extradata_size;j++) { + url_fprintf(pb, "%02x", data[j]); + } + url_fprintf(pb, "\n"); + } + } + break; + default: + /* XXX: add other codecs ? */ goto fail; + } + } + url_fprintf(pb, "a=control:streamid=%d\n", i); + } + return url_close_dyn_buf(pb, pbuffer); + fail: + url_close_dyn_buf(pb, pbuffer); + av_free(*pbuffer); + return -1; +} + +static void rtsp_cmd_options(HTTPContext *c, const char *url) +{ +// rtsp_reply_header(c, RTSP_STATUS_OK); + url_fprintf(c->pb, "RTSP/1.0 %d %s\r\n", RTSP_STATUS_OK, "OK"); + url_fprintf(c->pb, "CSeq: %d\r\n", c->seq); + url_fprintf(c->pb, "Public: %s\r\n", "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE"); + url_fprintf(c->pb, "\r\n"); +} + +static void rtsp_cmd_describe(HTTPContext *c, const char *url) +{ + FFStream *stream; + char path1[1024]; + const char *path; + uint8_t *content; + int content_length, len; + struct sockaddr_in my_addr; + + /* find which url is asked */ + url_split(NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + path = path1; + if (*path == '/') + path++; + + for(stream = first_stream; stream != NULL; stream = stream->next) { + if (!stream->is_feed && stream->fmt == &rtp_mux && + !strcmp(path, stream->filename)) { + goto found; + } + } + /* no stream found */ + rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */ + return; + + found: + /* prepare the media description in sdp format */ + + /* get the host IP */ + len = sizeof(my_addr); + getsockname(c->fd, (struct sockaddr *)&my_addr, &len); + content_length = prepare_sdp_description(stream, &content, my_addr.sin_addr); + if (content_length < 0) { + rtsp_reply_error(c, RTSP_STATUS_INTERNAL); + return; + } + rtsp_reply_header(c, RTSP_STATUS_OK); + url_fprintf(c->pb, "Content-Type: application/sdp\r\n"); + url_fprintf(c->pb, "Content-Length: %d\r\n", content_length); + url_fprintf(c->pb, "\r\n"); + put_buffer(c->pb, content, content_length); +} + +static HTTPContext *find_rtp_session(const char *session_id) +{ + HTTPContext *c; + + if (session_id[0] == '\0') + return NULL; + + for(c = first_http_ctx; c != NULL; c = c->next) { + if (!strcmp(c->session_id, session_id)) + return c; + } + return NULL; +} + +static RTSPTransportField *find_transport(RTSPHeader *h, enum RTSPProtocol protocol) +{ + RTSPTransportField *th; + int i; + + for(i=0;inb_transports;i++) { + th = &h->transports[i]; + if (th->protocol == protocol) + return th; + } + return NULL; +} + +static void rtsp_cmd_setup(HTTPContext *c, const char *url, + RTSPHeader *h) +{ + FFStream *stream; + int stream_index, port; + char buf[1024]; + char path1[1024]; + const char *path; + HTTPContext *rtp_c; + RTSPTransportField *th; + struct sockaddr_in dest_addr; + RTSPActionServerSetup setup; + + /* find which url is asked */ + url_split(NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + path = path1; + if (*path == '/') + path++; + + /* now check each stream */ + for(stream = first_stream; stream != NULL; stream = stream->next) { + if (!stream->is_feed && stream->fmt == &rtp_mux) { + /* accept aggregate filenames only if single stream */ + if (!strcmp(path, stream->filename)) { + if (stream->nb_streams != 1) { + rtsp_reply_error(c, RTSP_STATUS_AGGREGATE); + return; + } + stream_index = 0; + goto found; + } + + for(stream_index = 0; stream_index < stream->nb_streams; + stream_index++) { + snprintf(buf, sizeof(buf), "%s/streamid=%d", + stream->filename, stream_index); + if (!strcmp(path, buf)) + goto found; + } + } + } + /* no stream found */ + rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */ + return; + found: + + /* generate session id if needed */ + if (h->session_id[0] == '\0') { + snprintf(h->session_id, sizeof(h->session_id), + "%08x%08x", (int)random(), (int)random()); + } + + /* find rtp session, and create it if none found */ + rtp_c = find_rtp_session(h->session_id); + if (!rtp_c) { + /* always prefer UDP */ + th = find_transport(h, RTSP_PROTOCOL_RTP_UDP); + if (!th) { + th = find_transport(h, RTSP_PROTOCOL_RTP_TCP); + if (!th) { + rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); + return; + } + } + + rtp_c = rtp_new_connection(&c->from_addr, stream, h->session_id, + th->protocol); + if (!rtp_c) { + rtsp_reply_error(c, RTSP_STATUS_BANDWIDTH); + return; + } + + /* open input stream */ + if (open_input_stream(rtp_c, "") < 0) { + rtsp_reply_error(c, RTSP_STATUS_INTERNAL); + return; + } + } + + /* test if stream is OK (test needed because several SETUP needs + to be done for a given file) */ + if (rtp_c->stream != stream) { + rtsp_reply_error(c, RTSP_STATUS_SERVICE); + return; + } + + /* test if stream is already set up */ + if (rtp_c->rtp_ctx[stream_index]) { + rtsp_reply_error(c, RTSP_STATUS_STATE); + return; + } + + /* check transport */ + th = find_transport(h, rtp_c->rtp_protocol); + if (!th || (th->protocol == RTSP_PROTOCOL_RTP_UDP && + th->client_port_min <= 0)) { + rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); + return; + } + + /* setup default options */ + setup.transport_option[0] = '\0'; + dest_addr = rtp_c->from_addr; + dest_addr.sin_port = htons(th->client_port_min); + + /* add transport option if needed */ + if (ff_rtsp_callback) { + setup.ipaddr = ntohl(dest_addr.sin_addr.s_addr); + if (ff_rtsp_callback(RTSP_ACTION_SERVER_SETUP, rtp_c->session_id, + (char *)&setup, sizeof(setup), + stream->rtsp_option) < 0) { + rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); + return; + } + dest_addr.sin_addr.s_addr = htonl(setup.ipaddr); + } + + /* setup stream */ + if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, c) < 0) { + rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); + return; + } + + /* now everything is OK, so we can send the connection parameters */ + rtsp_reply_header(c, RTSP_STATUS_OK); + /* session ID */ + url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); + + switch(rtp_c->rtp_protocol) { + case RTSP_PROTOCOL_RTP_UDP: + port = rtp_get_local_port(rtp_c->rtp_handles[stream_index]); + url_fprintf(c->pb, "Transport: RTP/AVP/UDP;unicast;" + "client_port=%d-%d;server_port=%d-%d", + th->client_port_min, th->client_port_min + 1, + port, port + 1); + break; + case RTSP_PROTOCOL_RTP_TCP: + url_fprintf(c->pb, "Transport: RTP/AVP/TCP;interleaved=%d-%d", + stream_index * 2, stream_index * 2 + 1); + break; + default: + break; + } + if (setup.transport_option[0] != '\0') { + url_fprintf(c->pb, ";%s", setup.transport_option); + } + url_fprintf(c->pb, "\r\n"); + + + url_fprintf(c->pb, "\r\n"); +} + + +/* find an rtp connection by using the session ID. Check consistency + with filename */ +static HTTPContext *find_rtp_session_with_url(const char *url, + const char *session_id) +{ + HTTPContext *rtp_c; + char path1[1024]; + const char *path; + char buf[1024]; + int s; + + rtp_c = find_rtp_session(session_id); + if (!rtp_c) + return NULL; + + /* find which url is asked */ + url_split(NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + path = path1; + if (*path == '/') + path++; + if(!strcmp(path, rtp_c->stream->filename)) return rtp_c; + for(s=0; sstream->nb_streams; ++s) { + snprintf(buf, sizeof(buf), "%s/streamid=%d", + rtp_c->stream->filename, s); + if(!strncmp(path, buf, sizeof(buf))) { + // XXX: Should we reply with RTSP_STATUS_ONLY_AGGREGATE if nb_streams>1? + return rtp_c; + } + } + return NULL; +} + +static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPHeader *h) +{ + HTTPContext *rtp_c; + + rtp_c = find_rtp_session_with_url(url, h->session_id); + if (!rtp_c) { + rtsp_reply_error(c, RTSP_STATUS_SESSION); + return; + } + + if (rtp_c->state != HTTPSTATE_SEND_DATA && + rtp_c->state != HTTPSTATE_WAIT_FEED && + rtp_c->state != HTTPSTATE_READY) { + rtsp_reply_error(c, RTSP_STATUS_STATE); + return; + } + +#if 0 + /* XXX: seek in stream */ + if (h->range_start != AV_NOPTS_VALUE) { + printf("range_start=%0.3f\n", (double)h->range_start / AV_TIME_BASE); + av_seek_frame(rtp_c->fmt_in, -1, h->range_start); + } +#endif + + rtp_c->state = HTTPSTATE_SEND_DATA; + + /* now everything is OK, so we can send the connection parameters */ + rtsp_reply_header(c, RTSP_STATUS_OK); + /* session ID */ + url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); + url_fprintf(c->pb, "\r\n"); +} + +static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPHeader *h) +{ + HTTPContext *rtp_c; + + rtp_c = find_rtp_session_with_url(url, h->session_id); + if (!rtp_c) { + rtsp_reply_error(c, RTSP_STATUS_SESSION); + return; + } + + if (rtp_c->state != HTTPSTATE_SEND_DATA && + rtp_c->state != HTTPSTATE_WAIT_FEED) { + rtsp_reply_error(c, RTSP_STATUS_STATE); + return; + } + + rtp_c->state = HTTPSTATE_READY; + rtp_c->first_pts = AV_NOPTS_VALUE; + /* now everything is OK, so we can send the connection parameters */ + rtsp_reply_header(c, RTSP_STATUS_OK); + /* session ID */ + url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); + url_fprintf(c->pb, "\r\n"); +} + +static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPHeader *h) +{ + HTTPContext *rtp_c; + + rtp_c = find_rtp_session_with_url(url, h->session_id); + if (!rtp_c) { + rtsp_reply_error(c, RTSP_STATUS_SESSION); + return; + } + + /* abort the session */ + close_connection(rtp_c); + + if (ff_rtsp_callback) { + ff_rtsp_callback(RTSP_ACTION_SERVER_TEARDOWN, rtp_c->session_id, + NULL, 0, + rtp_c->stream->rtsp_option); + } + + /* now everything is OK, so we can send the connection parameters */ + rtsp_reply_header(c, RTSP_STATUS_OK); + /* session ID */ + url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); + url_fprintf(c->pb, "\r\n"); +} + + +/********************************************************************/ +/* RTP handling */ + +static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, + FFStream *stream, const char *session_id, + enum RTSPProtocol rtp_protocol) +{ + HTTPContext *c = NULL; + const char *proto_str; + + /* XXX: should output a warning page when coming + close to the connection limit */ + if (nb_connections >= nb_max_connections) + goto fail; + + /* add a new connection */ + c = av_mallocz(sizeof(HTTPContext)); + if (!c) + goto fail; + + c->fd = -1; + c->poll_entry = NULL; + c->from_addr = *from_addr; + c->buffer_size = IOBUFFER_INIT_SIZE; + c->buffer = av_malloc(c->buffer_size); + if (!c->buffer) + goto fail; + nb_connections++; + c->stream = stream; + pstrcpy(c->session_id, sizeof(c->session_id), session_id); + c->state = HTTPSTATE_READY; + c->is_packetized = 1; + c->rtp_protocol = rtp_protocol; + + /* protocol is shown in statistics */ + switch(c->rtp_protocol) { + case RTSP_PROTOCOL_RTP_UDP_MULTICAST: + proto_str = "MCAST"; + break; + case RTSP_PROTOCOL_RTP_UDP: + proto_str = "UDP"; + break; + case RTSP_PROTOCOL_RTP_TCP: + proto_str = "TCP"; + break; + default: + proto_str = "???"; + break; + } + pstrcpy(c->protocol, sizeof(c->protocol), "RTP/"); + pstrcat(c->protocol, sizeof(c->protocol), proto_str); + + current_bandwidth += stream->bandwidth; + + c->next = first_http_ctx; + first_http_ctx = c; + return c; + + fail: + if (c) { + av_free(c->buffer); + av_free(c); + } + return NULL; +} + +/* add a new RTP stream in an RTP connection (used in RTSP SETUP + command). If RTP/TCP protocol is used, TCP connection 'rtsp_c' is + used. */ +static int rtp_new_av_stream(HTTPContext *c, + int stream_index, struct sockaddr_in *dest_addr, + HTTPContext *rtsp_c) +{ + AVFormatContext *ctx; + AVStream *st; + char *ipaddr; + URLContext *h; + uint8_t *dummy_buf; + char buf2[32]; + int max_packet_size; + + /* now we can open the relevant output stream */ + ctx = av_alloc_format_context(); + if (!ctx) + return -1; + ctx->oformat = &rtp_mux; + + st = av_mallocz(sizeof(AVStream)); + if (!st) + goto fail; + ctx->nb_streams = 1; + ctx->streams[0] = st; - if (fmt_in->read_header(&s, 0) < 0) { - av_freep(&s.priv_data); - goto fail; - } + if (!c->stream->feed || + c->stream->feed == c->stream) { + memcpy(st, c->stream->streams[stream_index], sizeof(AVStream)); + } else { + memcpy(st, + c->stream->feed->streams[c->stream->feed_streams[stream_index]], + sizeof(AVStream)); + } + + /* build destination RTP address */ + ipaddr = inet_ntoa(dest_addr->sin_addr); - /* Now we have the actual streams */ - if (s.nb_streams != feed->nb_streams) { - av_freep(&s.priv_data); - goto fail; - } - for (i = 0; i < s.nb_streams; i++) { - memcpy(&feed->streams[i]->codec, - &s.streams[i]->codec, sizeof(AVCodecContext)); - } - av_freep(&s.priv_data); + switch(c->rtp_protocol) { + case RTSP_PROTOCOL_RTP_UDP: + case RTSP_PROTOCOL_RTP_UDP_MULTICAST: + /* RTP/UDP case */ + + /* XXX: also pass as parameter to function ? */ + if (c->stream->is_multicast) { + int ttl; + ttl = c->stream->multicast_ttl; + if (!ttl) + ttl = 16; + snprintf(ctx->filename, sizeof(ctx->filename), + "rtp://%s:%d?multicast=1&ttl=%d", + ipaddr, ntohs(dest_addr->sin_port), ttl); + } else { + snprintf(ctx->filename, sizeof(ctx->filename), + "rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port)); } - c->buffer_ptr = c->buffer; + + if (url_open(&h, ctx->filename, URL_WRONLY) < 0) + goto fail; + c->rtp_handles[stream_index] = h; + max_packet_size = url_get_max_packet_size(h); + break; + case RTSP_PROTOCOL_RTP_TCP: + /* RTP/TCP case */ + c->rtsp_c = rtsp_c; + max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; + break; + default: + goto fail; } + http_log("%s:%d - - [%s] \"PLAY %s/streamid=%d %s\"\n", + ipaddr, ntohs(dest_addr->sin_port), + ctime1(buf2), + c->stream->filename, stream_index, c->protocol); + + /* normally, no packets should be output here, but the packet size may be checked */ + if (url_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) { + /* XXX: close stream */ + goto fail; + } + av_set_parameters(ctx, NULL); + if (av_write_header(ctx) < 0) { + fail: + if (h) + url_close(h); + av_free(ctx); + return -1; + } + url_close_dyn_buf(&ctx->pb, &dummy_buf); + av_free(dummy_buf); + + c->rtp_ctx[stream_index] = ctx; return 0; - fail: - c->stream->feed_opened = 0; - close(c->feed_fd); - return -1; +} + +/********************************************************************/ +/* ffserver initialization */ + +static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec) +{ + AVStream *fst; + + fst = av_mallocz(sizeof(AVStream)); + if (!fst) + return NULL; + fst->priv_data = av_mallocz(sizeof(FeedData)); + memcpy(&fst->codec, codec, sizeof(AVCodecContext)); + fst->codec.coded_frame = &dummy_frame; + fst->index = stream->nb_streams; + stream->streams[stream->nb_streams++] = fst; + return fst; } /* return the stream number in the feed */ -int add_av_stream(FFStream *feed, - AVStream *st) +static int add_av_stream(FFStream *feed, AVStream *st) { AVStream *fst; AVCodecContext *av, *av1; @@ -1853,6 +3249,7 @@ int add_av_stream(FFStream *feed, if (av1->width == av->width && av1->height == av->height && av1->frame_rate == av->frame_rate && + av1->frame_rate_base == av->frame_rate_base && av1->gop_size == av->gop_size) goto found; break; @@ -1862,19 +3259,127 @@ int add_av_stream(FFStream *feed, } } - fst = av_mallocz(sizeof(AVStream)); + fst = add_av_stream1(feed, av); 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; } +static void remove_stream(FFStream *stream) +{ + FFStream **ps; + ps = &first_stream; + while (*ps != NULL) { + if (*ps == stream) { + *ps = (*ps)->next; + } else { + ps = &(*ps)->next; + } + } +} + +/* specific mpeg4 handling : we extract the raw parameters */ +static void extract_mpeg4_header(AVFormatContext *infile) +{ + int mpeg4_count, i, size; + AVPacket pkt; + AVStream *st; + const uint8_t *p; + + mpeg4_count = 0; + for(i=0;inb_streams;i++) { + st = infile->streams[i]; + if (st->codec.codec_id == CODEC_ID_MPEG4 && + st->codec.extradata_size == 0) { + mpeg4_count++; + } + } + if (!mpeg4_count) + return; + + printf("MPEG4 without extra data: trying to find header in %s\n", infile->filename); + while (mpeg4_count > 0) { + if (av_read_packet(infile, &pkt) < 0) + break; + st = infile->streams[pkt.stream_index]; + if (st->codec.codec_id == CODEC_ID_MPEG4 && + st->codec.extradata_size == 0) { + av_freep(&st->codec.extradata); + /* fill extradata with the header */ + /* XXX: we make hard suppositions here ! */ + p = pkt.data; + while (p < pkt.data + pkt.size - 4) { + /* stop when vop header is found */ + if (p[0] == 0x00 && p[1] == 0x00 && + p[2] == 0x01 && p[3] == 0xb6) { + size = p - pkt.data; + // av_hex_dump(pkt.data, size); + st->codec.extradata = av_malloc(size); + st->codec.extradata_size = size; + memcpy(st->codec.extradata, pkt.data, size); + break; + } + p++; + } + mpeg4_count--; + } + av_free_packet(&pkt); + } +} + +/* compute the needed AVStream for each file */ +static void build_file_streams(void) +{ + FFStream *stream, *stream_next; + AVFormatContext *infile; + int i; + + /* gather all streams */ + for(stream = first_stream; stream != NULL; stream = stream_next) { + stream_next = stream->next; + if (stream->stream_type == STREAM_TYPE_LIVE && + !stream->feed) { + /* the stream comes from a file */ + /* try to open the file */ + /* open stream */ + stream->ap_in = av_mallocz(sizeof(AVFormatParameters)); + if (stream->fmt == &rtp_mux) { + /* specific case : if transport stream output to RTP, + we use a raw transport stream reader */ + stream->ap_in->mpeg2ts_raw = 1; + stream->ap_in->mpeg2ts_compute_pcr = 1; + } + + if (av_open_input_file(&infile, stream->feed_filename, + stream->ifmt, 0, stream->ap_in) < 0) { + http_log("%s not found", stream->feed_filename); + /* remove stream (no need to spend more time on it) */ + fail: + remove_stream(stream); + } else { + /* find all the AVStreams inside and reference them in + 'stream' */ + if (av_find_stream_info(infile) < 0) { + http_log("Could not find codec parameters from '%s'", + stream->feed_filename); + av_close_input_file(infile); + goto fail; + } + extract_mpeg4_header(infile); + + for(i=0;inb_streams;i++) { + add_av_stream1(stream, &infile->streams[i]->codec); + } + av_close_input_file(infile); + } + } + } +} + /* compute the needed AVStream for each feed */ -void build_feed_streams(void) +static void build_feed_streams(void) { FFStream *stream, *feed; int i; @@ -1884,6 +3389,7 @@ void build_feed_streams(void) feed = stream->feed; if (feed) { if (!stream->is_feed) { + /* we handle a stream coming from a feed */ for(i=0;inb_streams;i++) { stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]); } @@ -1907,9 +3413,90 @@ void build_feed_streams(void) for(feed = first_feed; feed != NULL; feed = feed->next_feed) { int fd; + if (url_exist(feed->feed_filename)) { + /* See if it matches */ + AVFormatContext *s; + int matches = 0; + + if (av_open_input_file(&s, feed->feed_filename, NULL, FFM_PACKET_SIZE, NULL) >= 0) { + /* Now see if it matches */ + if (s->nb_streams == feed->nb_streams) { + matches = 1; + for(i=0;inb_streams;i++) { + AVStream *sf, *ss; + sf = feed->streams[i]; + ss = s->streams[i]; + + if (sf->index != ss->index || + sf->id != ss->id) { + printf("Index & Id do not match for stream %d (%s)\n", + i, feed->feed_filename); + matches = 0; + } else { + AVCodecContext *ccf, *ccs; + + ccf = &sf->codec; + ccs = &ss->codec; +#define CHECK_CODEC(x) (ccf->x != ccs->x) + + if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) { + printf("Codecs do not match for stream %d\n", i); + matches = 0; + } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) { + printf("Codec bitrates do not match for stream %d\n", i); + matches = 0; + } else if (ccf->codec_type == CODEC_TYPE_VIDEO) { + if (CHECK_CODEC(frame_rate) || + CHECK_CODEC(frame_rate_base) || + CHECK_CODEC(width) || + CHECK_CODEC(height)) { + printf("Codec width, height and framerate do not match for stream %d\n", i); + matches = 0; + } + } else if (ccf->codec_type == CODEC_TYPE_AUDIO) { + if (CHECK_CODEC(sample_rate) || + CHECK_CODEC(channels) || + CHECK_CODEC(frame_size)) { + printf("Codec sample_rate, channels, frame_size do not match for stream %d\n", i); + matches = 0; + } + } else { + printf("Unknown codec type\n"); + matches = 0; + } + } + if (!matches) { + break; + } + } + } else { + printf("Deleting feed file '%s' as stream counts differ (%d != %d)\n", + feed->feed_filename, s->nb_streams, feed->nb_streams); + } + + av_close_input_file(s); + } else { + printf("Deleting feed file '%s' as it appears to be corrupt\n", + feed->feed_filename); + } + if (!matches) { + if (feed->readonly) { + printf("Unable to delete feed file '%s' as it is marked readonly\n", + feed->feed_filename); + exit(1); + } + unlink(feed->feed_filename); + } + } if (!url_exist(feed->feed_filename)) { AVFormatContext s1, *s = &s1; + if (feed->readonly) { + printf("Unable to create feed file '%s' as it is marked readonly\n", + feed->feed_filename); + exit(1); + } + /* 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", @@ -1923,6 +3510,7 @@ void build_feed_streams(void) st = feed->streams[i]; s->streams[i] = st; } + av_set_parameters(s, NULL); av_write_header(s); /* XXX: need better api */ av_freep(&s->priv_data); @@ -1946,6 +3534,29 @@ void build_feed_streams(void) } } +/* compute the bandwidth used by each stream */ +static void compute_bandwidth(void) +{ + int bandwidth, i; + FFStream *stream; + + for(stream = first_stream; stream != NULL; stream = stream->next) { + bandwidth = 0; + for(i=0;inb_streams;i++) { + AVStream *st = stream->streams[i]; + switch(st->codec.codec_type) { + case CODEC_TYPE_AUDIO: + case CODEC_TYPE_VIDEO: + bandwidth += st->codec.bit_rate; + break; + default: + break; + } + } + stream->bandwidth = (bandwidth + 999) / 1000; + } +} + static void get_arg(char *buf, int buf_size, const char **pp) { const char *p; @@ -1979,7 +3590,7 @@ static void get_arg(char *buf, int buf_size, const char **pp) } /* add a codec and set the default parameters */ -void add_codec(FFStream *stream, AVCodecContext *av) +static void add_codec(FFStream *stream, AVCodecContext *av) { AVStream *st; @@ -1996,8 +3607,10 @@ void add_codec(FFStream *stream, AVCodecContext *av) case CODEC_TYPE_VIDEO: if (av->bit_rate == 0) av->bit_rate = 64000; - if (av->frame_rate == 0) - av->frame_rate = 5 * FRAME_RATE_BASE; + if (av->frame_rate == 0){ + av->frame_rate = 5; + av->frame_rate_base = 1; + } if (av->width == 0 || av->height == 0) { av->width = 160; av->height = 128; @@ -2014,6 +3627,19 @@ void add_codec(FFStream *stream, AVCodecContext *av) av->qcompress = 0.5; av->qblur = 0.5; + if (!av->rc_eq) + av->rc_eq = "tex^qComp"; + if (!av->i_quant_factor) + av->i_quant_factor = -0.8; + if (!av->b_quant_factor) + av->b_quant_factor = 1.25; + if (!av->b_quant_offset) + av->b_quant_offset = 1.25; + if (!av->rc_min_rate) + av->rc_min_rate = av->bit_rate / 2; + if (!av->rc_max_rate) + av->rc_max_rate = av->bit_rate * 2; + break; default: av_abort(); @@ -2026,7 +3652,7 @@ void add_codec(FFStream *stream, AVCodecContext *av) memcpy(&st->codec, av, sizeof(AVCodecContext)); } -int opt_audio_codec(const char *arg) +static int opt_audio_codec(const char *arg) { AVCodec *p; @@ -2043,7 +3669,7 @@ int opt_audio_codec(const char *arg) return p->id; } -int opt_video_codec(const char *arg) +static int opt_video_codec(const char *arg) { AVCodec *p; @@ -2060,7 +3686,33 @@ int opt_video_codec(const char *arg) return p->id; } -int parse_ffconfig(const char *filename) +/* simplistic plugin support */ + +#ifdef CONFIG_HAVE_DLOPEN +void load_module(const char *filename) +{ + void *dll; + void (*init_func)(void); + dll = dlopen(filename, RTLD_NOW); + if (!dll) { + fprintf(stderr, "Could not load module '%s' - %s\n", + filename, dlerror()); + return; + } + + init_func = dlsym(dll, "ffserver_module_init"); + if (!init_func) { + fprintf(stderr, + "%s: init function 'ffserver_module_init()' not found\n", + filename); + dlclose(dll); + } + + init_func(); +} +#endif + +static int parse_ffconfig(const char *filename) { FILE *f; char line[1024]; @@ -2104,10 +3756,22 @@ int parse_ffconfig(const char *filename) if (!strcasecmp(cmd, "Port")) { get_arg(arg, sizeof(arg), &p); - my_addr.sin_port = htons (atoi(arg)); + my_http_addr.sin_port = htons (atoi(arg)); } else if (!strcasecmp(cmd, "BindAddress")) { get_arg(arg, sizeof(arg), &p); - if (!inet_aton(arg, &my_addr.sin_addr)) { + if (!inet_aton(arg, &my_http_addr.sin_addr)) { + fprintf(stderr, "%s:%d: Invalid IP address: %s\n", + filename, line_num, arg); + errors++; + } + } else if (!strcasecmp(cmd, "NoDaemon")) { + ffserver_daemon = 0; + } else if (!strcasecmp(cmd, "RTSPPort")) { + get_arg(arg, sizeof(arg), &p); + my_rtsp_addr.sin_port = htons (atoi(arg)); + } else if (!strcasecmp(cmd, "RTSPBindAddress")) { + get_arg(arg, sizeof(arg), &p); + if (!inet_aton(arg, &my_rtsp_addr.sin_addr)) { fprintf(stderr, "%s:%d: Invalid IP address: %s\n", filename, line_num, arg); errors++; @@ -2130,7 +3794,7 @@ int parse_ffconfig(const char *filename) filename, line_num, arg); errors++; } else { - nb_max_bandwidth = val; + max_bandwidth = val; } } else if (!strcasecmp(cmd, "CustomLog")) { get_arg(logfilename, sizeof(logfilename), &p); @@ -2178,14 +3842,21 @@ int parse_ffconfig(const char *filename) if (!argbuf[0]) break; - feed->child_argv[i] = av_malloc(strlen(argbuf + 1)); + feed->child_argv[i] = av_malloc(strlen(argbuf) + 1); strcpy(feed->child_argv[i], argbuf); } feed->child_argv[i] = av_malloc(30 + strlen(feed->filename)); snprintf(feed->child_argv[i], 256, "http://127.0.0.1:%d/%s", - ntohs(my_addr.sin_port), feed->filename); + ntohs(my_http_addr.sin_port), feed->filename); + } + } else if (!strcasecmp(cmd, "ReadOnlyFile")) { + if (feed) { + get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p); + feed->readonly = 1; + } else if (stream) { + get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p); } } else if (!strcasecmp(cmd, "File")) { if (feed) { @@ -2212,13 +3883,14 @@ int parse_ffconfig(const char *filename) fsize *= 1024 * 1024 * 1024; break; } - feed->feed_max_size = (INT64)fsize; + feed->feed_max_size = (int64_t)fsize; } } else if (!strcasecmp(cmd, "")) { if (!feed) { fprintf(stderr, "%s:%d: No corresponding for \n", filename, line_num); errors++; +#if 0 } else { /* Make sure that we start out clean */ if (unlink(feed->feed_filename) < 0 @@ -2227,6 +3899,7 @@ int parse_ffconfig(const char *filename) filename, line_num, feed->feed_filename, strerror(errno)); errors++; } +#endif } feed = NULL; } else if (!strcasecmp(cmd, "filename, '>'); if (*q) *q = '\0'; - stream->fmt = guess_format(NULL, stream->filename, NULL); + stream->fmt = guess_stream_format(NULL, stream->filename, NULL); memset(&audio_enc, 0, sizeof(AVCodecContext)); memset(&video_enc, 0, sizeof(AVCodecContext)); audio_id = CODEC_ID_NONE; @@ -2283,7 +3956,7 @@ int parse_ffconfig(const char *filename) /* jpeg cannot be used here, so use single frame jpeg */ if (!strcmp(arg, "jpeg")) strcpy(arg, "singlejpeg"); - stream->fmt = guess_format(arg, NULL, NULL); + stream->fmt = guess_stream_format(arg, NULL, NULL); if (!stream->fmt) { fprintf(stderr, "%s:%d: Unknown Format: %s\n", filename, line_num, arg); @@ -2294,6 +3967,12 @@ int parse_ffconfig(const char *filename) audio_id = stream->fmt->audio_codec; video_id = stream->fmt->video_codec; } + } else if (!strcasecmp(cmd, "InputFormat")) { + stream->ifmt = av_find_input_format(arg); + if (!stream->ifmt) { + fprintf(stderr, "%s:%d: Unknown input format: %s\n", + filename, line_num, arg); + } } else if (!strcasecmp(cmd, "FaviconURL")) { if (stream && stream->stream_type == STREAM_TYPE_STATUS) { get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p); @@ -2321,7 +4000,7 @@ int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "Preroll")) { get_arg(arg, sizeof(arg), &p); if (stream) { - stream->prebuffer = atoi(arg) * 1000; + stream->prebuffer = atof(arg) * 1000; } } else if (!strcasecmp(cmd, "StartSendOnKey")) { if (stream) { @@ -2346,7 +4025,7 @@ int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "MaxTime")) { get_arg(arg, sizeof(arg), &p); if (stream) { - stream->max_time = atoi(arg) * 1000; + stream->max_time = atof(arg) * 1000; } } else if (!strcasecmp(cmd, "AudioBitRate")) { get_arg(arg, sizeof(arg), &p); @@ -2363,6 +4042,36 @@ int parse_ffconfig(const char *filename) if (stream) { audio_enc.sample_rate = atoi(arg); } + } else if (!strcasecmp(cmd, "AudioQuality")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { +// audio_enc.quality = atof(arg) * 1000; + } + } else if (!strcasecmp(cmd, "VideoBitRateRange")) { + if (stream) { + int minrate, maxrate; + + get_arg(arg, sizeof(arg), &p); + + if (sscanf(arg, "%d-%d", &minrate, &maxrate) == 2) { + video_enc.rc_min_rate = minrate * 1000; + video_enc.rc_max_rate = maxrate * 1000; + } else { + fprintf(stderr, "%s:%d: Incorrect format for VideoBitRateRange -- should be -: %s\n", + filename, line_num, arg); + errors++; + } + } + } else if (!strcasecmp(cmd, "VideoBufferSize")) { + if (stream) { + get_arg(arg, sizeof(arg), &p); + video_enc.rc_buffer_size = atoi(arg) * 1024; + } + } else if (!strcasecmp(cmd, "VideoBitRateTolerance")) { + if (stream) { + get_arg(arg, sizeof(arg), &p); + video_enc.bit_rate_tolerance = atoi(arg) * 1000; + } } else if (!strcasecmp(cmd, "VideoBitRate")) { get_arg(arg, sizeof(arg), &p); if (stream) { @@ -2382,7 +4091,8 @@ int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "VideoFrameRate")) { get_arg(arg, sizeof(arg), &p); if (stream) { - video_enc.frame_rate = (int)(strtod(arg, NULL) * FRAME_RATE_BASE); + video_enc.frame_rate_base= DEFAULT_FRAME_RATE_BASE; + video_enc.frame_rate = (int)(strtod(arg, NULL) * video_enc.frame_rate_base); } } else if (!strcasecmp(cmd, "VideoGopSize")) { get_arg(arg, sizeof(arg), &p); @@ -2395,9 +4105,15 @@ int parse_ffconfig(const char *filename) } } else if (!strcasecmp(cmd, "VideoHighQuality")) { if (stream) { - video_enc.flags |= CODEC_FLAG_HQ; + video_enc.mb_decision = FF_MB_DECISION_BITS; + } + } else if (!strcasecmp(cmd, "Video4MotionVector")) { + if (stream) { + video_enc.mb_decision = FF_MB_DECISION_BITS; //FIXME remove + video_enc.flags |= CODEC_FLAG_4MV; } } else if (!strcasecmp(cmd, "VideoQDiff")) { + get_arg(arg, sizeof(arg), &p); if (stream) { video_enc.max_qdiff = atoi(arg); if (video_enc.max_qdiff < 1 || video_enc.max_qdiff > 31) { @@ -2407,6 +4123,7 @@ int parse_ffconfig(const char *filename) } } } else if (!strcasecmp(cmd, "VideoQMax")) { + get_arg(arg, sizeof(arg), &p); if (stream) { video_enc.qmax = atoi(arg); if (video_enc.qmax < 1 || video_enc.qmax > 31) { @@ -2416,6 +4133,7 @@ int parse_ffconfig(const char *filename) } } } else if (!strcasecmp(cmd, "VideoQMin")) { + get_arg(arg, sizeof(arg), &p); if (stream) { video_enc.qmin = atoi(arg); if (video_enc.qmin < 1 || video_enc.qmin > 31) { @@ -2424,10 +4142,131 @@ int parse_ffconfig(const char *filename) errors++; } } + } else if (!strcasecmp(cmd, "LumaElim")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + video_enc.luma_elim_threshold = atoi(arg); + } + } else if (!strcasecmp(cmd, "ChromaElim")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + video_enc.chroma_elim_threshold = atoi(arg); + } + } else if (!strcasecmp(cmd, "LumiMask")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + video_enc.lumi_masking = atof(arg); + } + } else if (!strcasecmp(cmd, "DarkMask")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + video_enc.dark_masking = atof(arg); + } } else if (!strcasecmp(cmd, "NoVideo")) { video_id = CODEC_ID_NONE; } else if (!strcasecmp(cmd, "NoAudio")) { audio_id = CODEC_ID_NONE; + } else if (!strcasecmp(cmd, "ACL")) { + IPAddressACL acl; + struct hostent *he; + + get_arg(arg, sizeof(arg), &p); + if (strcasecmp(arg, "allow") == 0) { + acl.action = IP_ALLOW; + } else if (strcasecmp(arg, "deny") == 0) { + acl.action = IP_DENY; + } else { + fprintf(stderr, "%s:%d: ACL action '%s' is not ALLOW or DENY\n", + filename, line_num, arg); + errors++; + } + + get_arg(arg, sizeof(arg), &p); + + he = gethostbyname(arg); + if (!he) { + fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", + filename, line_num, arg); + errors++; + } else { + /* Only take the first */ + acl.first.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr); + acl.last = acl.first; + } + + get_arg(arg, sizeof(arg), &p); + + if (arg[0]) { + he = gethostbyname(arg); + if (!he) { + fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", + filename, line_num, arg); + errors++; + } else { + /* Only take the first */ + acl.last.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr); + } + } + + if (!errors) { + IPAddressACL *nacl = (IPAddressACL *) av_mallocz(sizeof(*nacl)); + IPAddressACL **naclp = 0; + + *nacl = acl; + nacl->next = 0; + + if (stream) { + naclp = &stream->acl; + } else if (feed) { + naclp = &feed->acl; + } else { + fprintf(stderr, "%s:%d: ACL found not in or \n", + filename, line_num); + errors++; + } + + if (naclp) { + while (*naclp) + naclp = &(*naclp)->next; + + *naclp = nacl; + } + } + } else if (!strcasecmp(cmd, "RTSPOption")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + av_freep(&stream->rtsp_option); + /* XXX: av_strdup ? */ + stream->rtsp_option = av_malloc(strlen(arg) + 1); + if (stream->rtsp_option) { + strcpy(stream->rtsp_option, arg); + } + } + } else if (!strcasecmp(cmd, "MulticastAddress")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + if (!inet_aton(arg, &stream->multicast_ip)) { + fprintf(stderr, "%s:%d: Invalid IP address: %s\n", + filename, line_num, arg); + errors++; + } + stream->is_multicast = 1; + stream->loop = 1; /* default is looping */ + } + } else if (!strcasecmp(cmd, "MulticastPort")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + stream->multicast_port = atoi(arg); + } + } else if (!strcasecmp(cmd, "MulticastTTL")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + stream->multicast_ttl = atoi(arg); + } + } else if (!strcasecmp(cmd, "NoLoop")) { + if (stream) { + stream->loop = 0; + } } else if (!strcasecmp(cmd, "")) { if (!stream) { fprintf(stderr, "%s:%d: No corresponding for \n", @@ -2481,6 +4320,15 @@ int parse_ffconfig(const char *filename) errors++; } redirect = NULL; + } else if (!strcasecmp(cmd, "LoadModule")) { + get_arg(arg, sizeof(arg), &p); +#ifdef CONFIG_HAVE_DLOPEN + load_module(arg); +#else + fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n", + filename, line_num, arg); + errors++; +#endif } else { fprintf(stderr, "%s:%d: Incorrect keyword: '%s'\n", filename, line_num, cmd); @@ -2496,22 +4344,16 @@ int parse_ffconfig(const char *filename) } -void *http_server_thread(void *arg) -{ - http_server(my_addr); - return NULL; -} - #if 0 static void write_packet(FFCodec *ffenc, - UINT8 *buf, int size) + uint8_t *buf, int size) { PacketHeader hdr; AVCodecContext *enc = &ffenc->enc; - UINT8 *wptr; + uint8_t *wptr; mk_header(&hdr, enc, size); wptr = http_fifo.wptr; - fifo_write(&http_fifo, (UINT8 *)&hdr, sizeof(hdr), &wptr); + fifo_write(&http_fifo, (uint8_t *)&hdr, sizeof(hdr), &wptr); fifo_write(&http_fifo, buf, size, &wptr); /* atomic modification of wptr */ http_fifo.wptr = wptr; @@ -2520,23 +4362,27 @@ static void write_packet(FFCodec *ffenc, } #endif -void help(void) +static void show_banner(void) +{ + printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2003 Fabrice Bellard\n"); +} + +static void show_help(void) { - printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n" - "usage: ffserver [-L] [-h] [-f configfile]\n" + show_banner(); + printf("usage: ffserver [-L] [-h] [-f configfile]\n" "Hyper fast multi format Audio/Video streaming server\n" "\n" - "-L : print the LICENCE\n" + "-L : print the LICENSE\n" "-h : this help\n" "-f configfile : use configfile instead of /etc/ffserver.conf\n" ); } -void licence(void) +static void show_license(void) { + show_banner(); printf( - "ffserver version " FFMPEG_VERSION "\n" - "Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n" "This library is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" "License as published by the Free Software Foundation; either\n" @@ -2590,24 +4436,27 @@ int main(int argc, char **argv) config_filename = "/etc/ffserver.conf"; my_program_name = argv[0]; - + my_program_dir = getcwd(0, 0); + ffserver_daemon = 1; + for(;;) { - c = getopt_long_only(argc, argv, "ndLh?f:", NULL, NULL); + c = getopt(argc, argv, "ndLh?f:"); if (c == -1) break; switch(c) { case 'L': - licence(); + show_license(); exit(1); case '?': case 'h': - help(); + show_help(); exit(1); case 'n': no_launch = 1; break; case 'd': ffserver_debug = 1; + ffserver_daemon = 0; break; case 'f': config_filename = optarg; @@ -2619,12 +4468,20 @@ int main(int argc, char **argv) putenv("http_proxy"); /* Kill the http_proxy */ - /* address on which the server will handle connections */ - my_addr.sin_family = AF_INET; - my_addr.sin_port = htons (8080); - my_addr.sin_addr.s_addr = htonl (INADDR_ANY); + srandom(gettime_ms() + (getpid() << 16)); + + /* address on which the server will handle HTTP connections */ + my_http_addr.sin_family = AF_INET; + my_http_addr.sin_port = htons (8080); + my_http_addr.sin_addr.s_addr = htonl (INADDR_ANY); + + /* address on which the server will handle RTSP connections */ + my_rtsp_addr.sin_family = AF_INET; + my_rtsp_addr.sin_port = htons (5454); + my_rtsp_addr.sin_addr.s_addr = htonl (INADDR_ANY); + nb_max_connections = 5; - nb_max_bandwidth = 1000; + max_bandwidth = 1000; first_stream = NULL; logfilename[0] = '\0'; @@ -2638,8 +4495,38 @@ int main(int argc, char **argv) exit(1); } + build_file_streams(); + build_feed_streams(); + compute_bandwidth(); + + /* put the process in background and detach it from its TTY */ + if (ffserver_daemon) { + int pid; + + pid = fork(); + if (pid < 0) { + perror("fork"); + exit(1); + } else if (pid > 0) { + /* parent : exit */ + exit(0); + } else { + /* child */ + setsid(); + chdir("/"); + close(0); + open("/dev/null", O_RDWR); + if (strcmp(logfilename, "-") != 0) { + close(1); + dup(0); + } + close(2); + dup(0); + } + } + /* signal init */ signal(SIGPIPE, SIG_IGN); @@ -2651,8 +4538,8 @@ int main(int argc, char **argv) logfile = fopen(logfilename, "w"); } - if (http_server(my_addr) < 0) { - fprintf(stderr, "Could not start http server\n"); + if (http_server() < 0) { + fprintf(stderr, "Could not start server\n"); exit(1); }