Skip to content

Commit 26a0d01

Browse files
chrisbattchrisbatt
committed
Bug fixes and code cleanup
1 parent 5b9e034 commit 26a0d01

File tree

89 files changed

+1184
-1178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1184
-1178
lines changed

‎examples/AllFiltersExample/gen/project/android/allfiltersexample/R.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ public static final class attr {
1212
}
1313
public static final class drawable {
1414
public static final int ic_launcher=0x7f020000;
15-
public static final int lookup=0x7f020001;
16-
public static final int lookup_amatorka=0x7f020002;
17-
public static final int lookup_miss_etikate=0x7f020003;
18-
public static final int lookup_soft_elegance_1=0x7f020004;
19-
public static final int lookup_soft_elegance_2=0x7f020005;
20-
public static final int tiger=0x7f020006;
15+
public static final int kukulkan=0x7f020001;
16+
public static final int lookup=0x7f020002;
17+
public static final int lookup_amatorka=0x7f020003;
18+
public static final int lookup_miss_etikate=0x7f020004;
19+
public static final int lookup_soft_elegance_1=0x7f020005;
20+
public static final int lookup_soft_elegance_2=0x7f020006;
2121
public static final int webcircles=0x7f020007;
2222
}
2323
public static final class id {

‎examples/AllFiltersExample/gen/project/android/fastimageprocessing/R.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public static final class string {
1616
}
1717
public static final class drawable {
1818
public static final int ic_launcher = 0x7f020000;
19-
public static final int lookup = 0x7f020001;
20-
public static final int lookup_soft_elegance_1 = 0x7f020004;
21-
public static final int lookup_miss_etikate = 0x7f020003;
22-
public static final int lookup_amatorka = 0x7f020002;
23-
public static final int lookup_soft_elegance_2 = 0x7f020005;
19+
public static final int lookup = 0x7f020002;
20+
public static final int lookup_soft_elegance_1 = 0x7f020005;
21+
public static final int lookup_miss_etikate = 0x7f020004;
22+
public static final int lookup_amatorka = 0x7f020003;
23+
public static final int lookup_soft_elegance_2 = 0x7f020006;
2424
}
2525
}

‎examples/AllFiltersExample/res/drawable-ldpi/kukulkan.jpg

406 KB
Loading

‎examples/AllFiltersExample/res/drawable-mdpi/kukulkan.jpg

1.31 MB
Loading

‎examples/AllFiltersExample/res/drawable/kukulkan.jpg

406 KB
Loading

‎examples/AllFiltersExample/res/drawable/tiger.jpg

-37.2 KB
Binary file not shown.

