summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ronghua Wu <ronghuawu@google.com> 2016-01-08 18:25:07 +0000
committer Ronghua Wu <ronghuawu@google.com> 2016-01-08 10:27:18 -0800
commitbf1bde05c6bed513f3d04d9f9c495bf013d6ac24 (patch)
tree1421b68f300f84ab7af0e68eb20759261df4bcdc
parentcbbdf73608bace91270622034e4813a2355b7bf1 (diff)
Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
This reverts commit 1e7ebf33dca14859dc48802ffafbc761c69bb225. Change-Id: I764c42818a3262b4316ddad2f72d527eb9a90e46
-rw-r--r--include/media/openmax/OMX_AsString.h2
-rw-r--r--include/media/openmax/OMX_Video.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index 5bfec615db..ae8430d856 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -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;
}
}
diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h
index 7b6df89330..decc410ba9 100644
--- a/include/media/openmax/OMX_Video.h
+++ b/include/media/openmax/OMX_Video.h
@@ -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