diff options
author | James Dong <jdong@google.com> | 2011-01-06 12:20:35 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-01-12 14:14:11 -0800 |
commit | 7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e (patch) | |
tree | 5e17f415d44cdba3c8b37a42c487e28e26593a64 /media/libstagefright | |
parent | 67988a9ba5a081d14dbd8a663516e1d484d829df (diff) | |
download | frameworks_av-7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e.zip frameworks_av-7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e.tar.gz frameworks_av-7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e.tar.bz2 |
Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.
bug - 2433195
Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 8 | ||||
-rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 17 |
2 files changed, 2 insertions, 23 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 5d15246..39b0021 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -131,9 +131,7 @@ status_t StagefrightMediaScanner::processFile( if (status != OK) { return status; } - } else if (mRetriever->setDataSource(path) == OK - && mRetriever->setMode( - METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { + } else if (mRetriever->setDataSource(path) == OK) { const char *value; if ((value = mRetriever->extractMetadata( METADATA_KEY_MIMETYPE)) != NULL) { @@ -182,9 +180,7 @@ char *StagefrightMediaScanner::extractAlbumArt(int fd) { } lseek64(fd, 0, SEEK_SET); - if (mRetriever->setDataSource(fd, 0, size) == OK - && mRetriever->setMode( - METADATA_MODE_FRAME_CAPTURE_ONLY) == OK) { + if (mRetriever->setDataSource(fd, 0, size) == OK) { sp<IMemory> mem = mRetriever->extractAlbumArt(); if (mem != NULL) { diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index 4f483ac..600de7c 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -266,11 +266,6 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime( int64_t timeUs, int option) { LOGV("getFrameAtTime: %lld us option: %d", timeUs, option); - if (0 == (mMode & METADATA_MODE_FRAME_CAPTURE_ONLY)) { - LOGV("getFrameAtTime disabled by mode (0x%08x)", mMode); - - return NULL; - } if (mExtractor.get() == NULL) { LOGV("no extractor."); @@ -324,12 +319,6 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime( MediaAlbumArt *StagefrightMetadataRetriever::extractAlbumArt() { LOGV("extractAlbumArt (extractor: %s)", mExtractor.get() != NULL ? "YES" : "NO"); - if (0 == (mMode & METADATA_MODE_METADATA_RETRIEVAL_ONLY)) { - LOGV("extractAlbumArt/metadata retrieval disabled by mode"); - - return NULL; - } - if (mExtractor == NULL) { return NULL; } @@ -348,12 +337,6 @@ MediaAlbumArt *StagefrightMetadataRetriever::extractAlbumArt() { } const char *StagefrightMetadataRetriever::extractMetadata(int keyCode) { - if (0 == (mMode & METADATA_MODE_METADATA_RETRIEVAL_ONLY)) { - LOGV("extractAlbumArt/metadata retrieval disabled by mode"); - - return NULL; - } - if (mExtractor == NULL) { return NULL; } |