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

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

omx: fix constrained profile support am: 775a54cb 

am: 2b31da17

Change-Id: Ic777dc0237d11ad2ab8372b7bee7a58199ba41f4
parents 4cab6aac 2b31da17

headers/media_plugin/media/openmax/OMX_AsString.h

+8 −0
Original line number Diff line number Diff line
@@ -930,6 +930,14 @@ inline static const char *asString(OMX_VIDEO_AVCLOOPFILTERTYPE i, const char *de 
#ifndef AS_STRING_FOR_OMX_VIDEOEXT_H

#define AS_STRING_FOR_OMX_VIDEOEXT_H



inline static const char *asString(OMX_VIDEO_AVCPROFILEEXTTYPE i, const char *def = "??") {

    switch (i) {

        case OMX_VIDEO_AVCProfileConstrainedBaseline:   return "ConstrainedBaseline";

        case OMX_VIDEO_AVCProfileConstrainedHigh:       return "ConstrainedHigh";

        default:                                return asString((OMX_VIDEO_AVCPROFILETYPE)i, def);

    }

}



inline static const char *asString(OMX_VIDEO_VP8PROFILETYPE i, const char *def = "??") {

    switch (i) {

        case OMX_VIDEO_VP8ProfileMain:    return "Main";

headers/media_plugin/media/openmax/OMX_VideoExt.h

+2 −2
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ typedef struct OMX_NALSTREAMFORMATTYPE{ 
} OMX_NALSTREAMFORMATTYPE;



/** AVC additional profiles */

typedef enum OMX_VIDEO_AVCPROFILETYPEEXT {

typedef enum OMX_VIDEO_AVCPROFILEEXTTYPE {

    OMX_VIDEO_AVCProfileConstrainedBaseline = 0x10000,   /**< Constrained baseline profile */

    OMX_VIDEO_AVCProfileConstrainedHigh     = 0x80000,   /**< Constrained high profile */

} OMX_VIDEO_AVCPROFILETYPEEXT;

} OMX_VIDEO_AVCPROFILEEXTTYPE;



/** VP8 profiles */

typedef enum OMX_VIDEO_VP8PROFILETYPE {