‎examples/AllFiltersExample/src/project/android/allfiltersexample/ImageProcessingActivity.java

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,24 @@
66
import project.android.imageprocessing.FastImageProcessingPipeline;
77
import project.android.imageprocessing.FastImageProcessingView;
88
import project.android.imageprocessing.filter.BasicFilter;
9-
import project.android.imageprocessing.filter.colour.ColourInvertFilter;
10-
import project.android.imageprocessing.filter.colour.ColourMatrixFilter;
11-
import project.android.imageprocessing.filter.colour.GreyScaleFilter;
12-
import project.android.imageprocessing.filter.colour.HueFilter;
13-
import project.android.imageprocessing.filter.colour.BrightnessFilter;
14-
import project.android.imageprocessing.filter.colour.MissEtikateFilter;
15-
import project.android.imageprocessing.filter.colour.MonochromeFilter;
16-
import project.android.imageprocessing.filter.colour.SoftEleganceFilter;
17-
import project.android.imageprocessing.filter.colour.ToneCurveFilter;
18-
import project.android.imageprocessing.filter.colour.HighlightShadowFilter;
19-
import project.android.imageprocessing.filter.colour.ContrastFilter;
20-
import project.android.imageprocessing.filter.colour.LookupFilter;
21-
import project.android.imageprocessing.filter.colour.AmatorkaFilter;
22-
import project.android.imageprocessing.filter.colour.ExposureFilter;
23-
import project.android.imageprocessing.filter.colour.GammaFilter;
24-
import project.android.imageprocessing.filter.colour.LevelsFilter;
25-
import project.android.imageprocessing.filter.colour.SaturationFilter;
26-
import project.android.imageprocessing.filter.colour.FalseColourFilter;
27-
import project.android.imageprocessing.filter.colour.RGBFilter;
28-
import project.android.imageprocessing.filter.colour.HazeFilter;
29-
import project.android.imageprocessing.filter.colour.SepiaFilter;
30-
import project.android.imageprocessing.filter.colour.OpacityFilter;
31-
import project.android.imageprocessing.filter.colour.LuminanceThresholdFilter;
32-
import project.android.imageprocessing.filter.colour.AdaptiveThresholdFilter;
33-
import project.android.imageprocessing.filter.colour.ChromaKeyFilter;
34-
import project.android.imageprocessing.filter.processing.*;
9+
import project.android.imageprocessing.filter.colour.*;
3510
import project.android.imageprocessing.filter.effect.*;
11+
import project.android.imageprocessing.filter.processing.*;
3612
import project.android.imageprocessing.input.CameraPreviewInput;
3713
import project.android.imageprocessing.input.GLTextureOutputRenderer;
3814
import project.android.imageprocessing.input.ImageResourceInput;
3915
import project.android.imageprocessing.output.ScreenEndpoint;
40-
import android.os.Build;
41-
import android.os.Bundle;
4216
import android.app.Activity;
17+
import android.content.Context;
4318
import android.graphics.Point;
4419
import android.graphics.PointF;
20+
import android.os.Build;
21+
import android.os.Bundle;
4522
import android.view.MotionEvent;
4623
import android.view.View;
4724
import android.view.Window;
4825
import android.view.WindowManager;
26+
import android.widget.Toast;
4927

