Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ID3v1 tag's strings are ISO8859, not UTF-8, so do the proper conversion when extracting metadata.

Browse Source 
related-to-bug: 2399408
This commit is contained in:
Andreas Huber
2010-02-08 11:04:56 -08:00
parent ba53068245
commit 9be54d400d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/id3/ID3.cpp
View File

@@ -274,7 +274,9 @@ static void convertISO8859ToString8(
String8 *s) {
size_t utf8len = 0;
for (size_t i = 0; i < size; ++i) {
if (data[i] < 0x80) {
if (data[i] == '\0') {
break;
} else if (data[i] < 0x80) {
++utf8len;
} else {
utf8len += 2;
@@ -291,7 +293,9 @@ static void convertISO8859ToString8(
char *tmp = new char[utf8len];
char *ptr = tmp;
for (size_t i = 0; i < size; ++i) {
if (data[i] < 0x80) {
if (data[i] == '\0') {
break;
} else if (data[i] < 0x80) {
*ptr++ = data[i];
} else if (data[i] < 0xc0) {
*ptr++ = 0xc2;
@@ -325,7 +329,7 @@ void ID3::Iterator::getString(String8 *id) const {
return;
}
id->setTo((const char *)mFrameData, mFrameSize);
convertISO8859ToString8(mFrameData, mFrameSize, id);
return;
}