Skip to content

Commit c00c1a4

Browse files
committed
Fixed blocking from synchronization of drawing. Added video output and
fixed camera input. Added camera and video example.
1 parent 9403284 commit c00c1a4

File tree

102 files changed

+903
-327
lines changed

Some content is hidden

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

102 files changed

+903
-327
lines changed

examples/SimpleImageProcessor/AndroidManifest.xml renamed to examples/AllFiltersExample/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="project.android.simpleimageprocessor"
3+
package="project.android.allfiltersexample"
44
android:versionCode="1"
55
android:versionName="1.0" >
66

@@ -12,9 +12,9 @@
1212
android:allowBackup="true"
1313
android:icon="@drawable/ic_launcher"
1414
android:label="@string/app_name"
15-
android:theme="@android:style/Theme.NoTitleBar" >
15+
android:theme="@style/AppTheme" >
1616
<activity
17-
android:name="project.android.simpleimageprocessor.ImageProcessorActivity"
17+
android:name="project.android.allfiltersexample.ImageProcessingActivity"
1818
android:label="@string/app_name"
1919
android:screenOrientation="landscape">
2020
<intent-filter>

examples/SimpleImageProcessor/gen/project/android/simpleimageprocessor/BuildConfig.java renamed to examples/AllFiltersExample/gen/project/android/allfiltersexample/BuildConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** Automatically generated file. DO NOT MODIFY */
2-
package project.android.simpleimageprocessor;
2+
package project.android.allfiltersexample;
33

