X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver.c;h=cec0e824259519b18a349d7ecfd6a50fb908ae31;hb=4e8f77ab617d1347eb6ae97da2fa2efe8a51b5a8;hp=47c4bcc5d017f58fdba7b0157336d7788fec259c;hpb=0bd5396778a28c989ae4fb08190bf4daf4f4ea0e;p=ffmpeg diff --git a/ffserver.c b/ffserver.c index 47c4bcc5d01..cec0e824259 100644 --- a/ffserver.c +++ b/ffserver.c @@ -20,19 +20,25 @@ */ #include "config.h" -#if HAVE_CLOSESOCKET != 1 +#ifndef HAVE_CLOSESOCKET #define closesocket close #endif #include #include -#include "avformat.h" - +#include "libavutil/random.h" +#include "libavutil/avstring.h" +#include "libavformat/avformat.h" +#include "libavformat/network.h" +#include "libavformat/os_support.h" +#include "libavformat/rtp.h" +#include "libavformat/rtsp.h" +#include "libavcodec/opt.h" #include #include #include #include -#ifdef HAVE_SYS_POLL_H -#include +#ifdef HAVE_POLL_H +#include #endif #include #include @@ -44,14 +50,15 @@ #include #endif -#include "network.h" -#include "version.h" -#include "ffserver.h" -#include "random.h" -#include "avstring.h" +#include "cmdutils.h" #undef exit +const char program_name[] = "FFserver"; +const int program_birth_year = 2000; + +static const OptionDef options[]; + /* maximum number of simultaneous HTTP connections */ #define HTTP_MAX_CONNECTIONS 2000 @@ -70,7 +77,7 @@ enum HTTPState { RTSPSTATE_SEND_PACKET, }; -const char *http_state[] = { +static const char *http_state[] = { "HTTP_WAIT_REQUEST", "HTTP_SEND_HEADER", @@ -162,8 +169,6 @@ typedef struct HTTPContext { 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, @@ -227,14 +232,14 @@ typedef struct FFStream { int conns_served; 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_write_index; /* current write position in feed (it wraps around) */ int64_t feed_size; /* current size of feed */ struct FFStream *next_feed; } FFStream; typedef struct FeedData { long long data_count; - float avg_frame_size; /* frame size averraged over last frames with exponential mean */ + float avg_frame_size; /* frame size averaged over last frames with exponential mean */ } FeedData; static struct sockaddr_in my_http_addr; @@ -252,7 +257,7 @@ static void close_connection(HTTPContext *c); static int handle_connection(HTTPContext *c); static int http_parse_request(HTTPContext *c); static int http_send_data(HTTPContext *c); -static void compute_stats(HTTPContext *c); +static void compute_status(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); @@ -281,6 +286,7 @@ static int rtp_new_av_stream(HTTPContext *c, static const char *my_program_name; static const char *my_program_dir; +static const char *config_filename; static int ffserver_debug; static int ffserver_daemon; static int no_launch; @@ -289,8 +295,8 @@ static int need_to_start_children; static int nb_max_connections; static int nb_connections; -static int max_bandwidth; -static int current_bandwidth; +static uint64_t max_bandwidth; +static uint64_t current_bandwidth; static int64_t cur_time; // Making this global saves on passing it around everywhere @@ -372,7 +378,7 @@ static void start_children(FFStream *feed) feed->pid = fork(); if (feed->pid < 0) { - fprintf(stderr, "Unable to create children\n"); + http_log("Unable to create children\n"); exit(1); } if (!feed->pid) { @@ -381,9 +387,8 @@ static void start_children(FFStream *feed) char *slash; int i; - for (i = 3; i < 256; i++) { + for (i = 3; i < 256; i++) close(i); - } if (!ffserver_debug) { i = open("/dev/null", O_RDWR); @@ -398,11 +403,10 @@ static void start_children(FFStream *feed) av_strlcpy(pathname, my_program_name, sizeof(pathname)); slash = strrchr(pathname, '/'); - if (!slash) { + if (!slash) slash = pathname; - } else { + else slash++; - } strcpy(slash, "ffmpeg"); /* This is needed to make relative pathnames work */ @@ -478,12 +482,12 @@ static void start_multicast(void) rtp_c = rtp_new_connection(&dest_addr, stream, session_id, RTSP_PROTOCOL_RTP_UDP_MULTICAST); - if (!rtp_c) { + if (!rtp_c) continue; - } + if (open_input_stream(rtp_c, "") < 0) { - fprintf(stderr, "Could not open input stream for stream '%s'\n", - stream->filename); + http_log("Could not open input stream for stream '%s'\n", + stream->filename); continue; } @@ -493,8 +497,8 @@ static void start_multicast(void) dest_addr.sin_port = htons(stream->multicast_port + 2 * stream_index); if (rtp_new_av_stream(rtp_c, stream_index, &dest_addr, NULL) < 0) { - fprintf(stderr, "Could not open output stream '%s/streamid=%d'\n", - stream->filename, stream_index); + http_log("Could not open output stream '%s/streamid=%d'\n", + stream->filename, stream_index); exit(1); } } @@ -617,14 +621,12 @@ static int http_server(void) poll_entry = poll_table; /* new HTTP connection request ? */ - if (poll_entry->revents & POLLIN) { + if (poll_entry->revents & POLLIN) new_connection(server_fd, 0); - } poll_entry++; /* new RTSP connection request ? */ - if (poll_entry->revents & POLLIN) { + if (poll_entry->revents & POLLIN) new_connection(rtsp_server_fd, 1); - } } } @@ -652,8 +654,10 @@ static void new_connection(int server_fd, int is_rtsp) len = sizeof(from_addr); fd = accept(server_fd, (struct sockaddr *)&from_addr, &len); - if (fd < 0) + if (fd < 0) { + http_log("error during accept %s\n", strerror(errno)); return; + } ff_socket_nonblock(fd, 1); /* XXX: should output a warning page when coming @@ -702,11 +706,10 @@ static void close_connection(HTTPContext *c) cp = &first_http_ctx; while ((*cp) != NULL) { c1 = *cp; - if (c1 == c) { + if (c1 == c) *cp = c->next; - } else { + else cp = &c1->next; - } } /* remove references, if any (XXX: do it faster) */ @@ -722,9 +725,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) { + if (st->codec->codec) avcodec_close(st->codec); - } } av_close_input_file(c->fmt_in); } @@ -741,9 +743,8 @@ static void close_connection(HTTPContext *c) av_free(ctx); } h = c->rtp_handles[i]; - if (h) { + if (h) url_close(h); - } } ctx = &c->fmt_ctx; @@ -753,7 +754,7 @@ static void close_connection(HTTPContext *c) /* prepare header */ if (url_open_dyn_buf(&ctx->pb) >= 0) { av_write_trailer(ctx); - url_close_dyn_buf(&ctx->pb, &c->pb_buffer); + url_close_dyn_buf(ctx->pb, &c->pb_buffer); } } } @@ -847,9 +848,8 @@ static int handle_connection(HTTPContext *c) if (c->buffer_ptr >= c->buffer_end) { av_freep(&c->pb_buffer); /* if error, exit */ - if (c->http_error) { + if (c->http_error) return -1; - } /* all the buffer was sent : synchronize to the incoming stream */ c->state = HTTPSTATE_SEND_DATA_HEADER; c->buffer_ptr = c->buffer_end = c->buffer; @@ -978,13 +978,12 @@ static int extract_rates(char *rates, int ratelen, const char *request) while (*q && *q != '\n' && *q != ':') q++; - if (sscanf(q, ":%d:%d", &stream_no, &rate_no) != 2) { + if (sscanf(q, ":%d:%d", &stream_no, &rate_no) != 2) break; - } + stream_no--; - if (stream_no < ratelen && stream_no >= 0) { + if (stream_no < ratelen && stream_no >= 0) rates[stream_no] = rate_no; - } while (*q && *q != '\n' && !isspace(*q)) q++; @@ -1015,9 +1014,8 @@ static int find_stream_in_feed(FFStream *feed, AVCodecContext *codec, int bit_ra if (feed_codec->codec_id != codec->codec_id || feed_codec->sample_rate != codec->sample_rate || feed_codec->width != codec->width || - feed_codec->height != codec->height) { + feed_codec->height != codec->height) continue; - } /* Potential stream */ @@ -1129,9 +1127,8 @@ static int validate_acl(FFStream *stream, HTTPContext *c) unsigned long src_addr = src->s_addr; for (acl = stream->acl; acl; acl = acl->next) { - if (src_addr >= acl->first.s_addr && src_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; } @@ -1218,9 +1215,8 @@ static int http_parse_request(HTTPContext *c) if (p) { av_strlcpy(info, p, sizeof(info)); *p = '\0'; - } else { + } else info[0] = '\0'; - } av_strlcpy(filename, url + ((*url == '/') ? 1 : 0), sizeof(filename)-1); @@ -1310,9 +1306,8 @@ static int http_parse_request(HTTPContext *c) goto send_error; } - if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) { + if (c->post == 0 && stream->stream_type == STREAM_TYPE_LIVE) current_bandwidth += stream->bandwidth; - } if (c->post == 0 && max_bandwidth < current_bandwidth) { c->http_error = 200; @@ -1322,7 +1317,7 @@ static int http_parse_request(HTTPContext *c) 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", + q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "

