From 1e839f83ea97460e640384cbd17996e5dc009d4e Mon Sep 17 00:00:00 2001
From: j <j>
Date: Wed, 8 Dec 2004 20:13:17 +0000
Subject: [PATCH] - add video_quality - update status.xsl with new info about
 theora streams

svn path=/icecast/trunk/icecast/; revision=8355
---
 src/format_theora.c |  7 +++++--
 web/status.xsl      | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/format_theora.c b/src/format_theora.c
index 09556dec..883e5809 100644
--- a/src/format_theora.c
+++ b/src/format_theora.c
@@ -49,7 +49,8 @@ static void theora_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
 
     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 @@ static refbuf_t *process_theora_page (ogg_state_t *ogg_info, ogg_codec_t *codec,
                 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;
diff --git a/web/status.xsl b/web/status.xsl
index 2fd3d5a2..e4469602 100644
--- a/web/status.xsl
+++ b/web/status.xsl
@@ -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>