mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-19 11:31:43 +00:00
ffserver: reindent compute_status()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet
parent
907101eb83
commit
9e55130a9d
280
ffserver.c
280
ffserver.c
@ -1774,153 +1774,172 @@ static void compute_status(HTTPContext *c)
|
|||||||
stream = stream->next;
|
stream = stream->next;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10);
|
|
||||||
eosf = sfilename + strlen(sfilename);
|
av_strlcpy(sfilename, stream->filename, sizeof(sfilename) - 10);
|
||||||
if (eosf - sfilename >= 4) {
|
eosf = sfilename + strlen(sfilename);
|
||||||
if (strcmp(eosf - 4, ".asf") == 0)
|
if (eosf - sfilename >= 4) {
|
||||||
strcpy(eosf - 4, ".asx");
|
if (strcmp(eosf - 4, ".asf") == 0)
|
||||||
else if (strcmp(eosf - 3, ".rm") == 0)
|
strcpy(eosf - 4, ".asx");
|
||||||
strcpy(eosf - 3, ".ram");
|
else if (strcmp(eosf - 3, ".rm") == 0)
|
||||||
else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
|
strcpy(eosf - 3, ".ram");
|
||||||
/* generate a sample RTSP director if
|
else if (stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
|
||||||
unicast. Generate an SDP redirector if
|
/* generate a sample RTSP director if
|
||||||
multicast */
|
unicast. Generate an SDP redirector if
|
||||||
eosf = strrchr(sfilename, '.');
|
multicast */
|
||||||
if (!eosf)
|
eosf = strrchr(sfilename, '.');
|
||||||
eosf = sfilename + strlen(sfilename);
|
if (!eosf)
|
||||||
if (stream->is_multicast)
|
eosf = sfilename + strlen(sfilename);
|
||||||
strcpy(eosf, ".sdp");
|
if (stream->is_multicast)
|
||||||
else
|
strcpy(eosf, ".sdp");
|
||||||
strcpy(eosf, ".rtsp");
|
else
|
||||||
}
|
strcpy(eosf, ".rtsp");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ",
|
avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ",
|
||||||
sfilename, stream->filename);
|
sfilename, stream->filename);
|
||||||
avio_printf(pb, "<td align=right> %d <td align=right> ",
|
avio_printf(pb, "<td align=right> %d <td align=right> ",
|
||||||
stream->conns_served);
|
stream->conns_served);
|
||||||
fmt_bytecount(pb, stream->bytes_served);
|
fmt_bytecount(pb, stream->bytes_served);
|
||||||
switch(stream->stream_type) {
|
|
||||||
case STREAM_TYPE_LIVE: {
|
|
||||||
int audio_bit_rate = 0;
|
|
||||||
int video_bit_rate = 0;
|
|
||||||
const char *audio_codec_name = "";
|
|
||||||
const char *video_codec_name = "";
|
|
||||||
const char *audio_codec_name_extra = "";
|
|
||||||
const char *video_codec_name_extra = "";
|
|
||||||
|
|
||||||
for(i=0;i<stream->nb_streams;i++) {
|
switch(stream->stream_type) {
|
||||||
AVStream *st = stream->streams[i];
|
case STREAM_TYPE_LIVE: {
|
||||||
AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
|
int audio_bit_rate = 0;
|
||||||
switch(st->codec->codec_type) {
|
int video_bit_rate = 0;
|
||||||
case AVMEDIA_TYPE_AUDIO:
|
const char *audio_codec_name = "";
|
||||||
audio_bit_rate += st->codec->bit_rate;
|
const char *video_codec_name = "";
|
||||||
if (codec) {
|
const char *audio_codec_name_extra = "";
|
||||||
if (*audio_codec_name)
|
const char *video_codec_name_extra = "";
|
||||||
audio_codec_name_extra = "...";
|
|
||||||
audio_codec_name = codec->name;
|
for(i=0;i<stream->nb_streams;i++) {
|
||||||
}
|
AVStream *st = stream->streams[i];
|
||||||
break;
|
AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
|
||||||
case AVMEDIA_TYPE_VIDEO:
|
|
||||||
video_bit_rate += st->codec->bit_rate;
|
switch(st->codec->codec_type) {
|
||||||
if (codec) {
|
case AVMEDIA_TYPE_AUDIO:
|
||||||
if (*video_codec_name)
|
audio_bit_rate += st->codec->bit_rate;
|
||||||
video_codec_name_extra = "...";
|
if (codec) {
|
||||||
video_codec_name = codec->name;
|
if (*audio_codec_name)
|
||||||
}
|
audio_codec_name_extra = "...";
|
||||||
break;
|
audio_codec_name = codec->name;
|
||||||
case AVMEDIA_TYPE_DATA:
|
|
||||||
video_bit_rate += st->codec->bit_rate;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
avio_printf(pb, "<td align=center> %s <td align=right> %d <td align=right> %d <td> %s %s <td align=right> %d <td> %s %s",
|
break;
|
||||||
stream->fmt->name,
|
case AVMEDIA_TYPE_VIDEO:
|
||||||
stream->bandwidth,
|
video_bit_rate += st->codec->bit_rate;
|
||||||
video_bit_rate / 1000, video_codec_name, video_codec_name_extra,
|
if (codec) {
|
||||||
audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra);
|
if (*video_codec_name)
|
||||||
if (stream->feed)
|
video_codec_name_extra = "...";
|
||||||
avio_printf(pb, "<td>%s", stream->feed->filename);
|
video_codec_name = codec->name;
|
||||||
else
|
}
|
||||||
avio_printf(pb, "<td>%s", stream->feed_filename);
|
break;
|
||||||
avio_printf(pb, "\n");
|
case AVMEDIA_TYPE_DATA:
|
||||||
|
video_bit_rate += st->codec->bit_rate;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
abort();
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
default:
|
|
||||||
avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n");
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
avio_printf(pb, "<td align=center> %s <td align=right> %d "
|
||||||
|
"<td align=right> %d <td> %s %s <td align=right> "
|
||||||
|
"%d <td> %s %s",
|
||||||
|
stream->fmt->name, 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)
|
||||||
|
avio_printf(pb, "<td>%s", stream->feed->filename);
|
||||||
|
else
|
||||||
|
avio_printf(pb, "<td>%s", stream->feed_filename);
|
||||||
|
avio_printf(pb, "\n");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
avio_printf(pb, "<td align=center> - <td align=right> - "
|
||||||
|
"<td align=right> - <td><td align=right> - <td>\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
stream = stream->next;
|
stream = stream->next;
|
||||||
}
|
}
|
||||||
avio_printf(pb, "</table>\n");
|
avio_printf(pb, "</table>\n");
|
||||||
|
|
||||||
stream = config.first_stream;
|
stream = config.first_stream;
|
||||||
while (stream) {
|
while (stream) {
|
||||||
|
|
||||||
if (stream->feed != stream) {
|
if (stream->feed != stream) {
|
||||||
stream = stream->next;
|
stream = stream->next;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
|
|
||||||
if (stream->pid) {
|
avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
|
||||||
avio_printf(pb, "Running as pid %d.\n", stream->pid);
|
if (stream->pid) {
|
||||||
|
avio_printf(pb, "Running as pid %d.\n", stream->pid);
|
||||||
|
|
||||||
#if defined(linux)
|
#if defined(linux)
|
||||||
{
|
{
|
||||||
FILE *pid_stat;
|
FILE *pid_stat;
|
||||||
char ps_cmd[64];
|
char ps_cmd[64];
|
||||||
|
|
||||||
/* This is somewhat linux specific I guess */
|
/* This is somewhat linux specific I guess */
|
||||||
snprintf(ps_cmd, sizeof(ps_cmd),
|
snprintf(ps_cmd, sizeof(ps_cmd),
|
||||||
"ps -o \"%%cpu,cputime\" --no-headers %d",
|
"ps -o \"%%cpu,cputime\" --no-headers %d",
|
||||||
stream->pid);
|
stream->pid);
|
||||||
|
|
||||||
pid_stat = popen(ps_cmd, "r");
|
pid_stat = popen(ps_cmd, "r");
|
||||||
if (pid_stat) {
|
if (pid_stat) {
|
||||||
char cpuperc[10];
|
char cpuperc[10];
|
||||||
char cpuused[64];
|
char cpuused[64];
|
||||||
|
|
||||||
if (fscanf(pid_stat, "%9s %63s", cpuperc,
|
if (fscanf(pid_stat, "%9s %63s", cpuperc, cpuused) == 2) {
|
||||||
cpuused) == 2) {
|
avio_printf(pb, "Currently using %s%% of the cpu. "
|
||||||
avio_printf(pb, "Currently using %s%% of the cpu. Total time used %s.\n",
|
"Total time used %s.\n",
|
||||||
cpuperc, cpuused);
|
cpuperc, cpuused);
|
||||||
}
|
}
|
||||||
fclose(pid_stat);
|
fclose(pid_stat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
avio_printf(pb, "<p>");
|
avio_printf(pb, "<p>");
|
||||||
|
}
|
||||||
|
|
||||||
|
avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>"
|
||||||
|
"type<th>kbits/s<th align=left>codec<th align=left>"
|
||||||
|
"Parameters\n");
|
||||||
|
|
||||||
|
for (i = 0; i < stream->nb_streams; i++) {
|
||||||
|
AVStream *st = stream->streams[i];
|
||||||
|
AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
|
||||||
|
const char *type = "unknown";
|
||||||
|
char parameters[64];
|
||||||
|
|
||||||
|
parameters[0] = 0;
|
||||||
|
|
||||||
|
switch(st->codec->codec_type) {
|
||||||
|
case AVMEDIA_TYPE_AUDIO:
|
||||||
|
type = "audio";
|
||||||
|
snprintf(parameters, sizeof(parameters), "%d channel(s), %d Hz",
|
||||||
|
st->codec->channels, st->codec->sample_rate);
|
||||||
|
break;
|
||||||
|
case AVMEDIA_TYPE_VIDEO:
|
||||||
|
type = "video";
|
||||||
|
snprintf(parameters, sizeof(parameters),
|
||||||
|
"%dx%d, q=%d-%d, fps=%d", st->codec->width,
|
||||||
|
st->codec->height, st->codec->qmin, st->codec->qmax,
|
||||||
|
st->codec->time_base.den / st->codec->time_base.num);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
abort();
|
||||||
}
|
}
|
||||||
avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec<th align=left>Parameters\n");
|
|
||||||
|
|
||||||
for (i = 0; i < stream->nb_streams; i++) {
|
avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d"
|
||||||
AVStream *st = stream->streams[i];
|
"<td>%s<td>%s\n",
|
||||||
AVCodec *codec = avcodec_find_encoder(st->codec->codec_id);
|
i, type, st->codec->bit_rate/1000,
|
||||||
const char *type = "unknown";
|
codec ? codec->name : "", parameters);
|
||||||
char parameters[64];
|
}
|
||||||
|
|
||||||
parameters[0] = 0;
|
|
||||||
|
|
||||||
switch(st->codec->codec_type) {
|
|
||||||
case AVMEDIA_TYPE_AUDIO:
|
|
||||||
type = "audio";
|
|
||||||
snprintf(parameters, sizeof(parameters), "%d channel(s), %d Hz", st->codec->channels, st->codec->sample_rate);
|
|
||||||
break;
|
|
||||||
case AVMEDIA_TYPE_VIDEO:
|
|
||||||
type = "video";
|
|
||||||
snprintf(parameters, sizeof(parameters), "%dx%d, q=%d-%d, fps=%d", st->codec->width, st->codec->height,
|
|
||||||
st->codec->qmin, st->codec->qmax, st->codec->time_base.den / st->codec->time_base.num);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s<td>%s\n",
|
|
||||||
i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters);
|
|
||||||
}
|
|
||||||
avio_printf(pb, "</table>\n");
|
|
||||||
|
|
||||||
|
avio_printf(pb, "</table>\n");
|
||||||
stream = stream->next;
|
stream = stream->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1928,13 +1947,14 @@ static void compute_status(HTTPContext *c)
|
|||||||
avio_printf(pb, "<h2>Connection Status</h2>\n");
|
avio_printf(pb, "<h2>Connection Status</h2>\n");
|
||||||
|
|
||||||
avio_printf(pb, "Number of connections: %d / %d<br>\n",
|
avio_printf(pb, "Number of connections: %d / %d<br>\n",
|
||||||
nb_connections, config.nb_max_connections);
|
nb_connections, config.nb_max_connections);
|
||||||
|
|
||||||
avio_printf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k<br>\n",
|
avio_printf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k<br>\n",
|
||||||
current_bandwidth, config.max_bandwidth);
|
current_bandwidth, config.max_bandwidth);
|
||||||
|
|
||||||
avio_printf(pb, "<table>\n");
|
avio_printf(pb, "<table>\n");
|
||||||
avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
|
avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target "
|
||||||
|
"bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
|
||||||
c1 = first_http_ctx;
|
c1 = first_http_ctx;
|
||||||
i = 0;
|
i = 0;
|
||||||
while (c1) {
|
while (c1) {
|
||||||
@ -1953,13 +1973,11 @@ static void compute_status(HTTPContext *c)
|
|||||||
|
|
||||||
i++;
|
i++;
|
||||||
p = inet_ntoa(c1->from_addr.sin_addr);
|
p = inet_ntoa(c1->from_addr.sin_addr);
|
||||||
avio_printf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s<td align=right>",
|
avio_printf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s"
|
||||||
i,
|
"<td align=right>",
|
||||||
c1->stream ? c1->stream->filename : "",
|
i, c1->stream ? c1->stream->filename : "",
|
||||||
c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "",
|
c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", p,
|
||||||
p,
|
c1->protocol, http_state[c1->state]);
|
||||||
c1->protocol,
|
|
||||||
http_state[c1->state]);
|
|
||||||
fmt_bytecount(pb, bitrate);
|
fmt_bytecount(pb, bitrate);
|
||||||
avio_printf(pb, "<td align=right>");
|
avio_printf(pb, "<td align=right>");
|
||||||
fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8);
|
fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user