The bandwidth being served (including your stream) is %lldkbit/sec, and this exceeds the limit of %lldkbit/sec.

\r\n", current_bandwidth, max_bandwidth); q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "\r\n"); @@ -1471,9 +1466,8 @@ static int http_parse_request(HTTPContext *c) logline = p; break; } - if (strncasecmp(p, "Pragma: client-id=", 18) == 0) { + if (strncasecmp(p, "Pragma: client-id=", 18) == 0) client_id = strtol(p + 18, 0, 10); - } p = strchr(p, '\n'); if (!p) break; @@ -1507,11 +1501,8 @@ static int http_parse_request(HTTPContext *c) break; } - if (wmpc) { - if (modify_current_stream(wmpc, ratebuf)) { - wmpc->switch_pending = 1; - } - } + if (wmpc && modify_current_stream(wmpc, ratebuf)) + wmpc->switch_pending = 1; } snprintf(msg, sizeof(msg), "POST command not handled"); @@ -1528,13 +1519,12 @@ static int http_parse_request(HTTPContext *c) } #ifdef DEBUG_WMP - if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0) { + if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0) http_log("\nGot request:\n%s\n", c->buffer); - } #endif if (c->stream->stream_type == STREAM_TYPE_STATUS) - goto send_stats; + goto send_status; /* open input stream */ if (open_input_stream(c, info) < 0) { @@ -1583,8 +1573,8 @@ static int http_parse_request(HTTPContext *c) c->buffer_end = q; c->state = HTTPSTATE_SEND_HEADER; return 0; - send_stats: - compute_stats(c); + send_status: + compute_status(c); c->http_error = 200; /* horrible : we use this value to avoid going to the send data state */ c->state = HTTPSTATE_SEND_HEADER; @@ -1596,22 +1586,21 @@ static void fmt_bytecount(ByteIOContext *pb, int64_t count) static const char *suffix = " kMGTP"; const char *s; - for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++) { - } + for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++); url_fprintf(pb, "%"PRId64"%c", count, *s); } -static void compute_stats(HTTPContext *c) +static void compute_status(HTTPContext *c) { HTTPContext *c1; FFStream *stream; char *p; time_t ti; int i, len; - ByteIOContext pb1, *pb = &pb1; + ByteIOContext *pb; - if (url_open_dyn_buf(pb) < 0) { + if (url_open_dyn_buf(&pb) < 0) { /* XXX: return an error ? */ c->buffer_ptr = c->buffer; c->buffer_end = c->buffer; @@ -1623,12 +1612,11 @@ static void compute_stats(HTTPContext *c) 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, "%s Status\n", program_name); + if (c->stream->feed_filename) url_fprintf(pb, "\n", c->stream->feed_filename); - } url_fprintf(pb, "\n"); - url_fprintf(pb, "

FFServer Status

\n"); + url_fprintf(pb, "

%s Status

\n", program_name); /* format status */ url_fprintf(pb, "

Available Streams

