Merge "Added benchmark mode. Added some image processing operations." (d52498a6) · Commits · e / os / android_frameworks_base

libs/rs/java/ImageProcessing/AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,8 @@
		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

		<application android:label="Image Processing">
		<activity android:name="ImageProcessingActivity">
		<activity android:name="ImageProcessingActivity"
		android:screenOrientation="portrait">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />

libs/rs/java/ImageProcessing/res/layout/main.xml

+151 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,146 @@
		android:layout_width="320dip"
		android:layout_height="266dip" />

		<Button
		android:layout_marginBottom="170dip"
		android:layout_width="wrap_content"
		android:layout_height="40dip"
		android:text="@string/benchmark"
		android:onClick="benchmark"
		android:layout_gravity="bottom"/>

		<TextView
		android:id="@+id/benchmarkText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="100dip"
		android:layout_marginBottom="175dip"
		android:layout_gravity="bottom"
		android:text="@string/saturation"/>

		<SeekBar
		android:id="@+id/inSaturation"
		android:layout_marginBottom="140dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="10dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/inSaturationText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="50dip"
		android:layout_marginBottom="142dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/saturation"/>

		<SeekBar
		android:id="@+id/inGamma"
		android:layout_marginBottom="110dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="10dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/inGammaText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="50dip"
		android:layout_marginBottom="112dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/gamma"/>

		<SeekBar
		android:id="@+id/outWhite"
		android:layout_marginBottom="80dip"
		android:layout_marginLeft="170dip"
		android:layout_marginRight="10dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/outWhiteText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="220dip"
		android:layout_marginBottom="82dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/out_white"/>

		<SeekBar
		android:id="@+id/inWhite"
		android:layout_marginBottom="80dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="170dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/inWhiteText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="50dip"
		android:layout_marginBottom="82dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/in_white"/>

		<SeekBar
		android:id="@+id/outBlack"
		android:layout_marginBottom="50dip"
		android:layout_marginLeft="170dip"
		android:layout_marginRight="10dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/outBlackText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="220dip"
		android:layout_marginBottom="52dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/out_black"/>

		<SeekBar
		android:id="@+id/inBlack"
		android:layout_marginBottom="50dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="170dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/inBlackText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="50dip"
		android:layout_marginBottom="52dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/in_black"/>

		<SeekBar
		android:id="@+id/threshold"
		android:id="@+id/radius"
		android:layout_marginBottom="10dip"
		android:layout_marginLeft="10dip"
		android:layout_marginRight="10dip"
		@@ -35,4 +173,15 @@
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" />

		<TextView
		android:id="@+id/blurText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:layout_marginLeft="50dip"
		android:layout_marginBottom="12dip"
		android:textColor="#000"
		android:layout_gravity="bottom"
		android:text="@string/blur_description"/>

		</merge>
		No newline at end of file

libs/rs/java/ImageProcessing/res/raw/threshold.rs

+310 −25

