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

Commit 56dd12ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cleanup: Remove default assignment of colorFormat" into main am: cceccda9 

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



Change-Id: I50040f84c84a3142e6acc29f081e3403f352bf77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5c1a039 cceccda9

media/libmedia/include/media/mediametadataretriever.h

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

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

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

            int colorFormat = HAL_PIXEL_FORMAT_RGB_565, bool metaOnly = false);

            int colorFormat, bool metaOnly = false);

    sp<IMemory> getImageAtIndex(int index,

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

            int colorFormat, 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 = HAL_PIXEL_FORMAT_RGB_565, bool metaOnly = false);

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

    sp<IMemory> extractAlbumArt();

    const char* extractMetadata(int keyCode);