diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-08-21 00:36:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-21 00:36:45 +0000 |
| commit | 9fac8a6a4a47bf7b72d6c759c6f605b1806f925a (patch) | |
| tree | 8efc3268665a61fb42e967d70f79072f1b5c38b4 /graphics/java | |
| parent | e9d372a1fa6af81cff038d7da60e4d67e54f71d3 (diff) | |
| parent | ccadaf1eb48c70a3eb5722ecbd0144d165bcd963 (diff) | |
| download | frameworks_base-9fac8a6a4a47bf7b72d6c759c6f605b1806f925a.zip frameworks_base-9fac8a6a4a47bf7b72d6c759c6f605b1806f925a.tar.gz frameworks_base-9fac8a6a4a47bf7b72d6c759c6f605b1806f925a.tar.bz2 | |
Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/renderscript/Type.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index ef08c29..e023739 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -37,10 +37,11 @@ import android.util.Log; * faces. LOD and cube map faces are booleans to indicate present or not * present. </p> * - * <p>A Type also supports YUV format information to support an {@link - * android.renderscript.Allocation} in a YUV format. The YUV formats supported - * are {@link android.graphics.ImageFormat#YV12} and {@link - * android.graphics.ImageFormat#NV21}.</p> + * <p>A Type also supports YUV format information to support an + * {@link android.renderscript.Allocation} in a YUV format. The YUV formats + * supported are {@link android.graphics.ImageFormat#YV12}, + * {@link android.graphics.ImageFormat#NV21}, and + * {@link android.graphics.ImageFormat#YUV_420_888}</p> * * <div class="special reference"> * <h3>Developer Guides</h3> @@ -284,16 +285,19 @@ public class Type extends BaseObj { /** * Set the YUV layout for a Type. * - * @param yuvFormat {@link android.graphics.ImageFormat#YV12} or {@link android.graphics.ImageFormat#NV21} + * @param yuvFormat {@link android.graphics.ImageFormat#YV12}, {@link android.graphics.ImageFormat#NV21}, or + * {@link android.graphics.ImageFormat#YUV_420_888}. */ public Builder setYuvFormat(int yuvFormat) { switch (yuvFormat) { case android.graphics.ImageFormat.NV21: case android.graphics.ImageFormat.YV12: + case android.graphics.ImageFormat.YUV_420_888: break; default: - throw new RSIllegalArgumentException("Only NV21 and YV12 are supported.."); + throw new RSIllegalArgumentException( + "Only ImageFormat.NV21, .YV12, and .YUV_420_888 are supported.."); } mYuv = yuvFormat; |