aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-03 23:55:03 +0100
committerMax Kellermann <max@duempel.org>2009-01-03 23:55:03 +0100
commit96c18e7d159d5b4f38642982ed0b370f15b385e1 (patch)
treefe89caee7b0b4d88a0469629b3e9ee192584c6f2
parentf9e9089f424217db31c0ad612777bd5a11620c2a (diff)
downloadmpd-96c18e7d159d5b4f38642982ed0b370f15b385e1.tar.gz
mpd-96c18e7d159d5b4f38642982ed0b370f15b385e1.tar.xz
mpd-96c18e7d159d5b4f38642982ed0b370f15b385e1.zip
input_curl: enabled Icy-Metadata support
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/icy_metadata.c6
-rw-r--r--src/input_curl.c103
3 files changed, 98 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index bb764daca..4c4cd002d 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ ver 0.15 - (200?/??/??)
* fall back to XDG music directory if no music_directory is configured
* failure to read the state file is non-fatal
* fix minor memory leak in decoder_tag()
+* added Icy-Metadata support
ver 0.14 (2008/12/25)
* audio outputs:
diff --git a/src/icy_metadata.c b/src/icy_metadata.c
index 5049d2805..aa65b32ca 100644
--- a/src/icy_metadata.c
+++ b/src/icy_metadata.c
@@ -52,9 +52,11 @@ icy_reset(struct icy_metadata *im)
size_t
icy_data(struct icy_metadata *im, size_t length)
{
- assert(icy_defined(im));
assert(length > 0);
+ if (!icy_defined(im))
+ return length;
+
if (im->data_rest == 0)
return 0;
@@ -145,7 +147,7 @@ icy_meta(struct icy_metadata *im, const void *data, size_t length)
if (length > im->meta_size - im->meta_position)
length = im->meta_size - im->meta_position;
- memcpy(im->meta_data + im->meta_position, data, length);
+ memcpy(im->meta_data + im->meta_position, p, length);
im->meta_position += length;
if (p != data)
diff --git a/src/input_curl.c b/src/input_curl.c
index 93c12d98e..ba6222993 100644
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -21,6 +21,7 @@
#include "dlist.h"
#include "config.h"
#include "tag.h"
+#include "icy_metadata.h"
#include <assert.h>
#include <sys/select.h>
@@ -75,6 +76,9 @@ struct input_curl {
/** error message provided by libcurl */
char error[CURL_ERROR_SIZE];
+ /** parser for icy-metadata */
+ struct icy_metadata icy_metadata;
+
/** the stream name from the icy-name response header */
char *meta_name;
@@ -147,6 +151,7 @@ input_curl_free(struct input_stream *is)
if (c->tag != NULL)
tag_free(c->tag);
+ g_free(c->meta_name);
input_curl_easy_free(c);
@@ -254,18 +259,66 @@ consume_buffer(struct buffer *buffer, size_t length,
}
static size_t
-read_from_buffer(struct buffer *buffer, void *dest, size_t length,
+read_from_buffer(struct icy_metadata *icy_metadata, struct buffer *buffer,
+ void *dest0, size_t length,
struct list_head *rewind_head)
{
+ uint8_t *dest = dest0;
+ size_t nbytes = 0;
+
assert(buffer->size > 0);
assert(buffer->consumed < buffer->size);
if (length > buffer->size - buffer->consumed)
length = buffer->size - buffer->consumed;
- memcpy(dest, buffer->data + buffer->consumed, length);
- consume_buffer(buffer, length, rewind_head);
- return length;
+ while (true) {
+ size_t chunk;
+
+ chunk = icy_data(icy_metadata, length);
+ if (chunk > 0) {
+ memcpy(dest, buffer->data + buffer->consumed,
+ chunk);
+ consume_buffer(buffer, chunk, rewind_head);
+
+ nbytes += chunk;
+ dest += chunk;
+ length -= chunk;
+
+ if (length == 0)
+ break;
+ }
+
+ chunk = icy_meta(icy_metadata, buffer->data + buffer->consumed,
+ length);
+ if (chunk > 0) {
+ consume_buffer(buffer, chunk, rewind_head);
+
+ length -= chunk;
+
+ if (length == 0)
+ break;
+ }
+ }
+
+ return nbytes;
+}
+
+static void
+copy_icy_tag(struct input_curl *c)
+{
+ struct tag *tag = icy_tag(&c->icy_metadata);
+
+ if (tag == NULL)
+ return;
+
+ if (c->tag != NULL)
+ tag_free(c->tag);
+
+ if (c->meta_name != NULL && !tag_has_type(tag, TAG_ITEM_NAME))
+ tag_add_item(tag, TAG_ITEM_NAME, c->meta_name);
+
+ c->tag = tag;
}
static size_t
@@ -317,13 +370,17 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
while (size > 0 && !list_empty(&c->buffers)) {
struct buffer *buffer = (struct buffer *)c->buffers.next;
- size_t copy = read_from_buffer(buffer, dest + nbytes, size,
+ size_t copy = read_from_buffer(&c->icy_metadata, buffer,
+ dest + nbytes, size,
rewind_head);
nbytes += copy;
size -= copy;
}
+ if (icy_defined(&c->icy_metadata))
+ copy_icy_tag(c);
+
is->offset += (off_t)nbytes;
if (rewind_head != NULL && is->offset > max_rewind_size) {
@@ -414,9 +471,11 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
while (end > value && g_ascii_isspace(end[-1]))
--end;
- if (strcasecmp(name, "accept-ranges") == 0)
- is->seekable = true;
- else if (strcasecmp(name, "content-length") == 0) {
+ if (strcasecmp(name, "accept-ranges") == 0) {
+ /* a stream with icy-metadata is not seekable */
+ if (!icy_defined(&c->icy_metadata))
+ is->seekable = true;
+ } else if (strcasecmp(name, "content-length") == 0) {
char buffer[64];
if ((size_t)(end - header) >= sizeof(buffer))
@@ -440,6 +499,27 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
c->tag = tag_new();
tag_add_item(c->tag, TAG_ITEM_NAME, c->meta_name);
+ } else if (strcasecmp(name, "icy-metaint") == 0) {
+ char buffer[64];
+ size_t icy_metaint;
+
+ if ((size_t)(end - header) >= sizeof(buffer) ||
+ icy_defined(&c->icy_metadata))
+ return size;
+
+ memcpy(buffer, value, end - value);
+ buffer[end - value] = 0;
+
+ icy_metaint = g_ascii_strtoull(buffer, NULL, 10);
+ g_debug("icy-metaint=%zu", icy_metaint);
+
+ if (icy_metaint > 0) {
+ icy_start(&c->icy_metadata, icy_metaint);
+
+ /* a stream with icy-metadata is not
+ seekable */
+ is->seekable = true;
+ }
}
return size;
@@ -507,10 +587,8 @@ input_curl_easy_init(struct input_stream *is)
return false;
c->request_headers = NULL;
- /*
c->request_headers = curl_slist_append(c->request_headers,
"Icy-Metadata: 1");
- */
curl_easy_setopt(c->easy, CURLOPT_HTTPHEADER, c->request_headers);
return true;
@@ -590,6 +668,10 @@ input_curl_rewind(struct input_stream *is)
list_splice_init(&c->rewind, &c->buffers);
is->offset = 0;
+
+ /* rewind the icy_metadata object */
+
+ icy_reset(&c->icy_metadata);
}
static bool
@@ -719,6 +801,7 @@ input_curl_open(struct input_stream *is, const char *url)
return false;
}
+ icy_clear(&c->icy_metadata);
c->tag = NULL;
ret = input_curl_easy_init(is);