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

Commit 6d042208 authored by Venkatarama Avadhani's avatar Venkatarama Avadhani Committed by Gerrit Code Review
Browse files

Revert "Add Overloads to Frame and Image Extract Functions" 

This reverts commit 932403af.

Reason for revert: These functions are always used with the colorspace parameter. The overloaded functions are not used.

Change-Id: Ia6d37e20db3a1d54ca14f3898ddedf7f839cdd39
parent 932403af

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)",