X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver.c;h=a8a78a7be6b396021d72a15640e3277ede9f68ce;hb=abade1429e66bb3ab820c75dab54ca73525c461e;hp=8e66672d239259547c0f6af5109cf97ce6f3b2a1;hpb=492cd3a9203779380cea24f23190b92af2b48007;p=ffmpeg diff --git a/ffserver.c b/ffserver.c index 8e66672d239..a8a78a7be6b 100644 --- a/ffserver.c +++ b/ffserver.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define HAVE_AV_CONFIG_H #include "avformat.h" @@ -26,6 +26,7 @@ #include #include #include +#undef time //needed because HAVE_AV_CONFIG_H is defined on top #include #include #include @@ -33,12 +34,12 @@ #include #include #include -#include #include #ifdef CONFIG_HAVE_DLFCN #include #endif +#include "version.h" #include "ffserver.h" /* maximum number of simultaneous HTTP connections */ @@ -50,15 +51,13 @@ enum HTTPState { HTTPSTATE_SEND_DATA_HEADER, HTTPSTATE_SEND_DATA, /* sending TCP or UDP data */ HTTPSTATE_SEND_DATA_TRAILER, - HTTPSTATE_RECEIVE_DATA, + HTTPSTATE_RECEIVE_DATA, HTTPSTATE_WAIT_FEED, /* wait for data from the feed */ - HTTPSTATE_WAIT, /* wait before sending next packets */ - HTTPSTATE_WAIT_SHORT, /* short wait for short term - bandwidth limitation */ HTTPSTATE_READY, RTSPSTATE_WAIT_REQUEST, RTSPSTATE_SEND_REPLY, + RTSPSTATE_SEND_PACKET, }; const char *http_state[] = { @@ -70,12 +69,11 @@ const char *http_state[] = { "SEND_DATA_TRAILER", "RECEIVE_DATA", "WAIT_FEED", - "WAIT", - "WAIT_SHORT", "READY", "RTSP_WAIT_REQUEST", "RTSP_SEND_REPLY", + "RTSP_SEND_PACKET", }; #define IOBUFFER_INIT_SIZE 8192 @@ -90,7 +88,7 @@ const char *http_state[] = { #define SYNC_TIMEOUT (10 * 1000) typedef struct { - INT64 count1, count2; + int64_t count1, count2; long time1, time2; } DataRateData; @@ -101,18 +99,25 @@ 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; + int post; 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 first_pts; /* initial pts value */ - int pts_stream_index; /* stream we choose as clock reference */ + 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 */ @@ -128,12 +133,12 @@ typedef struct HTTPContext { char method[16]; char url[128]; int buffer_size; - UINT8 *buffer; + 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 *pb_buffer; /* XXX: use that in all the code */ + uint8_t *pb_buffer; /* XXX: use that in all the code */ ByteIOContext *pb; int seq; /* RTSP sequence number */ @@ -141,13 +146,17 @@ typedef struct HTTPContext { enum RTSPProtocol rtp_protocol; char session_id[32]; /* session id */ AVFormatContext *rtp_ctx[MAX_STREAMS]; + + /* RTP/UDP specific */ URLContext *rtp_handles[MAX_STREAMS]; - /* RTP short term bandwidth limitation */ - int packet_byte_count; - int packet_start_time_us; /* used for short durations (a few - seconds max) */ + + /* 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, @@ -163,6 +172,7 @@ enum IPAddressAction { typedef struct IPAddressACL { struct IPAddressACL *next; enum IPAddressAction action; + /* These are in host order */ struct in_addr first; struct in_addr last; } IPAddressACL; @@ -173,6 +183,8 @@ typedef struct FFStream { char filename[1024]; /* stream filename */ 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; @@ -204,11 +216,12 @@ typedef struct FFStream { /* feed specific */ 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, zero means unlimited */ + 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; @@ -220,10 +233,10 @@ typedef struct FeedData { 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 char logfilename[1024]; +static HTTPContext *first_http_ctx; +static FFStream *first_feed; /* contains only feeds */ +static FFStream *first_stream; /* contains all streams, including feeds */ static void new_connection(int server_fd, int is_rtsp); static void close_connection(HTTPContext *c); @@ -236,25 +249,27 @@ static void compute_stats(HTTPContext *c); static int open_input_stream(HTTPContext *c, const char *info); static int http_start_receive_data(HTTPContext *c); static int http_receive_data(HTTPContext *c); -static int compute_send_delay(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 **pbuffer, +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); -static int rtp_new_av_stream(HTTPContext *c, - int stream_index, struct sockaddr_in *dest_addr); +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; @@ -264,11 +279,11 @@ static int ffserver_daemon; static int no_launch; static int need_to_start_children; -int nb_max_connections; -int nb_connections; +static int nb_max_connections; +static int nb_connections; -int max_bandwidth; -int current_bandwidth; +static int max_bandwidth; +static int current_bandwidth; static long cur_time; // Making this global saves on passing it around everywhere @@ -282,11 +297,11 @@ 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); - + if (logfile) { vfprintf(logfile, fmt, ap); fflush(logfile); @@ -312,16 +327,16 @@ static void log_connection(HTTPContext *c) { char buf2[32]; - if (c->suppress_log) + if (c->suppress_log) return; - http_log("%s - - [%s] \"%s %s %s\" %d %lld\n", - inet_ntoa(c->from_addr.sin_addr), - ctime1(buf2), c->method, c->url, + http_log("%s - - [%s] \"%s %s %s\" %d %"PRId64"\n", + 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; @@ -337,20 +352,12 @@ 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 count) -{ - /* You get the first 3 seconds flat out */ - if (cur_time - drd->time1 < 3000) - return 0; - return compute_datarate(drd, count); + return ((count - drd->count1) * 1000) / (cur_time - drd->time1); } @@ -402,6 +409,8 @@ static void start_children(FFStream *feed) /* This is needed to make relative pathnames work */ chdir(my_program_dir); + signal(SIGPIPE, SIG_DFL); + execvp(pathname, feed->child_argv); _exit(1); @@ -420,16 +429,18 @@ static int socket_open_listen(struct sockaddr_in *my_addr) perror ("socket"); return -1; } - + 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"); + char bindmsg[32]; + snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port)); + perror (bindmsg); close(server_fd); return -1; } - + if (listen (server_fd, 5) < 0) { perror ("listen"); close(server_fd); @@ -453,7 +464,7 @@ static void start_multicast(void) for(stream = first_stream; stream != NULL; stream = stream->next) { if (stream->is_multicast) { /* open the RTP connection */ - snprintf(session_id, sizeof(session_id), + snprintf(session_id, sizeof(session_id), "%08x%08x", (int)random(), (int)random()); /* choose a port if none given */ @@ -466,25 +477,24 @@ static void start_multicast(void) 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); + 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", + fprintf(stderr, "Could not open input stream for stream '%s'\n", stream->filename); continue; } - rtp_c->rtp_protocol = RTSP_PROTOCOL_RTP_UDP_MULTICAST; - /* open each RTP stream */ - for(stream_index = 0; stream_index < stream->nb_streams; + for(stream_index = 0; stream_index < stream->nb_streams; stream_index++) { - dest_addr.sin_port = htons(stream->multicast_port + + dest_addr.sin_port = htons(stream->multicast_port + 2 * stream_index); - if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr) < 0) { - fprintf(stderr, "Could not open output stream '%s/streamid=%d'\n", + 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); } @@ -510,14 +520,13 @@ static int http_server(void) 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); first_http_ctx = NULL; nb_connections = 0; - first_http_ctx = NULL; start_multicast(); @@ -540,6 +549,7 @@ static int http_server(void) switch(c->state) { case HTTPSTATE_SEND_HEADER: case RTSPSTATE_SEND_REPLY: + case RTSPSTATE_SEND_PACKET: c->poll_entry = poll_entry; poll_entry->fd = fd; poll_entry->events = POLLOUT; @@ -555,9 +565,12 @@ static int http_server(void) poll_entry->events = POLLOUT; poll_entry++; } else { - /* not strictly correct, but currently cannot add - more than one fd in poll entry */ - delay = 0; + /* 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: @@ -570,18 +583,6 @@ static int http_server(void) poll_entry->events = POLLIN;/* Maybe this will work */ poll_entry++; break; - case HTTPSTATE_WAIT: - c->poll_entry = NULL; - delay1 = compute_send_delay(c); - if (delay1 < delay) - delay = delay1; - break; - case HTTPSTATE_WAIT_SHORT: - c->poll_entry = NULL; - delay1 = 10; /* one tick wait XXX: 10 ms assumed */ - if (delay1 < delay) - delay = delay1; - break; default: c->poll_entry = NULL; break; @@ -593,8 +594,10 @@ static int http_server(void) second to handle timeouts */ do { ret = poll(poll_table, poll_entry - poll_table, delay); - } while (ret == -1); - + if (ret < 0 && errno != EAGAIN && errno != EINTR) + return -1; + } while (ret <= 0); + cur_time = gettime_ms(); if (need_to_start_children) { @@ -647,7 +650,7 @@ static void new_connection(int server_fd, int is_rtsp) HTTPContext *c = NULL; len = sizeof(from_addr); - fd = accept(server_fd, (struct sockaddr *)&from_addr, + fd = accept(server_fd, (struct sockaddr *)&from_addr, &len); if (fd < 0) return; @@ -657,14 +660,12 @@ static void new_connection(int server_fd, int is_rtsp) 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->next = first_http_ctx; - first_http_ctx = c; + c->fd = fd; c->poll_entry = NULL; c->from_addr = from_addr; @@ -672,8 +673,11 @@ static void new_connection(int server_fd, int is_rtsp) 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; @@ -705,6 +709,12 @@ static void close_connection(HTTPContext *c) } } + /* 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); @@ -712,8 +722,8 @@ static void close_connection(HTTPContext *c) /* 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); + if (st->codec->codec) { + avcodec_close(st->codec); } } av_close_input_file(c->fmt_in); @@ -721,9 +731,9 @@ static void close_connection(HTTPContext *c) /* free RTP output streams if any */ nb_streams = 0; - if (c->stream) + if (c->stream) nb_streams = c->stream->nb_streams; - + for(i=0;irtp_ctx[i]; if (ctx) { @@ -736,9 +746,25 @@ static void close_connection(HTTPContext *c) } } - if (c->stream) + 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 && !c->post && c->stream->stream_type == STREAM_TYPE_LIVE) current_bandwidth -= c->stream->bandwidth; av_freep(&c->pb_buffer); + av_freep(&c->packet_buffer); av_free(c->buffer); av_free(c); nb_connections--; @@ -747,7 +773,7 @@ static void close_connection(HTTPContext *c) static int handle_connection(HTTPContext *c) { int len, ret; - + switch(c->state) { case HTTPSTATE_WAIT_REQUEST: case RTSPSTATE_WAIT_REQUEST: @@ -761,15 +787,16 @@ static int handle_connection(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)) || @@ -785,7 +812,7 @@ static int handle_connection(HTTPContext *c) } else if (ptr >= c->buffer_end) { /* request too long: cannot do anything */ return -1; - } + } else goto read_loop; } break; @@ -830,7 +857,7 @@ static int handle_connection(HTTPContext *c) 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; @@ -855,16 +882,6 @@ static int handle_connection(HTTPContext *c) /* nothing to do, we'll be waken up by incoming feed packets */ break; - case HTTPSTATE_WAIT: - /* if the delay expired, we can send new packets */ - if (compute_send_delay(c) <= 0) - c->state = HTTPSTATE_SEND_DATA; - break; - case HTTPSTATE_WAIT_SHORT: - /* just return back to send data */ - c->state = HTTPSTATE_SEND_DATA; - break; - case RTSPSTATE_SEND_REPLY: if (c->poll_entry->revents & (POLLERR | POLLHUP)) { av_freep(&c->pb_buffer); @@ -890,6 +907,31 @@ static int handle_connection(HTTPContext *c) } } 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; @@ -954,7 +996,7 @@ static int find_stream_in_feed(FFStream *feed, AVCodecContext *codec, int bit_ra int best = -1; for (i = 0; i < feed->nb_streams; i++) { - AVCodecContext *feed_codec = &feed->streams[i]->codec; + AVCodecContext *feed_codec = feed->streams[i]->codec; if (feed_codec->codec_id != codec->codec_id || feed_codec->sample_rate != codec->sample_rate || @@ -965,7 +1007,7 @@ static int find_stream_in_feed(FFStream *feed, AVCodecContext *codec, int bit_ra /* Potential stream */ - /* We want the fastest stream less than bit_rate, or the slowest + /* We want the fastest stream less than bit_rate, or the slowest * faster than bit_rate */ @@ -991,8 +1033,12 @@ 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; + AVCodecContext *codec = req->streams[i]->codec; switch(rates[i]) { case 0: @@ -1023,7 +1069,7 @@ static int modify_current_stream(HTTPContext *c, char *rates) static void do_switch_stream(HTTPContext *c, int i) { if (c->switch_feed_streams[i] >= 0) { -#ifdef PHILIP +#ifdef PHILIP c->feed_streams[i] = c->switch_feed_streams[i]; #endif @@ -1066,9 +1112,10 @@ 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->s_addr >= acl->first.s_addr && src->s_addr <= acl->last.s_addr) { + if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr) { return (acl->action == IP_ALLOW) ? 1 : 0; } last_action = acl->action; @@ -1117,7 +1164,6 @@ enum RedirType { static int http_parse_request(HTTPContext *c) { char *p; - int post; enum RedirType redir_type; char cmd[32]; char info[1024], *filename; @@ -1135,9 +1181,9 @@ static int http_parse_request(HTTPContext *c) pstrcpy(c->method, sizeof(c->method), cmd); if (!strcmp(cmd, "GET")) - post = 0; + c->post = 0; else if (!strcmp(cmd, "POST")) - post = 1; + c->post = 1; else return -1; @@ -1149,7 +1195,10 @@ static int http_parse_request(HTTPContext *c) return -1; pstrcpy(c->protocol, sizeof(c->protocol), protocol); - + + if (ffserver_debug) + http_log("New connection: %s %s\n", cmd, url); + /* find the filename and the optional info string in the request */ p = url; if (*p == '/') @@ -1181,7 +1230,7 @@ static int http_parse_request(HTTPContext *c) if (match_ext(filename, "asx")) { redir_type = REDIR_ASX; filename[strlen(filename)-1] = 'f'; - } else if (match_ext(filename, ".asf") && + } else if (match_ext(filename, "asf") && (!useragent || strncasecmp(useragent, "NSPlayer", 8) != 0)) { /* if this isn't WMP or lookalike, return the redirector file */ redir_type = REDIR_ASF; @@ -1195,7 +1244,7 @@ static int http_parse_request(HTTPContext *c) redir_type = REDIR_SDP; compute_real_filename(filename, sizeof(url) - 1); } - + stream = first_stream; while (stream != NULL) { if (!strcmp(stream->filename, filename) && validate_acl(stream, c)) @@ -1203,7 +1252,7 @@ static int http_parse_request(HTTPContext *c) 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; } @@ -1214,13 +1263,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; @@ -1239,21 +1288,21 @@ static int http_parse_request(HTTPContext *c) } } - if (post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { + if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { current_bandwidth += stream->bandwidth; } - - if (post == 0 && max_bandwidth < current_bandwidth) { + + if (c->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", + 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 += sprintf(q, "\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -1261,10 +1310,10 @@ static int http_parse_request(HTTPContext *c) c->state = HTTPSTATE_SEND_HEADER; return 0; } - + if (redir_type != REDIR_NONE) { char *hostinfo = 0; - + for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { if (strncasecmp(p, "Host:", 5) == 0) { hostinfo = p + 5; @@ -1297,29 +1346,29 @@ static int http_parse_request(HTTPContext *c) q = c->buffer; switch(redir_type) { case REDIR_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", + 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"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); break; case REDIR_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, "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); break; case REDIR_ASF: - 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", + 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); break; case REDIR_RTSP: @@ -1330,31 +1379,31 @@ static int http_parse_request(HTTPContext *c) p = strrchr(hostname, ':'); if (p) *p = '\0'; - q += sprintf(q, "HTTP/1.0 200 RTSP Redirect follows\r\n"); + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "HTTP/1.0 200 RTSP Redirect follows\r\n"); /* XXX: incorrect mime type ? */ - q += sprintf(q, "Content-type: application/x-rtsp\r\n"); - q += sprintf(q, "\r\n"); - q += sprintf(q, "rtsp://%s:%d/%s\r\n", - hostname, ntohs(my_rtsp_addr.sin_port), + 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 *sdp_data; + uint8_t *sdp_data; int sdp_data_size, len; struct sockaddr_in my_addr; - q += sprintf(q, "HTTP/1.0 200 OK\r\n"); - q += sprintf(q, "Content-type: application/sdp\r\n"); - q += sprintf(q, "\r\n"); + 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, + 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); @@ -1378,7 +1427,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; } @@ -1386,7 +1435,7 @@ static int http_parse_request(HTTPContext *c) /* XXX: add there authenticate and IP match */ - if (post) { + if (c->post) { /* if post, it means a feed is being sent */ if (!stream->is_feed) { /* However it might be a status report from WMP! Lets log the data @@ -1394,7 +1443,7 @@ static int http_parse_request(HTTPContext *c) */ char *logline = 0; int client_id = 0; - + for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) { if (strncasecmp(p, "Pragma: log-line=", 17) == 0) { logline = p; @@ -1418,7 +1467,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; } } @@ -1442,12 +1491,13 @@ 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; @@ -1466,17 +1516,17 @@ 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_stream")) { @@ -1484,12 +1534,11 @@ static int http_parse_request(HTTPContext *c) c->wmp_client_id = random() & 0x7fffffff; - 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; c->buffer_ptr = c->buffer; @@ -1499,13 +1548,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; @@ -1520,7 +1569,7 @@ static int http_parse_request(HTTPContext *c) return 0; } -static void fmt_bytecount(ByteIOContext *pb, INT64 count) +static void fmt_bytecount(ByteIOContext *pb, int64_t count) { static const char *suffix = " kMGTP"; const char *s; @@ -1528,7 +1577,7 @@ static void fmt_bytecount(ByteIOContext *pb, INT64 count) for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++) { } - url_fprintf(pb, "%lld%c", count, *s); + url_fprintf(pb, "%"PRId64"%c", count, *s); } static void compute_stats(HTTPContext *c) @@ -1551,7 +1600,7 @@ static void compute_stats(HTTPContext *c) url_fprintf(pb, "Content-type: %s\r\n", "text/html"); url_fprintf(pb, "Pragma: no-cache\r\n"); url_fprintf(pb, "\r\n"); - + url_fprintf(pb, "FFServer Status\n"); if (c->stream->feed_filename) { url_fprintf(pb, "\n", c->stream->feed_filename); @@ -1575,7 +1624,7 @@ static void compute_stats(HTTPContext *c) strcpy(eosf - 4, ".asx"); } else if (strcmp(eosf - 3, ".rm") == 0) { strcpy(eosf - 3, ".ram"); - } else if (stream->fmt == &rtp_mux) { + } else if (stream->fmt == &rtp_muxer) { /* generate a sample RTSP director if unicast. Generate an SDP redirector if multicast */ @@ -1588,8 +1637,8 @@ static void compute_stats(HTTPContext *c) strcpy(eosf, ".rtsp"); } } - - url_fprintf(pb, "%s ", + + url_fprintf(pb, "%s ", sfilename, stream->filename); url_fprintf(pb, " %d ", stream->conns_served); @@ -1606,10 +1655,10 @@ static void compute_stats(HTTPContext *c) for(i=0;inb_streams;i++) { AVStream *st = stream->streams[i]; - AVCodec *codec = avcodec_find_encoder(st->codec.codec_id); - switch(st->codec.codec_type) { + AVCodec *codec = avcodec_find_encoder(st->codec->codec_id); + switch(st->codec->codec_type) { case CODEC_TYPE_AUDIO: - audio_bit_rate += st->codec.bit_rate; + audio_bit_rate += st->codec->bit_rate; if (codec) { if (*audio_codec_name) audio_codec_name_extra = "..."; @@ -1617,18 +1666,21 @@ static void compute_stats(HTTPContext *c) } break; case CODEC_TYPE_VIDEO: - video_bit_rate += st->codec.bit_rate; + video_bit_rate += st->codec->bit_rate; if (codec) { if (*video_codec_name) video_codec_name_extra = "..."; video_codec_name = codec->name; } break; + case CODEC_TYPE_DATA: + video_bit_rate += st->codec->bit_rate; + break; default: av_abort(); } } - url_fprintf(pb, " %s %d %d %s %s %d %s %s", + url_fprintf(pb, " %s %d %d %s %s %d %s %s", stream->fmt->name, stream->bandwidth, video_bit_rate / 1000, video_codec_name, video_codec_name_extra, @@ -1663,16 +1715,16 @@ static void compute_stats(HTTPContext *c) char ps_cmd[64]; /* This is somewhat linux specific I guess */ - snprintf(ps_cmd, sizeof(ps_cmd), - "ps -o \"%%cpu,cputime\" --no-headers %d", + 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, + + 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); @@ -1688,39 +1740,39 @@ static void compute_stats(HTTPContext *c) 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"; + AVCodec *codec = avcodec_find_encoder(st->codec->codec_id); + const char *type = "unknown"; char parameters[64]; parameters[0] = 0; - switch(st->codec.codec_type) { + switch(st->codec->codec_type) { case CODEC_TYPE_AUDIO: type = "audio"; 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->time_base.den / st->codec->time_base.num); break; default: av_abort(); } url_fprintf(pb, "%d%s%d%s%s\n", - i, type, st->codec.bit_rate/1000, codec ? codec->name : "", parameters); + i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters); } url_fprintf(pb, "\n"); - } + } stream = stream->next; } - + #if 0 { float avg; AVCodecContext *enc; char buf[1024]; - + /* feed status */ stream = first_feed; while (stream != NULL) { @@ -1730,13 +1782,13 @@ static void compute_stats(HTTPContext *c) for(i=0;inb_streams;i++) { AVStream *st = stream->streams[i]; FeedData *fdata = st->priv_data; - enc = &st->codec; - + enc = st->codec; + avcodec_string(buf, sizeof(buf), enc); avg = fdata->avg_frame_size * (float)enc->rate * 8.0; if (enc->codec->type == CODEC_TYPE_AUDIO && enc->frame_size > 0) avg /= enc->frame_size; - url_fprintf(pb, "%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); } url_fprintf(pb, "\n"); @@ -1766,10 +1818,10 @@ static void compute_stats(HTTPContext *c) if (c1->stream) { for (j = 0; j < c1->stream->nb_streams; j++) { if (!c1->stream->feed) { - bitrate += c1->stream->streams[j]->codec.bit_rate; + 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; + bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; } } } @@ -1777,11 +1829,11 @@ static void compute_stats(HTTPContext *c) i++; p = inet_ntoa(c1->from_addr.sin_addr); - url_fprintf(pb, "%d%s%s%s%s%s", - i, - c1->stream ? c1->stream->filename : "", + url_fprintf(pb, "%d%s%s%s%s%s", + i, + c1->stream ? c1->stream->filename : "", c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", - p, + p, c1->protocol, http_state[c1->state]); fmt_bytecount(pb, bitrate); @@ -1793,7 +1845,7 @@ static void compute_stats(HTTPContext *c) c1 = c1->next; } url_fprintf(pb, "\n"); - + /* date */ ti = time(NULL); p = ctime(&ti); @@ -1811,12 +1863,12 @@ static void open_parser(AVFormatContext *s, int i) AVStream *st = s->streams[i]; AVCodec *codec; - if (!st->codec.codec) { - codec = avcodec_find_decoder(st->codec.codec_id); + 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; + st->codec->parse_only = 1; + if (avcodec_open(st->codec, codec) < 0) { + st->codec->parse_only = 0; } } } @@ -1828,7 +1880,7 @@ static int open_input_stream(HTTPContext *c, const char *info) char input_filename[1024]; AVFormatContext *s; int buf_size, i; - INT64 stream_pos; + int64_t stream_pos; /* find file name */ if (c->stream->feed) { @@ -1839,9 +1891,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 * (INT64)1000000; + stream_pos = av_gettime() - prebuffer * (int64_t)1000000; } else { - stream_pos = av_gettime() - c->stream->prebuffer * (INT64)1000; + stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000; } } else { strcpy(input_filename, c->stream->feed_filename); @@ -1863,12 +1915,13 @@ static int open_input_stream(HTTPContext *c, const char *info) #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); @@ -1877,201 +1930,63 @@ static int open_input_stream(HTTPContext *c, const char *info) 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) { + if (c->pts_stream_index == 0 && + c->stream->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) { c->pts_stream_index = i; } } +#if 1 if (c->fmt_in->iformat->read_seek) { - c->fmt_in->iformat->read_seek(c->fmt_in, stream_pos); + c->fmt_in->iformat->read_seek(c->fmt_in, 0, stream_pos, 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; } -/* currently desactivated because the new PTS handling is not - satisfactory yet */ -//#define AV_READ_FRAME -#ifdef AV_READ_FRAME - -/* XXX: generalize that in ffmpeg for picture/audio/data. Currently - the return packet MUST NOT be freed */ -int av_read_frame(AVFormatContext *s, AVPacket *pkt) +/* return the server clock (in us) */ +static int64_t get_server_clock(HTTPContext *c) { - AVStream *st; - int len, ret, old_nb_streams, i; - - /* see if remaining frames must be parsed */ - for(;;) { - if (s->cur_len > 0) { - st = s->streams[s->cur_pkt.stream_index]; - len = avcodec_parse_frame(&st->codec, &pkt->data, &pkt->size, - s->cur_ptr, s->cur_len); - if (len < 0) { - /* error: get next packet */ - s->cur_len = 0; - } else { - s->cur_ptr += len; - s->cur_len -= len; - if (pkt->size) { - /* init pts counter if not done */ - if (st->pts.den == 0) { - switch(st->codec.codec_type) { - case CODEC_TYPE_AUDIO: - st->pts_incr = (INT64)s->pts_den; - av_frac_init(&st->pts, st->pts.val, 0, - (INT64)s->pts_num * st->codec.sample_rate); - break; - case CODEC_TYPE_VIDEO: - st->pts_incr = (INT64)s->pts_den * FRAME_RATE_BASE; - av_frac_init(&st->pts, st->pts.val, 0, - (INT64)s->pts_num * st->codec.frame_rate); - break; - default: - av_abort(); - } - } - - /* a frame was read: return it */ - pkt->pts = st->pts.val; -#if 0 - printf("add pts=%Lx num=%Lx den=%Lx incr=%Lx\n", - st->pts.val, st->pts.num, st->pts.den, st->pts_incr); -#endif - switch(st->codec.codec_type) { - case CODEC_TYPE_AUDIO: - av_frac_add(&st->pts, st->pts_incr * st->codec.frame_size); - break; - case CODEC_TYPE_VIDEO: - av_frac_add(&st->pts, st->pts_incr); - break; - default: - av_abort(); - } - pkt->stream_index = s->cur_pkt.stream_index; - /* we use the codec indication because it is - more accurate than the demux flags */ - pkt->flags = 0; - if (st->codec.coded_frame->key_frame) - pkt->flags |= PKT_FLAG_KEY; - return 0; - } - } - } else { - /* free previous packet */ - av_free_packet(&s->cur_pkt); - - old_nb_streams = s->nb_streams; - ret = av_read_packet(s, &s->cur_pkt); - if (ret) - return ret; - /* open parsers for each new streams */ - for(i = old_nb_streams; i < s->nb_streams; i++) - open_parser(s, i); - st = s->streams[s->cur_pkt.stream_index]; - - /* update current pts (XXX: dts handling) from packet, or - use current pts if none given */ - if (s->cur_pkt.pts != AV_NOPTS_VALUE) { - av_frac_set(&st->pts, s->cur_pkt.pts); - } else { - s->cur_pkt.pts = st->pts.val; - } - if (!st->codec.codec) { - /* no codec opened: just return the raw packet */ - *pkt = s->cur_pkt; - - /* no codec opened: just update the pts by considering we - have one frame and free the packet */ - if (st->pts.den == 0) { - switch(st->codec.codec_type) { - case CODEC_TYPE_AUDIO: - st->pts_incr = (INT64)s->pts_den * st->codec.frame_size; - av_frac_init(&st->pts, st->pts.val, 0, - (INT64)s->pts_num * st->codec.sample_rate); - break; - case CODEC_TYPE_VIDEO: - st->pts_incr = (INT64)s->pts_den * FRAME_RATE_BASE; - av_frac_init(&st->pts, st->pts.val, 0, - (INT64)s->pts_num * st->codec.frame_rate); - break; - default: - av_abort(); - } - } - av_frac_add(&st->pts, st->pts_incr); - return 0; - } else { - s->cur_ptr = s->cur_pkt.data; - s->cur_len = s->cur_pkt.size; - } - } - } -} - -static int compute_send_delay(HTTPContext *c) -{ - INT64 cur_pts, delta_pts, next_pts; - int delay1; - /* compute current pts value from system time */ - cur_pts = ((INT64)(cur_time - c->start_time) * c->fmt_in->pts_den) / - (c->fmt_in->pts_num * 1000LL); - /* compute the delta from the stream we choose as - main clock (we do that to avoid using explicit - buffers to do exact packet reordering for each - stream */ - /* XXX: really need to fix the number of streams */ - if (c->pts_stream_index >= c->fmt_in->nb_streams) - next_pts = cur_pts; - else - next_pts = c->fmt_in->streams[c->pts_stream_index]->pts.val; - delta_pts = next_pts - cur_pts; - if (delta_pts <= 0) { - delay1 = 0; - } else { - delay1 = (delta_pts * 1000 * c->fmt_in->pts_num) / c->fmt_in->pts_den; - } - return delay1; -} -#else - -/* just fall backs */ -int av_read_frame(AVFormatContext *s, AVPacket *pkt) -{ - return av_read_packet(s, pkt); + return (int64_t)(cur_time - c->start_time) * 1000LL; } -static int compute_send_delay(HTTPContext *c) +/* return the estimated time at which the current packet must be sent + (in us) */ +static int64_t get_packet_send_clock(HTTPContext *c) { - int datarate = 8 * get_longterm_datarate(&c->datarate, c->data_count); + int bytes_left, bytes_sent, frame_bytes; - if (datarate > c->stream->bandwidth * 2000) { - return 1000; + 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; } - return 0; } -#endif - + static int http_prepare_data(HTTPContext *c) { 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), + pstrcpy(c->fmt_ctx.author, sizeof(c->fmt_ctx.author), c->stream->author); - pstrcpy(c->fmt_ctx.comment, sizeof(c->fmt_ctx.comment), + pstrcpy(c->fmt_ctx.comment, sizeof(c->fmt_ctx.comment), c->stream->comment); - pstrcpy(c->fmt_ctx.copyright, sizeof(c->fmt_ctx.copyright), + pstrcpy(c->fmt_ctx.copyright, sizeof(c->fmt_ctx.copyright), c->stream->copyright); - pstrcpy(c->fmt_ctx.title, sizeof(c->fmt_ctx.title), + pstrcpy(c->fmt_ctx.title, sizeof(c->fmt_ctx.title), c->stream->title); /* open output stream by using specified codecs */ @@ -2079,17 +1994,25 @@ static int http_prepare_data(HTTPContext *c) c->fmt_ctx.nb_streams = c->stream->nb_streams; for(i=0;ifmt_ctx.nb_streams;i++) { AVStream *st; + AVStream *src; st = av_mallocz(sizeof(AVStream)); + st->codec= avcodec_alloc_context(); c->fmt_ctx.streams[i] = st; /* if file or feed, then just take streams from FFStream struct */ - if (!c->stream->feed || + if (!c->stream->feed || c->stream->feed == c->stream) - memcpy(st, c->stream->streams[i], sizeof(AVStream)); + src = c->stream->streams[i]; else - memcpy(st, c->stream->feed->streams[c->stream->feed_streams[i]], - sizeof(AVStream)); - st->codec.frame_number = 0; /* XXX: should be done in + src = c->stream->feed->streams[c->stream->feed_streams[i]]; + + *st = *src; + st->priv_data = 0; + 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; @@ -2100,6 +2023,7 @@ static int http_prepare_data(HTTPContext *c) } c->fmt_ctx.pb.is_streamed = 1; + 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); @@ -2113,25 +2037,19 @@ static int http_prepare_data(HTTPContext *c) /* find a new packet */ { AVPacket pkt; - + /* read a packet from the input stream */ if (c->stream->feed) { - ffm_set_write_index(c->fmt_in, + ffm_set_write_index(c->fmt_in, c->stream->feed->feed_write_index, c->stream->feed->feed_size); } - if (c->stream->max_time && + if (c->stream->max_time && c->stream->max_time + c->start_time - cur_time < 0) { /* We have timed out */ c->state = HTTPSTATE_SEND_DATA_TRAILER; } else { - if (1 || c->is_packetized) { - if (compute_send_delay(c) > 0) { - c->state = HTTPSTATE_WAIT; - return 1; /* state changed */ - } - } redo: if (av_read_frame(c->fmt_in, &pkt) < 0) { if (c->stream->feed && c->stream->feed->feed_opened) { @@ -2154,9 +2072,10 @@ static int http_prepare_data(HTTPContext *c) } } else { /* update first pts if needed */ - if (c->first_pts == AV_NOPTS_VALUE) - c->first_pts = pkt.pts; - + if (c->first_pts == AV_NOPTS_VALUE) { + c->first_pts = av_rescale_q(pkt.dts, c->fmt_in->streams[pkt.stream_index]->time_base, AV_TIME_BASE_Q); + c->start_time = cur_time; + } /* send it to the appropriate stream */ if (c->stream->feed) { /* if coming from a feed, select the right stream */ @@ -2179,14 +2098,14 @@ static int http_prepare_data(HTTPContext *c) if (pkt.flags & PKT_FLAG_KEY) { c->got_key_frame |= 1 << i; } - /* See if we have all the key frames, then + /* 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 + * 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). + * audio streams (for which every frame is + * typically a key frame). */ - if (!c->stream->send_on_key || + if (!c->stream->send_on_key || ((c->got_key_frame + 1) >> c->stream->nb_streams)) { goto send_it; } @@ -2194,37 +2113,51 @@ static int http_prepare_data(HTTPContext *c) } } 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 = av_rescale_q(pkt.dts, st->time_base, AV_TIME_BASE_Q); + if (st->start_time != AV_NOPTS_VALUE) + c->cur_pts -= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); + c->cur_frame_duration = av_rescale_q(pkt.duration, st->time_base, AV_TIME_BASE_Q); +#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]; - codec = &ctx->streams[0]->codec; + 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 = ctx->streams[pkt.stream_index]->codec; } - + codec->coded_frame->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 (c->is_packetized) { - ret = url_open_dyn_packet_buf(&ctx->pb, - url_get_max_packet_size(c->rtp_handles[c->packet_stream_index])); - c->packet_byte_count = 0; - c->packet_start_time_us = av_gettime(); + 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); } @@ -2232,19 +2165,20 @@ static int http_prepare_data(HTTPContext *c) /* XXX: potential leak */ return -1; } - if (av_write_frame(ctx, pkt.stream_index, pkt.data, pkt.size)) { + 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; } -#ifndef AV_READ_FRAME av_free_packet(&pkt); -#endif } } } @@ -2275,76 +2209,128 @@ static int http_prepare_data(HTTPContext *c) #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, dt; - - while (c->buffer_ptr >= c->buffer_end) { - av_freep(&c->pb_buffer); - ret = http_prepare_data(c); - if (ret < 0) - return -1; - else if (ret == 0) { - continue; - } else { - /* state change requested */ - return 0; - } - } + int len, ret; - if (c->buffer_ptr < c->buffer_end) { - if (c->is_packetized) { - /* RTP/UDP 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; - - /* short term bandwidth limitation */ - dt = av_gettime() - c->packet_start_time_us; - if (dt < 1) - dt = 1; - - if ((c->packet_byte_count + len) * (INT64)1000000 >= - (SHORT_TERM_BANDWIDTH / 8) * (INT64)dt) { - /* bandwidth overflow : wait at most one tick and retry */ - c->state = HTTPSTATE_WAIT_SHORT; - return 0; + 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; } - - c->buffer_ptr += 4; - url_write(c->rtp_handles[c->packet_stream_index], - c->buffer_ptr, len); - c->buffer_ptr += len; - c->packet_byte_count += len; } 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 { + 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 { - c->buffer_ptr += len; + /* 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; } } - c->data_count += len; - update_datarate(&c->datarate, c->data_count); - if (c->stream) - c->stream->bytes_served += len; - } + } /* for(;;) */ return 0; } @@ -2355,12 +2341,16 @@ 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) return -1; c->feed_fd = fd; - + c->stream->feed_write_index = ffm_read_write_index(fd); c->stream->feed_size = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); @@ -2371,7 +2361,7 @@ static int http_start_receive_data(HTTPContext *c) c->stream->feed_opened = 1; return 0; } - + static int http_receive_data(HTTPContext *c) { HTTPContext *c1; @@ -2395,24 +2385,32 @@ 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 if header */ if (c->data_count > FFM_PACKET_SIZE) { - + // printf("writing pos=0x%Lx size=0x%Lx\n", feed->feed_write_index, feed->feed_size); /* XXX: use llseek or url_seek */ lseek(c->feed_fd, feed->feed_write_index, SEEK_SET); write(c->feed_fd, c->buffer, FFM_PACKET_SIZE); - + feed->feed_write_index += FFM_PACKET_SIZE; /* update file size */ if (feed->feed_write_index > c->stream->feed_size) feed->feed_size = feed->feed_write_index; /* handle wrap around if max file size reached */ - if (feed->feed_write_index >= c->stream->feed_max_size) + if (c->stream->feed_max_size && feed->feed_write_index >= c->stream->feed_max_size) feed->feed_write_index = FFM_PACKET_SIZE; /* write index */ @@ -2420,7 +2418,7 @@ static int http_receive_data(HTTPContext *c) /* wake up any waiting connections */ for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) { - if (c1->state == HTTPSTATE_WAIT_FEED && + if (c1->state == HTTPSTATE_WAIT_FEED && c1->stream->feed == c->stream->feed) { c1->state = HTTPSTATE_SEND_DATA; } @@ -2443,9 +2441,12 @@ 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) - goto fail; + 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); @@ -2458,9 +2459,9 @@ static int http_receive_data(HTTPContext *c) goto fail; } for (i = 0; i < s.nb_streams; i++) { - memcpy(&feed->streams[i]->codec, - &s.streams[i]->codec, sizeof(AVCodecContext)); - } + memcpy(feed->streams[i]->codec, + s.streams[i]->codec, sizeof(AVCodecContext)); + } av_freep(&s.priv_data); } c->buffer_ptr = c->buffer; @@ -2484,14 +2485,14 @@ static void rtsp_reply_header(HTTPContext *c, enum RTSPStatusCode error_number) char buf2[32]; switch(error_number) { -#define DEF(n, c, s) case c: str = s; break; +#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); @@ -2521,10 +2522,10 @@ static int rtsp_parse_request(HTTPContext *c) 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); @@ -2577,6 +2578,8 @@ static int rtsp_parse_request(HTTPContext *c) 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")) { @@ -2603,17 +2606,17 @@ static int rtsp_parse_request(HTTPContext *c) /* XXX: move that to rtsp.c, but would need to replace FFStream by AVFormatContext */ -static int prepare_sdp_description(FFStream *stream, UINT8 **pbuffer, +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"); @@ -2629,23 +2632,27 @@ static int prepare_sdp_description(FFStream *stream, UINT8 **pbuffer, url_fprintf(pb, "c=IN IP4 %s\n", inet_ntoa(stream->multicast_ip)); } /* for each stream, we output the necessary info */ - private_payload_type = 96; + private_payload_type = RTP_PT_PRIVATE; for(i = 0; i < stream->nb_streams; i++) { st = stream->streams[i]; - switch(st->codec.codec_type) { - case CODEC_TYPE_AUDIO: - mediatype = "audio"; - break; - case CODEC_TYPE_VIDEO: + if (st->codec->codec_id == CODEC_ID_MPEG2TS) { mediatype = "video"; - break; - default: - mediatype = "application"; - break; + } 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); + payload_type = rtp_get_payload_type(st->codec); if (payload_type < 0) payload_type = private_payload_type++; if (stream->is_multicast) { @@ -2653,21 +2660,21 @@ static int prepare_sdp_description(FFStream *stream, UINT8 **pbuffer, } else { port = 0; } - url_fprintf(pb, "m=%s %d RTP/AVP %d\n", + url_fprintf(pb, "m=%s %d RTP/AVP %d\n", mediatype, port, payload_type); - if (payload_type >= 96) { + if (payload_type >= RTP_PT_PRIVATE) { /* for private payload type, we need to give more info */ - switch(st->codec.codec_id) { + switch(st->codec->codec_id) { case CODEC_ID_MPEG4: { uint8_t *data; - url_fprintf(pb, "a=rtpmap:%d MP4V-ES/%d\n", + url_fprintf(pb, "a=rtpmap:%d MP4V-ES/%d\n", payload_type, 90000); /* we must also add the mpeg4 header */ - data = st->codec.extradata; + data = st->codec->extradata; if (data) { - url_fprintf(pb, "a=fmtp:%d config="); - for(j=0;jcodec.extradata_size;j++) { + 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"); @@ -2688,23 +2695,32 @@ static int prepare_sdp_description(FFStream *stream, UINT8 **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 *content; + 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); + url_split(NULL, 0, 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 && + if (!stream->is_feed && stream->fmt == &rtp_muxer && !strcmp(path, stream->filename)) { goto found; } @@ -2719,7 +2735,6 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url) /* 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); @@ -2746,7 +2761,7 @@ static HTTPContext *find_rtp_session(const char *session_id) return NULL; } -RTSPTransportField *find_transport(RTSPHeader *h, enum RTSPProtocol protocol) +static RTSPTransportField *find_transport(RTSPHeader *h, enum RTSPProtocol protocol) { RTSPTransportField *th; int i; @@ -2759,7 +2774,7 @@ RTSPTransportField *find_transport(RTSPHeader *h, enum RTSPProtocol protocol) return NULL; } -static void rtsp_cmd_setup(HTTPContext *c, const char *url, +static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPHeader *h) { FFStream *stream; @@ -2771,16 +2786,16 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, 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); + url_split(NULL, 0, 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) { + if (!stream->is_feed && stream->fmt == &rtp_muxer) { /* accept aggregate filenames only if single stream */ if (!strcmp(path, stream->filename)) { if (stream->nb_streams != 1) { @@ -2790,10 +2805,10 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, stream_index = 0; goto found; } - + for(stream_index = 0; stream_index < stream->nb_streams; stream_index++) { - snprintf(buf, sizeof(buf), "%s/streamid=%d", + snprintf(buf, sizeof(buf), "%s/streamid=%d", stream->filename, stream_index); if (!strcmp(path, buf)) goto found; @@ -2807,14 +2822,25 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, /* generate session id if needed */ if (h->session_id[0] == '\0') { - snprintf(h->session_id, sizeof(h->session_id), + 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) { - rtp_c = rtp_new_connection(&c->from_addr, stream, h->session_id); + /* 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; @@ -2825,26 +2851,15 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, rtsp_reply_error(c, RTSP_STATUS_INTERNAL); return; } - - /* 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_protocol = th->protocol; } - + /* 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); @@ -2853,7 +2868,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, /* check transport */ th = find_transport(h, rtp_c->rtp_protocol); - if (!th || (th->protocol == RTSP_PROTOCOL_RTP_UDP && + if (!th || (th->protocol == RTSP_PROTOCOL_RTP_UDP && th->client_port_min <= 0)) { rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); return; @@ -2863,11 +2878,11 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, 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, + 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); @@ -2875,9 +2890,9 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, } dest_addr.sin_addr.s_addr = htonl(setup.ipaddr); } - + /* setup stream */ - if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr) < 0) { + if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, c) < 0) { rtsp_reply_error(c, RTSP_STATUS_TRANSPORT); return; } @@ -2906,7 +2921,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, url_fprintf(c->pb, ";%s", setup.transport_option); } url_fprintf(c->pb, "\r\n"); - + url_fprintf(c->pb, "\r\n"); } @@ -2914,25 +2929,34 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, /* find an rtp connection by using the session ID. Check consistency with filename */ -static HTTPContext *find_rtp_session_with_url(const char *url, +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); + url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); path = path1; if (*path == '/') path++; - if (strcmp(path, rtp_c->stream->filename) != 0) - return NULL; - return rtp_c; + 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) @@ -2944,7 +2968,7 @@ static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPHeader *h) 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) { @@ -2952,8 +2976,16 @@ static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPHeader *h) 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 */ @@ -2970,15 +3002,15 @@ static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPHeader *h) 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 */ @@ -2995,12 +3027,12 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPHeader *h) 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, + ff_rtsp_callback(RTSP_ACTION_SERVER_TEARDOWN, rtp_c->session_id, NULL, 0, rtp_c->stream->rtsp_option); } @@ -3016,21 +3048,23 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPHeader *h) /********************************************************************/ /* RTP handling */ -static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, - FFStream *stream, const char *session_id) +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; @@ -3043,15 +3077,32 @@ static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, 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 */ - pstrcpy(c->protocol, sizeof(c->protocol), "RTP"); + 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); @@ -3061,43 +3112,50 @@ static HTTPContext *rtp_new_connection(struct sockaddr_in *from_addr, } /* add a new RTP stream in an RTP connection (used in RTSP SETUP - command). if dest_addr is NULL, then TCP tunneling in RTSP is + 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) +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 *dummy_buf; + uint8_t *dummy_buf; char buf2[32]; - + int max_packet_size; + /* now we can open the relevant output stream */ - ctx = av_mallocz(sizeof(AVFormatContext)); + ctx = av_alloc_format_context(); if (!ctx) return -1; - ctx->oformat = &rtp_mux; + ctx->oformat = &rtp_muxer; st = av_mallocz(sizeof(AVStream)); if (!st) goto fail; + st->codec= avcodec_alloc_context(); ctx->nb_streams = 1; ctx->streams[0] = st; - if (!c->stream->feed || + if (!c->stream->feed || c->stream->feed == c->stream) { memcpy(st, c->stream->streams[stream_index], sizeof(AVStream)); } else { - memcpy(st, + memcpy(st, c->stream->feed->streams[c->stream->feed_streams[stream_index]], sizeof(AVStream)); } - - if (dest_addr) { - /* build destination RTP address */ - ipaddr = inet_ntoa(dest_addr->sin_addr); - + + /* build destination RTP address */ + ipaddr = inet_ntoa(dest_addr->sin_addr); + + 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; @@ -3105,7 +3163,7 @@ static int rtp_new_av_stream(HTTPContext *c, if (!ttl) ttl = 16; snprintf(ctx->filename, sizeof(ctx->filename), - "rtp://%s:%d?multicast=1&ttl=%d", + "rtp://%s:%d?multicast=1&ttl=%d", ipaddr, ntohs(dest_addr->sin_port), ttl); } else { snprintf(ctx->filename, sizeof(ctx->filename), @@ -3115,21 +3173,28 @@ static int rtp_new_av_stream(HTTPContext *c, if (url_open(&h, ctx->filename, URL_WRONLY) < 0) goto fail; c->rtp_handles[stream_index] = h; - } else { + 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] \"RTPSTART %s/streamid=%d\"\n", - ipaddr, ntohs(dest_addr->sin_port), - ctime1(buf2), - c->stream->filename, stream_index); + 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, - url_get_max_packet_size(h)) < 0) { + 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) @@ -3139,7 +3204,7 @@ static int rtp_new_av_stream(HTTPContext *c, } url_close_dyn_buf(&ctx->pb, &dummy_buf); av_free(dummy_buf); - + c->rtp_ctx[stream_index] = ctx; return 0; } @@ -3147,31 +3212,34 @@ static int rtp_new_av_stream(HTTPContext *c, /********************************************************************/ /* ffserver initialization */ -AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec) +static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec) { AVStream *fst; fst = av_mallocz(sizeof(AVStream)); if (!fst) return NULL; + fst->codec= avcodec_alloc_context(); fst->priv_data = av_mallocz(sizeof(FeedData)); - memcpy(&fst->codec, codec, sizeof(AVCodecContext)); + memcpy(fst->codec, codec, sizeof(AVCodecContext)); + fst->codec->coded_frame = &dummy_frame; + fst->index = stream->nb_streams; + av_set_pts_info(fst, 33, 1, 90000); 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; int i; - av = &st->codec; + av = st->codec; for(i=0;inb_streams;i++) { st = feed->streams[i]; - av1 = &st->codec; + av1 = st->codec; if (av1->codec_id == av->codec_id && av1->codec_type == av->codec_type && av1->bit_rate == av->bit_rate) { @@ -3185,7 +3253,8 @@ int add_av_stream(FFStream *feed, case CODEC_TYPE_VIDEO: if (av1->width == av->width && av1->height == av->height && - av1->frame_rate == av->frame_rate && + av1->time_base.den == av->time_base.den && + av1->time_base.num == av->time_base.num && av1->gop_size == av->gop_size) goto found; break; @@ -3194,7 +3263,7 @@ int add_av_stream(FFStream *feed, } } } - + fst = add_av_stream1(feed, av); if (!fst) return -1; @@ -3203,7 +3272,7 @@ int add_av_stream(FFStream *feed, return i; } -void remove_stream(FFStream *stream) +static void remove_stream(FFStream *stream) { FFStream **ps; ps = &first_stream; @@ -3217,43 +3286,44 @@ void remove_stream(FFStream *stream) } /* specific mpeg4 handling : we extract the raw parameters */ -void extract_mpeg4_header(AVFormatContext *infile) +static void extract_mpeg4_header(AVFormatContext *infile) { int mpeg4_count, i, size; AVPacket pkt; AVStream *st; - const UINT8 *p; + 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 == NULL) { + 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\n"); + 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 == NULL) { + 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 && + 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); + st->codec->extradata = av_malloc(size); + st->codec->extradata_size = size; + memcpy(st->codec->extradata, pkt.data, size); break; } p++; @@ -3265,7 +3335,7 @@ void extract_mpeg4_header(AVFormatContext *infile) } /* compute the needed AVStream for each file */ -void build_file_streams(void) +static void build_file_streams(void) { FFStream *stream, *stream_next; AVFormatContext *infile; @@ -3279,8 +3349,16 @@ void build_file_streams(void) /* the stream comes from a file */ /* try to open the file */ /* open stream */ - if (av_open_input_file(&infile, stream->feed_filename, - NULL, 0, NULL) < 0) { + stream->ap_in = av_mallocz(sizeof(AVFormatParameters)); + if (stream->fmt == &rtp_muxer) { + /* 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: @@ -3289,7 +3367,7 @@ void build_file_streams(void) /* 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'", + http_log("Could not find codec parameters from '%s'", stream->feed_filename); av_close_input_file(infile); goto fail; @@ -3297,7 +3375,7 @@ void build_file_streams(void) extract_mpeg4_header(infile); for(i=0;inb_streams;i++) { - add_av_stream1(stream, &infile->streams[i]->codec); + add_av_stream1(stream, infile->streams[i]->codec); } av_close_input_file(infile); } @@ -3306,7 +3384,7 @@ void build_file_streams(void) } /* compute the needed AVStream for each feed */ -void build_feed_streams(void) +static void build_feed_streams(void) { FFStream *stream, *feed; int i; @@ -3356,13 +3434,14 @@ void build_feed_streams(void) if (sf->index != ss->index || sf->id != ss->id) { - printf("Index & Id do not match for stream %d\n", i); + 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; + ccf = sf->codec; + ccs = ss->codec; #define CHECK_CODEC(x) (ccf->x != ccs->x) if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) { @@ -3372,7 +3451,8 @@ void build_feed_streams(void) 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) || + if (CHECK_CODEC(time_base.den) || + CHECK_CODEC(time_base.num) || CHECK_CODEC(width) || CHECK_CODEC(height)) { printf("Codec width, height and framerate do not match for stream %d\n", i); @@ -3404,12 +3484,24 @@ void build_feed_streams(void) printf("Deleting feed file '%s' as it appears to be corrupt\n", feed->feed_filename); } - if (!matches) + 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", @@ -3423,6 +3515,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); @@ -3439,7 +3532,7 @@ void build_feed_streams(void) feed->feed_write_index = ffm_read_write_index(fd); feed->feed_size = lseek(fd, 0, SEEK_END); /* ensure that we do not wrap before the end of file */ - if (feed->feed_max_size < feed->feed_size) + if (feed->feed_max_size && feed->feed_max_size < feed->feed_size) feed->feed_max_size = feed->feed_size; close(fd); @@ -3451,15 +3544,15 @@ 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) { + switch(st->codec->codec_type) { case CODEC_TYPE_AUDIO: case CODEC_TYPE_VIDEO: - bandwidth += st->codec.bit_rate; + bandwidth += st->codec->bit_rate; break; default: break; @@ -3502,7 +3595,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; @@ -3519,8 +3612,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->time_base.num == 0){ + av->time_base.den = 5; + av->time_base.num = 1; + } if (av->width == 0 || av->height == 0) { av->width = 160; av->height = 128; @@ -3537,6 +3632,13 @@ void add_codec(FFStream *stream, AVCodecContext *av) av->qcompress = 0.5; av->qblur = 0.5; + if (!av->nsse_weight) + av->nsse_weight = 8; + + av->frame_skip_cmp = FF_CMP_DCTMAX; + av->me_method = ME_EPZS; + av->rc_buffer_aggressivity = 1.0; + if (!av->rc_eq) av->rc_eq = "tex^qComp"; if (!av->i_quant_factor) @@ -3545,11 +3647,14 @@ void add_codec(FFStream *stream, AVCodecContext *av) 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; + if (av->rc_max_rate && !av->rc_buffer_size) { + av->rc_buffer_size = av->rc_max_rate; + } + + break; default: av_abort(); @@ -3558,11 +3663,12 @@ void add_codec(FFStream *stream, AVCodecContext *av) st = av_mallocz(sizeof(AVStream)); if (!st) return; + st->codec = avcodec_alloc_context(); stream->streams[stream->nb_streams++] = st; - memcpy(&st->codec, av, sizeof(AVCodecContext)); + memcpy(st->codec, av, sizeof(AVCodecContext)); } -int opt_audio_codec(const char *arg) +static int opt_audio_codec(const char *arg) { AVCodec *p; @@ -3579,7 +3685,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; @@ -3599,7 +3705,7 @@ int opt_video_codec(const char *arg) /* simplistic plugin support */ #ifdef CONFIG_HAVE_DLOPEN -void load_module(const char *filename) +static void load_module(const char *filename) { void *dll; void (*init_func)(void); @@ -3609,10 +3715,10 @@ void load_module(const char *filename) filename, dlerror()); return; } - + init_func = dlsym(dll, "ffserver_module_init"); if (!init_func) { - fprintf(stderr, + fprintf(stderr, "%s: init function 'ffserver_module_init()' not found\n", filename); dlclose(dll); @@ -3622,7 +3728,7 @@ void load_module(const char *filename) } #endif -int parse_ffconfig(const char *filename) +static int parse_ffconfig(const char *filename) { FILE *f; char line[1024]; @@ -3640,7 +3746,7 @@ int parse_ffconfig(const char *filename) perror(filename); return -1; } - + errors = 0; line_num = 0; first_stream = NULL; @@ -3657,20 +3763,20 @@ int parse_ffconfig(const char *filename) break; line_num++; p = line; - while (isspace(*p)) + while (isspace(*p)) p++; if (*p == '\0' || *p == '#') continue; get_arg(cmd, sizeof(cmd), &p); - + if (!strcasecmp(cmd, "Port")) { get_arg(arg, sizeof(arg), &p); my_http_addr.sin_port = htons (atoi(arg)); } else if (!strcasecmp(cmd, "BindAddress")) { get_arg(arg, sizeof(arg), &p); if (!inet_aton(arg, &my_http_addr.sin_addr)) { - fprintf(stderr, "%s:%d: Invalid IP address: %s\n", + fprintf(stderr, "%s:%d: Invalid IP address: %s\n", filename, line_num, arg); errors++; } @@ -3682,7 +3788,7 @@ int parse_ffconfig(const char *filename) } 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", + fprintf(stderr, "%s:%d: Invalid IP address: %s\n", filename, line_num, arg); errors++; } @@ -3690,7 +3796,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); val = atoi(arg); if (val < 1 || val > HTTP_MAX_CONNECTIONS) { - fprintf(stderr, "%s:%d: Invalid MaxClients: %s\n", + fprintf(stderr, "%s:%d: Invalid MaxClients: %s\n", filename, line_num, arg); errors++; } else { @@ -3700,7 +3806,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); val = atoi(arg); if (val < 10 || val > 100000) { - fprintf(stderr, "%s:%d: Invalid MaxBandwidth: %s\n", + fprintf(stderr, "%s:%d: Invalid MaxBandwidth: %s\n", filename, line_num, arg); errors++; } else { @@ -3723,7 +3829,7 @@ int parse_ffconfig(const char *filename) /* add in feed list */ *last_feed = feed; last_feed = &feed->next_feed; - + get_arg(feed->filename, sizeof(feed->filename), &p); q = strrchr(feed->filename, '>'); if (*q) @@ -3742,24 +3848,40 @@ int parse_ffconfig(const char *filename) feed->child_argv = (char **) av_mallocz(64 * sizeof(char *)); - feed->child_argv[0] = av_malloc(7); - strcpy(feed->child_argv[0], "ffmpeg"); - - for (i = 1; i < 62; i++) { + for (i = 0; i < 62; i++) { char argbuf[256]; get_arg(argbuf, sizeof(argbuf), &p); 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", + snprintf(feed->child_argv[i], 30+strlen(feed->filename), + "http://%s:%d/%s", + (my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" : + inet_ntoa(my_http_addr.sin_addr), ntohs(my_http_addr.sin_port), feed->filename); + + if (ffserver_debug) + { + int j; + fprintf(stdout, "Launch commandline: "); + for (j = 0; j <= i; j++) + fprintf(stdout, "%s ", feed->child_argv[j]); + fprintf(stdout, "\n"); + } + } + } 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) { @@ -3786,7 +3908,7 @@ 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) { @@ -3796,7 +3918,7 @@ int parse_ffconfig(const char *filename) #if 0 } else { /* Make sure that we start out clean */ - if (unlink(feed->feed_filename) < 0 + if (unlink(feed->feed_filename) < 0 && errno != ENOENT) { fprintf(stderr, "%s:%d: Unable to clean old feed file '%s': %s\n", filename, line_num, feed->feed_filename, strerror(errno)); @@ -3835,7 +3957,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); if (stream) { FFStream *sfeed; - + sfeed = first_feed; while (sfeed != NULL) { if (!strcmp(sfeed->filename, arg)) @@ -3858,10 +3980,10 @@ int parse_ffconfig(const char *filename) stream->stream_type = STREAM_TYPE_LIVE; /* jpeg cannot be used here, so use single frame jpeg */ if (!strcmp(arg, "jpeg")) - strcpy(arg, "singlejpeg"); + strcpy(arg, "mjpeg"); stream->fmt = guess_stream_format(arg, NULL, NULL); if (!stream->fmt) { - fprintf(stderr, "%s:%d: Unknown Format: %s\n", + fprintf(stderr, "%s:%d: Unknown Format: %s\n", filename, line_num, arg); errors++; } @@ -3870,11 +3992,17 @@ 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); } else { - fprintf(stderr, "%s:%d: FaviconURL only permitted for status streams\n", + fprintf(stderr, "%s:%d: FaviconURL only permitted for status streams\n", filename, line_num); errors++; } @@ -3907,7 +4035,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); audio_id = opt_audio_codec(arg); if (audio_id == CODEC_ID_NONE) { - fprintf(stderr, "%s:%d: Unknown AudioCodec: %s\n", + fprintf(stderr, "%s:%d: Unknown AudioCodec: %s\n", filename, line_num, arg); errors++; } @@ -3915,7 +4043,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); video_id = opt_video_codec(arg); if (video_id == CODEC_ID_NONE) { - fprintf(stderr, "%s:%d: Unknown VideoCodec: %s\n", + fprintf(stderr, "%s:%d: Unknown VideoCodec: %s\n", filename, line_num, arg); errors++; } @@ -3939,8 +4067,8 @@ 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); + } else if (!strcasecmp(cmd, "AudioQuality")) { + get_arg(arg, sizeof(arg), &p); if (stream) { // audio_enc.quality = atof(arg) * 1000; } @@ -3954,11 +4082,26 @@ int parse_ffconfig(const char *filename) 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", + fprintf(stderr, "%s:%d: Incorrect format for VideoBitRateRange -- should be -: %s\n", filename, line_num, arg); errors++; } } + } else if (!strcasecmp(cmd, "Debug")) { + if (stream) { + get_arg(arg, sizeof(arg), &p); + video_enc.debug = strtol(arg,0,0); + } + } else if (!strcasecmp(cmd, "Strict")) { + if (stream) { + get_arg(arg, sizeof(arg), &p); + video_enc.strict_std_compliance = atoi(arg); + } + } else if (!strcasecmp(cmd, "VideoBufferSize")) { + if (stream) { + get_arg(arg, sizeof(arg), &p); + video_enc.rc_buffer_size = atoi(arg) * 8*1024; + } } else if (!strcasecmp(cmd, "VideoBitRateTolerance")) { if (stream) { get_arg(arg, sizeof(arg), &p); @@ -3983,7 +4126,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.time_base.num= DEFAULT_FRAME_RATE_BASE; + video_enc.time_base.den = (int)(strtod(arg, NULL) * video_enc.time_base.num); } } else if (!strcasecmp(cmd, "VideoGopSize")) { get_arg(arg, sizeof(arg), &p); @@ -3996,7 +4140,30 @@ 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, "BitExact")) { + if (stream) { + video_enc.flags |= CODEC_FLAG_BITEXACT; + } + } else if (!strcasecmp(cmd, "DctFastint")) { + if (stream) { + video_enc.dct_algo = FF_DCT_FASTINT; + } + } else if (!strcasecmp(cmd, "IdctSimple")) { + if (stream) { + video_enc.idct_algo = FF_IDCT_SIMPLE; + } + } else if (!strcasecmp(cmd, "Qscale")) { + get_arg(arg, sizeof(arg), &p); + if (stream) { + video_enc.flags |= CODEC_FLAG_QSCALE; + video_enc.global_quality = FF_QP2LAMBDA * atoi(arg); } } else if (!strcasecmp(cmd, "VideoQDiff")) { get_arg(arg, sizeof(arg), &p); @@ -4076,7 +4243,7 @@ int parse_ffconfig(const char *filename) errors++; } else { /* Only take the first */ - acl.first = *(struct in_addr *) he->h_addr_list[0]; + acl.first.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr); acl.last = acl.first; } @@ -4090,7 +4257,7 @@ int parse_ffconfig(const char *filename) errors++; } else { /* Only take the first */ - acl.last = *(struct in_addr *) he->h_addr_list[0]; + acl.last.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr); } } @@ -4132,7 +4299,7 @@ int parse_ffconfig(const char *filename) get_arg(arg, sizeof(arg), &p); if (stream) { if (!inet_aton(arg, &stream->multicast_ip)) { - fprintf(stderr, "%s:%d: Invalid IP address: %s\n", + fprintf(stderr, "%s:%d: Invalid IP address: %s\n", filename, line_num, arg); errors++; } @@ -4211,12 +4378,12 @@ int parse_ffconfig(const char *filename) #ifdef CONFIG_HAVE_DLOPEN load_module(arg); #else - fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n", + 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", + fprintf(stderr, "%s:%d: Incorrect keyword: '%s'\n", filename, line_num, cmd); errors++; } @@ -4232,14 +4399,14 @@ int parse_ffconfig(const char *filename) #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; @@ -4248,23 +4415,27 @@ static void write_packet(FFCodec *ffenc, } #endif -void help(void) +static void show_banner(void) { - printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n" - "usage: ffserver [-L] [-h] [-f configfile]\n" + printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2003 Fabrice Bellard\n"); +} + +static void show_help(void) +{ + 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" @@ -4277,7 +4448,7 @@ void licence(void) "\n" "You should have received a copy of the GNU Lesser General Public\n" "License along with this library; if not, write to the Free Software\n" - "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" ); } @@ -4299,7 +4470,7 @@ static void handle_child_exit(int sig) if (uptime < 30) { /* Turn off any more restarts */ feed->child_argv = 0; - } + } } } } @@ -4320,18 +4491,18 @@ int main(int argc, char **argv) my_program_name = argv[0]; my_program_dir = getcwd(0, 0); ffserver_daemon = 1; - + for(;;) { 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; @@ -4361,7 +4532,7 @@ int main(int argc, char **argv) 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; max_bandwidth = 1000; first_stream = NULL;