summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMetadataRetriever.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-01-06 12:20:35 -0800
committerJames Dong <jdong@google.com>2011-01-12 14:14:11 -0800
commit7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e (patch)
tree5e17f415d44cdba3c8b37a42c487e28e26593a64 /media/libstagefright/StagefrightMetadataRetriever.cpp
parent67988a9ba5a081d14dbd8a663516e1d484d829df (diff)
downloadframeworks_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/StagefrightMetadataRetriever.cpp')
-rw-r--r--media/libstagefright/StagefrightMetadataRetriever.cpp17
1 files changed, 0 insertions, 17 deletions
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;
}