5028
public class ImageProcessingActivity extends Activity {
5129

@@ -56,6 +34,7 @@ public class ImageProcessingActivity extends Activity {
5634
private long touchTime;
5735
private FastImageProcessingPipeline pipeline;
5836
private ScreenEndpoint screen;
37+
private boolean usingCamera;
5938

6039
private void addFilter(BasicFilter filter) {
6140
filters.add(filter);
@@ -70,18 +49,19 @@ protected void onCreate(Bundle savedInstanceState) {
7049
pipeline = new FastImageProcessingPipeline();
7150
view.setPipeline(pipeline);
7251
setContentView(view);
73-
/*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
52+
usingCamera = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH);
53+
if (usingCamera) {
7454
input = new CameraPreviewInput(view);
75-
} else {*/
76-
input = new ImageResourceInput(view, this, R.drawable.tiger);
77-
//}
55+
} else {
56+
input = new ImageResourceInput(view, this, R.drawable.kukulkan);
57+
}
7858
filters = new ArrayList<BasicFilter>();
7959

8060
addFilter(new FlipFilter(FlipFilter.FLIP_HORIZONTAL));
8161
addFilter(new MosaicFilter(this, R.drawable.webcircles, new PointF(0.125f, 0.125f), new PointF(0.025f, 0.025f), 64, true));
8262
addFilter(new CGAColourSpaceFilter());
8363
addFilter(new KuwaharaRadius3Filter());
84-
addFilter(new KuwaharaFilter(4));
64+
//addFilter(new KuwaharaFilter(8)); //Will not work on devices that don't support for loop on shader
8565
addFilter(new VignetteFilter(new PointF(0.5f, 0.5f), new float[] {0.3f, 0.8f, 0.3f}, 0.3f, 0.75f));
8666
addFilter(new GlassSphereFilter(new PointF(0.43f, 0.5f), 0.25f, 0.71f, 0.5f));
8767
addFilter(new SphereRefractionFilter(new PointF(0.43f, 0.5f), 0.25f, 0.71f, 0.5f));
@@ -157,7 +137,7 @@ protected void onCreate(Bundle savedInstanceState) {
157137
addFilter(new LookupFilter(this, R.drawable.lookup_soft_elegance_1));
158138
addFilter(new HighlightShadowFilter(0f, 1f));
159139
Point[] defaultCurve = new Point[] {new Point(128,128), new Point(64,0), new Point(192,255)};
160-
addFilter(new ToneCurveFilter(defaultCurve,defaultCurve,defaultCurve,defaultCurve)); //TODO fix on 4+
140+
addFilter(new ToneCurveFilter(defaultCurve,defaultCurve,defaultCurve,defaultCurve));
161141
addFilter(new HueFilter(3.14f/6f));
162142
addFilter(new BrightnessFilter(0.5f));
163143
addFilter(new ColourMatrixFilter(new float[]{ 0.33f,0f,0f,0f,
@@ -185,8 +165,9 @@ protected void onCreate(Bundle savedInstanceState) {
185165
filter.addTarget(screen);
186166
}
187167

188-
pipeline.setRootRenderer(input);
168+
pipeline.addRootRenderer(input);
189169
pipeline.startRendering();
170+
final Context context = this;
190171
view.setOnTouchListener(new View.OnTouchListener() {
191172
public boolean onTouch(View v, MotionEvent e) {
192173
if(System.currentTimeMillis() - touchTime > 100) {
@@ -203,13 +184,31 @@ public boolean onTouch(View v, MotionEvent e) {
203184
input.addTarget(screen);
204185
} else {
205186
input.addTarget(filters.get(curFilter-1));
187+
Toast.makeText(context, filters.get(curFilter-1).getClass().getSimpleName(), Toast.LENGTH_SHORT).show();
206188
}
207189
pipeline.startRendering();
208190
view.requestRender();
209191
}
210192
return false;
211193
}
212194
});
195+
Toast.makeText(this, "Tap the screen to change filter.", Toast.LENGTH_LONG).show();
196+
}
197+
198+
@Override
199+
public void onPause() {
200+
super.onPause();
201+
if (usingCamera) {
202+
((CameraPreviewInput) input).onPause();
203+
}
204+
}
205+
206+
@Override
207+
public void onResume() {
208+
super.onResume();
209+
if (usingCamera) {
210+
((CameraPreviewInput) input).onResume();
211+
}
213212
}
214213

215214
}

‎examples/CameraToVideoExample/src/project/android/cameratovideoexample/ImageProcessingActivity.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@
55
import project.android.imageprocessing.filter.BasicFilter;
66
import project.android.imageprocessing.filter.processing.ConvolutionFilter;
77
import project.android.imageprocessing.input.CameraPreviewInput;
8-
import project.android.imageprocessing.output.Mp4VideoFileEndpoint;
8+
import project.android.imageprocessing.output.ScreenEndpoint;
99
import android.os.Bundle;
10-
import android.os.Environment;
1110
import android.app.Activity;
12-
import android.view.MotionEvent;
13-
import android.view.View;
1411
import android.view.Window;
1512
import android.view.WindowManager;
1613

1714
public class ImageProcessingActivity extends Activity {
1815

1916
private FastImageProcessingView view;
2017
private BasicFilter sharpen;
21-
private long touchTime;
18+
//private long touchTime;
2219
private FastImageProcessingPipeline pipeline;
2320
private CameraPreviewInput camera;
24-
private Mp4VideoFileEndpoint video;
21+
//private Mp4VideoFileEndpoint video;
22+
private ScreenEndpoint screen;
2523

2624
@Override
2725
protected void onCreate(Bundle savedInstanceState) {
@@ -36,14 +34,15 @@ protected void onCreate(Bundle savedInstanceState) {
3634
-1, 5, -1,
3735
0, -1, 0
3836
}, 3, 3);
39-
video = new Mp4VideoFileEndpoint(Environment.getExternalStorageDirectory().getAbsolutePath()+"/Movies/cameraOuput", 15);
37+
screen = new ScreenEndpoint(pipeline);
38+
//video = new Mp4VideoFileEndpoint(Environment.getExternalStorageDirectory().getAbsolutePath()+"/Movies/cameraOuput", 15);
4039
camera.addTarget(sharpen);
41-
sharpen.addTarget(video);
42-
pipeline.setRootRenderer(camera);
40+
sharpen.addTarget(screen);
41+
pipeline.addRootRenderer(camera);
4342
view.setPipeline(pipeline);
4443
setContentView(view);
4544
pipeline.startRendering();
46-
view.setOnTouchListener(new View.OnTouchListener() {
45+
/*view.setOnTouchListener(new View.OnTouchListener() {
4746
public boolean onTouch(View v, MotionEvent e) {
4847
if(System.currentTimeMillis() - touchTime > 100) {
4948
touchTime = System.currentTimeMillis();
@@ -55,17 +54,19 @@ public boolean onTouch(View v, MotionEvent e) {
5554
}
5655
return false;
5756
}
58-
});
57+
});*/
5958
}
6059

6160
@Override
6261
public void onPause() {
6362
super.onPause();
63+
camera.onPause();
6464
}
6565

6666
@Override
6767
public void onResume() {
6868
super.onResume();
69+
camera.onResume();
6970
}
7071

7172
}

‎examples/TwoInputFilterExample/gen/project/android/fastimageprocessing/R.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public static final class string {
1616
}
1717
public static final class drawable {
1818
public static final int ic_launcher = 0x7f020000;
19-
public static final int lookup = 0x7f020001;
20-
public static final int lookup_soft_elegance_1 = 0x7f020004;
21-
public static final int lookup_miss_etikate = 0x7f020003;
22-
public static final int lookup_amatorka = 0x7f020002;
23-
public static final int lookup_soft_elegance_2 = 0x7f020005;
19+
public static final int lookup = 0x7f020002;
20+
public static final int lookup_soft_elegance_1 = 0x7f020005;
21+
public static final int lookup_miss_etikate = 0x7f020004;
22+
public static final int lookup_amatorka = 0x7f020003;
23+
public static final int lookup_soft_elegance_2 = 0x7f020006;
2424
}
2525
}

‎examples/TwoInputFilterExample/gen/project/android/twoinputfilterexample/R.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ public static final class attr {
1212
}
1313
public static final class drawable {
1414
public static final int ic_launcher=0x7f020000;
15-
public static final int lookup=0x7f020001;
16-
public static final int lookup_amatorka=0x7f020002;
17-
public static final int lookup_miss_etikate=0x7f020003;
18-
public static final int lookup_soft_elegance_1=0x7f020004;
19-
public static final int lookup_soft_elegance_2=0x7f020005;
20-
public static final int tiger=0x7f020006;
15+
public static final int kukulkan=0x7f020001;
16+
public static final int lookup=0x7f020002;
17+
public static final int lookup_amatorka=0x7f020003;
18+
public static final int lookup_miss_etikate=0x7f020004;
19+
public static final int lookup_soft_elegance_1=0x7f020005;
20+
public static final int lookup_soft_elegance_2=0x7f020006;
21+
public static final int wakeboard=0x7f020007;
2122
}
2223
public static final class id {
2324
public static final int menu_settings=0x7f060000;

‎examples/TwoInputFilterExample/res/drawable-hdpi/kukulkan.jpg

4.18 MB
Loading

‎examples/TwoInputFilterExample/res/drawable-ldpi/kukulkan.jpg

406 KB
Loading

‎examples/TwoInputFilterExample/res/drawable-mdpi/kukulkan.jpg

1.31 MB
Loading

‎examples/TwoInputFilterExample/res/drawable/kukulkan.jpg

406 KB
Loading

‎examples/TwoInputFilterExample/res/drawable/tiger.jpg

-37.2 KB
Binary file not shown.

‎examples/TwoInputFilterExample/res/drawable/wakeboard.jpg

237 KB
Loading

0 commit comments

Comments
 (0)