From: Baptiste Coudurier Date: Sat, 21 Jun 2008 03:23:51 +0000 (+0000) Subject: upgrade bandwidth to uint64_t X-Git-Tag: v0.5~4077 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ad8289edece30c4a2c51ad24f093e5421e41ab9;p=coroid%2Flibav_saccubus.git upgrade bandwidth to uint64_t Originally committed as revision 13841 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/ffserver.c b/ffserver.c index 2b5e6c8fd..a061cfa9a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -295,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 @@ -1315,7 +1315,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"); @@ -1811,7 +1811,7 @@ static void compute_status(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");