Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev (51e67a0a) · Commits · e / os / android_frameworks_base

media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -72,9 +72,7 @@ public class RedEyeFilter extends Filter {
		"void main() {\n" +
		" vec4 color = texture2D(tex_sampler_0, v_texcoord);\n" +
		" vec4 mask = texture2D(tex_sampler_1, v_texcoord);\n" +
		" gl_FragColor = vec4(mask.a, mask.a, mask.a, 1.0) * intensity + color * (1.0 - intensity);\n" +
		" if (mask.a > 0.0) {\n" +
		" gl_FragColor.r = 0.0;\n" +
		" float green_blue = color.g + color.b;\n" +
		" float red_intensity = color.r / green_blue;\n" +
		" if (red_intensity > intensity) {\n" +
		@@ -105,8 +103,8 @@ public class RedEyeFilter extends Filter {
		ShaderProgram shaderProgram = new ShaderProgram(context, mRedEyeShader);
		shaderProgram.setMaximumTileSize(mTileSize);
		mProgram = shaderProgram;
		mProgram.setHostValue("intensity", DEFAULT_RED_INTENSITY);
		break;

		default:
		throw new RuntimeException("Filter RedEye does not support frames of " +
		"target " + target + "!");
		@@ -180,8 +178,6 @@ public class RedEyeFilter extends Filter {
		}

		private void updateProgramParams() {
		mProgram.setHostValue("intensity", DEFAULT_RED_INTENSITY);

		if ( mCenters.length % 2 == 1) {
		throw new RuntimeException("The size of center array must be even.");
		}