lindera api refactor

mediapipe/examples/android/solutions/posetracking-lindera/src/main/BUILD

@@ -35,7 +35,7 @@ android_binary(
         "//mediapipe/java/com/google/mediapipe/solutioncore:solution_rendering",
         "//mediapipe/java/com/google/mediapipe/solutioncore:video_input",
         #        "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-lindera",
-        "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-lindera-dummpy-interface",
+        "//mediapipe/java/com/google/mediapipe/solutions/lindera:copperlabs-lindera",
         "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-api",
         "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-detection",
         "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-graph",

mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java

@@ -2,9 +2,9 @@ package com.google.mediapipe.examples.posetracking_lindera;
 
 import android.util.Log;
 
-import com.google.mediapipe.solutions.posetracking.BodyJoints;
+import com.google.mediapipe.solutions.lindera.BodyJoints;
-import com.google.mediapipe.solutions.posetracking.ComputerVisionPlugin;
+import com.google.mediapipe.solutions.lindera.ComputerVisionPlugin;
-import com.google.mediapipe.solutions.posetracking.XYZPointWithConfidence;
+import com.google.mediapipe.solutions.lindera.XYZPointWithConfidence;
 
 public class ComputerVisionPluginImpl implements ComputerVisionPlugin {
 

mediapipe/examples/android/solutions/posetracking-lindera/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java

@@ -21,8 +21,8 @@ import android.widget.FrameLayout;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.google.mediapipe.solutions.posetracking.ComputerVisionPlugin;
+import com.google.mediapipe.solutions.lindera.ComputerVisionPlugin;
-import com.google.mediapipe.solutions.posetracking.Lindera;
+import com.google.mediapipe.solutions.lindera.Lindera;
 
 import java.util.List;
 

mediapipe/java/com/google/mediapipe/solutions/lindera/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.mediapipe.solutions.lindera">
+
+    <uses-sdk android:minSdkVersion="21"
+        android:targetSdkVersion="27" />
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+</manifest>

mediapipe/java/com/google/mediapipe/solutions/lindera/BUILD

@@ -0,0 +1,21 @@
+android_library(
+    name = "copperlabs-lindera",
+    srcs = glob(["*.java"]),
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//mediapipe/framework/formats:detection_java_proto_lite",
+        "//mediapipe/framework/formats:landmark_java_proto_lite",
+        "//mediapipe/java/com/google/mediapipe/framework:android_framework",
+        "//mediapipe/java/com/google/mediapipe/solutioncore:camera_input",
+        "//mediapipe/java/com/google/mediapipe/solutioncore:solution_base",
+        "//mediapipe/java/com/google/mediapipe/solutioncore:solution_rendering",
+        "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-api",
+        "//third_party:androidx_appcompat",
+        "//third_party:autovalue",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:androidx_annotation_annotation",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+    ],
+)

mediapipe/java/com/google/mediapipe/solutions/lindera/BodyJoints.java

@@ -1,4 +1,4 @@
-package com.google.mediapipe.solutions.posetracking;
+package com.google.mediapipe.solutions.lindera;
 
 public class BodyJoints {
     public XYZPointWithConfidence nose;

mediapipe/java/com/google/mediapipe/solutions/lindera/CameraRotation.java

@@ -1,4 +1,4 @@
-package com.google.mediapipe.solutions.posetracking;
+package com.google.mediapipe.solutions.lindera;
 
 
 

mediapipe/java/com/google/mediapipe/solutions/lindera/ComputerVisionPlugin.java

@@ -1,4 +1,4 @@
-package com.google.mediapipe.solutions.posetracking;
+package com.google.mediapipe.solutions.lindera;
 
 public interface ComputerVisionPlugin {
     void bodyJoints(int timestamp, BodyJoints bodyJoints);

mediapipe/java/com/google/mediapipe/solutions/lindera/Lindera.java

@@ -1,7 +1,6 @@
-package com.google.mediapipe.solutions.posetracking;
+package com.google.mediapipe.solutions.lindera;
 
 import android.util.Log;
-import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -11,6 +10,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.mediapipe.formats.proto.LandmarkProto;
 import com.google.mediapipe.solutioncore.CameraInput;
 import com.google.mediapipe.solutioncore.SolutionGlSurfaceView;
+import com.google.mediapipe.solutions.posetracking.PoseTracking;
+import com.google.mediapipe.solutions.posetracking.PoseTrackingOptions;
+import com.google.mediapipe.solutions.posetracking.PoseTrackingResult;
+import com.google.mediapipe.solutions.posetracking.PoseTrackingResultGlRenderer;
 
 import java.util.Arrays;
 import java.util.List;

mediapipe/java/com/google/mediapipe/solutions/lindera/XYZPointWithConfidence.java

@@ -1,4 +1,4 @@
-package com.google.mediapipe.solutions.posetracking;
+package com.google.mediapipe.solutions.lindera;
 
 public class XYZPointWithConfidence {
     public float x = 0;

mediapipe/java/com/google/mediapipe/solutions/posetracking/BUILD

@@ -21,9 +21,7 @@ POSE_TRACKING_SRCS = [
     "PoseTracking.java",
     "PoseTrackingOptions.java",
     "PoseTrackingResult.java",
-    "Lindera.java",
     "PoseTrackingResultGlRenderer.java",
-    "CameraRotation.java",
 ]
 
 android_library(
@@ -33,7 +31,6 @@ android_library(
     manifest = ":AndroidManifest.xml",
     visibility = ["//visibility:public"],
     deps = [
-        ":copperlabs-lindera-dummpy-interface",
         "//mediapipe/framework/formats:detection_java_proto_lite",
         "//mediapipe/framework/formats:landmark_java_proto_lite",
         "//mediapipe/framework/formats:location_data_java_proto_lite",
@@ -93,40 +90,6 @@ android_library(
     deps = [],
 )
 
-#android_library(
-#    name = "copperlabs-lindera",
-#    srcs = ["Lindera.java"],
-#    manifest = "AndroidManifest.xml",
-#    visibility = ["//visibility:public"],
-#    deps = [
-#        "copperlabs-lindera-dummpy-interface",
-#        "copperlabs-pose-api",
-#        "//mediapipe/framework/formats:detection_java_proto_lite",
-#        "//mediapipe/framework/formats:landmark_java_proto_lite",
-#        "//mediapipe/java/com/google/mediapipe/framework:android_framework",
-#        "//mediapipe/java/com/google/mediapipe/solutioncore:camera_input",
-#        "//mediapipe/java/com/google/mediapipe/solutioncore:solution_base",
-#        "//mediapipe/java/com/google/mediapipe/solutioncore:solution_rendering",
-#        "//third_party:androidx_appcompat",
-#        "//third_party:autovalue",
-#        "@com_google_protobuf//:protobuf_javalite",
-#        "@maven//:androidx_annotation_annotation",
-#        "@maven//:com_google_code_findbugs_jsr305",
-#        "@maven//:com_google_guava_guava",
-#    ],
-#)
-
-android_library(
-    name = "copperlabs-lindera-dummpy-interface",
-    srcs = [
-        "BodyJoints.java",
-        "ComputerVisionPlugin.java",
-        "XYZPointWithConfidence.java",
-    ],
-    manifest = "AndroidManifest.xml",
-    visibility = ["//visibility:public"],
-    deps = [],
-)
 #mediapipe_aar(
 #    name = "copperlabs-mediapipe",
 #    calculators = ["//mediapipe/graphs/pose_tracking:pose_tracking_gpu_deps"],