cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

camera demo ok

Browse Source
This commit is contained in:
WangQiang 2022-08-04 18:08:45 +08:00
parent 0eafbf9ff1
commit e44ea96b43
26 changed files with 275 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.quark.quamera">
package="com.ola.olamera">
<uses-permission android:name="android.permission.CAMERA" />
<uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2" />
<uses-sdk android:minSdkVersion="16" tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
</manifest>

14
mediapipe/render/android/camera/java/com/ola/olamera/BUILD
View File

@ -20,7 +20,7 @@ exports_files([
android_library(
name = "camera_framework",
proguard_specs = [":proguard.pgcfg"],
# proguard_specs = [":proguard.pgcfg"],
visibility = ["//visibility:public"],
exports = [
":camera_core",
@ -32,14 +32,14 @@ android_library(
srcs = glob(
["**/*.java"],
),
assets = [
"//mediapipe/render/android/camera/java/com/ola/olamera:rbga_2_yuv_frag.frag",
"//mediapipe/render/android/camera/java/com/ola/olamera:rgba_2_yuv_vertex.vert",
],
assets_dir = "",
# assets = [
# "//mediapipe/render/android/camera/java/com/ola/olamera:rbga_2_yuv_frag.frag",
# "//mediapipe/render/android/camera/java/com/ola/olamera:rgba_2_yuv_vertex.vert",
# ],
# assets_dir = "",
# resource_files = glob(["res/**"]),
javacopts = ["-Acom.google.auto.value.AutoBuilderIsUnstable"],
manifest = ":AndroidManifest.xml",
# manifest = ":AndroidManifest.xml",
visibility = ["//visibility:public"],
deps = [
"@maven//:com_google_guava_guava",

10
mediapipe/render/module/beauty/android/framework/opengl_renderer_jni.cpp → mediapipe/render/android/camera/opengl_renderer_jni.cpp
View File

@ -288,7 +288,7 @@ namespace {
extern "C" {
JNIEXPORT jlong JNICALL
Java_com_quark_quamera_OpenGLRenderer_initContext(
Java_com_ola_olamera_OpenGLRenderer_initContext(
JNIEnv *env, jclass clazz) {
EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
assert(eglDisplay != EGL_NO_DISPLAY);
@ -391,7 +391,7 @@ Java_com_quark_quamera_OpenGLRenderer_initContext(
}
JNIEXPORT jboolean JNICALL
Java_com_quark_quamera_OpenGLRenderer_setWindowSurface(
Java_com_ola_olamera_OpenGLRenderer_setWindowSurface(
JNIEnv *env, jclass clazz, jlong context, jobject jsurface) {
auto *nativeContext = reinterpret_cast<NativeContext *>(context);
@ -429,14 +429,14 @@ Java_com_quark_quamera_OpenGLRenderer_setWindowSurface(
}
JNIEXPORT jint JNICALL
Java_com_quark_quamera_OpenGLRenderer_getTexName(
Java_com_ola_olamera_OpenGLRenderer_getTexName(
JNIEnv *env, jclass clazz, jlong context) {
auto *nativeContext = reinterpret_cast<NativeContext *>(context);
return nativeContext->textureId;
}
JNIEXPORT jboolean JNICALL
Java_com_quark_quamera_OpenGLRenderer_renderTexture(
Java_com_ola_olamera_OpenGLRenderer_renderTexture(
JNIEnv *env, jclass clazz, jlong context, jlong timestampNs,
jfloatArray jmvpTransformArray, jboolean mvpDirty, jfloatArray jtexTransformArray) {
@ -556,7 +556,7 @@ Java_com_quark_quamera_OpenGLRenderer_renderTexture(
}
JNIEXPORT void JNICALL
Java_com_quark_quamera_OpenGLRenderer_closeContext(
Java_com_ola_olamera_OpenGLRenderer_closeContext(
JNIEnv *env, jclass clazz, jlong context) {
auto *nativeContext = reinterpret_cast<NativeContext *>(context);

2
mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java
View File

@ -1,4 +1,4 @@
package com.ola.quamerademo;
package com.ola.olamerademo;
/*
*
* Creation : 20-11-25

14
mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml
View File

@ -1,24 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ola.quamerademo"
package="com.ola.olamerademo"
xmlns:tools="http://schemas.android.com/tools">
<!-- <uses-sdk tools:overrideLibrary="androidx.camera.core"/>-->
<!-- <uses-sdk tools:overrideLibrary="androidx.camera.camera2"/>-->
<uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2" />
<!-- <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2" /> -->
<uses-sdk android:minSdkVersion="16" tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
<uses-permission android:name="android.permission.CAMERA" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Quamera">
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -27,10 +25,6 @@
</intent-filter>
</activity>
<!-- <activity android:name=".CameraXActivity"></activity>-->
</application>
</manifest>

22
mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD
View File

@ -32,14 +32,26 @@ cc_library(
)
android_binary(
name = "quamerademo",
name = "olamerademo",
srcs = glob(["*.java"]),
assets = [],
manifest = ":AndroidManifest.xml",
resource_files = glob(["res/**"]),
visibility = ["//visibility:public"],
assets = [
":rbga_2_yuv_frag.frag",
":rgba_2_yuv_vertex.vert",
],
assets_dir = "",
manifest = "//mediapipe/render/demo/android/java/com/ola/quamerademo:AndroidManifest.xml",
multidex = "native",
deps = [
":ola_render_jni_lib",
"//mediapipe/java/com/google/mediapipe/framework:android_framework",
# ":ola_render_jni_lib",
"//mediapipe/render/android/camera/java/com/ola/olamera:camera_core",
"//third_party:androidx_annotation",
"//third_party:lifecycle_livedata",
"//third_party:androidx_appcompat",
"//third_party:lifecycle_livedata_core",
"//third_party:androidx_core",
"//third_party:androidx_lifecycle_common",
"//third_party:androidx_lifecycle_runtime",
],
)

2
mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java
View File

@ -1,4 +1,4 @@
package com.ola.quamerademo;
package com.ola.olamerademo;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

0
mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag → mediapipe/render/demo/android/java/com/ola/olamerademo/rbga_2_yuv_frag.frag
View File

30
mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable-v24/ic_launcher_foreground.xml Normal file
View File

@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

170
mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable/ic_launcher_background.xml Normal file
View File

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

5
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

5
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher_round.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher_round.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

13
mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/colors.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
</resources>

3
mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/strings.xml Normal file
View File

@ -0,0 +1,3 @@
<resources>
<string name="app_name">Olamera</string>
</resources>

11
mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/styles.xml Normal file
View File

@ -0,0 +1,11 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
</resources>

0
mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert → mediapipe/render/demo/android/java/com/ola/olamerademo/rgba_2_yuv_vertex.vert
View File