summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-09-05 07:36:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-05 07:36:43 +0000
commitd2676f9bd93c333ae2c7f3ca284d0fef5a7e146b (patch)
tree1b69726920d7644c38f5063220f59dbde1a25337 /graphics
parentc5c203d6ef8eea46f1c06f52e3ebfcc59c304760 (diff)
parent932e78e9903342e3494983fd3463084caab4ba42 (diff)
downloadframeworks_base-d2676f9bd93c333ae2c7f3ca284d0fef5a7e146b.zip
frameworks_base-d2676f9bd93c333ae2c7f3ca284d0fef5a7e146b.tar.gz
frameworks_base-d2676f9bd93c333ae2c7f3ca284d0fef5a7e146b.tar.bz2
Merge "Add YUV element convenience function." into klp-dev
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/renderscript/Element.java7
-rw-r--r--graphics/java/android/renderscript/RenderScript.java2
-rw-r--r--graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java6
3 files changed, 12 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index 3838c61..68badfa 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -725,6 +725,13 @@ public class Element extends BaseObj {
return rs.mElement_LONG_4;
}
+ public static Element YUV(RenderScript rs) {
+ if (rs.mElement_YUV == null) {
+ rs.mElement_YUV = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_YUV);
+ }
+ return rs.mElement_YUV;
+ }
+
public static Element MATRIX_4X4(RenderScript rs) {
if(rs.mElement_MATRIX_4X4 == null) {
rs.mElement_MATRIX_4X4 = createUser(rs, DataType.MATRIX_4X4);
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 854f079..7d4a5c4 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -898,6 +898,8 @@ public class RenderScript {
Element mElement_LONG_3;
Element mElement_LONG_4;
+ Element mElement_YUV;
+
Element mElement_MATRIX_4X4;
Element mElement_MATRIX_3X3;
Element mElement_MATRIX_2X2;
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
index 9b5de9b..845625d 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
@@ -20,9 +20,9 @@ package android.renderscript;
/**
* Intrinsic for converting an Android YUV buffer to RGB.
*
- * The input allocation is supplied in NV21 format as a U8
- * element type. The output is RGBA, the alpha channel will be
- * set to 255.
+ * The input allocation should be supplied in a supported YUV format
+ * as a YUV element Allocation. The output is RGBA; the alpha channel
+ * will be set to 255.
*/
public final class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic {
private Allocation mInput;