diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml b/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml index 5a1f8ccd0..e4e3b40b8 100644 --- a/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml +++ b/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml @@ -1,9 +1,9 @@ - + package="com.ola.olamera"> - + + \ No newline at end of file diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/BUILD b/mediapipe/render/android/camera/java/com/ola/olamera/BUILD index b7674e211..4c34f45e5 100644 --- a/mediapipe/render/android/camera/java/com/ola/olamera/BUILD +++ b/mediapipe/render/android/camera/java/com/ola/olamera/BUILD @@ -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", diff --git a/mediapipe/render/module/beauty/android/framework/opengl_renderer_jni.cpp b/mediapipe/render/android/camera/opengl_renderer_jni.cpp similarity index 98% rename from mediapipe/render/module/beauty/android/framework/opengl_renderer_jni.cpp rename to mediapipe/render/android/camera/opengl_renderer_jni.cpp index 3bbf30e08..9770acf38 100644 --- a/mediapipe/render/module/beauty/android/framework/opengl_renderer_jni.cpp +++ b/mediapipe/render/android/camera/opengl_renderer_jni.cpp @@ -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(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(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(context); diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java b/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java index dc33c5e3a..3e97c0d6c 100644 --- a/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java @@ -1,4 +1,4 @@ -package com.ola.quamerademo; +package com.ola.olamerademo; /* * * Creation : 20-11-25 diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml index 9401d3ed7..4a0ec6401 100644 --- a/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml @@ -1,24 +1,22 @@ - + + - - - + android:theme="@style/AppTheme"> @@ -27,10 +25,6 @@ - - - - \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD b/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD index 884a06fb9..f00c24ba0 100644 --- a/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD @@ -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", ], ) diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java b/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java index daed689dc..d4ea2b715 100644 --- a/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java @@ -1,4 +1,4 @@ -package com.ola.quamerademo; +package com.ola.olamerademo; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag b/mediapipe/render/demo/android/java/com/ola/olamerademo/rbga_2_yuv_frag.frag similarity index 100% rename from mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag rename to mediapipe/render/demo/android/java/com/ola/olamerademo/rbga_2_yuv_frag.frag diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable-v24/ic_launcher_foreground.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable/ic_launcher_background.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..07d5da9cb --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..eca70cfe5 --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a571e6009 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher_round.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..61da551c5 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c41dd2853 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher_round.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..db5080a75 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6dba46dab Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher_round.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..da31a871c Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..15ac68172 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher_round.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..b216f2d31 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..f25a41974 Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher_round.png b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e96783ccc Binary files /dev/null and b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/colors.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/colors.xml new file mode 100644 index 000000000..dcd14fde1 --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/colors.xml @@ -0,0 +1,13 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #008577 + #00574B + #D81B60 + \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/strings.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/strings.xml new file mode 100644 index 000000000..daa03ff2c --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/strings.xml @@ -0,0 +1,3 @@ + + Olamera + \ No newline at end of file diff --git a/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/styles.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/styles.xml new file mode 100644 index 000000000..5885930df --- /dev/null +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert b/mediapipe/render/demo/android/java/com/ola/olamerademo/rgba_2_yuv_vertex.vert similarity index 100% rename from mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert rename to mediapipe/render/demo/android/java/com/ola/olamerademo/rgba_2_yuv_vertex.vert