Original line number	Diff line number	Diff line
		@@ -4,46 +4,331 @@
		#include "../../../../scriptc/rs_math.rsh"
		#include "../../../../scriptc/rs_graphics.rsh"

		#define MAX_RADIUS 25

		int height;
		int width;
		float threshold;
		int radius;

		typedef struct c4u_s {
		char r, g, b, a;
		uint8_t r, g, b, a;
		} c4u_t;

		//rs_color4u * InPixel;
		//rs_color4u * OutPixel;
		c4u_t * InPixel;
		c4u_t * OutPixel;
		c4u_t * ScratchPixel;

		float inBlack;
		float outBlack;
		float inWhite;
		float outWhite;
		float gamma;

		float saturation;

		float inWMinInB;
		float outWMinOutB;

		#pragma rs export_var(height, width, radius, InPixel, OutPixel, ScratchPixel, inBlack, outBlack, inWhite, outWhite, gamma, saturation)
		#pragma rs export_func(filter, processNoBlur, computeColorMatrix, computeGaussianWeights);

		// Store our coefficients here
		float gaussian[MAX_RADIUS * 2 + 1];
		float colorMat[4][4];

		void computeColorMatrix() {
		// Saturation
		// Linear weights
		//float rWeight = 0.3086f;
		//float gWeight = 0.6094f;
		//float bWeight = 0.0820f;

		// Gamma 2.2 weights (we haven't converted our image to linear space yet for perf reasons)
		float rWeight = 0.299f;
		float gWeight = 0.587f;
		float bWeight = 0.114f;

		float oneMinusS = 1.0f - saturation;

		matrixLoadIdentity(colorMat);

		colorMat[0][0] = oneMinusS * rWeight + saturation;
		colorMat[0][1] = oneMinusS * rWeight;
		colorMat[0][2] = oneMinusS * rWeight;
		colorMat[1][0] = oneMinusS * gWeight;
		colorMat[1][1] = oneMinusS * gWeight + saturation;
		colorMat[1][2] = oneMinusS * gWeight;
		colorMat[2][0] = oneMinusS * bWeight;
		colorMat[2][1] = oneMinusS * bWeight;
		colorMat[2][2] = oneMinusS * bWeight + saturation;

		inWMinInB = inWhite - inBlack;
		outWMinOutB = outWhite - outBlack;
		}

		void computeGaussianWeights() {
		// Compute gaussian weights for the blur
		// e is the euler's number
		float e = 2.718281828459045f;
		float pi = 3.1415926535897932f;
		// g(x) = ( 1 / sqrt( 2 * pi ) * sigma) * e ^ ( -x^2 / 2 * sigma^2 )
		// x is of the form [-radius .. 0 .. radius]
		// and sigma varies with radius.
		// Based on some experimental radius values and sigma's
		// we approximately fit sigma = f(radius) as
		// sigma = radius * 0.4 + 0.6
		// The larger the radius gets, the more our gaussian blur
		// will resemble a box blur since with large sigma
		// the gaussian curve begins to lose its shape
		float sigma = 0.4f * (float)radius + 0.6f;

		// Now compute the coefficints
		// We will store some redundant values to save some math during
		// the blur calculations
		// precompute some values
		float coeff1 = 1.0f / (sqrt( 2.0f * pi ) * sigma);
		float coeff2 = - 1.0f / (2.0f * sigma * sigma);

		float normalizeFactor = 0.0f;
		float floatR = 0.0f;
		int r;
		for(r = -radius; r <= radius; r ++) {
		floatR = (float)r;
		gaussian[r + radius] = coeff1 * pow(e, floatR * floatR * coeff2);
		normalizeFactor += gaussian[r + radius];
		}

		//Now we need to normalize the weights because all our coefficients need to add up to one
		normalizeFactor = 1.0f / normalizeFactor;
		for(r = -radius; r <= radius; r ++) {
		floatR = (float)r;
		gaussian[r + radius] *= normalizeFactor;
		}
		}

		// This needs to be inline
		void levelsSaturation(float4 *currentPixel) {
		// Color matrix multiply
		float tempX = colorMat[0][0] * currentPixel->x + colorMat[1][0] * currentPixel->y + colorMat[2][0] * currentPixel->z;
		float tempY = colorMat[0][1] * currentPixel->x + colorMat[1][1] * currentPixel->y + colorMat[2][1] * currentPixel->z;
		float tempZ = colorMat[0][2] * currentPixel->x + colorMat[1][2] * currentPixel->y + colorMat[2][2] * currentPixel->z;

		currentPixel->x = tempX;
		currentPixel->y = tempY;
		currentPixel->z = tempZ;

		// Clamp to 0..255
		// Inline the code here to avoid funciton calls
		currentPixel->x = currentPixel->x > 255.0f ? 255.0f : currentPixel->x;
		currentPixel->y = currentPixel->y > 255.0f ? 255.0f : currentPixel->y;
		currentPixel->z = currentPixel->z > 255.0f ? 255.0f : currentPixel->z;

		currentPixel->x = currentPixel->x <= 0.0f ? 0.1f : currentPixel->x;
		currentPixel->y = currentPixel->y <= 0.0f ? 0.1f : currentPixel->y;
		currentPixel->z = currentPixel->z <= 0.0f ? 0.1f : currentPixel->z;

		currentPixel->x = pow( (currentPixel->x - inBlack) / (inWMinInB), gamma) * (outWMinOutB) + outBlack;
		currentPixel->y = pow( (currentPixel->y - inBlack) / (inWMinInB), gamma) * (outWMinOutB) + outBlack;
		currentPixel->z = pow( (currentPixel->z - inBlack) / (inWMinInB), gamma) * (outWMinOutB) + outBlack;

		currentPixel->x = currentPixel->x > 255.0f ? 255.0f : currentPixel->x;
		currentPixel->y = currentPixel->y > 255.0f ? 255.0f : currentPixel->y;
		currentPixel->z = currentPixel->z > 255.0f ? 255.0f : currentPixel->z;

		currentPixel->x = currentPixel->x <= 0.0f ? 0.1f : currentPixel->x;
		currentPixel->y = currentPixel->y <= 0.0f ? 0.1f : currentPixel->y;
		currentPixel->z = currentPixel->z <= 0.0f ? 0.1f : currentPixel->z;
		}

		void processNoBlur() {
		int w, h, r;
		int count = 0;

		float inWMinInB = inWhite - inBlack;
		float outWMinOutB = outWhite - outBlack;
		float4 currentPixel = 0;

		for(h = 0; h < height; h ++) {
		for(w = 0; w < width; w ++) {
		c4u_t input = InPixel + hwidth + w;

		currentPixel.x = (float)(input->r);
		currentPixel.y = (float)(input->g);
		currentPixel.z = (float)(input->b);

		levelsSaturation(&currentPixel);

		c4u_t output = OutPixel + hwidth + w;
		output->r = (uint8_t)currentPixel.x;
		output->g = (uint8_t)currentPixel.y;
		output->b = (uint8_t)currentPixel.z;
		output->a = input->a;
		}
		}
		sendToClient(&count, 1, 4, 0);
		}

		void horizontalBlur() {
		float4 blurredPixel = 0;
		float4 currentPixel = 0;
		// Horizontal blur
		int w, h, r;
		for(h = 0; h < height; h ++) {
		for(w = 0; w < width; w ++) {

		blurredPixel = 0;

		for(r = -radius; r <= radius; r ++) {
		// Stepping left and right away from the pixel
		int validW = w + r;
		// Clamp to zero and width max() isn't exposed for ints yet
		if(validW < 0) {
		validW = 0;
		}
		if(validW > width - 1) {
		validW = width - 1;
		}

		#pragma rs export_var(height, width, threshold, InPixel, OutPixel)
		c4u_t input = InPixel + hwidth + validW;

		float weight = gaussian[r + radius];
		currentPixel.x = (float)(input->r);
		currentPixel.y = (float)(input->g);
		currentPixel.z = (float)(input->b);
		//currentPixel.w = (float)(input->a);

		blurredPixel += currentPixel*weight;
		}

		c4u_t output = ScratchPixel + hwidth + w;
		output->r = (uint8_t)blurredPixel.x;
		output->g = (uint8_t)blurredPixel.y;
		output->b = (uint8_t)blurredPixel.z;
		//output->a = (uint8_t)blurredPixel.w;
		}
		}
		}

		void horizontalBlurLevels() {
		float4 blurredPixel = 0;
		float4 currentPixel = 0;
		// Horizontal blur
		int w, h, r;
		for(h = 0; h < height; h ++) {
		for(w = 0; w < width; w ++) {

		blurredPixel = 0;

		for(r = -radius; r <= radius; r ++) {
		// Stepping left and right away from the pixel
		int validW = w + r;
		// Clamp to zero and width max() isn't exposed for ints yet
		if(validW < 0) {
		validW = 0;
		}
		if(validW > width - 1) {
		validW = width - 1;
		}

		c4u_t input = InPixel + hwidth + validW;

		float weight = gaussian[r + radius];
		currentPixel.x = (float)(input->r);
		currentPixel.y = (float)(input->g);
		currentPixel.z = (float)(input->b);
		//currentPixel.w = (float)(input->a);

		blurredPixel += currentPixel*weight;
		}

		levelsSaturation(&blurredPixel);

		c4u_t output = ScratchPixel + hwidth + w;
		output->r = (uint8_t)blurredPixel.x;
		output->g = (uint8_t)blurredPixel.y;
		output->b = (uint8_t)blurredPixel.z;
		//output->a = (uint8_t)blurredPixel.w;
		}
		}
		}

		void verticalBlur() {
		float4 blurredPixel = 0;
		float4 currentPixel = 0;
		// Vertical blur
		int w, h, r;
		for(h = 0; h < height; h ++) {
		for(w = 0; w < width; w ++) {

		blurredPixel = 0;
		for(r = -radius; r <= radius; r ++) {
		int validH = h + r;
		// Clamp to zero and width
		if(validH < 0) {
		validH = 0;
		}
		if(validH > height - 1) {
		validH = height - 1;
		}

		c4u_t input = ScratchPixel + validHwidth + w;

		float weight = gaussian[r + radius];

		currentPixel.x = (float)(input->r);
		currentPixel.y = (float)(input->g);
		currentPixel.z = (float)(input->b);
		//currentPixel.w = (float)(input->a);

		blurredPixel += currentPixel*weight;
		}

		c4u_t output = OutPixel + hwidth + w;

		output->r = (uint8_t)blurredPixel.x;
		output->g = (uint8_t)blurredPixel.y;
		output->b = (uint8_t)blurredPixel.z;
		//output->a = (uint8_t)blurredPixel.w;
		}
		}
		}

		void filter() {
		debugP(0, (void *)height);
		debugP(0, (void *)width);
		debugP(0, (void *)((int)threshold));
		debugP(0, (void *)InPixel);
		debugP(0, (void *)OutPixel);
		debugP(0, (void *)radius);

		debugPf(10, inBlack);
		debugPf(11, outBlack);
		debugPf(12, inWhite);
		debugPf(13, outWhite);
		debugPf(14, gamma);
		debugPf(15, saturation);

		computeColorMatrix();

		if(radius == 0) {
		processNoBlur();
		return;
		}

		rs_color4u in = (rs_color4u )InPixel;
		rs_color4u out = (rs_color4u )OutPixel;
		//const rs_color4u mask = {0,0,0,0xff};
		computeGaussianWeights();

		int count = width * height;
		int tf = threshold * 255 * 255;
		int masks[2] = {0xffffffff, 0xff000000};
		horizontalBlurLevels();
		verticalBlur();

		while (count--) {
		int luminance = 54 * in->x +
		182 * in->y +
		18 * in->z;
		int idx = ((uint32_t)(luminance - tf)) >> 31;
		((int )out) = ((int )in) & masks[idx];
		in++;
		out++;
		int count = 0;
		sendToClient(&count, 1, 4, 0);
		}

		void filterBenchmark() {

		computeGaussianWeights();

		horizontalBlur();
		verticalBlur();

		int count = 0;
		sendToClient(&count, 1, 4, 0);
		}

libs/rs/java/ImageProcessing/res/raw/threshold_bc.bc

+6.71 KiB (8.2 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

libs/rs/java/ImageProcessing/res/values/strings.xml

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		-->

		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- General -->
		<skip />
		<!--slider label -->
		<string name="blur_description">Blur Radius</string>
		<string name="in_white">In White</string>
		<string name="out_white">Out White</string>
		<string name="in_black">In Black</string>
		<string name="out_black">Out Black</string>
		<string name="gamma">Gamma</string>
		<string name="saturation">Saturation</string>
		<string name="benchmark">Benchmark</string>

		</resources>