[xiph-commits] r9718 - icecast/trunk/icecast/src

[karl at svn.xiph.org]

Author: karl
Date: 2005-08-08 12:21:54 -0700 (Mon, 08 Aug 2005)
New Revision: 9718

Modified:
   icecast/trunk/icecast/src/format_mp3.c
   icecast/trunk/icecast/src/format_mp3.h
   icecast/trunk/icecast/src/format_vorbis.c
Log:
Merge mp3 packing. mp3 (and other pass-through streams) can bre received in
very small blocks and go out in those same small blocks increasing the protocol
overhead used by the provided. Generally occurs when using a low bitrate stream
and many listeners.  With this patch we pack out a refbuf before queuing.
Add missing include for vorbis build that shows on some platforms


Modified: icecast/trunk/icecast/src/format_mp3.c
===================================================================
--- icecast/trunk/icecast/src/format_mp3.c	2005-08-08 18:39:34 UTC (rev 9717)
+++ icecast/trunk/icecast/src/format_mp3.c	2005-08-08 19:21:54 UTC (rev 9718)
@@ -197,7 +197,7 @@
 {
     mp3_state *source_mp3 = format->_state;
 
-    if (mount== NULL || mount->mp3_meta_interval <= 0)
+    if (mount == NULL || mount->mp3_meta_interval <= 0)
     {
         char *metadata = httpp_getvar (client->parser, "icy-metaint");
         source_mp3->interval = -1;
@@ -414,40 +414,77 @@
 }
 
 
-/* read an mp3 stream which does not have shoutcast style metadata */
-static refbuf_t *mp3_get_no_meta (source_t *source)
+/* This does the actual reading, making sure the read data is packaged in
+ * blocks of 1400 bytes (near the common MTU size). This is because many
+ * incoming streams come in small packets which could waste a lot of 
+ * bandwidth with many listeners due to headers and such like.
+ */
+static int complete_read (source_t *source)
 {
     int bytes;
+    format_plugin_t *format = source->format;
+    mp3_state *source_mp3 = format->_state;
+    char *buf;
     refbuf_t *refbuf;
-    mp3_state *source_mp3 = source->format->_state;
-    format_plugin_t *format = source->format;
 
-    if ((refbuf = refbuf_new (2048)) == NULL)
-        return NULL;
+#define REFBUF_SIZE 1400
 
-    bytes = client_read_bytes (source->client, refbuf->data, 2048);
+    if (source_mp3->read_data == NULL)
+    {
+        source_mp3->read_data = refbuf_new (REFBUF_SIZE); 
+        source_mp3->read_count = 0;
+    }
+    buf = source_mp3->read_data->data + source_mp3->read_count;
+
+    bytes = client_read_bytes (source->client, buf, REFBUF_SIZE-source_mp3->read_count);
     if (bytes < 0)
     {
-        refbuf_release (refbuf);
-        return NULL;
+        if (source->client->con->error)
+        {
+            refbuf_release (source_mp3->read_data);
+            source_mp3->read_data = NULL;
+        }
+        return 0;
     }
+    source_mp3->read_count += bytes;
+    refbuf = source_mp3->read_data;
+    refbuf->len = source_mp3->read_count;
     format->read_bytes += bytes;
+
+    if (source_mp3->read_count < REFBUF_SIZE)
+    {
+        if (source_mp3->read_count == 0)
+        {
+            refbuf_release (source_mp3->read_data);
+            source_mp3->read_data = NULL;
+        }
+        return 0;
+    }
+    return 1;
+}
+
+
+/* read an mp3 stream which does not have shoutcast style metadata */
+static refbuf_t *mp3_get_no_meta (source_t *source)
+{
+    refbuf_t *refbuf;
+    mp3_state *source_mp3 = source->format->_state;
+
+    if (complete_read (source) == 0)
+        return NULL;
+
+    refbuf = source_mp3->read_data;
+    source_mp3->read_data = NULL;
+
     if (source_mp3->update_metadata)
     {
         mp3_set_title (source);
         source_mp3->update_metadata = 0;
     }
-    if (bytes > 0)
-    {
-        refbuf->len  = bytes;
-        refbuf->associated = source_mp3->metadata;
-        refbuf_addref (source_mp3->metadata);
-        refbuf->sync_point = 1;
-        return refbuf;
-    }
-    refbuf_release (refbuf);
-
-    return NULL;
+    refbuf->associated = source_mp3->metadata;
+    refbuf_addref (source_mp3->metadata);
+    refbuf->sync_point = 1;
+    return refbuf;
 }
 
 
@@ -460,28 +497,23 @@
     refbuf_t *refbuf;
     format_plugin_t *plugin = source->format;
     mp3_state *source_mp3 = plugin->_state;
-    format_plugin_t *format = source->format;
     unsigned char *src;
     unsigned int bytes, mp3_block;
-    int ret;
 
-    refbuf = refbuf_new (2048);
+    if (complete_read (source) == 0)
+        return NULL;
+
+    refbuf = source_mp3->read_data;
+    source_mp3->read_data = NULL;
     src = refbuf->data;
 
-    ret = client_read_bytes (source->client, refbuf->data, 2048);
-    if (ret < 0)
-    {
-        refbuf_release (refbuf);
-        return NULL;
-    }
-    format->read_bytes += ret;
     if (source_mp3->update_metadata)
     {
         mp3_set_title (source);
         source_mp3->update_metadata = 0;
     }
     /* fill the buffer with the read data */
-    bytes = (unsigned int)ret;
+    bytes = source_mp3->read_count;
     refbuf->len = 0;
     while (bytes > 0)
     {
@@ -556,6 +588,7 @@
                 ERROR0 ("Incorrect metadata format, ending stream");
                 source->running = 0;
                 refbuf_release (refbuf);
+                refbuf_release (meta);
                 return NULL;
             }
         }

Modified: icecast/trunk/icecast/src/format_mp3.h
===================================================================
--- icecast/trunk/icecast/src/format_mp3.h	2005-08-08 18:39:34 UTC (rev 9717)
+++ icecast/trunk/icecast/src/format_mp3.h	2005-08-08 19:21:54 UTC (rev 9718)
@@ -28,6 +28,8 @@
     int update_metadata;
 
     refbuf_t *metadata;
+    refbuf_t *read_data;
+    unsigned int read_count;
     mutex_t url_lock;
 
     unsigned build_metadata_len;

Modified: icecast/trunk/icecast/src/format_vorbis.c
===================================================================
--- icecast/trunk/icecast/src/format_vorbis.c	2005-08-08 18:39:34 UTC (rev 9717)
+++ icecast/trunk/icecast/src/format_vorbis.c	2005-08-08 19:21:54 UTC (rev 9718)
@@ -21,6 +21,7 @@
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <memory.h>
+#include <string.h>
 
 #include "refbuf.h"
 #include "source.h"