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

Commit d644021b authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.""

parents c7d1b225 bf1bde05

include/media/openmax/OMX_AsString.h

+0 −2
Original line number Diff line number Diff line
@@ -714,8 +714,6 @@ inline static const char *asString(OMX_VIDEO_CODINGTYPE i, const char *def = "?? 
        case OMX_VIDEO_CodingVP8:        return "VP8";

        case OMX_VIDEO_CodingVP9:        return "VP9";

        case OMX_VIDEO_CodingHEVC:       return "HEVC";

        case OMX_VIDEO_CodingDolbyAVC:   return "DolbyAVC";

        case OMX_VIDEO_CodingDolbyHEVC:  return "DolbyHEVC";

        default:                         return def;

    }

}

include/media/openmax/OMX_Video.h

+0 −2
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ typedef enum OMX_VIDEO_CODINGTYPE { 
    OMX_VIDEO_CodingVP8,        /**< Google VP8, formerly known as On2 VP8 */

    OMX_VIDEO_CodingVP9,        /**< Google VP9 */

    OMX_VIDEO_CodingHEVC,       /**< ITU H.265/HEVC */

    OMX_VIDEO_CodingDolbyAVC,   /**< DolbyVision H.264/AVC */

    OMX_VIDEO_CodingDolbyHEVC,  /**< DolbyVision H.265/HEVC */

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

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

    OMX_VIDEO_CodingMax = 0x7FFFFFFF