diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 8 | ||||
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index c92fc23..a3c3f09 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -262,14 +262,6 @@ public class MediaMetadataRetriever return getFrameAtTime(-1, OPTION_CLOSEST_SYNC); } - /** - * FIXME - * To be removed and replaced by getFrameAt(). - */ - public Bitmap captureFrame() { - return _getFrameAtTime(-1, OPTION_CLOSEST_SYNC); - } - private native Bitmap _getFrameAtTime(long timeUs, int option); diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index ee3eefc..6331a63 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -260,7 +260,7 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime( LOGV("getFrameAtTime: %lld us option: %d", timeUs, option); if (0 == (mMode & METADATA_MODE_FRAME_CAPTURE_ONLY)) { - LOGV("captureFrame disabled by mode (0x%08x)", mMode); + LOGV("getFrameAtTime disabled by mode (0x%08x)", mMode); return NULL; } |