commit d644021b37ac57f87bb94e2f4907e8f18e2e979e
author Ronghua Wu <ronghuawu@google.com> Wed Jan 13 00:40:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 13 00:40:04 2016 +0000
tree d8fce485745c80b5a1a15cba435b66cd1e8bdf72
parent c7d1b2250e8245a7e4e144758bc3ccd33b8d6319
parent bf1bde05c6bed513f3d04d9f9c495bf013d6ac24

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

include/media/openmax/OMX_AsString.h

diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index 5bfec61..ae8430d 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -714,8 +714,6 @@
         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

diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h
index 7b6df89..decc410 100644
--- a/include/media/openmax/OMX_Video.h
+++ b/include/media/openmax/OMX_Video.h
@@ -88,8 +88,6 @@
     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