Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files." into froyo (a58cc5a0) · Commits · e / os / android_frameworks_base

media/libstagefright/StagefrightMediaScanner.cpp

+14 −4

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ status_t StagefrightMediaScanner::processFile(
		return UNKNOWN_ERROR;
		}

		status_t status;
		if (!strcasecmp(extension, ".mid")
		\|\| !strcasecmp(extension, ".smf")
		\|\| !strcasecmp(extension, ".imy")
		@@ -244,15 +245,24 @@ status_t StagefrightMediaScanner::processFile(
		\|\| !strcasecmp(extension, ".rtttl")
		\|\| !strcasecmp(extension, ".rtx")
		\|\| !strcasecmp(extension, ".ota")) {
		return HandleMIDI(path, &client);
		status = HandleMIDI(path, &client);
		if (status != OK)
		return status;
		goto endfile;
		}

		if (!strcasecmp(extension, ".ogg")) {
		return HandleOGG(path, &client);
		status = HandleOGG(path, &client);
		if (status != OK)
		return status;
		goto endfile;
		}

		if (!strcasecmp(extension, ".flac")) {
		return HandleFLAC(path, &client);
		status = HandleFLAC(path, &client);
		if (status != OK)
		return status;
		goto endfile;
		}

		if (mRetriever->setDataSource(path) == OK
		@@ -290,7 +300,7 @@ status_t StagefrightMediaScanner::processFile(
		}
		}
		}

		endfile:
		client.endFile();

		return OK;