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

Commit 9da8d5b3 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: Add level 6+ OMX enums for AVC/H.264"

parents 084cf9a9 80c29f19

headers/media_plugin/media/openmax/OMX_AsString.h

+3 −0
Original line number Diff line number Diff line
@@ -911,6 +911,9 @@ inline static const char *asString(OMX_VIDEO_AVCLEVELTYPE i, const char *def = " 
        case OMX_VIDEO_AVCLevel5:  return "Level5";

        case OMX_VIDEO_AVCLevel51: return "Level51";

        case OMX_VIDEO_AVCLevel52: return "Level52";

        case OMX_VIDEO_AVCLevel6:  return "Level6";

        case OMX_VIDEO_AVCLevel61: return "Level61";

        case OMX_VIDEO_AVCLevel62: return "Level62";

        default:                   return def;

    }

}

headers/media_plugin/media/openmax/OMX_Video.h

+3 −0
Original line number Diff line number Diff line
@@ -832,6 +832,9 @@ typedef enum OMX_VIDEO_AVCLEVELTYPE { 
    OMX_VIDEO_AVCLevel5   = 0x4000,   /**< Level 5 */

    OMX_VIDEO_AVCLevel51  = 0x8000,   /**< Level 5.1 */

    OMX_VIDEO_AVCLevel52  = 0x10000,  /**< Level 5.2 */

    OMX_VIDEO_AVCLevel6   = 0x20000,  /**< Level 6 */

    OMX_VIDEO_AVCLevel61  = 0x40000,  /**< Level 6.1 */

    OMX_VIDEO_AVCLevel62  = 0x80000,  /**< Level 6.2 */

    OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */

    OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF