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

StagefrightMediaScanner: Call endFile() for MIDI and OGG files.

Browse Source 
addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file.  This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
This commit is contained in:
Hiroshi Takekawa
2010-11-06 18:28:11 +09:00
parent 14ac954636
commit dc1a26eb78
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/libstagefright/StagefrightMediaScanner.cpp
View File

@@ -172,14 +172,16 @@ status_t StagefrightMediaScanner::processFile(
|| !strcasecmp(extension, ".rtttl")
|| !strcasecmp(extension, ".rtx")
|| !strcasecmp(extension, ".ota")) {
return HandleMIDI(path, &client);
}
if (!strcasecmp(extension, ".ogg")) {
return HandleOGG(path, &client);
}
if (mRetriever->setDataSource(path) == OK
status_t status = HandleMIDI(path, &client);
if (status != OK) {
return status;
}
} else if (!strcasecmp(extension, ".ogg")) {
status_t status = HandleOGG(path, &client);
if (status != OK) {
return status;
}
} else if (mRetriever->setDataSource(path) == OK
&& mRetriever->setMode(
METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {
const char *value;