Mercurial > hg > svcore
changeset 349:f39d33b0b265 1.2-stable
* Merge r884 from trunk
| author | Chris Cannam |
|---|---|
| date | Fri, 30 Nov 2007 17:36:14 +0000 |
| parents | 7a5a9b6d50c7 |
| children | 94fc0591ea43 |
| files | data/fileio/MP3FileReader.cpp |
| diffstat | 1 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp Thu Nov 29 17:16:02 2007 +0000 +++ b/data/fileio/MP3FileReader.cpp Fri Nov 30 17:36:14 2007 +0000 @@ -206,7 +206,7 @@ unsigned int nstrings = id3_field_getnstrings(&frame->fields[1]); if (nstrings == 0) { #ifdef DEBUG_ID3TAG - std::cerr << "MP3FileReader::loadTags: No data for \"" << name << "\" in ID3 tag" << std::endl; + std::cerr << "MP3FileReader::loadTags: No strings for \"" << name << "\" in ID3 tag" << std::endl; #endif return ""; } @@ -291,7 +291,22 @@ DecoderData *data = (DecoderData *)dp; if (!data->length) return MAD_FLOW_STOP; - mad_stream_buffer(stream, data->start, data->length); + + unsigned char const *start = data->start; + unsigned long length = data->length; + +#ifdef HAVE_ID3TAG + if (length > ID3_TAG_QUERYSIZE) { + int taglen = id3_tag_query(start, ID3_TAG_QUERYSIZE); + if (taglen > 0) { +// std::cerr << "ID3 tag length to skip: " << taglen << std::endl; + start += taglen; + length -= taglen; + } + } +#endif + + mad_stream_buffer(stream, start, length); data->length = 0; return MAD_FLOW_CONTINUE;