VP8: unroll MB mode decoding tree

[ffmpeg] / ffserver.c
diff --git a/ffserver.c b/ffserver.c

index 31d0268d05c6c3b3cfec0eefa48e19168f07e445..d5d841768dcdc6ec4c3eed32054298e9052db24e 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -36,6 +36,7 @@
  #include "libavutil/avstring.h"
  #include "libavutil/lfg.h"
  #include "libavutil/random_seed.h"
+#include "libavcore/parseutils.h"
  #include "libavcodec/opt.h"
  #include <stdarg.h>
  #include <unistd.h>
@@ -740,7 +741,7 @@ static void http_send_too_busy_reply(int fd)
  {
      char buffer[300];
      int len = snprintf(buffer, sizeof(buffer),
-                       "HTTP/1.0 200 Server too busy\r\n"
+                       "HTTP/1.0 503 Server too busy\r\n"
                         "Content-type: text/html\r\n"
                         "\r\n"
                         "<html><head><title>Too busy</title></head><body>\r\n"
@@ -1589,10 +1590,10 @@ static int http_parse_request(HTTPContext *c)
      }
  
      if (c->post == 0 && max_bandwidth < current_bandwidth) {
-        c->http_error = 200;
+        c->http_error = 503;
          q = c->buffer;
          q += snprintf(q, c->buffer_size,
-                      "HTTP/1.0 200 Server too busy\r\n"
+                      "HTTP/1.0 503 Server too busy\r\n"
                        "Content-type: text/html\r\n"
                        "\r\n"
                        "<html><head><title>Too busy</title></head><body>\r\n"
@@ -2748,14 +2749,7 @@ static int http_receive_data(HTTPContext *c)
              for (i = 0; i < s->nb_streams; i++) {
                  AVStream *fst = feed->streams[i];
                  AVStream *st = s->streams[i];
-                memcpy(fst->codec, st->codec, sizeof(AVCodecContext));
-                if (fst->codec->extradata_size) {
-                    fst->codec->extradata = av_malloc(fst->codec->extradata_size);
-                    if (!fst->codec->extradata)
-                        goto fail;
-                    memcpy(fst->codec->extradata, st->codec->extradata,
-                           fst->codec->extradata_size);
-                }
+                avcodec_copy_context(fst->codec, st->codec);
              }
  
              av_close_input_stream(s);
@@ -2985,7 +2979,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
      struct sockaddr_in my_addr;
  
      /* find which url is asked */
-    ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
+    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
      path = path1;
      if (*path == '/')
          path++;
@@ -3062,7 +3056,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
      RTSPActionServerSetup setup;
  
      /* find which url is asked */
-    ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
+    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
      path = path1;
      if (*path == '/')
          path++;
@@ -3205,7 +3199,7 @@ static HTTPContext *find_rtp_session_with_url(const char *url,
          return NULL;
  
      /* find which url is asked */
-    ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
+    av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url);
      path = path1;
      if (*path == '/')
          path++;
@@ -4417,7 +4411,7 @@ static int parse_ffconfig(const char *filename)
          } else if (!strcasecmp(cmd, "VideoSize")) {
              get_arg(arg, sizeof(arg), &p);
              if (stream) {
-                av_parse_video_frame_size(&video_enc.width, &video_enc.height, arg);
+                av_parse_video_size(&video_enc.width, &video_enc.height, arg);
                  if ((video_enc.width % 16) != 0 ||
                      (video_enc.height % 16) != 0) {
                      ERROR("Image size must be a multiple of 16\n");
@@ -4427,7 +4421,7 @@ static int parse_ffconfig(const char *filename)
              get_arg(arg, sizeof(arg), &p);
              if (stream) {
                  AVRational frame_rate;
-                if (av_parse_video_frame_rate(&frame_rate, arg) < 0) {
+                if (av_parse_video_rate(&frame_rate, arg) < 0) {
                      ERROR("Incorrect frame rate: %s\n", arg);
                  } else {
                      video_enc.time_base.num = frame_rate.den;