From: Ronghua Wu <ronghuawu@google.com>
Date: Thu, 10 Dec 2015 20:28:43 +0000 (-0800)
Subject: media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.
X-Git-Tag: android-x86-7.1-r1~657^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e7ebf33dca14859dc48802ffafbc761c69bb225;p=android-x86%2Fframeworks-native.git

media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.

Bug: 25684127
Change-Id: I1f6e97e60ae5868073a5768e956473c4b7348afa
---

diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index ae8430d856..5bfec615db 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -714,6 +714,8 @@ 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;
     }
 }
diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h
index decc410ba9..7b6df89330 100644
--- a/include/media/openmax/OMX_Video.h
+++ b/include/media/openmax/OMX_Video.h
@@ -88,6 +88,8 @@ 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