[SCM] libav/experimental: * Added yet more output to the status page to try and track down a problem
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:32:03 UTC 2013
The following commit has been merged in the experimental branch:
commit b582f314f7876571ee0877c318caabd26fad093c
Author: Philip Gladstone <philipjsg at users.sourceforge.net>
Date: Fri May 24 02:06:15 2002 +0000
* Added yet more output to the status page to try and track down a problem
Originally committed as revision 579 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 767da5f..e1fa386 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -860,12 +860,15 @@ static void compute_stats(HTTPContext *c)
while (stream != NULL) {
if (stream->feed == stream) {
q += sprintf(q, "<h2>Feed %s</h2>", stream->filename);
- q += sprintf(q, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec\n");
+ q += sprintf(q, "<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);
char *type = "unknown";
+ char parameters[64];
+
+ parameters[0] = 0;
switch(st->codec.codec_type) {
case CODEC_TYPE_AUDIO:
@@ -873,12 +876,14 @@ static void compute_stats(HTTPContext *c)
break;
case CODEC_TYPE_VIDEO:
type = "video";
+ sprintf(parameters, "%dx%d, q=%d-%d", st->codec.width, st->codec.height,
+ st->codec.qmin, st->codec.qmax);
break;
default:
av_abort();
}
- q += sprintf(q, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s\n",
- i, type, st->codec.bit_rate/1000, codec ? codec->name : "");
+ q += sprintf(q, "<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);
}
q += sprintf(q, "</table>\n");
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list