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

Commit 1935768c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add Overloads to Frame and Image Extract Functions"" into main... 

Merge "Revert "Add Overloads to Frame and Image Extract Functions"" into main am: 00193efa am: d5939b66 am: 4070173a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2769163



Change-Id: Iace36d6108dfa836ca4076551a7722d5892b54dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38d94ef4 4070173a

media/libmedia/include/media/mediametadataretriever.h

+3 −9
Original line number Diff line number Diff line
@@ -96,19 +96,13 @@ public: 
    status_t setDataSource(

            const sp<IDataSource>& dataSource, const char *mime = NULL);

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

            int colorFormat, bool metaOnly = false);

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

            bool metaOnly = false);

    sp<IMemory> getImageAtIndex(int index,

            int colorFormat, bool metaOnly = false, bool thumbnail = false);

            int colorFormat = HAL_PIXEL_FORMAT_RGB_565, bool metaOnly = false);

    sp<IMemory> getImageAtIndex(int index,

            bool metaOnly = false, bool thumbnail = false);

            int colorFormat = HAL_PIXEL_FORMAT_RGB_565, bool metaOnly = false, bool thumbnail = false);

    sp<IMemory> getImageRectAtIndex(

            int index, int colorFormat, int left, int top, int right, int bottom);

    sp<IMemory>  getFrameAtIndex(

            int index, int colorFormat, bool metaOnly = false);

    sp<IMemory>  getFrameAtIndex(

            int index, bool metaOnly = false);

            int index, int colorFormat = HAL_PIXEL_FORMAT_RGB_565, bool metaOnly = false);

    sp<IMemory> extractAlbumArt();

    const char* extractMetadata(int keyCode);

media/libmedia/mediametadataretriever.cpp

+0 −15
Original line number Diff line number Diff line
@@ -141,11 +141,6 @@ status_t MediaMetadataRetriever::setDataSource( 
    return mRetriever->setDataSource(dataSource, mime);

}



sp<IMemory> MediaMetadataRetriever::getFrameAtTime(

        int64_t timeUs, int option, bool metaOnly) {

    return getFrameAtTime(timeUs, option, HAL_PIXEL_FORMAT_RGB_565, metaOnly);

}



sp<IMemory> MediaMetadataRetriever::getFrameAtTime(

        int64_t timeUs, int option, int colorFormat, bool metaOnly)

{
@@ -159,11 +154,6 @@ sp<IMemory> MediaMetadataRetriever::getFrameAtTime( 
    return mRetriever->getFrameAtTime(timeUs, option, colorFormat, metaOnly);

}



sp<IMemory> MediaMetadataRetriever::getImageAtIndex(

        int index, bool metaOnly, bool thumbnail) {

    return getImageAtIndex(index, HAL_PIXEL_FORMAT_RGB_565, metaOnly, thumbnail);

}



sp<IMemory> MediaMetadataRetriever::getImageAtIndex(

        int index, int colorFormat, bool metaOnly, bool thumbnail) {

    ALOGV("getImageAtIndex: index(%d) colorFormat(%d) metaOnly(%d) thumbnail(%d)",
@@ -189,11 +179,6 @@ sp<IMemory> MediaMetadataRetriever::getImageRectAtIndex( 
            index, colorFormat, left, top, right, bottom);

}



sp<IMemory>  MediaMetadataRetriever::getFrameAtIndex(

        int index, bool metaOnly) {

    return getFrameAtIndex(index, HAL_PIXEL_FORMAT_RGB_565, metaOnly);

}



sp<IMemory>  MediaMetadataRetriever::getFrameAtIndex(

        int index, int colorFormat, bool metaOnly) {

    ALOGV("getFrameAtIndex: index(%d), colorFormat(%d) metaOnly(%d)",