devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Add support for flac embeded album art.

Browse source 
Change-Id: I077768f7d80b57976f9a7278b640ef67cf4f2af2
Reviewed-on: http://gerrit.rockbox.org/694
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
This commit is contained in:
Albert Song 2013-12-13 01:48:48 -08:00 • committed by Thomas Martitz
parent 8666871cb3
commit f633d5ed48
1 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

50
lib/rbcodec/metadata/flac.c
View file

@ -113,6 +113,56 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
return rc; return rc;
} }
} }
#ifdef HAVE_ALBUMART
else if (type == 6) /* 6 is the PICTURE block */
{
if(!id3->has_embedded_albumart) /* only use the first PICTURE */
{
unsigned int buf_size = MIN(sizeof(id3->path), i);
int picframe_pos = 4; /* skip picture type */
int mime_length, description_length;
id3->albumart.pos = lseek(fd, 0, SEEK_CUR);
int bytes_read = read(fd, buf, buf_size);
i -= bytes_read;
mime_length = get_long_be(&buf[picframe_pos]);
char *mime = buf + picframe_pos + 4;
picframe_pos += 4 + mime_length;
id3->albumart.type = AA_TYPE_UNKNOWN;
if (memcmp(mime, "image/", 6) == 0)
{
mime += 6;
if (strcmp(mime, "jpeg") == 0 || strcmp(mime, "jpg") == 0){
id3->albumart.type = AA_TYPE_JPG;
}else if (strcmp(mime, "png") == 0)
id3->albumart.type = AA_TYPE_PNG;
}
description_length = get_long_be(&buf[picframe_pos]);
/* 16 = skip picture width,height,color-depth,color-used */
picframe_pos += 4 + description_length + 16;
/* if we support the format and image length is in the buffer */
if(id3->albumart.type != AA_TYPE_UNKNOWN
&& (picframe_pos + 4) - buf_size > 0)
{
id3->has_embedded_albumart = true;
id3->albumart.size = get_long_be(&buf[picframe_pos]);
id3->albumart.pos += picframe_pos + 4;
}
}
if (lseek(fd, i, SEEK_CUR) < 0)
{
return rc;
}
}
#endif
else if (!last_metadata) else if (!last_metadata)
{ {
/* Skip to next metadata block */ /* Skip to next metadata block */