From c29bcd0dcd00225e0206d0ad7a374bc1766d2d5a Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Tue, 26 Jan 2016 14:19:25 -0800 Subject: [PATCH] [RenderScript] Unhide new Allocation APIs Bug: 23535524 - ByteBuffer getByteBuffer() - long getStride() - Allocation[] createAllocations(rs, type, usage, num) - long getTimeStamp() Change-Id: I0cad88c81f9f48c7aca59af159c49f506b234aee --- api/current.txt | 4 ++++ api/system-current.txt | 4 ++++ api/test-current.txt | 4 ++++ rs/java/android/renderscript/Allocation.java | 4 ---- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 05883b45c6afc..47666074d6f75 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32423,6 +32423,7 @@ package android.renderscript { method public void copyTo(short[]); method public void copyTo(int[]); method public void copyTo(float[]); + method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); @@ -32438,9 +32439,12 @@ package android.renderscript { method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int); method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type); method public void generateMipmaps(); + method public java.nio.ByteBuffer getByteBuffer(); method public int getBytesSize(); method public android.renderscript.Element getElement(); + method public long getStride(); method public android.view.Surface getSurface(); + method public long getTimeStamp(); method public android.renderscript.Type getType(); method public int getUsage(); method public void ioReceive(); diff --git a/api/system-current.txt b/api/system-current.txt index 66f406a9ed836..edca394c49d2f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -34649,6 +34649,7 @@ package android.renderscript { method public void copyTo(short[]); method public void copyTo(int[]); method public void copyTo(float[]); + method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); @@ -34664,9 +34665,12 @@ package android.renderscript { method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int); method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type); method public void generateMipmaps(); + method public java.nio.ByteBuffer getByteBuffer(); method public int getBytesSize(); method public android.renderscript.Element getElement(); + method public long getStride(); method public android.view.Surface getSurface(); + method public long getTimeStamp(); method public android.renderscript.Type getType(); method public int getUsage(); method public void ioReceive(); diff --git a/api/test-current.txt b/api/test-current.txt index 792d0969cb307..370e5e11dcf4f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32437,6 +32437,7 @@ package android.renderscript { method public void copyTo(short[]); method public void copyTo(int[]); method public void copyTo(float[]); + method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap); method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int); @@ -32452,9 +32453,12 @@ package android.renderscript { method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int); method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type); method public void generateMipmaps(); + method public java.nio.ByteBuffer getByteBuffer(); method public int getBytesSize(); method public android.renderscript.Element getElement(); + method public long getStride(); method public android.view.Surface getSurface(); + method public long getTimeStamp(); method public android.renderscript.Type getType(); method public int getUsage(); method public void ioReceive(); diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 4bda87e918dea..8c78a3ac2aad8 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -2074,7 +2074,6 @@ public class Allocation extends BaseObj { } /** - * @hide * Gets or creates a ByteBuffer that contains the raw data of the current Allocation. * If the Allocation is created with USAGE_IO_INPUT, the returned ByteBuffer * would contain the up-to-date data as READ ONLY. @@ -2109,7 +2108,6 @@ public class Allocation extends BaseObj { } /** - * @hide * Creates a new Allocation Array with the given {@link * android.renderscript.Type}, and usage flags. * Note: If the input allocation is of usage: USAGE_IO_INPUT, @@ -2211,7 +2209,6 @@ public class Allocation extends BaseObj { } /** - * @hide * Gets the stride of the Allocation. * For a 2D or 3D Allocation, the raw data maybe padded so that each row of * the Allocation has certain alignment. The size of each row including such @@ -2229,7 +2226,6 @@ public class Allocation extends BaseObj { } /** - * @hide * Get the timestamp for the most recent buffer held by this Allocation. * The timestamp is guaranteed to be unique and monotonically increasing. * Default value: -1. The timestamp will be updated after each {@link