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

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

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-11-19 15:50:29 -08:00
committed by Android Code Review
parent e3bef7c48d dc1a26eb78
commit e2ec61b23b
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;