[xiph-commits] r8355 - in icecast/trunk/icecast: src web

[j at motherfish-iii.xiph.org]

Author: j
Date: 2004-12-08 12:13:17 -0800 (Wed, 08 Dec 2004)
New Revision: 8355

Modified:
   icecast/trunk/icecast/src/format_theora.c
   icecast/trunk/icecast/web/status.xsl
Log:
- add video_quality
- update status.xsl with new info about theora streams


Modified: icecast/trunk/icecast/src/format_theora.c
===================================================================
--- icecast/trunk/icecast/src/format_theora.c	2004-12-08 19:31:33 UTC (rev 8354)
+++ icecast/trunk/icecast/src/format_theora.c	2004-12-08 20:13:17 UTC (rev 8355)
@@ -49,7 +49,8 @@
 
     DEBUG0 ("freeing theora codec");
     stats_event (ogg_info->mount, "video_bitrate", NULL);
-    stats_event (ogg_info->mount, "framerate", NULL);
+    stats_event (ogg_info->mount, "video_quality", NULL);
+    stats_event (ogg_info->mount, "frame_rate", NULL);
     stats_event (ogg_info->mount, "frame_size", NULL);
     theora_info_clear (&theora->ti);
     theora_comment_clear (&theora->tc);
@@ -95,10 +96,12 @@
                 ogg_info->bitrate += theora->ti.target_bitrate;
                 stats_event_args (ogg_info->mount, "video_bitrate", "%ld",
                         (long)theora->ti.target_bitrate);
+                stats_event_args (ogg_info->mount, "video_quality", "%ld",
+                        (long)theora->ti.quality);
                 stats_event_args (ogg_info->mount, "frame_size", "%ld x %ld",
                         (long)theora->ti.frame_width,
                         (long)theora->ti.frame_height);
-                stats_event_args (ogg_info->mount, "framerate", "%.2f",
+                stats_event_args (ogg_info->mount, "frame_rate", "%.2f",
                         (float)theora->ti.fps_numerator/theora->ti.fps_denominator);
             }
             continue;

Modified: icecast/trunk/icecast/web/status.xsl
===================================================================
--- icecast/trunk/icecast/web/status.xsl	2004-12-08 19:31:33 UTC (rev 8354)
+++ icecast/trunk/icecast/web/status.xsl	2004-12-08 20:13:17 UTC (rev 8355)
@@ -37,6 +37,16 @@
 <xsl:if test="quality">
 <tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr>
 </xsl:if>
+<xsl:if test="video_quality">
+<tr><td>Video Quality:</td><td class="streamdata"> <xsl:value-of select="video_quality" /></td></tr>
+</xsl:if>
+<xsl:if test="frame_size">
+<tr><td>Framesize:</td><td class="streamdata"> <xsl:value-of select="frame_size" /></td></tr>
+</xsl:if>
+<xsl:if test="frame_rate">
+<tr><td>Framerate:</td><td class="streamdata"> <xsl:value-of select="frame_rate" /></td></tr>
+</xsl:if>
+
 <xsl:if test="listeners">
 <tr><td>Stream Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
 </xsl:if>