\n"); url_fprintf(pb, "\n"); @@ -1642,11 +1630,11 @@ static void compute_stats(HTTPContext *c) av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10); eosf = sfilename + strlen(sfilename); if (eosf - sfilename >= 4) { - if (strcmp(eosf - 4, ".asf") == 0) { + if (strcmp(eosf - 4, ".asf") == 0) strcpy(eosf - 4, ".asx"); - } else if (strcmp(eosf - 3, ".rm") == 0) { + else if (strcmp(eosf - 3, ".rm") == 0) strcpy(eosf - 3, ".ram"); - } else if (stream->fmt == &rtp_muxer) { + else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) { /* generate a sample RTSP director if unicast. Generate an SDP redirector if multicast */ @@ -1707,11 +1695,10 @@ static void compute_stats(HTTPContext *c) stream->bandwidth, video_bit_rate / 1000, video_codec_name, video_codec_name_extra, audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra); - if (stream->feed) { + if (stream->feed) url_fprintf(pb, "
%s", stream->feed->filename); - } else { + else url_fprintf(pb, "%s", stream->feed_filename); - } url_fprintf(pb, "\n"); } break; @@ -1826,7 +1813,7 @@ static void compute_stats(HTTPContext *c) url_fprintf(pb, "Number of connections: %d / %d
\n", nb_connections, nb_max_connections); - url_fprintf(pb, "Bandwidth in use: %dk / %dk
\n", + url_fprintf(pb, "Bandwidth in use: %lldk / %lldk
\n", current_bandwidth, max_bandwidth); url_fprintf(pb, "\n"); @@ -1840,13 +1827,10 @@ static void compute_stats(HTTPContext *c) bitrate = 0; if (c1->stream) { for (j = 0; j < c1->stream->nb_streams; j++) { - if (!c1->stream->feed) { + if (!c1->stream->feed) bitrate += c1->stream->streams[j]->codec->bit_rate; - } else { - if (c1->feed_streams[j] >= 0) { - bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; - } - } + else if (c1->feed_streams[j] >= 0) + bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate; } } @@ -1890,9 +1874,8 @@ static void open_parser(AVFormatContext *s, int i) 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) { + if (avcodec_open(st->codec, codec) < 0) st->codec->parse_only = 0; - } } } } @@ -1902,7 +1885,7 @@ static int open_input_stream(HTTPContext *c, const char *info) char buf[128]; char input_filename[1024]; AVFormatContext *s; - int buf_size, i; + int buf_size, i, ret; int64_t stream_pos; /* find file name */ @@ -1910,23 +1893,29 @@ static int open_input_stream(HTTPContext *c, const char *info) strcpy(input_filename, c->stream->feed->feed_filename); buf_size = FFM_PACKET_SIZE; /* compute position (absolute time) */ - if (find_info_tag(buf, sizeof(buf), "date", info)) { + if (find_info_tag(buf, sizeof(buf), "date", info)) + { stream_pos = parse_date(buf, 0); - } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) { + if (stream_pos == INT64_MIN) + return -1; + } + else if (find_info_tag(buf, sizeof(buf), "buffer", info)) { int prebuffer = strtol(buf, 0, 10); stream_pos = av_gettime() - prebuffer * (int64_t)1000000; - } else { + } else stream_pos = av_gettime() - c->stream->prebuffer * (int64_t)1000; - } } else { strcpy(input_filename, c->stream->feed_filename); buf_size = 0; /* compute position (relative time) */ - if (find_info_tag(buf, sizeof(buf), "date", info)) { + if (find_info_tag(buf, sizeof(buf), "date", info)) + { stream_pos = parse_date(buf, 1); - } else { - stream_pos = 0; + if (stream_pos == INT64_MIN) + return -1; } + else + stream_pos = 0; } if (input_filename[0] == '\0') return -1; @@ -1938,12 +1927,14 @@ static int open_input_stream(HTTPContext *c, const char *info) #endif /* open stream */ - 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); + if ((ret = av_open_input_file(&s, input_filename, c->stream->ifmt, + buf_size, c->stream->ap_in)) < 0) { + http_log("could not open %s: %d\n", input_filename, ret); return -1; } + s->flags |= AVFMT_FLAG_GENPTS; c->fmt_in = s; + av_find_stream_info(c->fmt_in); /* open each parser */ for(i=0;inb_streams;i++) @@ -1960,9 +1951,8 @@ static int open_input_stream(HTTPContext *c, const char *info) } #if 1 - if (c->fmt_in->iformat->read_seek) { + if (c->fmt_in->iformat->read_seek) 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; @@ -1984,9 +1974,9 @@ static int64_t get_packet_send_clock(HTTPContext *c) int bytes_left, bytes_sent, frame_bytes; frame_bytes = c->cur_frame_bytes; - if (frame_bytes <= 0) { + if (frame_bytes <= 0) return c->cur_pts; - } else { + 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; @@ -2032,10 +2022,6 @@ static int http_prepare_data(HTTPContext *c) 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; @@ -2044,13 +2030,15 @@ static int http_prepare_data(HTTPContext *c) /* XXX: potential leak */ return -1; } - c->fmt_ctx.pb.is_streamed = 1; + c->fmt_ctx.pb->is_streamed = 1; av_set_parameters(&c->fmt_ctx, NULL); - if (av_write_header(&c->fmt_ctx) < 0) + if (av_write_header(&c->fmt_ctx) < 0) { + http_log("Error writing output header\n"); return -1; + } - len = url_close_dyn_buf(&c->fmt_ctx.pb, &c->pb_buffer); + len = url_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer); c->buffer_ptr = c->pb_buffer; c->buffer_end = c->pb_buffer + len; @@ -2059,159 +2047,152 @@ static int http_prepare_data(HTTPContext *c) break; case HTTPSTATE_SEND_DATA: /* find a new packet */ - { + /* read a packet from the input stream */ + if (c->stream->feed) + ffm_set_write_index(c->fmt_in, + c->stream->feed->feed_write_index, + c->stream->feed->feed_size); + + if (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 { AVPacket pkt; - - /* read a packet from the input stream */ - if (c->stream->feed) { - ffm_set_write_index(c->fmt_in, - c->stream->feed->feed_write_index, - c->stream->feed->feed_size); - } - - if (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 { - redo: - if (av_read_frame(c->fmt_in, &pkt) < 0) { - if (c->stream->feed && c->stream->feed->feed_opened) { - /* if coming from feed, it means we reached the end of the - ffm file, so must wait for more data */ - c->state = HTTPSTATE_WAIT_FEED; - return 1; /* state changed */ - } else { - if (c->stream->loop) { - av_close_input_file(c->fmt_in); - c->fmt_in = NULL; - if (open_input_stream(c, "") < 0) - goto no_loop; - goto redo; - } else { - no_loop: - /* must send trailer now because eof or error */ - c->state = HTTPSTATE_SEND_DATA_TRAILER; - } - } + redo: + if (av_read_frame(c->fmt_in, &pkt) < 0) { + if (c->stream->feed && c->stream->feed->feed_opened) { + /* if coming from feed, it means we reached the end of the + ffm file, so must wait for more data */ + c->state = HTTPSTATE_WAIT_FEED; + return 1; /* state changed */ } else { - /* update first pts if needed */ - 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; + if (c->stream->loop) { + av_close_input_file(c->fmt_in); + c->fmt_in = NULL; + if (open_input_stream(c, "") < 0) + goto no_loop; + goto redo; + } else { + no_loop: + /* must send trailer now because eof or error */ + c->state = HTTPSTATE_SEND_DATA_TRAILER; } - /* send it to the appropriate stream */ - if (c->stream->feed) { - /* if coming from a feed, select the right stream */ - if (c->switch_pending) { - c->switch_pending = 0; - for(i=0;istream->nb_streams;i++) { - if (c->switch_feed_streams[i] == pkt.stream_index) { - if (pkt.flags & PKT_FLAG_KEY) { - do_switch_stream(c, i); - } - } - if (c->switch_feed_streams[i] >= 0) { - c->switch_pending = 1; - } - } - } + } + } else { + int source_index = pkt.stream_index; + /* update first pts if needed */ + 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 */ + if (c->switch_pending) { + c->switch_pending = 0; for(i=0;istream->nb_streams;i++) { - if (c->feed_streams[i] == pkt.stream_index) { - pkt.stream_index = i; - if (pkt.flags & PKT_FLAG_KEY) { - c->got_key_frame |= 1 << i; - } - /* See if we have all the key frames, then - * we start to send. This logic is not quite - * right, but it works for the case of a - * single video stream with one or more - * audio streams (for which every frame is - * typically a key frame). - */ - if (!c->stream->send_on_key || - ((c->got_key_frame + 1) >> c->stream->nb_streams)) { - goto send_it; - } - } + if (c->switch_feed_streams[i] == pkt.stream_index) + if (pkt.flags & PKT_FLAG_KEY) + do_switch_stream(c, i); + if (c->switch_feed_streams[i] >= 0) + c->switch_pending = 1; } - } 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); + } + for(i=0;istream->nb_streams;i++) { + if (c->feed_streams[i] == pkt.stream_index) { + AVStream *st = c->fmt_in->streams[source_index]; + pkt.stream_index = i; + if (pkt.flags & PKT_FLAG_KEY && + (st->codec->codec_type == CODEC_TYPE_VIDEO || + c->stream->nb_streams == 1)) + c->got_key_frame = 1; + if (!c->stream->send_on_key || c->got_key_frame) + goto send_it; + } + } + } else { + AVCodecContext *codec; + + send_it: + /* specific handling for RTP: we use several + output stream (one for each RTP + connection). XXX: need more abstract handling */ + if (c->is_packetized) { + AVStream *st; + /* compute send time and duration */ + st = c->fmt_in->streams[pkt.stream_index]; + c->cur_pts = 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); + printf("index=%d pts=%0.3f duration=%0.6f\n", + pkt.stream_index, + (double)c->cur_pts / + AV_TIME_BASE, + (double)c->cur_frame_duration / + AV_TIME_BASE); #endif - /* find RTP context */ - c->packet_stream_index = pkt.stream_index; - ctx = c->rtp_ctx[c->packet_stream_index]; - if(!ctx) { - av_free_packet(&pkt); - break; - } - codec = ctx->streams[0]->codec; - /* only one stream per RTP connection */ - pkt.stream_index = 0; - } else { - ctx = &c->fmt_ctx; - /* Fudge here */ - codec = ctx->streams[pkt.stream_index]->codec; + /* find RTP context */ + c->packet_stream_index = pkt.stream_index; + ctx = c->rtp_ctx[c->packet_stream_index]; + if(!ctx) { + av_free_packet(&pkt); + break; } + codec = ctx->streams[0]->codec; + /* only one stream per RTP connection */ + pkt.stream_index = 0; + } else { + ctx = &c->fmt_ctx; + /* Fudge here */ + codec = ctx->streams[pkt.stream_index]->codec; + } - codec->coded_frame->key_frame = ((pkt.flags & PKT_FLAG_KEY) != 0); - if (c->is_packetized) { - int max_packet_size; - if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) - max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; - else - max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); - ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size); - } else { - ret = url_open_dyn_buf(&ctx->pb); - } - if (ret < 0) { - /* XXX: potential leak */ - return -1; - } - if (pkt.dts != AV_NOPTS_VALUE) - pkt.dts = av_rescale_q(pkt.dts, - c->fmt_in->streams[pkt.stream_index]->time_base, - ctx->streams[pkt.stream_index]->time_base); - if (pkt.pts != AV_NOPTS_VALUE) - pkt.pts = av_rescale_q(pkt.pts, - c->fmt_in->streams[pkt.stream_index]->time_base, - ctx->streams[pkt.stream_index]->time_base); - if (av_write_frame(ctx, &pkt)) { - c->state = HTTPSTATE_SEND_DATA_TRAILER; - } + if (c->is_packetized) { + int max_packet_size; + if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) + max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; + else + max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); + ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size); + } else { + ret = url_open_dyn_buf(&ctx->pb); + } + if (ret < 0) { + /* XXX: potential leak */ + return -1; + } + c->fmt_ctx.pb->is_streamed = 1; + if (pkt.dts != AV_NOPTS_VALUE) + pkt.dts = av_rescale_q(pkt.dts, + c->fmt_in->streams[source_index]->time_base, + ctx->streams[pkt.stream_index]->time_base); + if (pkt.pts != AV_NOPTS_VALUE) + pkt.pts = av_rescale_q(pkt.pts, + c->fmt_in->streams[source_index]->time_base, + ctx->streams[pkt.stream_index]->time_base); + pkt.duration = av_rescale_q(pkt.duration, + c->fmt_in->streams[source_index]->time_base, + ctx->streams[pkt.stream_index]->time_base); + if (av_write_frame(ctx, &pkt) < 0) { + http_log("Error writing frame to output\n"); + 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; + 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; + codec->frame_number++; + if (len == 0) { + av_free_packet(&pkt); + goto redo; } - av_free_packet(&pkt); } + av_free_packet(&pkt); } } break; @@ -2226,8 +2207,9 @@ static int http_prepare_data(HTTPContext *c) /* XXX: potential leak */ return -1; } + c->fmt_ctx.pb->is_streamed = 1; av_write_trailer(ctx); - len = url_close_dyn_buf(&ctx->pb, &c->pb_buffer); + len = url_close_dyn_buf(ctx->pb, &c->pb_buffer); c->buffer_ptr = c->pb_buffer; c->buffer_end = c->pb_buffer + len; @@ -2249,10 +2231,9 @@ static int http_send_data(HTTPContext *c) ret = http_prepare_data(c); if (ret < 0) return -1; - else if (ret != 0) { + else if (ret != 0) /* state change requested */ break; - } } else { if (c->is_packetized) { /* RTP data output */ @@ -2281,7 +2262,7 @@ static int http_send_data(HTTPContext *c) if (c->rtp_protocol == RTSP_PROTOCOL_RTP_TCP) { /* RTP packets are sent inside the RTSP TCP connection */ - ByteIOContext pb1, *pb = &pb1; + ByteIOContext *pb; int interleaved_index, size; uint8_t header[4]; HTTPContext *rtsp_c; @@ -2291,10 +2272,9 @@ static int http_send_data(HTTPContext *c) if (!rtsp_c) return -1; /* if already sending something, then wait. */ - if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST) { + if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST) break; - } - if (url_open_dyn_buf(pb) < 0) + if (url_open_dyn_buf(&pb) < 0) goto fail1; interleaved_index = c->packet_stream_index * 2; /* RTCP packets are sent at odd indexes */ @@ -2318,19 +2298,17 @@ static int http_send_data(HTTPContext *c) /* send everything we can NOW */ len = send(rtsp_c->fd, rtsp_c->packet_buffer_ptr, rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr, 0); - if (len > 0) { + 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 { + } else /* all data has been sent */ av_freep(&c->packet_buffer); - } } else { /* send RTP packet directly in UDP */ c->buffer_ptr += 4; @@ -2344,15 +2322,14 @@ static int http_send_data(HTTPContext *c) len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (ff_neterrno() != FF_NETERROR(EAGAIN) && - ff_neterrno() != FF_NETERROR(EINTR)) { + ff_neterrno() != FF_NETERROR(EINTR)) /* error : close connection */ return -1; - } else { + else return 0; - } - } else { + } else c->buffer_ptr += len; - } + c->data_count += len; update_datarate(&c->datarate, c->data_count); if (c->stream) @@ -2377,8 +2354,10 @@ static int http_start_receive_data(HTTPContext *c) /* open feed */ fd = open(c->stream->feed_filename, O_RDWR); - if (fd < 0) + if (fd < 0) { + http_log("Error opening feeder file: %s\n", strerror(errno)); return -1; + } c->feed_fd = fd; c->stream->feed_write_index = ffm_read_write_index(fd); @@ -2402,14 +2381,13 @@ static int http_receive_data(HTTPContext *c) len = recv(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (ff_neterrno() != FF_NETERROR(EAGAIN) && - ff_neterrno() != FF_NETERROR(EINTR)) { + ff_neterrno() != FF_NETERROR(EINTR)) /* error : close connection */ goto fail; - } - } else if (len == 0) { + } else if (len == 0) /* end of connection : close it */ goto fail; - } else { + else { c->buffer_ptr += len; c->data_count += len; update_datarate(&c->datarate, c->data_count); @@ -2433,7 +2411,10 @@ static int http_receive_data(HTTPContext *c) // printf("writing pos=0x%"PRIx64" size=0x%"PRIx64"\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); + if (write(c->feed_fd, c->buffer, FFM_PACKET_SIZE) < 0) { + http_log("Error writing to feed file: %s\n", strerror(errno)); + goto fail; + } feed->feed_write_index += FFM_PACKET_SIZE; /* update file size */ @@ -2450,22 +2431,19 @@ 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 && - c1->stream->feed == c->stream->feed) { + c1->stream->feed == c->stream->feed) c1->state = HTTPSTATE_SEND_DATA; - } } } else { /* We have a header in our hands that contains useful data */ AVFormatContext s; AVInputFormat *fmt_in; - ByteIOContext *pb = &s.pb; int i; memset(&s, 0, sizeof(s)); - url_open_buf(pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY); - pb->buf_end = c->buffer_end; /* ?? */ - pb->is_streamed = 1; + url_open_buf(&s.pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY); + s.pb->is_streamed = 1; /* use feed output format name to find corresponding input format */ fmt_in = av_find_input_format(feed->fmt->name); @@ -2489,10 +2467,9 @@ static int http_receive_data(HTTPContext *c) av_freep(&s.priv_data); goto fail; } - for (i = 0; i < s.nb_streams; i++) { + for (i = 0; i < s.nb_streams; i++) memcpy(feed->streams[i]->codec, s.streams[i]->codec, sizeof(AVCodecContext)); - } av_freep(&s.priv_data); } c->buffer_ptr = c->buffer; @@ -2502,6 +2479,12 @@ static int http_receive_data(HTTPContext *c) fail: c->stream->feed_opened = 0; close(c->feed_fd); + /* wake up any waiting connections to stop waiting for feed */ + for(c1 = first_http_ctx; c1 != NULL; c1 = c1->next) { + if (c1->state == HTTPSTATE_WAIT_FEED && + c1->stream->feed == c->stream->feed) + c1->state = HTTPSTATE_SEND_DATA_TRAILER; + } return -1; } @@ -2580,7 +2563,6 @@ static int rtsp_parse_request(HTTPContext *c) char url[1024]; char protocol[32]; char line[1024]; - ByteIOContext pb1; int len; RTSPHeader header1, *header = &header1; @@ -2595,8 +2577,7 @@ static int rtsp_parse_request(HTTPContext *c) av_strlcpy(c->url, url, sizeof(c->url)); av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); - c->pb = &pb1; - if (url_open_dyn_buf(c->pb) < 0) { + if (url_open_dyn_buf(&c->pb) < 0) { /* XXX: cannot do more */ c->pb = NULL; /* safety */ return -1; @@ -2637,21 +2618,21 @@ static int rtsp_parse_request(HTTPContext *c) /* handle sequence number */ c->seq = header->seq; - if (!strcmp(cmd, "DESCRIBE")) { + if (!strcmp(cmd, "DESCRIBE")) rtsp_cmd_describe(c, url); - } else if (!strcmp(cmd, "OPTIONS")) { + else if (!strcmp(cmd, "OPTIONS")) rtsp_cmd_options(c, url); - } else if (!strcmp(cmd, "SETUP")) { + else if (!strcmp(cmd, "SETUP")) rtsp_cmd_setup(c, url, header); - } else if (!strcmp(cmd, "PLAY")) { + else if (!strcmp(cmd, "PLAY")) rtsp_cmd_play(c, url, header); - } else if (!strcmp(cmd, "PAUSE")) { + else if (!strcmp(cmd, "PAUSE")) rtsp_cmd_pause(c, url, header); - } else if (!strcmp(cmd, "TEARDOWN")) { + else if (!strcmp(cmd, "TEARDOWN")) rtsp_cmd_teardown(c, url, header); - } else { + else rtsp_reply_error(c, RTSP_STATUS_METHOD); - } + the_end: len = url_close_dyn_buf(c->pb, &c->pb_buffer); c->pb = NULL; /* safety */ @@ -2665,95 +2646,38 @@ static int rtsp_parse_request(HTTPContext *c) return 0; } -/* XXX: move that to rtsp.c, but would need to replace FFStream by - AVFormatContext */ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, struct in_addr my_ip) { - ByteIOContext pb1, *pb = &pb1; - int i, payload_type, port, private_payload_type, j; - const char *ipstr, *title, *mediatype; - AVStream *st; + AVFormatContext *avc; + AVStream avs[MAX_STREAMS]; + int i; - if (url_open_dyn_buf(pb) < 0) + avc = av_alloc_format_context(); + if (avc == NULL) { return -1; - - /* general media info */ - - url_fprintf(pb, "v=0\n"); - ipstr = inet_ntoa(my_ip); - url_fprintf(pb, "o=- 0 0 IN IP4 %s\n", ipstr); - title = stream->title; - if (title[0] == '\0') - title = "No Title"; - url_fprintf(pb, "s=%s\n", title); - if (stream->comment[0] != '\0') - url_fprintf(pb, "i=%s\n", stream->comment); + } + if (stream->title[0] != 0) { + av_strlcpy(avc->title, stream->title, sizeof(avc->title)); + } else { + av_strlcpy(avc->title, "No Title", sizeof(avc->title)); + } + avc->nb_streams = stream->nb_streams; if (stream->is_multicast) { - url_fprintf(pb, "c=IN IP4 %s\n", inet_ntoa(stream->multicast_ip)); + snprintf(avc->filename, 1024, "rtp://%s:%d?multicast=1?ttl=%d", + inet_ntoa(stream->multicast_ip), + stream->multicast_port, stream->multicast_ttl); } - /* for each stream, we output the necessary info */ - private_payload_type = RTP_PT_PRIVATE; + for(i = 0; i < stream->nb_streams; i++) { - st = stream->streams[i]; - if (st->codec->codec_id == CODEC_ID_MPEG2TS) { - mediatype = "video"; - } else { - switch(st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - mediatype = "audio"; - break; - case CODEC_TYPE_VIDEO: - mediatype = "video"; - break; - default: - mediatype = "application"; - break; - } - } - /* NOTE: the port indication is not correct in case of - unicast. It is not an issue because RTSP gives it */ - payload_type = rtp_get_payload_type(st->codec); - if (payload_type < 0) - payload_type = private_payload_type++; - if (stream->is_multicast) { - port = stream->multicast_port + 2 * i; - } else { - port = 0; - } - url_fprintf(pb, "m=%s %d RTP/AVP %d\n", - mediatype, port, payload_type); - if (payload_type >= RTP_PT_PRIVATE) { - /* for private payload type, we need to give more info */ - switch(st->codec->codec_id) { - case CODEC_ID_MPEG4: - { - uint8_t *data; - url_fprintf(pb, "a=rtpmap:%d MP4V-ES/%d\n", - payload_type, 90000); - /* we must also add the mpeg4 header */ - data = st->codec->extradata; - if (data) { - url_fprintf(pb, "a=fmtp:%d config=", payload_type); - for(j=0;jcodec->extradata_size;j++) { - url_fprintf(pb, "%02x", data[j]); - } - url_fprintf(pb, "\n"); - } - } - break; - default: - /* XXX: add other codecs ? */ - goto fail; - } - } - url_fprintf(pb, "a=control:streamid=%d\n", i); + avc->streams[i] = &avs[i]; + avc->streams[i]->codec = stream->streams[i]->codec; } - return url_close_dyn_buf(pb, pbuffer); - fail: - url_close_dyn_buf(pb, pbuffer); - av_free(*pbuffer); - return -1; + *pbuffer = av_mallocz(2048); + avf_sdp_create(&avc, 1, *pbuffer, 2048); + av_free(avc); + + return strlen(*pbuffer); } static void rtsp_cmd_options(HTTPContext *c, const char *url) @@ -2781,7 +2705,8 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url) path++; for(stream = first_stream; stream != NULL; stream = stream->next) { - if (!stream->is_feed && stream->fmt == &rtp_muxer && + if (!stream->is_feed && + stream->fmt && !strcmp(stream->fmt->name, "rtp") && !strcmp(path, stream->filename)) { goto found; } @@ -2856,7 +2781,8 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, /* now check each stream */ for(stream = first_stream; stream != NULL; stream = stream->next) { - if (!stream->is_feed && stream->fmt == &rtp_muxer) { + if (!stream->is_feed && + stream->fmt && !strcmp(stream->fmt->name, "rtp")) { /* accept aggregate filenames only if single stream */ if (!strcmp(path, stream->filename)) { if (stream->nb_streams != 1) { @@ -2882,10 +2808,9 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, found: /* generate session id if needed */ - if (h->session_id[0] == '\0') { + if (h->session_id[0] == '\0') snprintf(h->session_id, sizeof(h->session_id), "%08x%08x", av_random(&random_state), av_random(&random_state)); - } /* find rtp session, and create it if none found */ rtp_c = find_rtp_session(h->session_id); @@ -2966,9 +2891,8 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, default: break; } - if (setup.transport_option[0] != '\0') { + if (setup.transport_option[0] != '\0') url_fprintf(c->pb, ";%s", setup.transport_option); - } url_fprintf(c->pb, "\r\n"); @@ -3167,7 +3091,7 @@ static int rtp_new_av_stream(HTTPContext *c, AVFormatContext *ctx; AVStream *st; char *ipaddr; - URLContext *h; + URLContext *h = NULL; uint8_t *dummy_buf; char buf2[32]; int max_packet_size; @@ -3176,7 +3100,7 @@ static int rtp_new_av_stream(HTTPContext *c, ctx = av_alloc_format_context(); if (!ctx) return -1; - ctx->oformat = &rtp_muxer; + ctx->oformat = guess_format("rtp", NULL, NULL); st = av_mallocz(sizeof(AVStream)); if (!st) @@ -3186,13 +3110,12 @@ static int rtp_new_av_stream(HTTPContext *c, ctx->streams[0] = st; if (!c->stream->feed || - c->stream->feed == c->stream) { + c->stream->feed == c->stream) memcpy(st, c->stream->streams[stream_index], sizeof(AVStream)); - } else { + else memcpy(st, c->stream->feed->streams[c->stream->feed_streams[stream_index]], sizeof(AVStream)); - } st->priv_data = NULL; /* build destination RTP address */ @@ -3249,7 +3172,7 @@ static int rtp_new_av_stream(HTTPContext *c, av_free(ctx); return -1; } - url_close_dyn_buf(&ctx->pb, &dummy_buf); + url_close_dyn_buf(ctx->pb, &dummy_buf); av_free(dummy_buf); c->rtp_ctx[stream_index] = ctx; @@ -3269,7 +3192,6 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec) fst->codec= avcodec_alloc_context(); fst->priv_data = av_mallocz(sizeof(FeedData)); 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; @@ -3324,11 +3246,10 @@ static void remove_stream(FFStream *stream) FFStream **ps; ps = &first_stream; while (*ps != NULL) { - if (*ps == stream) { + if (*ps == stream) *ps = (*ps)->next; - } else { + else ps = &(*ps)->next; - } } } @@ -3386,7 +3307,7 @@ static void build_file_streams(void) { FFStream *stream, *stream_next; AVFormatContext *infile; - int i; + int i, ret; /* gather all streams */ for(stream = first_stream; stream != NULL; stream = stream_next) { @@ -3397,16 +3318,16 @@ static void build_file_streams(void) /* try to open the file */ /* open stream */ stream->ap_in = av_mallocz(sizeof(AVFormatParameters)); - if (stream->fmt == &rtp_muxer) { + if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) { /* 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); + if ((ret = av_open_input_file(&infile, stream->feed_filename, + stream->ifmt, 0, stream->ap_in)) < 0) { + http_log("could not open %s: %d\n", stream->feed_filename, ret); /* remove stream (no need to spend more time on it) */ fail: remove_stream(stream); @@ -3414,16 +3335,16 @@ static 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'\n", stream->feed_filename); av_close_input_file(infile); goto fail; } extract_mpeg4_header(infile); - for(i=0;inb_streams;i++) { + for(i=0;inb_streams;i++) add_av_stream1(stream, infile->streams[i]->codec); - } + av_close_input_file(infile); } } @@ -3442,9 +3363,8 @@ static void build_feed_streams(void) if (feed) { if (!stream->is_feed) { /* we handle a stream coming from a feed */ - for(i=0;inb_streams;i++) { + for(i=0;inb_streams;i++) stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]); - } } } } @@ -3454,9 +3374,8 @@ static void build_feed_streams(void) feed = stream->feed; if (feed) { if (stream->is_feed) { - for(i=0;inb_streams;i++) { + for(i=0;inb_streams;i++) stream->feed_streams[i] = i; - } } } } @@ -3517,20 +3436,18 @@ static void build_feed_streams(void) matches = 0; } } - if (!matches) { + if (!matches) break; - } } - } else { + } else printf("Deleting feed file '%s' as stream counts differ (%d != %d)\n", feed->feed_filename, s->nb_streams, feed->nb_streams); - } av_close_input_file(s); - } else { + } else printf("Deleting feed file '%s' as it appears to be corrupt\n", feed->feed_filename); - } + if (!matches) { if (feed->readonly) { printf("Unable to delete feed file '%s' as it is marked readonly\n", @@ -3551,8 +3468,8 @@ static void build_feed_streams(void) /* only write the header of the ffm file */ if (url_fopen(&s->pb, feed->feed_filename, URL_WRONLY) < 0) { - fprintf(stderr, "Could not open output feed file '%s'\n", - feed->feed_filename); + http_log("Could not open output feed file '%s'\n", + feed->feed_filename); exit(1); } s->oformat = feed->fmt; @@ -3564,17 +3481,17 @@ static void build_feed_streams(void) } av_set_parameters(s, NULL); if (av_write_header(s) < 0) { - fprintf(stderr, "Container doesn't supports the required parameters\n"); + http_log("Container doesn't supports the required parameters\n"); exit(1); } /* XXX: need better api */ av_freep(&s->priv_data); - url_fclose(&s->pb); + url_fclose(s->pb); } /* get feed size and write index */ fd = open(feed->feed_filename, O_RDONLY); if (fd < 0) { - fprintf(stderr, "Could not open output feed file '%s'\n", + http_log("Could not open output feed file '%s'\n", feed->feed_filename); exit(1); } @@ -3672,7 +3589,8 @@ static void add_codec(FFStream *stream, AVCodecContext *av) } /* Bitrate tolerance is less for streaming */ if (av->bit_rate_tolerance == 0) - av->bit_rate_tolerance = av->bit_rate / 4; + av->bit_rate_tolerance = FFMAX(av->bit_rate / 4, + (int64_t)av->bit_rate*av->time_base.num/av->time_base.den); if (av->qmin == 0) av->qmin = 3; if (av->qmax == 0) @@ -3720,34 +3638,20 @@ static void add_codec(FFStream *stream, AVCodecContext *av) static int opt_audio_codec(const char *arg) { - AVCodec *p; + AVCodec *p= avcodec_find_encoder_by_name(arg); - p = first_avcodec; - while (p) { - if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_AUDIO) - break; - p = p->next; - } - if (p == NULL) { + if (p == NULL || p->type != CODEC_TYPE_AUDIO) return CODEC_ID_NONE; - } return p->id; } static int opt_video_codec(const char *arg) { - AVCodec *p; + AVCodec *p= avcodec_find_encoder_by_name(arg); - p = first_avcodec; - while (p) { - if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_VIDEO) - break; - p = p->next; - } - if (p == NULL) { + if (p == NULL || p->type != CODEC_TYPE_VIDEO) return CODEC_ID_NONE; - } return p->id; } @@ -3778,6 +3682,18 @@ static void load_module(const char *filename) } #endif +static int opt_default(const char *opt, const char *arg, + AVCodecContext *avctx, int type) +{ + const AVOption *o = NULL; + const AVOption *o2 = av_find_opt(avctx, opt, NULL, type, type); + if(o2) + o = av_set_string(avctx, opt, arg); + if(!o) + return -1; + return 0; +} + static int parse_ffconfig(const char *filename) { FILE *f; @@ -3865,17 +3781,18 @@ static int parse_ffconfig(const char *filename) nb_max_connections = val; } } else if (!strcasecmp(cmd, "MaxBandwidth")) { + int64_t llval; get_arg(arg, sizeof(arg), &p); - val = atoi(arg); - if (val < 10 || val > 100000) { + llval = atoll(arg); + if (llval < 10 || llval > 10000000) { fprintf(stderr, "%s:%d: Invalid MaxBandwidth: %s\n", filename, line_num, arg); errors++; - } else { - max_bandwidth = val; - } + } else + max_bandwidth = llval; } else if (!strcasecmp(cmd, "CustomLog")) { - get_arg(logfilename, sizeof(logfilename), &p); + if (!ffserver_debug) + get_arg(logfilename, sizeof(logfilename), &p); } else if (!strcasecmp(cmd, "child_argv = (char **) av_mallocz(64 * sizeof(char *)); + feed->child_argv = av_mallocz(64 * sizeof(char *)); for (i = 0; i < 62; i++) { get_arg(arg, sizeof(arg), &p); @@ -3945,17 +3862,16 @@ static int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "File")) { if (feed) { get_arg(feed->feed_filename, sizeof(feed->feed_filename), &p); - } else if (stream) { + } else if (stream) get_arg(stream->feed_filename, sizeof(stream->feed_filename), &p); - } } else if (!strcasecmp(cmd, "FileMaxSize")) { if (feed) { - const char *p1; + char *p1; double fsize; get_arg(arg, sizeof(arg), &p); p1 = arg; - fsize = strtod(p1, (char **)&p1); + fsize = strtod(p1, &p1); switch(toupper(*p1)) { case 'K': fsize *= 1024; @@ -3984,6 +3900,7 @@ static int parse_ffconfig(const char *filename) fprintf(stderr, "%s:%d: Already in a tag\n", filename, line_num); } else { + const AVClass *class; stream = av_mallocz(sizeof(FFStream)); *last_stream = stream; last_stream = &stream->next; @@ -3993,8 +3910,15 @@ static int parse_ffconfig(const char *filename) if (*q) *q = '\0'; stream->fmt = guess_stream_format(NULL, stream->filename, NULL); + /* fetch avclass so AVOption works + * FIXME try to use avcodec_get_context_defaults2 + * without changing defaults too much */ + avcodec_get_context_defaults(&video_enc); + class = video_enc.av_class; memset(&audio_enc, 0, sizeof(AVCodecContext)); memset(&video_enc, 0, sizeof(AVCodecContext)); + audio_enc.av_class = class; + video_enc.av_class = class; audio_id = CODEC_ID_NONE; video_id = CODEC_ID_NONE; if (stream->fmt) { @@ -4013,15 +3937,15 @@ static int parse_ffconfig(const char *filename) break; sfeed = sfeed->next_feed; } - if (!sfeed) { + if (!sfeed) fprintf(stderr, "%s:%d: feed '%s' not defined\n", filename, line_num, arg); - } else { + else stream->feed = sfeed; - } } } else if (!strcasecmp(cmd, "Format")) { get_arg(arg, sizeof(arg), &p); + if (stream) { if (!strcmp(arg, "status")) { stream->stream_type = STREAM_TYPE_STATUS; stream->fmt = NULL; @@ -4041,6 +3965,7 @@ static int parse_ffconfig(const char *filename) audio_id = stream->fmt->audio_codec; video_id = stream->fmt->video_codec; } + } } else if (!strcasecmp(cmd, "InputFormat")) { get_arg(arg, sizeof(arg), &p); stream->ifmt = av_find_input_format(arg); @@ -4057,30 +3982,24 @@ static int parse_ffconfig(const char *filename) errors++; } } else if (!strcasecmp(cmd, "Author")) { - if (stream) { + if (stream) get_arg(stream->author, sizeof(stream->author), &p); - } } else if (!strcasecmp(cmd, "Comment")) { - if (stream) { + if (stream) get_arg(stream->comment, sizeof(stream->comment), &p); - } } else if (!strcasecmp(cmd, "Copyright")) { - if (stream) { + if (stream) get_arg(stream->copyright, sizeof(stream->copyright), &p); - } } else if (!strcasecmp(cmd, "Title")) { - if (stream) { + if (stream) get_arg(stream->title, sizeof(stream->title), &p); - } } else if (!strcasecmp(cmd, "Preroll")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) stream->prebuffer = atof(arg) * 1000; - } } else if (!strcasecmp(cmd, "StartSendOnKey")) { - if (stream) { + if (stream) stream->send_on_key = 1; - } } else if (!strcasecmp(cmd, "AudioCodec")) { get_arg(arg, sizeof(arg), &p); audio_id = opt_audio_codec(arg); @@ -4099,24 +4018,20 @@ static int parse_ffconfig(const char *filename) } } else if (!strcasecmp(cmd, "MaxTime")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) stream->max_time = atof(arg) * 1000; - } } else if (!strcasecmp(cmd, "AudioBitRate")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) audio_enc.bit_rate = atoi(arg) * 1000; - } } else if (!strcasecmp(cmd, "AudioChannels")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) audio_enc.channels = atoi(arg); - } } else if (!strcasecmp(cmd, "AudioSampleRate")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) audio_enc.sample_rate = atoi(arg); - } } else if (!strcasecmp(cmd, "AudioQuality")) { get_arg(arg, sizeof(arg), &p); if (stream) { @@ -4176,44 +4091,61 @@ static int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "VideoFrameRate")) { get_arg(arg, sizeof(arg), &p); if (stream) { - video_enc.time_base.num= DEFAULT_FRAME_RATE_BASE; - video_enc.time_base.den = (int)(strtod(arg, NULL) * video_enc.time_base.num); + AVRational frame_rate; + if (av_parse_video_frame_rate(&frame_rate, arg) < 0) { + fprintf(stderr, "Incorrect frame rate\n"); + errors++; + } else { + video_enc.time_base.num = frame_rate.den; + video_enc.time_base.den = frame_rate.num; + } } } else if (!strcasecmp(cmd, "VideoGopSize")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) video_enc.gop_size = atoi(arg); - } } else if (!strcasecmp(cmd, "VideoIntraOnly")) { - if (stream) { + if (stream) video_enc.gop_size = 1; - } } else if (!strcasecmp(cmd, "VideoHighQuality")) { - if (stream) { + if (stream) 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, "AVOptionVideo") || + !strcasecmp(cmd, "AVOptionAudio")) { + char arg2[1024]; + AVCodecContext *avctx; + int type; + get_arg(arg, sizeof(arg), &p); + get_arg(arg2, sizeof(arg2), &p); + if (!strcasecmp(cmd, "AVOptionVideo")) { + avctx = &video_enc; + type = AV_OPT_FLAG_VIDEO_PARAM; + } else { + avctx = &audio_enc; + type = AV_OPT_FLAG_AUDIO_PARAM; + } + if (opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) { + fprintf(stderr, "AVOption error: %s %s\n", arg, arg2); + errors++; + } } else if (!strcasecmp(cmd, "VideoTag")) { get_arg(arg, sizeof(arg), &p); - if ((strlen(arg) == 4) && stream) { + if ((strlen(arg) == 4) && stream) video_enc.codec_tag = ff_get_fourcc(arg); - } } else if (!strcasecmp(cmd, "BitExact")) { - if (stream) { + if (stream) video_enc.flags |= CODEC_FLAG_BITEXACT; - } } else if (!strcasecmp(cmd, "DctFastint")) { - if (stream) { + if (stream) video_enc.dct_algo = FF_DCT_FASTINT; - } } else if (!strcasecmp(cmd, "IdctSimple")) { - if (stream) { + if (stream) video_enc.idct_algo = FF_IDCT_SIMPLE; - } } else if (!strcasecmp(cmd, "Qscale")) { get_arg(arg, sizeof(arg), &p); if (stream) { @@ -4252,24 +4184,20 @@ static int parse_ffconfig(const char *filename) } } else if (!strcasecmp(cmd, "LumaElim")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) video_enc.luma_elim_threshold = atoi(arg); - } } else if (!strcasecmp(cmd, "ChromaElim")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) video_enc.chroma_elim_threshold = atoi(arg); - } } else if (!strcasecmp(cmd, "LumiMask")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) video_enc.lumi_masking = atof(arg); - } } else if (!strcasecmp(cmd, "DarkMask")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) video_enc.dark_masking = atof(arg); - } } else if (!strcasecmp(cmd, "NoVideo")) { video_id = CODEC_ID_NONE; } else if (!strcasecmp(cmd, "NoAudio")) { @@ -4278,11 +4206,11 @@ static int parse_ffconfig(const char *filename) IPAddressACL acl; get_arg(arg, sizeof(arg), &p); - if (strcasecmp(arg, "allow") == 0) { + if (strcasecmp(arg, "allow") == 0) acl.action = IP_ALLOW; - } else if (strcasecmp(arg, "deny") == 0) { + else if (strcasecmp(arg, "deny") == 0) acl.action = IP_DENY; - } else { + else { fprintf(stderr, "%s:%d: ACL action '%s' is not ALLOW or DENY\n", filename, line_num, arg); errors++; @@ -4294,9 +4222,8 @@ static int parse_ffconfig(const char *filename) fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", filename, line_num, arg); errors++; - } else { + } else acl.last = acl.first; - } get_arg(arg, sizeof(arg), &p); @@ -4309,17 +4236,17 @@ static int parse_ffconfig(const char *filename) } if (!errors) { - IPAddressACL *nacl = (IPAddressACL *) av_mallocz(sizeof(*nacl)); + IPAddressACL *nacl = av_mallocz(sizeof(*nacl)); IPAddressACL **naclp = 0; acl.next = 0; *nacl = acl; - if (stream) { + if (stream) naclp = &stream->acl; - } else if (feed) { + else if (feed) naclp = &feed->acl; - } else { + else { fprintf(stderr, "%s:%d: ACL found not in or \n", filename, line_num); errors++; @@ -4351,37 +4278,35 @@ static int parse_ffconfig(const char *filename) } } else if (!strcasecmp(cmd, "MulticastPort")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) stream->multicast_port = atoi(arg); - } } else if (!strcasecmp(cmd, "MulticastTTL")) { get_arg(arg, sizeof(arg), &p); - if (stream) { + if (stream) stream->multicast_ttl = atoi(arg); - } } else if (!strcasecmp(cmd, "NoLoop")) { - if (stream) { + if (stream) stream->loop = 0; - } } else if (!strcasecmp(cmd, "")) { if (!stream) { fprintf(stderr, "%s:%d: No corresponding for \n", filename, line_num); errors++; - } - if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { - if (audio_id != CODEC_ID_NONE) { - audio_enc.codec_type = CODEC_TYPE_AUDIO; - audio_enc.codec_id = audio_id; - add_codec(stream, &audio_enc); - } - if (video_id != CODEC_ID_NONE) { - video_enc.codec_type = CODEC_TYPE_VIDEO; - video_enc.codec_id = video_id; - add_codec(stream, &video_enc); + } else { + if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { + if (audio_id != CODEC_ID_NONE) { + audio_enc.codec_type = CODEC_TYPE_AUDIO; + audio_enc.codec_id = audio_id; + add_codec(stream, &audio_enc); + } + if (video_id != CODEC_ID_NONE) { + video_enc.codec_type = CODEC_TYPE_VIDEO; + video_enc.codec_id = video_id; + add_codec(stream, &video_enc); + } } + stream = NULL; } - stream = NULL; } else if (!strcasecmp(cmd, "stream_type = STREAM_TYPE_REDIRECT; } } else if (!strcasecmp(cmd, "URL")) { - if (redirect) { + if (redirect) get_arg(redirect->feed_filename, sizeof(redirect->feed_filename), &p); - } } else if (!strcasecmp(cmd, "")) { if (!redirect) { fprintf(stderr, "%s:%d: No corresponding for \n", filename, line_num); errors++; + } else { + if (!redirect->feed_filename[0]) { + fprintf(stderr, "%s:%d: No URL found for \n", + filename, line_num); + errors++; + } + redirect = NULL; } - if (!redirect->feed_filename[0]) { - fprintf(stderr, "%s:%d: No URL found for \n", - filename, line_num); - errors++; - } - redirect = NULL; } else if (!strcasecmp(cmd, "LoadModule")) { get_arg(arg, sizeof(arg), &p); #ifdef HAVE_DLOPEN @@ -4439,43 +4364,6 @@ static int parse_ffconfig(const char *filename) return 0; } -static void show_banner(void) -{ - printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\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 LICENSE\n" - "-h : this help\n" - "-f configfile : use configfile instead of /etc/ffserver.conf\n" - ); -} - -static void show_license(void) -{ - show_banner(); - printf( - "FFmpeg 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" - "version 2.1 of the License, or (at your option) any later version.\n" - "\n" - "FFmpeg is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "Lesser General Public License for more details.\n" - "\n" - "You should have received a copy of the GNU Lesser General Public\n" - "License along with FFmpeg; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n" - ); -} - static void handle_child_exit(int sig) { pid_t pid; @@ -4491,10 +4379,9 @@ static void handle_child_exit(int sig) feed->pid = 0; fprintf(stderr, "%s: Pid %d exited with status %d after %d seconds\n", feed->filename, pid, status, uptime); - if (uptime < 30) { + if (uptime < 30) /* Turn off any more restarts */ feed->child_argv = 0; - } } } } @@ -4502,48 +4389,49 @@ static void handle_child_exit(int sig) need_to_start_children = 1; } +static void opt_debug() +{ + ffserver_debug = 1; + ffserver_daemon = 0; + logfilename[0] = '-'; +} + +static void opt_show_help(void) +{ + printf("usage: ffserver [options]\n" + "Hyper fast multi format Audio/Video streaming server\n"); + printf("\n"); + show_help_options(options, "Main options:\n", 0, 0); +} + +static const OptionDef options[] = { + { "h", OPT_EXIT, {(void*)opt_show_help}, "show help" }, + { "version", OPT_EXIT, {(void*)show_version}, "show version" }, + { "L", OPT_EXIT, {(void*)show_license}, "show license" }, + { "formats", OPT_EXIT, {(void*)show_formats}, "show available formats, codecs, protocols, ..." }, + { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" }, + { "d", 0, {(void*)opt_debug}, "enable debug mode" }, + { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" }, + { NULL }, +}; + int main(int argc, char **argv) { - const char *config_filename; - int c; struct sigaction sigact; av_register_all(); + show_banner(); + config_filename = "/etc/ffserver.conf"; 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': - show_license(); - exit(1); - case '?': - case 'h': - show_help(); - exit(1); - case 'n': - no_launch = 1; - break; - case 'd': - ffserver_debug = 1; - ffserver_daemon = 0; - break; - case 'f': - config_filename = optarg; - break; - default: - exit(2); - } - } + parse_options(argc, argv, options, NULL); - putenv("http_proxy"); /* Kill the http_proxy */ + unsetenv("http_proxy"); /* Kill the http_proxy */ av_init_random(av_gettime() + (getpid() << 16), &random_state); @@ -4612,7 +4500,7 @@ int main(int argc, char **argv) if (!strcmp(logfilename, "-")) logfile = stdout; else - logfile = fopen(logfilename, "w"); + logfile = fopen(logfilename, "a"); } if (http_server() < 0) {