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

Commit 8f5f1bea authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media/omx: fix VP9 level enums" into oc-mr1-dev 

am: e0626840

Change-Id: Ie180ae4bd989a57ff5b7aadb53a45b0a39953683
parents fa22e898 e0626840

headers/media_plugin/media/openmax/OMX_VideoExt.h

+14 −14
Original line number Diff line number Diff line
@@ -164,20 +164,20 @@ typedef enum OMX_VIDEO_VP9PROFILETYPE { 


/** VP9 levels */

typedef enum OMX_VIDEO_VP9LEVELTYPE {

    OMX_VIDEO_VP9Level1  = 0x0,

    OMX_VIDEO_VP9Level11 = 0x1,

    OMX_VIDEO_VP9Level2  = 0x2,

    OMX_VIDEO_VP9Level21 = 0x4,

    OMX_VIDEO_VP9Level3  = 0x8,

    OMX_VIDEO_VP9Level31 = 0x10,

    OMX_VIDEO_VP9Level4  = 0x20,

    OMX_VIDEO_VP9Level41 = 0x40,

    OMX_VIDEO_VP9Level5  = 0x80,

    OMX_VIDEO_VP9Level51 = 0x100,

    OMX_VIDEO_VP9Level52 = 0x200,

    OMX_VIDEO_VP9Level6  = 0x400,

    OMX_VIDEO_VP9Level61 = 0x800,

    OMX_VIDEO_VP9Level62 = 0x1000,

    OMX_VIDEO_VP9Level1  = 0x1,

    OMX_VIDEO_VP9Level11 = 0x2,

    OMX_VIDEO_VP9Level2  = 0x4,

    OMX_VIDEO_VP9Level21 = 0x8,

    OMX_VIDEO_VP9Level3  = 0x10,

    OMX_VIDEO_VP9Level31 = 0x20,

    OMX_VIDEO_VP9Level4  = 0x40,

    OMX_VIDEO_VP9Level41 = 0x80,

    OMX_VIDEO_VP9Level5  = 0x100,

    OMX_VIDEO_VP9Level51 = 0x200,

    OMX_VIDEO_VP9Level52 = 0x400,

    OMX_VIDEO_VP9Level6  = 0x800,

    OMX_VIDEO_VP9Level61 = 0x1000,

    OMX_VIDEO_VP9Level62 = 0x2000,

    OMX_VIDEO_VP9LevelUnknown = 0x6EFFFFFF,

    OMX_VIDEO_VP9LevelMax = 0x7FFFFFFF

} OMX_VIDEO_VP9LEVELTYPE;