ffserver now runs again (sort of).

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index 20f2b2372461d8da1426a7f64490526527b2f174..6f377860af619842796cf926d5c23b7bb209c294 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -26,6 +26,7 @@
 #include <sys/poll.h>
 #include <errno.h>
 #include <sys/time.h>
+#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -599,7 +600,9 @@ 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();
 
@@ -1351,7 +1354,7 @@ static int http_parse_request(HTTPContext *c)
                         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, "<ASX Version=\"3\">\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, "<!-- Autogenerated by ffserver -->\r\n");
                         q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "<ENTRY><REF HREF=\"http://%s/%s%s\"/></ENTRY>\r\n", 
                                 hostbuf, filename, info);
                         q += snprintf(q, q - (char *) c->buffer + c->buffer_size, "</ASX>\r\n");
@@ -1995,15 +1998,18 @@ static int http_prepare_data(HTTPContext *c)
         c->fmt_ctx.nb_streams = c->stream->nb_streams;
         for(i=0;i<c->fmt_ctx.nb_streams;i++) {
             AVStream *st;
+           AVStream *src;
             st = av_mallocz(sizeof(AVStream));
             c->fmt_ctx.streams[i] = st;
             /* if file or feed, then just take streams from FFStream struct */
             if (!c->stream->feed || 
                 c->stream->feed == c->stream)
-                memcpy(st, c->stream->streams[i], sizeof(AVStream));
+                src = c->stream->streams[i];
             else
-                memcpy(st, c->stream->feed->streams[c->stream->feed_streams[i]],
-                           sizeof(AVStream));
+                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...
@@ -2162,7 +2168,7 @@ 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;
                         }
                         
@@ -2711,7 +2717,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
     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++;
@@ -2785,7 +2791,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
     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++;
@@ -2940,7 +2946,7 @@ static HTTPContext *find_rtp_session_with_url(const char *url,
         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++;
@@ -3219,6 +3225,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec)
     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;
 }
@@ -3634,8 +3641,6 @@ static 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;
 
@@ -4281,6 +4286,9 @@ static int parse_ffconfig(const char *filename)
                 if (video_id != CODEC_ID_NONE) {
                     video_enc.codec_type = CODEC_TYPE_VIDEO;
                     video_enc.codec_id = video_id;
+                   if (!video_enc.rc_buffer_size) {
+                       video_enc.rc_buffer_size = 40 * 1024;
+                   }
                     add_codec(stream, &video_enc);
                 }
             }