Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b43587 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been... 

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

media/java/android/media/MediaMetadataRetriever.java

+0 −8
Original line number Diff line number Diff line
@@ -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);

media/libstagefright/StagefrightMetadataRetriever.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }