Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix b/5974247

Browse Source 
Change-Id: I8c5cf035f195142607875739604d163c7a43e305
This commit is contained in:
Ruei-sung Lin
2012-05-02 15:13:42 -07:00
parent 6f28f9ef31
commit f4b403159f
3 changed files with 15 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
media/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
View File

@@ -47,20 +47,19 @@ public class BlackWhiteFilter extends Filter {
private int mHeight = 0;
private int mTarget = FrameFormat.TARGET_UNSPECIFIED;
private Frame mNoiseFrame = null;
private Random mRandom;
private final String mBlackWhiteShader =
"precision mediump float;\n" +
"uniform sampler2D tex_sampler_0;\n" +
"uniform sampler2D tex_sampler_1;\n" +
"uniform float black;\n" +
"uniform float scale;\n" +
"uniform float stepsize;\n" +
"varying vec2 v_texcoord;\n" +
"float rand(vec2 loc) {\n" +
" return fract(sin(dot(loc, vec2(12.9898, 78.233))) * 43758.5453);\n" +
"}\n" +
"void main() {\n" +
" vec4 color = texture2D(tex_sampler_0, v_texcoord);\n" +
" float dither = texture2D(tex_sampler_1, v_texcoord).r;\n" +
" float dither = rand(v_texcoord);\n" +
" vec3 xform = clamp((color.rgb - black) * scale, 0.0, 1.0);\n" +
" vec3 temp = clamp((color.rgb + stepsize - black) * scale, 0.0, 1.0);\n" +
" vec3 new_color = clamp(xform + (temp - xform) * (dither - 0.5), 0.0, 1.0);\n" +
@@ -69,8 +68,6 @@ public class BlackWhiteFilter extends Filter {
public BlackWhiteFilter(String name) {
super(name);
mRandom = new Random();
}
@Override
@@ -84,14 +81,6 @@ public class BlackWhiteFilter extends Filter {
return inputFormat;
}
@Override
public void tearDown(FilterContext context) {
if (mNoiseFrame != null) {
mNoiseFrame.release();
mNoiseFrame = null;
}
}
public void initProgram(FilterContext context, int target) {
switch (target) {
case FrameFormat.TARGET_GPU:
@@ -139,33 +128,13 @@ public class BlackWhiteFilter extends Filter {
if (inputFormat.getWidth() != mWidth || inputFormat.getHeight() != mHeight) {
mWidth = inputFormat.getWidth();
mHeight = inputFormat.getHeight();
if (mNoiseFrame != null) {
mNoiseFrame.release();
}
int[] buffer = new int[mWidth * mHeight];
for (int i = 0; i < mWidth * mHeight; ++i) {
buffer[i] = mRandom.nextInt(255);
}
FrameFormat format = ImageFormat.create(mWidth, mHeight,
ImageFormat.COLORSPACE_RGBA,
FrameFormat.TARGET_GPU);
mNoiseFrame = context.getFrameManager().newFrame(format);
mNoiseFrame.setInts(buffer);
}
if (mNoiseFrame != null && (mNoiseFrame.getFormat().getWidth() != mWidth ||
mNoiseFrame.getFormat().getHeight() != mHeight)) {
throw new RuntimeException("Random map and imput image size mismatch!");
}
// Create output frame
Frame output = context.getFrameManager().newFrame(inputFormat);
// Process
Frame[] inputs = {input, mNoiseFrame};
mProgram.process(inputs, output);
mProgram.process(input, output);
// Push output
pushOutput("image", output);

41
media/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
View File

@@ -41,21 +41,20 @@ public class DocumentaryFilter extends Filter {
private int mHeight = 0;
private int mTarget = FrameFormat.TARGET_UNSPECIFIED;
private Frame mNoiseFrame;
private Random mRandom;
private final String mDocumentaryShader =
"precision mediump float;\n" +
"uniform sampler2D tex_sampler_0;\n" +
"uniform sampler2D tex_sampler_1;\n" +
"uniform float stepsize;\n" +
"uniform float inv_max_dist;\n" +
"uniform vec2 center;\n" +
"varying vec2 v_texcoord;\n" +
"float rand(vec2 loc) {\n" +
" return fract(sin(dot(loc, vec2(12.9898, 78.233))) * 43758.5453);\n" +
"}\n" +
"void main() {\n" +
// black white
" vec4 color = texture2D(tex_sampler_0, v_texcoord);\n" +
" float dither = texture2D(tex_sampler_1, v_texcoord).r;\n" +
" float dither = rand(v_texcoord);\n" +
" vec3 xform = clamp(2.0 * color.rgb, 0.0, 1.0);\n" +
" vec3 temp = clamp(2.0 * (color.rgb + stepsize), 0.0, 1.0);\n" +
" vec3 new_color = clamp(xform + (temp - xform) * (dither - 0.5), 0.0, 1.0);\n" +
@@ -70,8 +69,6 @@ public class DocumentaryFilter extends Filter {
public DocumentaryFilter(String name) {
super(name);
mRandom = new Random();
}
@Override
@@ -85,14 +82,6 @@ public class DocumentaryFilter extends Filter {
return inputFormat;
}
@Override
public void tearDown(FilterContext context) {
if (mNoiseFrame != null) {
mNoiseFrame.release();
mNoiseFrame = null;
}
}
public void initProgram(FilterContext context, int target) {
switch (target) {
case FrameFormat.TARGET_GPU:
@@ -123,34 +112,14 @@ public class DocumentaryFilter extends Filter {
if (inputFormat.getWidth() != mWidth || inputFormat.getHeight() != mHeight) {
mWidth = inputFormat.getWidth();
mHeight = inputFormat.getHeight();
int[] buffer = new int[mWidth * mHeight];
for (int i = 0; i < mWidth * mHeight; ++i) {
buffer[i] = mRandom.nextInt(255);
}
FrameFormat format = ImageFormat.create(mWidth, mHeight,
ImageFormat.COLORSPACE_RGBA,
FrameFormat.TARGET_GPU);
if (mNoiseFrame != null) {
mNoiseFrame.release();
}
mNoiseFrame = context.getFrameManager().newFrame(format);
mNoiseFrame.setInts(buffer);
initParameters();
}
if (mNoiseFrame != null && (mNoiseFrame.getFormat().getWidth() != mWidth ||
mNoiseFrame.getFormat().getHeight() != mHeight)) {
throw new RuntimeException("Random map and imput image size mismatch!");
}
// Create output frame
Frame output = context.getFrameManager().newFrame(inputFormat);
// Process
Frame[] inputs = {input, mNoiseFrame};
mProgram.process(inputs, output);
mProgram.process(input, output);
// Push output
pushOutput("image", output);

43
media/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
View File

@@ -28,8 +28,6 @@ import android.filterfw.core.Program;
import android.filterfw.core.ShaderProgram;
import android.filterfw.format.ImageFormat;
import java.util.Random;
public class LomoishFilter extends Filter {
@GenerateFieldPort(name = "tile_size", hasDefault = true)
@@ -41,19 +39,18 @@ public class LomoishFilter extends Filter {
private int mHeight = 0;
private int mTarget = FrameFormat.TARGET_UNSPECIFIED;
private Frame mNoiseFrame;
private Random mRandom;
private final String mLomoishShader =
"precision mediump float;\n" +
"uniform sampler2D tex_sampler_0;\n" +
"uniform sampler2D tex_sampler_1;\n" +
"uniform float stepsizeX;\n" +
"uniform float stepsizeY;\n" +
"uniform float stepsize;\n" +
"uniform vec2 center;\n" +
"uniform float inv_max_dist;\n" +
"varying vec2 v_texcoord;\n" +
"float rand(vec2 loc) {\n" +
" return fract(sin(dot(loc, vec2(12.9898, 78.233))) * 43758.5453);\n" +
"}\n" +
"void main() {\n" +
// sharpen
" vec3 nbr_color = vec3(0.0, 0.0, 0.0);\n" +
@@ -99,7 +96,7 @@ public class LomoishFilter extends Filter {
" }\n" +
" c_color.b = s_color.b * 0.5 + 0.25;\n" +
// blackwhite
" float dither = texture2D(tex_sampler_1, v_texcoord).r;\n" +
" float dither = rand(v_texcoord);\n" +
" vec3 xform = clamp((c_color.rgb - 0.15) * 1.53846, 0.0, 1.0);\n" +
" vec3 temp = clamp((color.rgb + stepsize - 0.15) * 1.53846, 0.0, 1.0);\n" +
" vec3 bw_color = clamp(xform + (temp - xform) * (dither - 0.5), 0.0, 1.0);\n" +
@@ -111,8 +108,6 @@ public class LomoishFilter extends Filter {
public LomoishFilter(String name) {
super(name);
mRandom = new Random();
}
@Override
@@ -126,14 +121,6 @@ public class LomoishFilter extends Filter {
return inputFormat;
}
@Override
public void tearDown(FilterContext context) {
if (mNoiseFrame != null) {
mNoiseFrame.release();
mNoiseFrame = null;
}
}
public void initProgram(FilterContext context, int target) {
switch (target) {
case FrameFormat.TARGET_GPU:
@@ -180,34 +167,14 @@ public class LomoishFilter extends Filter {
if (inputFormat.getWidth() != mWidth || inputFormat.getHeight() != mHeight) {
mWidth = inputFormat.getWidth();
mHeight = inputFormat.getHeight();
int[] buffer = new int[mWidth * mHeight];
for (int i = 0; i < mWidth * mHeight; ++i) {
buffer[i] = mRandom.nextInt(255);
}
FrameFormat format = ImageFormat.create(mWidth, mHeight,
ImageFormat.COLORSPACE_RGBA,
FrameFormat.TARGET_GPU);
if (mNoiseFrame != null) {
mNoiseFrame.release();
}
mNoiseFrame = context.getFrameManager().newFrame(format);
mNoiseFrame.setInts(buffer);
initParameters();
}
if (mNoiseFrame != null && (mNoiseFrame.getFormat().getWidth() != mWidth ||
mNoiseFrame.getFormat().getHeight() != mHeight)) {
throw new RuntimeException("Random map and imput image size mismatch!");
}
// Create output frame
Frame output = context.getFrameManager().newFrame(inputFormat);
// Process
Frame[] inputs = {input, mNoiseFrame};
mProgram.process(inputs, output);
mProgram.process(input, output);
// Push output
pushOutput("image", output);