diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-10-22 09:50:25 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-10-22 09:50:25 -0400 |
| commit | b160ab0a365ef3a0dd4de78ac2dcf4f2e50f3023 (patch) | |
| tree | b0fa8cb6a86efd8ead9ebd8bb43009aac825e5d6 /media | |
| parent | 1acb2fbadc3da3c3fdb4f57425449780c1a8e20b (diff) | |
| download | frameworks_base-b160ab0a365ef3a0dd4de78ac2dcf4f2e50f3023.zip frameworks_base-b160ab0a365ef3a0dd4de78ac2dcf4f2e50f3023.tar.gz frameworks_base-b160ab0a365ef3a0dd4de78ac2dcf4f2e50f3023.tar.bz2 | |
Revert "For performance reasons, setMode() needs to be called before setDataSource()"
This reverts commit a34cb442866609c9fa49a8d2ca09dff09dd43aa9.
Breaks embedded album art.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index ac0a160..25236cf 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -255,8 +255,9 @@ status_t StagefrightMediaScanner::processFile( return HandleFLAC(path, &client); } - if (mRetriever->setMode(METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK && - mRetriever->setDataSource(path) == OK) { + if (mRetriever->setDataSource(path) == OK + && mRetriever->setMode( + METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { const char *value; if ((value = mRetriever->extractMetadata( METADATA_KEY_MIMETYPE)) != NULL) { @@ -304,8 +305,9 @@ char *StagefrightMediaScanner::extractAlbumArt(int fd) { } lseek(fd, 0, SEEK_SET); - if (mRetriever->setMode(METADATA_MODE_FRAME_CAPTURE_ONLY) == OK - && mRetriever->setDataSource(fd, 0, size) == OK) { + if (mRetriever->setDataSource(fd, 0, size) == OK + && mRetriever->setMode( + METADATA_MODE_FRAME_CAPTURE_ONLY) == OK) { sp<IMemory> mem = mRetriever->extractAlbumArt(); if (mem != NULL) { |