Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method"

Browse Source
This commit is contained in:
James Dong
2011-01-04 13:12:47 -08:00
committed by Android (Google) Code Review
parent dc3c9c4b85 6e77de71ac
commit 69b43587be
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaMetadataRetriever.java
View File

@@ -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);

2
media/libstagefright/StagefrightMetadataRetriever.cpp
View File

@@ -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;
}