44
public final class BuildConfig {
55
public final static boolean DEBUG = true;
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
1-
/* AUTO-GENERATED FILE. DO NOT MODIFY.
2-
*
3-
* This class was automatically generated by the
4-
* aapt tool from the resource data it found. It
5-
* should not be modified by hand.
6-
*/
7-
8-
package project.android.simpleimageprocessor;
9-
10-
public final class R {
11-
public static final class attr {
12-
}
13-
public static final class drawable {
14-
public static final int ic_launcher=0x7f020000;
15-
public static final int tiger=0x7f020001;
16-
}
17-
public static final class id {
18-
public static final int menu_settings=0x7f060000;
19-
}
20-
public static final class menu {
21-
public static final int activity_image_processor=0x7f050000;
22-
}
23-
public static final class string {
24-
public static final int app_name=0x7f030000;
25-
public static final int hello_world=0x7f030001;
26-
public static final int menu_settings=0x7f030002;
27-
}
28-
public static final class style {
29-
/**
30-
Base application theme, dependent on API level. This theme is replaced
31-
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
32-
33-
34-
Theme customizations available in newer API levels can go in
35-
res/values-vXX/styles.xml, while customizations related to
36-
backward-compatibility can go here.
37-
38-
39-
Base application theme for API 11+. This theme completely replaces
40-
AppBaseTheme from res/values/styles.xml on API 11+ devices.
41-
42-
API 11 theme customizations can go here.
43-
44-
Base application theme for API 14+. This theme completely replaces
45-
AppBaseTheme from BOTH res/values/styles.xml and
46-
res/values-v11/styles.xml on API 14+ devices.
47-
48-
API 14 theme customizations can go here.
49-
50-
Base application theme, dependent on API level. This theme is replaced
51-
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
52-
53-
54-
Theme customizations available in newer API levels can go in
55-
res/values-vXX/styles.xml, while customizations related to
56-
backward-compatibility can go here.
57-
58-
59-
Base application theme for API 11+. This theme completely replaces
60-
AppBaseTheme from res/values/styles.xml on API 11+ devices.
61-
62-
API 11 theme customizations can go here.
63-
64-
Base application theme for API 14+. This theme completely replaces
65-
AppBaseTheme from BOTH res/values/styles.xml and
66-
res/values-v11/styles.xml on API 14+ devices.
67-
68-
API 14 theme customizations can go here.
69-
*/
70-
public static final int AppBaseTheme=0x7f040000;
71-
/** Application theme.
72-
All customizations that are NOT specific to a particular API-level can go here.
73-
Application theme.
74-
All customizations that are NOT specific to a particular API-level can go here.
75-
*/
76-
public static final int AppTheme=0x7f040001;
77-
}
78-
}
1+
/* AUTO-GENERATED FILE. DO NOT MODIFY.
2+
*
3+
* This class was automatically generated by the
4+
* aapt tool from the resource data it found. It
5+
* should not be modified by hand.
6+
*/
7+
8+
package project.android.allfiltersexample;
9+
10+
public final class R {
11+
public static final class attr {
12+
}
13+
public static final class drawable {
14+
public static final int ic_launcher=0x7f020000;
15+
public static final int tiger=0x7f020001;
16+
}
17+
public static final class id {
18+
public static final int menu_settings=0x7f060000;
19+
}
20+
public static final class menu {
21+
public static final int activity_image_processing=0x7f050000;
22+
}
23+
public static final class string {
24+
public static final int app_name=0x7f030000;
25+
public static final int hello_world=0x7f030001;
26+
public static final int menu_settings=0x7f030002;
27+
}
28+
public static final class style {
29+
/**
30+
Base application theme, dependent on API level. This theme is replaced
31+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
32+
33+
34+
Theme customizations available in newer API levels can go in
35+
res/values-vXX/styles.xml, while customizations related to
36+
backward-compatibility can go here.
37+
38+
39+
Base application theme for API 11+. This theme completely replaces
40+
AppBaseTheme from res/values/styles.xml on API 11+ devices.
41+
42+
API 11 theme customizations can go here.
43+
44+
Base application theme for API 14+. This theme completely replaces
45+
AppBaseTheme from BOTH res/values/styles.xml and
46+
res/values-v11/styles.xml on API 14+ devices.
47+
48+
API 14 theme customizations can go here.
49+
50+
Base application theme, dependent on API level. This theme is replaced
51+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
52+
53+
54+
Theme customizations available in newer API levels can go in
55+
res/values-vXX/styles.xml, while customizations related to
56+
backward-compatibility can go here.
57+
58+
59+
Base application theme for API 11+. This theme completely replaces
60+
AppBaseTheme from res/values/styles.xml on API 11+ devices.
61+
62+
API 11 theme customizations can go here.
63+
64+
Base application theme for API 14+. This theme completely replaces
65+
AppBaseTheme from BOTH res/values/styles.xml and
66+
res/values-v11/styles.xml on API 14+ devices.
67+
68+
API 14 theme customizations can go here.
69+
*/
70+
public static final int AppBaseTheme=0x7f040000;
71+
/** Application theme.
72+
All customizations that are NOT specific to a particular API-level can go here.
73+
Application theme.
74+
All customizations that are NOT specific to a particular API-level can go here.
75+
*/
76+
public static final int AppTheme=0x7f040001;
77+
}
78+
}
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2-
3-
<item
4-
android:id="@+id/menu_settings"
5-
android:orderInCategory="100"
6-
android:showAsAction="never"
7-
android:title="@string/menu_settings"/>
8-
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
3+
<item
4+
android:id="@+id/menu_settings"
5+
android:orderInCategory="100"
6+
android:showAsAction="never"
7+
android:title="@string/menu_settings"/>
8+
99
</menu>
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<resources>
2-
3-
<!--
1+
<resources>
2+
3+
<!--
44
Base application theme for API 11+. This theme completely replaces
5-
AppBaseTheme from res/values/styles.xml on API 11+ devices.
6-
-->
7-
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
8-
<!-- API 11 theme customizations can go here. -->
9-
</style>
10-
5+
AppBaseTheme from res/values/styles.xml on API 11+ devices.
6+
-->
7+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
8+
<!-- API 11 theme customizations can go here. -->
9+
</style>
10+
1111
</resources>
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<resources>
2-
3-
<!--
1+
<resources>
2+
3+
<!--
44
Base application theme for API 14+. This theme completely replaces
55
AppBaseTheme from BOTH res/values/styles.xml and
6-
res/values-v11/styles.xml on API 14+ devices.
7-
-->
8-
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
9-
<!-- API 14 theme customizations can go here. -->
10-
</style>
11-
6+
res/values-v11/styles.xml on API 14+ devices.
7+
-->
8+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
9+
<!-- API 14 theme customizations can go here. -->
10+
</style>
11+
1212
</resources>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
3-
4-
<string name="app_name">SimpleImageProcessor</string>
5-
<string name="hello_world">Hello world!</string>
6-
<string name="menu_settings">Settings</string>
7-
2+
<resources>
3+
4+
<string name="app_name">AllFiltersExample</string>
5+
<string name="hello_world">Hello world!</string>
6+
<string name="menu_settings">Settings</string>
7+
88
</resources>
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<resources>
2-
3-
<!--
1+
<resources>
2+
3+
<!--
44
Base application theme, dependent on API level. This theme is replaced
5-
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
6-
-->
7-
<style name="AppBaseTheme" parent="android:Theme.Light">
8-
<!--
5+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
6+
-->
7+
<style name="AppBaseTheme" parent="android:Theme.Light">
8+
<!--
99
Theme customizations available in newer API levels can go in
1010
res/values-vXX/styles.xml, while customizations related to
11-
backward-compatibility can go here.
12-
-->
13-
</style>
14-
15-
<!-- Application theme. -->
16-
<style name="AppTheme" parent="AppBaseTheme">
17-
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
18-
</style>
19-
11+
backward-compatibility can go here.
12+
-->
13+
</style>
14+
15+
<!-- Application theme. -->
16+
<style name="AppTheme" parent="AppBaseTheme">
17+
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
18+
</style>
19+
2020
</resources>

0 commit comments

Comments
 (0)