Skip to content

Commit 9d0cb83

Browse files
author
xufuji456
committed
Feature: add filter of white balance
1 parent 605e60e commit 9d0cb83

8 files changed

Lines changed: 74 additions & 4 deletions

File tree

‎CameraFilter/src/main/java/com/frank/camerafilter/factory/BeautyFilterFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.frank.camerafilter.filter.advance.BeautyHueFilter;
66
import com.frank.camerafilter.filter.advance.BeautySketchFilter;
77
import com.frank.camerafilter.filter.BaseFilter;
8+
import com.frank.camerafilter.filter.advance.BeautyWhiteBalanceFilter;
89

910
public class BeautyFilterFactory {
1011

@@ -17,6 +18,8 @@ public static BaseFilter getFilter(BeautyFilterType type, Context context) {
1718
return new BeautySketchFilter(context);
1819
case HUE:
1920
return new BeautyHueFilter(context);
21+
case WHITE_BALANCE:
22+
return new BeautyWhiteBalanceFilter(context);
2023
default:
2124
return null;
2225
}

‎CameraFilter/src/main/java/com/frank/camerafilter/factory/BeautyFilterType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
public enum BeautyFilterType {
44
NONE,
55
HUE,
6+
WHITE_BALANCE,
67
SKETCH
78
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.frank.camerafilter.filter.advance;
2+
3+
import android.content.Context;
4+
import android.opengl.GLES30;
5+
6+
import com.frank.camerafilter.R;
7+
import com.frank.camerafilter.filter.BaseFilter;
8+
import com.frank.camerafilter.util.OpenGLUtil;
9+
10+
public class BeautyWhiteBalanceFilter extends BaseFilter {
11+
12+
private int tint;
13+
private int temperature;
14+
15+
public BeautyWhiteBalanceFilter(Context context) {
16+
super(NORMAL_VERTEX_SHADER, OpenGLUtil.readShaderFromSource(context, R.raw.whitebalance));
17+
}
18+
19+
protected void onInit() {
20+
super.onInit();
21+
tint = GLES30.glGetUniformLocation(getProgramId(), "tint");
22+
temperature = GLES30.glGetUniformLocation(getProgramId(), "temperature");
23+
}
24+
25+
protected void onInitialized() {
26+
super.onInitialized();
27+
setFloat(tint, 0.5f);
28+
setFloat(temperature, 0.3f);
29+
}
30+
31+
@Override
32+
public void onInputSizeChanged(int width, int height) {
33+
super.onInputSizeChanged(width, height);
34+
}
35+
36+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
uniform sampler2D inputImageTexture;
2+
varying highp vec2 textureCoordinate;
3+
4+
uniform lowp float temperature;
5+
uniform lowp float tint;
6+
7+
const lowp vec3 warmFilter = vec3(0.93, 0.54, 0.0);
8+
9+
const mediump mat3 RGBtoYIQ = mat3(0.299, 0.587, 0.114, 0.596, -0.274, -0.322, 0.212, -0.523, 0.311);
10+
const mediump mat3 YIQtoRGB = mat3(1.0, 0.956, 0.621, 1.0, -0.272, -0.647, 1.0, -1.105, 1.702);
11+
12+
void main()
13+
{
14+
lowp vec4 source = texture2D(inputImageTexture, textureCoordinate);
15+
16+
mediump vec3 yiq = RGBtoYIQ * source.rgb; //adjusting tint
17+
yiq.b = clamp(yiq.b + tint*0.5226*0.1, -0.5226, 0.5226);
18+
lowp vec3 rgb = YIQtoRGB * yiq;
19+
20+
lowp vec3 processed = vec3(
21+
(rgb.r < 0.5 ? (2.0 * rgb.r * warmFilter.r) : (1.0 - 2.0 * (1.0 - rgb.r) * (1.0 - warmFilter.r))), //adjusting temperature
22+
(rgb.g < 0.5 ? (2.0 * rgb.g * warmFilter.g) : (1.0 - 2.0 * (1.0 - rgb.g) * (1.0 - warmFilter.g))),
23+
(rgb.b < 0.5 ? (2.0 * rgb.b * warmFilter.b) : (1.0 - 2.0 * (1.0 - rgb.b) * (1.0 - warmFilter.b))));
24+
25+
gl_FragColor = vec4(mix(rgb, processed, temperature), source.a);
26+
}

‎app/src/main/java/com/frank/ffmpeg/activity/CameraFilterActivity.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ class CameraFilterActivity : BaseActivity() {
1515

1616
private val filterType: Array<BeautyFilterType> = arrayOf(
1717
BeautyFilterType.NONE,
18-
BeautyFilterType.CRAYON,
18+
BeautyFilterType.HUE,
19+
BeautyFilterType.WHITE_BALANCE,
1920
BeautyFilterType.SKETCH
2021
)
2122

‎app/src/main/java/com/frank/ffmpeg/util/FilterTypeUtil.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ object FilterTypeUtil {
1313
fun filterTypeToNameId(type: BeautyFilterType): Int {
1414
return when (type) {
1515
BeautyFilterType.NONE -> R.string.camera_filter_none
16-
BeautyFilterType.CRAYON -> R.string.camera_filter_crayon
16+
BeautyFilterType.HUE -> R.string.camera_filter_hue
17+
BeautyFilterType.WHITE_BALANCE -> R.string.camera_filter_balance
1718
BeautyFilterType.SKETCH -> R.string.camera_filter_sketch
1819
else -> R.string.camera_filter_none
1920
}

‎app/src/main/res/values-en/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@
113113
<string name="filter_sharpening">sharpen</string>
114114

115115
<string name="camera_filter_none">None</string>
116-
<string name="camera_filter_crayon">Crayon</string>
116+
<string name="camera_filter_hue">Hue</string>
117+
<string name="camera_filter_balance">White balance</string>
117118
<string name="camera_filter_sketch">Sketch</string>
118119

119120
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@
113113
<string name="filter_sharpening">锐化</string>
114114

115115
<string name="camera_filter_none">正常</string>
116-
<string name="camera_filter_crayon">蜡笔</string>
116+
<string name="camera_filter_hue">Hue</string>
117+
<string name="camera_filter_balance">白平衡</string>
117118
<string name="camera_filter_sketch">素描</string>
118119

119120
</resources>

0 commit comments

Comments
 (0)