From 6e77de71ac6d23b6591028d04e1f2a4b5fc14d94 Mon Sep 17 00:00:00 2001 From: James Dong Date: Tue, 4 Jan 2011 12:13:44 -0800 Subject: [PATCH] Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2 --- media/java/android/media/MediaMetadataRetriever.java | 8 -------- media/libstagefright/StagefrightMetadataRetriever.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index c92fc23555df2..a3c3f099171ef 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 ee3eefcba1500..6331a63fee606 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; }