nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving to XML and base64 for metadata transmission. Metadat handling still not final.

Browse Source
This commit is contained in:
Mke Brady
2015-02-24 16:56:43 +00:00
parent 7785d36f98
commit 00fc99ba6c
4 changed files with 100 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+5 -1
View File
@@ -5,9 +5,13 @@ shairport_sync_SOURCES = shairport.c metadata.c rtsp.c mdns.c mdns_external.c co
if USE_CUSTOMPIDDIR
AM_CFLAGS= \
-DPIDDIR=\"$(CUSTOM_PID_DIR)\"
-DPIDDIR=\"$(CUSTOM_PID_DIR)\" -Wno-multichar
else
AM_CFLAGS= -Wno-multichar
endif
AM_CFLAGS += -Wno-multichar
if USE_AVAHI
shairport_sync_SOURCES += mdns_avahi.c
endif
metadata.c
+53 -1
View File
@@ -65,7 +65,7 @@ void metadata_open(void) {
if (!config.meta_dir)
return;
const char fn[] = "now_playing";
const char fn[] = "shairport_sync_metadata_pipe";
size_t pl = strlen(config.meta_dir) + 1 + strlen(fn);
char* path = malloc(pl+1);
@@ -185,3 +185,55 @@ void metadata_cover_image(const char *buf, int len, const char *ext) {
free(path);
}
// Metadata is not used by shairport-sync.
// Instead we send all metadata to a fifo pipe, so that other apps can listen to the pipe and use the metadata.
// We use two 4-character codes to identify each piece of data and we send the data itself in base64 form.
// The first 4-character code, called the "type", is either:
// 'core' for all the regular metadadata coming from iTunes, etc., or
// 'ssnc' (for 'shairport-sync') for all metadata coming from Shairport Sync itself, such as start/end delimiters, etc.
// For 'core' metadata, the second 4-character code is the 4-character metadata code coming from iTunes etc.
// For 'ssnc' metadata, the second 4-character code is used to distinguish the messages.
// Cover art is not tagged in the same way as other metadata, it seems, so is sent as an 'ssnc' type metadata message with the code 'PICT'
// The three kinds of 'ssnc' metadata at present are 'strt', 'stop' and 'PICT' for metadata package start, metadata package stop and cover art, respectively.
// Metadata is sent in two disctinct parts:
// (1) a line with type, code and length information surrounded by XML-type tags and
// (2) the data itself, if any, in base64 form, surrounded by XML-style data tags.
void metadata_process(uint32_t type,uint32_t code,char *data,uint32_t length) {
debug(2,"Process metadata with type %x, code %x and length %u.",type,code,length);
int ret;
// readers may go away and come back
if (fd < 0)
metadata_open();
if (fd < 0)
return;
char thestring[1024];
snprintf(thestring,1024,"<type>%x</type><code>%x</code><length>%u</length>\n",type,code,length);
ret = write(fd, thestring, strlen(thestring));
if (ret < 1) // no reader
metadata_close();
if (length>0) {
snprintf(thestring,1024,"<data encoding=\"base64\">\n");
ret = write(fd, thestring, strlen(thestring));
if (ret < 1) // no reader
metadata_close();
char *b64 = base64_enc(data,length);
ret = write(fd,b64,strlen(b64));
free(b64);
if (ret < 1) // no reader
metadata_close();
snprintf(thestring,1024,"\n</data>\n");
ret = write(fd, thestring, strlen(thestring));
if (ret < 1) // no reader
metadata_close();
}
}
metadata.h
+2
View File
@@ -17,6 +17,8 @@ void metadata_open(void);
void metadata_write(void);
void metadata_cover_image(const char *buf, int len, const char *ext);
void metadata_process(uint32_t type,uint32_t code,char *data,uint32_t length);
extern metadata player_meta;
#endif // _METADATA_H
rtsp.c
+40 -52
View File
@@ -581,6 +581,22 @@ static void handle_set_parameter_parameter(rtsp_conn_info *conn,
}
}
// Metadata is not used by shairport-sync.
// Instead we send all metadata to a fifo pipe, so that other apps can listen to the pipe and use the metadata.
// We use two 4-character codes to identify each piece of data and we send the data itself in base64 form.
// The first 4-character code, called the "type", is either:
// 'core' for all the regular metadadata coming from iTunes, etc., or
// 'ssnc' (for 'shairport-sync') for all metadata coming from Shairport Sync itself, such as start/end delimiters, etc.
// For 'core' metadata, the second 4-character code is the 4-character metadata code coming from iTunes etc.
// For 'ssnc' metadata, the second 4-character code is used to distinguish the messages.
// Cover art is not tagged in the same way as other metadata, it seems, so is sent as an 'ssnc' type metadata message with the code 'PICT'
// The three kinds of 'ssnc' metadata at present are 'strt', 'stop' and 'PICT' for metadata package start, metadata package stop and cover art, respectively.
static void handle_set_parameter_metadata(rtsp_conn_info *conn,
rtsp_message *req,
rtsp_message *resp) {
@@ -588,61 +604,33 @@ static void handle_set_parameter_metadata(rtsp_conn_info *conn,
int cl = req->contentlength;
unsigned int off = 8;
// inform the listener that a set of metadata is starting
// this doesn't include the cover art though...
metadata_process('ssnc','strt',NULL,0);
while (off < cl) {
char tag[5];
strncpy(tag, cp+off, 4);
tag[4] = '\0';
off += 4;
uint32_t vl = ntohl(*(uint32_t *)(cp+off));
// pick up the metadata tag as an unsigned longint
uint32_t itag = ntohl(*(uint32_t *)(cp+off));
off += sizeof(uint32_t);
char *val = malloc(vl+1);
strncpy(val, cp+off, vl);
val[vl] = '\0';
// pick up the length of the data
uint32_t vl = ntohl(*(uint32_t *)(cp+off));
off += sizeof(uint32_t);
// pass the data over
if (vl==0)
metadata_process('core',itag,NULL,0);
else
metadata_process('core',itag,(char *)(cp+off),vl);
// move on to the next item
off += vl;
debug(2, "Tag: %s Content: %s\n", tag, val);
if (!strncmp(tag, "asal ", 4)) {
debug(2, "META Album: \"%s\".\n", val);
metadata_set(&player_meta.album, val);
} else if (!strncmp(tag, "asar ", 4)) {
debug(2, "META Artist: \"%s\".\n", val);
metadata_set(&player_meta.artist, val);
} else if (!strncmp(tag, "ascm ", 4)) {
debug(2, "META Comment: \"%s\".\n", val);
metadata_set(&player_meta.comment, val);
} else if (!strncmp(tag, "asgn ", 4)) {
debug(2, "META Genre: \"%s\".\n", val);
metadata_set(&player_meta.genre, val);
} else if (!strncmp(tag, "minm ", 4)) {
debug(2, "META Title: \"%s\".\n", val);
metadata_set(&player_meta.title, val);
}
free(val);
}
metadata_write();
}
static void handle_set_parameter_coverart(rtsp_conn_info *conn,
rtsp_message *req, rtsp_message *resp) {
char *cp = req->content;
int cl = req->contentlength;
char *ct = msg_get_header(req, "Content-Type");
if (!strncmp(ct, "image/jpeg", 10)) {
metadata_cover_image(cp, cl, "jpg");
} else if (!strncmp(ct, "image/png", 9)) {
metadata_cover_image(cp, cl, "png");
} else {
debug(1, "unrecognised image type received: \"%s\".\n",ct);
metadata_cover_image(NULL, 0, NULL);
}
// inform the listener that a set of metadata is ending
metadata_process('ssnc','stop',NULL,0);
}
static void handle_set_parameter(rtsp_conn_info *conn,
@@ -657,14 +645,14 @@ static void handle_set_parameter(rtsp_conn_info *conn,
if (!strncmp(ct, "application/x-dmap-tagged", 25)) {
debug(2, "received metadata tags in SET_PARAMETER request\n");
handle_set_parameter_metadata(conn, req, resp);
} else if (!strncmp(ct, "image", 5)) {
debug(2, "received image in SET_PARAMETER request\n");
handle_set_parameter_coverart(conn, req, resp);
// note: the image/type tag isn't reliable, so it's not being sent
// -- best look at the first few bytes of the image
metadata_process('ssnc','PICT',req->content,req->contentlength);
} else if (!strncmp(ct, "text/parameters", 15)) {
debug(2, "received parameters in SET_PARAMETER request\n");
handle_set_parameter_parameter(conn, req, resp);
} else {
debug(1, "received unknown Content-Type \"%s\" in SET_PARAMETER request\n", ct);