diff options
| author | Garret Pick <pickgr@pv.com> | 2010-08-23 11:49:52 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-10-17 04:52:07 -0400 |
| commit | a34cb442866609c9fa49a8d2ca09dff09dd43aa9 (patch) | |
| tree | 7f3f0d5a756e1bcfd71c2b0b401d212f05881f69 /media | |
| parent | e3e40046a02ea80ba70897d26886abfc0e62f77a (diff) | |
| download | frameworks_base-a34cb442866609c9fa49a8d2ca09dff09dd43aa9.zip frameworks_base-a34cb442866609c9fa49a8d2ca09dff09dd43aa9.tar.gz frameworks_base-a34cb442866609c9fa49a8d2ca09dff09dd43aa9.tar.bz2 | |
For performance reasons, setMode() needs to be called before setDataSource()
Change-Id: Ibcc3cd3abf8d4572b56fc66431f6d14bf8be5d48
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 25236cf..ac0a160 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -255,9 +255,8 @@ status_t StagefrightMediaScanner::processFile( return HandleFLAC(path, &client); } - if (mRetriever->setDataSource(path) == OK - && mRetriever->setMode( - METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { + if (mRetriever->setMode(METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK && + mRetriever->setDataSource(path) == OK) { const char *value; if ((value = mRetriever->extractMetadata( METADATA_KEY_MIMETYPE)) != NULL) { @@ -305,9 +304,8 @@ char *StagefrightMediaScanner::extractAlbumArt(int fd) { } lseek(fd, 0, SEEK_SET); - if (mRetriever->setDataSource(fd, 0, size) == OK - && mRetriever->setMode( - METADATA_MODE_FRAME_CAPTURE_ONLY) == OK) { + if (mRetriever->setMode(METADATA_MODE_FRAME_CAPTURE_ONLY) == OK + && mRetriever->setDataSource(fd, 0, size) == OK) { sp<IMemory> mem = mRetriever->extractAlbumArt(); if (mem != NULL) { |