*/
#include "config.h"
-#if HAVE_CLOSESOCKET != 1
+#ifndef HAVE_CLOSESOCKET
#define closesocket close
#endif
#include <string.h>
#include <stdlib.h>
#include "avformat.h"
+#include "rtsp.h"
+#include "rtp.h"
+#include "os_support.h"
#include <stdarg.h>
#include <unistd.h>
#include "ffserver.h"
#include "random.h"
#include "avstring.h"
+#include "cmdutils.h"
#undef exit
+static const char program_name[] = "FFserver";
+static const int program_birth_year = 2000;
+
/* maximum number of simultaneous HTTP connections */
#define HTTP_MAX_CONNECTIONS 2000
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;
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);
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 */
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);
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);
- }
}
}
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) */
/* close each frame parser */
for(i=0;i<c->fmt_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);
}
av_free(ctx);
}
h = c->rtp_handles[i];
- if (h) {
+ if (h)
url_close(h);
- }
}
ctx = &c->fmt_ctx;
/* 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);
}
}
}
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;
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++;
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 */
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;
}
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);
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;
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;
}
#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)
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);
}
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;
url_fprintf(pb, "\r\n");
url_fprintf(pb, "<HEAD><TITLE>FFServer Status</TITLE>\n");
- if (c->stream->feed_filename) {
+ if (c->stream->feed_filename)
url_fprintf(pb, "<link rel=\"shortcut icon\" href=\"%s\">\n", c->stream->feed_filename);
- }
url_fprintf(pb, "</HEAD>\n<BODY>");
url_fprintf(pb, "<H1>FFServer Status</H1>\n");
/* format status */
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 */
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, "<TD>%s", stream->feed->filename);
- } else {
+ else
url_fprintf(pb, "<TD>%s", stream->feed_filename);
- }
url_fprintf(pb, "\n");
}
break;
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;
- }
}
}
}
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;
http_log("%s not found", input_filename);
return -1;
}
+ s->flags |= AVFMT_FLAG_GENPTS;
c->fmt_in = s;
+ av_find_stream_info(c->fmt_in);
/* open each parser */
for(i=0;i<s->nb_streams;i++)
}
#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;
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;
/* 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)
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;
AVPacket pkt;
/* read a packet from the input stream */
- if (c->stream->feed) {
+ 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) {
+ c->stream->max_time + c->start_time - cur_time < 0)
/* We have timed out */
c->state = HTTPSTATE_SEND_DATA_TRAILER;
- } else {
+ else {
redo:
if (av_read_frame(c->fmt_in, &pkt) < 0) {
if (c->stream->feed && c->stream->feed->feed_opened) {
if (c->switch_pending) {
c->switch_pending = 0;
for(i=0;i<c->stream->nb_streams;i++) {
- if (c->switch_feed_streams[i] == pkt.stream_index) {
- if (pkt.flags & PKT_FLAG_KEY) {
+ 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) {
+ if (c->switch_feed_streams[i] >= 0)
c->switch_pending = 1;
- }
}
}
for(i=0;i<c->stream->nb_streams;i++) {
if (c->feed_streams[i] == pkt.stream_index) {
pkt.stream_index = i;
- if (pkt.flags & PKT_FLAG_KEY) {
+ 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
* typically a key frame).
*/
if (!c->stream->send_on_key ||
- ((c->got_key_frame + 1) >> c->stream->nb_streams)) {
+ ((c->got_key_frame + 1) >> c->stream->nb_streams))
goto send_it;
- }
}
}
} else {
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)) {
+ if (av_write_frame(ctx, &pkt))
c->state = HTTPSTATE_SEND_DATA_TRAILER;
- }
- len = url_close_dyn_buf(&ctx->pb, &c->pb_buffer);
+ 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;
return -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;
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 */
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;
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 */
/* 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;
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)
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);
/* 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);
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;
char url[1024];
char protocol[32];
char line[1024];
- ByteIOContext pb1;
int len;
RTSPHeader header1, *header = &header1;
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;
/* 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 */
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;j<st->codec->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)
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;
}
/* 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) {
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);
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");
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)
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 */
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;
FFStream **ps;
ps = &first_stream;
while (*ps != NULL) {
- if (*ps == stream) {
+ if (*ps == stream)
*ps = (*ps)->next;
- } else {
+ else
ps = &(*ps)->next;
- }
}
}
/* 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;
}
extract_mpeg4_header(infile);
- for(i=0;i<infile->nb_streams;i++) {
+ for(i=0;i<infile->nb_streams;i++)
add_av_stream1(stream, infile->streams[i]->codec);
- }
+
av_close_input_file(infile);
}
}
if (feed) {
if (!stream->is_feed) {
/* we handle a stream coming from a feed */
- for(i=0;i<stream->nb_streams;i++) {
+ for(i=0;i<stream->nb_streams;i++)
stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
- }
}
}
}
feed = stream->feed;
if (feed) {
if (stream->is_feed) {
- for(i=0;i<stream->nb_streams;i++) {
+ for(i=0;i<stream->nb_streams;i++)
stream->feed_streams[i] = i;
- }
}
}
}
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",
}
/* 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);
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;
}
fprintf(stderr, "%s:%d: Invalid MaxBandwidth: %s\n",
filename, line_num, arg);
errors++;
- } else {
+ } else
max_bandwidth = val;
- }
} else if (!strcasecmp(cmd, "CustomLog")) {
get_arg(logfilename, sizeof(logfilename), &p);
} else if (!strcasecmp(cmd, "<Feed")) {
if (feed) {
int i;
- feed->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);
} 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;
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);
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);
}
} 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) {
}
} 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
}
} 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) {
}
} 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")) {
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++;
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);
}
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 <stream> or <feed>\n",
filename, line_num);
errors++;
}
} 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, "</Stream>")) {
if (!stream) {
fprintf(stderr, "%s:%d: No corresponding <Stream> for </Stream>\n",
redirect->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, "</Redirect>")) {
if (!redirect) {
fprintf(stderr, "%s:%d: No corresponding <Redirect> for </Redirect>\n",
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"
);
}
-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;
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;
- }
}
}
}
av_register_all();
+ show_banner(program_name, program_birth_year);
+
config_filename = "/etc/ffserver.conf";
my_program_name = argv[0];
switch(c) {
case 'L':
show_license();
- exit(1);
+ exit(0);
case '?':
case 'h':
show_help();
- exit(1);
+ exit(0);
case 'n':
no_launch = 1;
break;
projects / ffmpeg / blobdiff