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

Commit 95304d54 authored by James Dong's avatar James Dong
Browse files

Squash commits of the following patches, cherry-picked from other branch - do not merge. 

o Prepare for publishing MediaMetadataRetriever as public API
  step one:
  o replaced captureFrame with getFrameAtTime
  o removed getMode

o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
  as part of the preparation for publishing MediaMetadataRetriever as public Java API

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

o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java

o 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 - 3309041

Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
parent e4905140

cmds/stagefright/stagefright.cpp

+5 −7
Original line number Diff line number Diff line
@@ -596,21 +596,19 @@ int main(int argc, char **argv) { 
            const char *filename = argv[k];



            CHECK_EQ(retriever->setDataSource(filename), (status_t)OK);

            CHECK_EQ(retriever->setMode(

                        METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL),

                     (status_t)OK);



            sp<IMemory> mem = retriever->captureFrame();

            sp<IMemory> mem =

                    retriever->getFrameAtTime(-1,

                                    MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC);



            if (mem != NULL) {

                printf("captureFrame(%s) => OK\n", filename);

                printf("getFrameAtTime(%s) => OK\n", filename);

            } else {

                mem = retriever->extractAlbumArt();



                if (mem != NULL) {

                    printf("extractAlbumArt(%s) => OK\n", filename);

                } else {

                    printf("both captureFrame and extractAlbumArt "

                    printf("both getFrameAtTime and extractAlbumArt "

                           "failed on file '%s'.\n", filename);

                }

            }

include/media/IMediaMetadataRetriever.h

+1 −3
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ public: 
    virtual void            disconnect() = 0;

    virtual status_t        setDataSource(const char* srcUrl) = 0;

    virtual status_t        setDataSource(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t        setMode(int mode) = 0;

    virtual status_t        getMode(int* mode) const = 0;

    virtual sp<IMemory>     captureFrame() = 0;

    virtual sp<IMemory>     getFrameAtTime(int64_t timeUs, int option) = 0;

    virtual sp<IMemory>     extractAlbumArt() = 0;

    virtual const char*     extractMetadata(int keyCode) = 0;

};

include/media/MediaMetadataRetrieverInterface.h

+3 −28
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ public: 
    virtual             ~MediaMetadataRetrieverBase() {}

    virtual status_t    setDataSource(const char *url) = 0;

    virtual status_t    setDataSource(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t    setMode(int mode) = 0;

    virtual status_t    getMode(int* mode) const = 0;

    virtual VideoFrame* captureFrame() = 0;

    virtual VideoFrame* getFrameAtTime(int64_t timeUs, int option) = 0;

    virtual MediaAlbumArt* extractAlbumArt() = 0;

    virtual const char* extractMetadata(int keyCode) = 0;

};
@@ -43,35 +41,12 @@ public: 
class MediaMetadataRetrieverInterface : public MediaMetadataRetrieverBase

{

public:

    MediaMetadataRetrieverInterface()

        : mMode(0) {

    }

    MediaMetadataRetrieverInterface() {}



    virtual             ~MediaMetadataRetrieverInterface() {}



    // @param mode The intended mode of operations:

    // can be any of the following:

    // METADATA_MODE_NOOP: Experimental - just add and remove data source.

    // METADATA_MODE_FRAME_CAPTURE_ONLY: For capture frame/thumbnail only.

    // METADATA_MODE_METADATA_RETRIEVAL_ONLY: For meta data retrieval only.

    // METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL: For both frame

    //     capture and meta data retrieval.

    virtual status_t    setMode(int mode) {

                            if (mode < METADATA_MODE_NOOP ||

                                mode > METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL) {

                                return BAD_VALUE;

                            }



                            mMode = mode;

                            return NO_ERROR;

                        }



    virtual status_t    getMode(int* mode) const { *mode = mMode; return NO_ERROR; }

    virtual VideoFrame* captureFrame() { return NULL; }

    virtual VideoFrame* getFrameAtTime(int64_t timeUs, int option) { return NULL; }

    virtual MediaAlbumArt* extractAlbumArt() { return NULL; }

    virtual const char* extractMetadata(int keyCode) { return NULL; }



    uint32_t mMode;

};



}; // namespace android

include/media/mediametadataretriever.h

+6 −31
Original line number Diff line number Diff line
@@ -42,37 +42,14 @@ enum { 
    METADATA_KEY_YEAR            = 8,

    METADATA_KEY_DURATION        = 9,

    METADATA_KEY_NUM_TRACKS      = 10,

    METADATA_KEY_IS_DRM_CRIPPLED = 11,

    METADATA_KEY_CODEC           = 12,

    METADATA_KEY_RATING          = 13,

    METADATA_KEY_COMMENT         = 14,

    METADATA_KEY_COPYRIGHT       = 15,

    METADATA_KEY_BIT_RATE        = 16,

    METADATA_KEY_FRAME_RATE      = 17,

    METADATA_KEY_VIDEO_FORMAT    = 18,

    METADATA_KEY_VIDEO_HEIGHT    = 19,

    METADATA_KEY_VIDEO_WIDTH     = 20,

    METADATA_KEY_WRITER          = 21,

    METADATA_KEY_MIMETYPE        = 22,

    METADATA_KEY_DISC_NUMBER     = 23,

    METADATA_KEY_ALBUMARTIST     = 24,

    METADATA_KEY_COMPILATION     = 25,

    METADATA_KEY_WRITER          = 11,

    METADATA_KEY_MIMETYPE        = 12,

    METADATA_KEY_ALBUMARTIST     = 13,

    METADATA_KEY_DISC_NUMBER     = 14,

    METADATA_KEY_COMPILATION     = 15,

    // Add more here...

};



// The intended mode of operations:$

// METADATA_MODE_NOOP: Experimental - just add and remove data source.$

// METADATA_MODE_FRAME_CAPTURE_ONLY: For capture frame/thumbnail only.$

// METADATA_MODE_METADATA_RETRIEVAL_ONLY: For meta data retrieval only.$

// METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL: For both frame capture

//   and meta data retrieval.$

enum {

    METADATA_MODE_NOOP                                 = 0x00,

    METADATA_MODE_METADATA_RETRIEVAL_ONLY              = 0x01,

    METADATA_MODE_FRAME_CAPTURE_ONLY                   = 0x02,

    METADATA_MODE_FRAME_CAPTURE_AND_METADATA_RETRIEVAL = 0x03

};



class MediaMetadataRetriever: public RefBase

{

public:
@@ -81,9 +58,7 @@ public: 
    void disconnect();

    status_t setDataSource(const char* dataSourceUrl);

    status_t setDataSource(int fd, int64_t offset, int64_t length);

    status_t setMode(int mode);

    status_t getMode(int* mode);

    sp<IMemory> captureFrame();

    sp<IMemory> getFrameAtTime(int64_t timeUs, int option);

    sp<IMemory> extractAlbumArt();

    const char* extractMetadata(int keyCode);

media/libmedia/IMediaMetadataRetriever.cpp

+11 −39
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ enum { 
    DISCONNECT = IBinder::FIRST_CALL_TRANSACTION,

    SET_DATA_SOURCE_URL,

    SET_DATA_SOURCE_FD,

    SET_MODE,

    GET_MODE,

    CAPTURE_FRAME,

    GET_FRAME_AT_TIME,

    EXTRACT_ALBUM_ART,

    EXTRACT_METADATA,

};
@@ -124,32 +122,17 @@ public: 
        return reply.readInt32();

    }



    status_t setMode(int mode)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaMetadataRetriever::getInterfaceDescriptor());

        data.writeInt32(mode);

        remote()->transact(SET_MODE, data, &reply);

        return reply.readInt32();

    }



    status_t getMode(int* mode) const

    {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaMetadataRetriever::getInterfaceDescriptor());

        remote()->transact(GET_MODE, data, &reply);

        *mode = reply.readInt32();

        return reply.readInt32();

    }



    sp<IMemory> captureFrame()

    sp<IMemory> getFrameAtTime(int64_t timeUs, int option)

    {

        LOGV("getTimeAtTime: time(%lld us) and option(%d)", timeUs, option);

        Parcel data, reply;

        data.writeInterfaceToken(IMediaMetadataRetriever::getInterfaceDescriptor());

        data.writeInt64(timeUs);

        data.writeInt32(option);

#ifndef DISABLE_GROUP_SCHEDULE_HACK

        sendSchedPolicy(data);

#endif

        remote()->transact(CAPTURE_FRAME, data, &reply);

        remote()->transact(GET_FRAME_AT_TIME, data, &reply);

        status_t ret = reply.readInt32();

        if (ret != NO_ERROR) {

            return NULL;
@@ -216,26 +199,15 @@ status_t BnMediaMetadataRetriever::onTransact( 
            reply->writeInt32(setDataSource(fd, offset, length));

            return NO_ERROR;

        } break;

        case SET_MODE: {

            CHECK_INTERFACE(IMediaMetadataRetriever, data, reply);

            int mode = data.readInt32();

            reply->writeInt32(setMode(mode));

            return NO_ERROR;

        } break;

        case GET_MODE: {

            CHECK_INTERFACE(IMediaMetadataRetriever, data, reply);

            int mode;

            status_t status = getMode(&mode);

            reply->writeInt32(mode);

            reply->writeInt32(status);

            return NO_ERROR;

        } break;

        case CAPTURE_FRAME: {

        case GET_FRAME_AT_TIME: {

            CHECK_INTERFACE(IMediaMetadataRetriever, data, reply);

            int64_t timeUs = data.readInt64();

            int option = data.readInt32();

            LOGV("getTimeAtTime: time(%lld us) and option(%d)", timeUs, option);

#ifndef DISABLE_GROUP_SCHEDULE_HACK

            setSchedPolicy(data);

#endif

            sp<IMemory> bitmap = captureFrame();

            sp<IMemory> bitmap = getFrameAtTime(timeUs, option);

            if (bitmap != 0) {  // Don't send NULL across the binder interface

                reply->writeInt32(NO_ERROR);

                reply->writeStrongBinder(bitmap->asBinder());