mozilla-inbound: changeset 234126:2fb7a59b725ef854befc3f3c9da1a3fa032d1b16

author	Ryan VanderMeulen <ryanvm@gmail.com>
	Tue, 17 Mar 2015 15:46:50 -0400
changeset 234126	2fb7a59b725ef854befc3f3c9da1a3fa032d1b16
parent 234125	b34a02250499c02273d2eb47bfb492187d4e6468
child 234127	4881139642104b65d7b1e71fa23d13c75af0c040
child 234148	d25e976a647c040eee17dbb0bdf91abba2040aaa
push id	57038
push user	ryanvm@gmail.com
push date	Tue, 17 Mar 2015 19:46:57 +0000
treeherder	mozilla-inbound@2fb7a59b725e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1120780, 1144224
milestone	39.0a1
backs out	e86c7b372d7a4f1d5ab5ff0476c317e0cfc0e60d
first release with	nightly linux32 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly linux64 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly mac 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly win32 1174ffb1696d / 39.0a1 / 20150318030202 / files nightly win64 1174ffb1696d / 39.0a1 / 20150318030202 / files
last release without	nightly linux32 008b3f65a7e0 / 39.0a1 / 20150317073344 / files nightly linux64 008b3f65a7e0 / 39.0a1 / 20150317073344 / files nightly mac 008b3f65a7e0 / 39.0a1 / 20150317073344 / files nightly win32 008b3f65a7e0 / 39.0a1 / 20150317073344 / files nightly win64 008b3f65a7e0 / 39.0a1 / 20150317073344 / files

--- a/gfx/layers/GrallocImages.cpp
+++ b/gfx/layers/GrallocImages.cpp
@@ -27,16 +27,17 @@ namespace layers {
 
 int32_t GrallocImage::sColorIdMap[] = {
     HAL_PIXEL_FORMAT_YCbCr_420_P, OMX_COLOR_FormatYUV420Planar,
     HAL_PIXEL_FORMAT_YCbCr_422_P, OMX_COLOR_FormatYUV422Planar,
     HAL_PIXEL_FORMAT_YCbCr_420_SP, OMX_COLOR_FormatYUV420SemiPlanar,
     HAL_PIXEL_FORMAT_YCrCb_420_SP, -1,
     HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO, -1,
     HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED, HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED,
+    HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS, HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS,
     HAL_PIXEL_FORMAT_YV12, OMX_COLOR_FormatYUV420Planar,
     0, 0
 };
 
 struct GraphicBufferAutoUnlock {
   android::sp<GraphicBuffer> mGraphicBuffer;
 
   GraphicBufferAutoUnlock(android::sp<GraphicBuffer>& aGraphicBuffer)