From 16a52fd95aea86a61c9f0789fdb79b378cb50927 Mon Sep 17 00:00:00 2001 From: Mautisim Munir Date: Thu, 10 Nov 2022 03:44:57 +0500 Subject: [PATCH] rename packages --- .../solutions/copperlabs/app/build.gradle | 2 +- .../mediapipe/ExampleInstrumentedTest.java | 2 +- .../app/src/main/AndroidManifest.xml | 2 +- .../ComputerVisionPluginImpl.java | 10 ++--- .../posetracking_lindera/MainActivity.java | 40 +++++++++---------- .../mediapipe}/ExampleUnitTest.java | 2 +- .../.gitignore | 0 .../BUILD.bazel | 0 .../build.gradle | 2 +- .../consumer-rules.pro | 0 .../proguard-rules.pro | 0 .../cv}/ExampleInstrumentedTest.java | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../java/ca/copperlabs/cv}/BodyJoints.java | 2 +- .../ca/copperlabs/cv}/CameraRotation.java | 2 +- .../ca/copperlabs/cv/ComputerVision.java} | 14 +++---- .../copperlabs/cv}/ComputerVisionPlugin.java | 2 +- .../java/ca/copperlabs/cv}/FpsHelper.java | 2 +- .../java/ca/copperlabs/cv/InputSource.java | 5 +++ .../cv}/XYZPointWithConfidence.java | 2 +- .../ca/copperlabs/cv}/ExampleUnitTest.java | 2 +- .../solutions/lindera/InputSource.java | 5 --- .../copperlabs-pose-api/BUILD.bazel | 2 +- .../copperlabs-pose-api/build.gradle | 2 +- .../posetracking/ExampleInstrumentedTest.java | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../posetracking/PersonKeypoint.java | 2 +- .../mediapipe}/posetracking/PoseTracking.java | 2 +- .../posetracking/PoseTrackingOptions.java | 4 +- .../posetracking/PoseTrackingResult.java | 3 +- .../PoseTrackingResultGlRenderer.java | 3 +- .../posetracking}/ExampleUnitTest.java | 2 +- .../posetracking/ExampleUnitTest.java | 17 -------- .../copperlabs-pose-detection/build.gradle | 2 +- .../ExampleInstrumentedTest.java | 2 +- .../ExampleUnitTest.java | 17 ++++++++ .../copperlabs-pose-graph/build.gradle | 2 +- .../ExampleInstrumentedTest.java | 2 +- .../ExampleUnitTest.java | 2 +- .../copperlabs-pose-landmark/build.gradle | 2 +- .../ExampleInstrumentedTest.java | 2 +- .../ExampleUnitTest.java | 2 +- .../solutions/copperlabs/settings.gradle | 2 +- 43 files changed, 88 insertions(+), 88 deletions(-) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/{com/google => ca/copperlabs}/mediapipe/ExampleInstrumentedTest.java (95%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/{com/google => ca/copperlabs}/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java (93%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/{com/google => ca/copperlabs}/mediapipe/examples/posetracking_lindera/MainActivity.java (88%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-pose-graph/src/test/java/com/google/copperlabs_pose_graph => app/src/test/java/ca/copperlabs/mediapipe}/ExampleUnitTest.java (89%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/.gitignore (100%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/BUILD.bazel (100%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/build.gradle (96%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/consumer-rules.pro (100%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/proguard-rules.pro (100%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/androidTest/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/androidTest/java/ca/copperlabs/cv}/ExampleInstrumentedTest.java (93%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera => copperlabs-computer-vision}/src/main/AndroidManifest.xml (72%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv}/BodyJoints.java (98%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv}/CameraRotation.java (88%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/Lindera.java => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVision.java} (97%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv}/ComputerVisionPlugin.java (68%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv}/FpsHelper.java (95%) create mode 100644 mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/InputSource.java rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera => copperlabs-computer-vision/src/main/java/ca/copperlabs/cv}/XYZPointWithConfidence.java (78%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{app/src/test/java/com/google/mediapipe => copperlabs-computer-vision/src/test/java/ca/copperlabs/cv}/ExampleUnitTest.java (91%) delete mode 100644 mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/InputSource.java rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/ExampleInstrumentedTest.java (93%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/PersonKeypoint.java (95%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/PoseTracking.java (99%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/PoseTrackingOptions.java (96%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/PoseTrackingResult.java (99%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/{com/google/mediapipe/solutions => ca/copperlabs/mediapipe}/posetracking/PoseTrackingResultGlRenderer.java (98%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-pose-detection/src/test/java/com/google/copperlabs_pose_detection => copperlabs-pose-api/src/test/java/ca/copperlabs/mediapipe/posetracking}/ExampleUnitTest.java (88%) delete mode 100644 mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/com/google/mediapipe/solutions/posetracking/ExampleUnitTest.java rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/{com/google => ca/copperlabs}/copperlabs_pose_detection/ExampleInstrumentedTest.java (93%) create mode 100644 mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/ca/copperlabs/copperlabs_pose_detection/ExampleUnitTest.java rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/{com/google => ca/copperlabs}/copperlabs_pose_graph/ExampleInstrumentedTest.java (94%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-pose-landmark/src/test/java/com/google/copperlabs_pose_landmark => copperlabs-pose-graph/src/test/java/ca/copperlabs/copperlabs_pose_graph}/ExampleUnitTest.java (88%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/{com/google => ca/copperlabs}/copperlabs_pose_landmark/ExampleInstrumentedTest.java (93%) rename mediapipe/java/com/google/mediapipe/solutions/copperlabs/{copperlabs-lindera/src/test/java/com/google/mediapipe/solutions/lindera => copperlabs-pose-landmark/src/test/java/ca/copperlabs/copperlabs_pose_landmark}/ExampleUnitTest.java (87%) diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/build.gradle index 5eff1c105..93afad37f 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/build.gradle @@ -30,7 +30,7 @@ android { dependencies { - implementation project(':copperlabs-lindera') + implementation project(':copperlabs-computer-vision') implementation project(':copperlabs-pose-api') implementation project(':copperlabs-pose-detection') implementation project(':copperlabs-pose-landmark') diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/com/google/mediapipe/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/ca/copperlabs/mediapipe/ExampleInstrumentedTest.java similarity index 95% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/com/google/mediapipe/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/ca/copperlabs/mediapipe/ExampleInstrumentedTest.java index 4ad84d885..d2bcba6f8 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/com/google/mediapipe/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/androidTest/java/ca/copperlabs/mediapipe/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.mediapipe; +package ca.copperlabs.mediapipe; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/AndroidManifest.xml b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/AndroidManifest.xml index 9dc41437f..55f7721f6 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/AndroidManifest.xml +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:theme="@style/Theme.Posetracking" tools:targetApi="31"> diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java similarity index 93% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java index 902f72a2d..5b0e9c672 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/ComputerVisionPluginImpl.java @@ -1,20 +1,18 @@ -package com.google.mediapipe.examples.posetracking_lindera; +package ca.copperlabs.mediapipe.examples.posetracking_lindera; import static java.lang.Math.min; -import com.google.mediapipe.solutions.lindera.BodyJoints; -import com.google.mediapipe.solutions.lindera.ComputerVisionPlugin; -import com.google.mediapipe.solutions.lindera.XYZPointWithConfidence; +import ca.copperlabs.cv.BodyJoints; +import ca.copperlabs.cv.ComputerVisionPlugin; +import ca.copperlabs.cv.XYZPointWithConfidence; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Field; -import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; -import java.util.Map; public class ComputerVisionPluginImpl implements ComputerVisionPlugin { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/MainActivity.java similarity index 88% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/MainActivity.java index 1dd47440d..4153e0abd 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/com/google/mediapipe/examples/posetracking_lindera/MainActivity.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/main/java/ca/copperlabs/mediapipe/examples/posetracking_lindera/MainActivity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.examples.posetracking_lindera; +package ca.copperlabs.mediapipe.examples.posetracking_lindera; import android.content.ContentResolver; import android.content.ContentValues; @@ -33,9 +33,9 @@ import androidx.appcompat.app.AppCompatActivity; import com.afollestad.materialdialogs.MaterialDialog; import com.google.mediapipe.R; -import com.google.mediapipe.solutions.lindera.CameraRotation; -import com.google.mediapipe.solutions.lindera.InputSource; -import com.google.mediapipe.solutions.lindera.Lindera; +import ca.copperlabs.cv.CameraRotation; +import ca.copperlabs.cv.InputSource; +import ca.copperlabs.cv.ComputerVision; import org.json.JSONException; import org.json.JSONObject; @@ -56,7 +56,7 @@ import java.util.function.Consumer; public class MainActivity extends AppCompatActivity { private static final String TAG = "MainActivity"; - private Lindera lindera; + private ComputerVision computerVision; private ComputerVisionPluginImpl plugin; private boolean isLinderaInitialized = false; private boolean isDetectionStarted = false; @@ -78,13 +78,13 @@ public class MainActivity extends AppCompatActivity { plugin = new ComputerVisionPluginImpl(); - lindera = new Lindera(plugin); - lindera.setupVideoPicker(this); - List cameras = lindera.getAvailableCameras(); + computerVision = new ComputerVision(plugin); + computerVision.setupVideoPicker(this); + List cameras = computerVision.getAvailableCameras(); // FRONT or BACK - lindera.setCamera("BACK"); - lindera.setCameraRotation(CameraRotation.AUTOMATIC); - lindera.fpsHelper.onFpsUpdate = new Consumer() { + computerVision.setCamera("BACK"); + computerVision.setCameraRotation(CameraRotation.AUTOMATIC); + computerVision.fpsHelper.onFpsUpdate = new Consumer() { @Override public void accept(Double fps) { String text = "FPS: "+String.format("%04.1f" ,fps); @@ -102,9 +102,9 @@ public class MainActivity extends AppCompatActivity { if (!isLinderaInitialized) { modelLoadAsyncDialogue(()->{ if (inputSource==InputSource.VIDEO){ - lindera.setInputSource(InputSource.VIDEO); + computerVision.setInputSource(InputSource.VIDEO); } - lindera.initialize(findViewById(R.id.preview_display_layout), MainActivity.this); + computerVision.initialize(findViewById(R.id.preview_display_layout), MainActivity.this); isLinderaInitialized = true; findViewById(R.id.button_start_video).setVisibility(View.GONE); findViewById(R.id.button_start_camera).setVisibility(View.GONE); @@ -115,7 +115,7 @@ public class MainActivity extends AppCompatActivity { updateLandmarkButtonText(); updateModelComplexityButtonText(); if (inputSource==InputSource.VIDEO) { - lindera.pickVideo(); + computerVision.pickVideo(); } }); @@ -153,7 +153,7 @@ public class MainActivity extends AppCompatActivity { toggleLandmarks.setOnClickListener( v ->{ - this.lindera.setLandmarksVisibility(!this.lindera.getLandmarkVisibility()); + this.computerVision.setLandmarksVisibility(!this.computerVision.getLandmarkVisibility()); updateLandmarkButtonText(); } ); @@ -213,7 +213,7 @@ public class MainActivity extends AppCompatActivity { }); modelComplexity.setOnClickListener(v->{ - int modelComplexityVal = lindera.getModelComplexity(); + int modelComplexityVal = computerVision.getModelComplexity(); new MaterialDialog.Builder(this) .title("Choose Model Complexity") @@ -227,8 +227,8 @@ public class MainActivity extends AppCompatActivity { **/ if (which != modelComplexityVal){ modelLoadAsyncDialogue(()-> { - lindera.setModelComplexity(which); - lindera.restartDetection(); + computerVision.setModelComplexity(which); + computerVision.restartDetection(); updateModelComplexityButtonText(); }); } @@ -247,7 +247,7 @@ public class MainActivity extends AppCompatActivity { void updateLandmarkButtonText(){ Button toggleLandmarks = findViewById(R.id.button_toggle_landmarks); - if (this.lindera.getLandmarkVisibility()) { + if (this.computerVision.getLandmarkVisibility()) { toggleLandmarks.setText("Show Landmarks (On)"); }else{ toggleLandmarks.setText("Show Landmarks (Off)"); @@ -257,7 +257,7 @@ public class MainActivity extends AppCompatActivity { void updateModelComplexityButtonText(){ String text = "Select Model "; - switch (this.lindera.getModelComplexity()){ + switch (this.computerVision.getModelComplexity()){ case 0: text += "(lite)"; break; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/com/google/copperlabs_pose_graph/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/ca/copperlabs/mediapipe/ExampleUnitTest.java similarity index 89% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/com/google/copperlabs_pose_graph/ExampleUnitTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/ca/copperlabs/mediapipe/ExampleUnitTest.java index b37073199..a335fb4d7 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/com/google/copperlabs_pose_graph/ExampleUnitTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/ca/copperlabs/mediapipe/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_graph; +package ca.copperlabs.mediapipe; import org.junit.Test; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/.gitignore b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/.gitignore similarity index 100% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/.gitignore rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/.gitignore diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/BUILD.bazel similarity index 100% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/BUILD.bazel diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/build.gradle similarity index 96% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/build.gradle rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/build.gradle index 88fb4df2e..7cf03a6e1 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.google.mediapipe.solutions.lindera' + namespace 'ca.copperlabs.cv' compileSdk 32 defaultConfig { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/consumer-rules.pro b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/consumer-rules.pro similarity index 100% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/consumer-rules.pro rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/consumer-rules.pro diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/proguard-rules.pro b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/proguard-rules.pro similarity index 100% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/proguard-rules.pro rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/proguard-rules.pro diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/androidTest/java/com/google/mediapipe/solutions/lindera/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/androidTest/java/ca/copperlabs/cv/ExampleInstrumentedTest.java similarity index 93% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/androidTest/java/com/google/mediapipe/solutions/lindera/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/androidTest/java/ca/copperlabs/cv/ExampleInstrumentedTest.java index 7a315b27f..c955abfd3 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/androidTest/java/com/google/mediapipe/solutions/lindera/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/androidTest/java/ca/copperlabs/cv/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/AndroidManifest.xml similarity index 72% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/AndroidManifest.xml index c05b2368e..ef9cd43a1 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="ca.copperlabs.cv"> diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/BodyJoints.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/BodyJoints.java similarity index 98% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/BodyJoints.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/BodyJoints.java index 81b5c3946..1d28a1acc 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/BodyJoints.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/BodyJoints.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; public class BodyJoints { public XYZPointWithConfidence neckNose; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/CameraRotation.java similarity index 88% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/CameraRotation.java index 3dcd05c7c..5bd8f323d 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/CameraRotation.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/Lindera.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVision.java similarity index 97% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/Lindera.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVision.java index 0a22cd3a8..a889f4754 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/Lindera.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVision.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; import android.app.Activity; import android.content.Intent; @@ -16,16 +16,16 @@ import com.google.mediapipe.formats.proto.LandmarkProto; import com.google.mediapipe.solutioncore.CameraInput; import com.google.mediapipe.solutioncore.SolutionGlSurfaceView; import com.google.mediapipe.solutioncore.VideoInput; -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 ca.copperlabs.mediapipe.posetracking.PoseTracking; +import ca.copperlabs.mediapipe.posetracking.PoseTrackingOptions; +import ca.copperlabs.mediapipe.posetracking.PoseTrackingResult; +import ca.copperlabs.mediapipe.posetracking.PoseTrackingResultGlRenderer; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -public class Lindera { +public class ComputerVision { private ComputerVisionPlugin plugin; public FpsHelper fpsHelper = new FpsHelper(); @@ -43,7 +43,7 @@ public class Lindera { private VideoInput videoInput; private ActivityResultLauncher videoGetter; - public Lindera(ComputerVisionPlugin plugin){ + public ComputerVision(ComputerVisionPlugin plugin){ this.plugin = plugin; } diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/ComputerVisionPlugin.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVisionPlugin.java similarity index 68% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/ComputerVisionPlugin.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVisionPlugin.java index ebd2b0fa9..5a54396fc 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/ComputerVisionPlugin.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/ComputerVisionPlugin.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; public interface ComputerVisionPlugin { void bodyJoints(Long timestamp, BodyJoints bodyJoints); diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/FpsHelper.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/FpsHelper.java similarity index 95% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/FpsHelper.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/FpsHelper.java index af44ee506..a373399be 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/FpsHelper.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/FpsHelper.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; import java.util.function.Consumer; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/InputSource.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/InputSource.java new file mode 100644 index 000000000..273a61a07 --- /dev/null +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/InputSource.java @@ -0,0 +1,5 @@ +package ca.copperlabs.cv; + +public enum InputSource { + VIDEO, CAMERA +} diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/XYZPointWithConfidence.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/XYZPointWithConfidence.java similarity index 78% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/XYZPointWithConfidence.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/XYZPointWithConfidence.java index ac368d60c..14ff5d5bf 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/XYZPointWithConfidence.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/main/java/ca/copperlabs/cv/XYZPointWithConfidence.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.cv; public class XYZPointWithConfidence { public float x = 0; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/com/google/mediapipe/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/test/java/ca/copperlabs/cv/ExampleUnitTest.java similarity index 91% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/com/google/mediapipe/ExampleUnitTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/test/java/ca/copperlabs/cv/ExampleUnitTest.java index 0667a833a..2cb8e2009 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/app/src/test/java/com/google/mediapipe/ExampleUnitTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-computer-vision/src/test/java/ca/copperlabs/cv/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.google.mediapipe; +package ca.copperlabs.cv; import org.junit.Test; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/InputSource.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/InputSource.java deleted file mode 100644 index ac05f7e25..000000000 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/InputSource.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.google.mediapipe.solutions.lindera; - -public enum InputSource { - VIDEO, CAMERA -} diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel index 788140e2a..f87b637b9 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel @@ -17,7 +17,7 @@ licenses(["notice"]) android_library( name = "copperlabs-pose-api", srcs = glob(["src/main/**/*.java"]), - custom_package = "com.google.mediapipe.solutions", + custom_package = "ca.copperlabs.mediapipe.posetracking", javacopts = ["-Acom.google.auto.value.AutoBuilderIsUnstable"], manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/build.gradle index 10a5c4ae5..cb117fb11 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.google.mediapipe.solutions.posetracking' + namespace 'ca.copperlabs.mediapipe.posetracking' compileSdk 32 defaultConfig { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/com/google/mediapipe/solutions/posetracking/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/ca/copperlabs/mediapipe/posetracking/ExampleInstrumentedTest.java similarity index 93% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/com/google/mediapipe/solutions/posetracking/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/ca/copperlabs/mediapipe/posetracking/ExampleInstrumentedTest.java index 70b4ac4e0..1fb8cdf96 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/com/google/mediapipe/solutions/posetracking/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/androidTest/java/ca/copperlabs/mediapipe/posetracking/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml index f873d63f2..ffd31b68e 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="ca.copperlabs.mediapipe.posetracking"> \ No newline at end of file diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PersonKeypoint.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PersonKeypoint.java similarity index 95% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PersonKeypoint.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PersonKeypoint.java index 8ba9f592c..4bec43647 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PersonKeypoint.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PersonKeypoint.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import androidx.annotation.IntDef; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTracking.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTracking.java similarity index 99% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTracking.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTracking.java index 9796a8f6a..6767ac0a8 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTracking.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTracking.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import android.content.Context; import android.util.Log; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingOptions.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingOptions.java similarity index 96% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingOptions.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingOptions.java index f87902185..eb27e8c05 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingOptions.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingOptions.java @@ -12,10 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import com.google.auto.value.AutoValue; +import ca.copperlabs.mediapipe.posetracking.AutoValue_PoseTrackingOptions; + /** * MediaPipe Face Detection solution-specific options. * diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResult.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResult.java similarity index 99% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResult.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResult.java index 1e4569cd7..2e7947ac6 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResult.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResult.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import static java.lang.Math.min; @@ -31,6 +31,7 @@ import java.util.Arrays; import java.util.List; + /** * FaceDetectionResult contains the detected faces, and the input {@link Bitmap} or {@link * TextureFrame}. If not in static image mode, the timestamp field will be set to the timestamp of diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResultGlRenderer.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResultGlRenderer.java similarity index 98% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResultGlRenderer.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResultGlRenderer.java index 26a741d99..2906ae50d 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/com/google/mediapipe/solutions/posetracking/PoseTrackingResultGlRenderer.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/java/ca/copperlabs/mediapipe/posetracking/PoseTrackingResultGlRenderer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.mediapipe.solutions.posetracking; +package ca.copperlabs.mediapipe.posetracking; import android.opengl.GLES20; @@ -26,7 +26,6 @@ import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; /** A custom implementation of {@link ResultGlRenderer} to render {@link PoseTrackingResult}. */ diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/com/google/copperlabs_pose_detection/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/ca/copperlabs/mediapipe/posetracking/ExampleUnitTest.java similarity index 88% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/com/google/copperlabs_pose_detection/ExampleUnitTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/ca/copperlabs/mediapipe/posetracking/ExampleUnitTest.java index a7fb92a70..ee19374ed 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/com/google/copperlabs_pose_detection/ExampleUnitTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/ca/copperlabs/mediapipe/posetracking/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_detection; +package ca.copperlabs.mediapipe.posetracking; import org.junit.Test; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/com/google/mediapipe/solutions/posetracking/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/com/google/mediapipe/solutions/posetracking/ExampleUnitTest.java deleted file mode 100644 index 0701e447d..000000000 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/test/java/com/google/mediapipe/solutions/posetracking/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.google.mediapipe.solutions.posetracking; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/build.gradle index 3c3174dca..a239a44c6 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.google.copperlabs_pose_detection' + namespace 'ca.copperlabs.mediapipe.pose_detection' compileSdk 32 defaultConfig { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/com/google/copperlabs_pose_detection/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/ca/copperlabs/copperlabs_pose_detection/ExampleInstrumentedTest.java similarity index 93% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/com/google/copperlabs_pose_detection/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/ca/copperlabs/copperlabs_pose_detection/ExampleInstrumentedTest.java index e968b23bc..5806e42ec 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/com/google/copperlabs_pose_detection/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/androidTest/java/ca/copperlabs/copperlabs_pose_detection/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_detection; +package ca.copperlabs.copperlabs_pose_detection; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/ca/copperlabs/copperlabs_pose_detection/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/ca/copperlabs/copperlabs_pose_detection/ExampleUnitTest.java new file mode 100644 index 000000000..91e6efb9e --- /dev/null +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-detection/src/test/java/ca/copperlabs/copperlabs_pose_detection/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package ca.copperlabs.copperlabs_pose_detection; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/build.gradle index e62ac8f4d..4d361d21b 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.google.copperlabs_pose_graph' + namespace 'ca.copperlabs.mediapipe.pose_graph' compileSdk 32 defaultConfig { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/com/google/copperlabs_pose_graph/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/ca/copperlabs/copperlabs_pose_graph/ExampleInstrumentedTest.java similarity index 94% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/com/google/copperlabs_pose_graph/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/ca/copperlabs/copperlabs_pose_graph/ExampleInstrumentedTest.java index 9fd9aa41f..525c7b283 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/com/google/copperlabs_pose_graph/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/androidTest/java/ca/copperlabs/copperlabs_pose_graph/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_graph; +package ca.copperlabs.copperlabs_pose_graph; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/com/google/copperlabs_pose_landmark/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/ca/copperlabs/copperlabs_pose_graph/ExampleUnitTest.java similarity index 88% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/com/google/copperlabs_pose_landmark/ExampleUnitTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/ca/copperlabs/copperlabs_pose_graph/ExampleUnitTest.java index eccd8c511..a719004be 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/com/google/copperlabs_pose_landmark/ExampleUnitTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-graph/src/test/java/ca/copperlabs/copperlabs_pose_graph/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_landmark; +package ca.copperlabs.copperlabs_pose_graph; import org.junit.Test; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/build.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/build.gradle index 460c5787f..f9c2dbbc7 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/build.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.google.copperlabs_pose_landmark' + namespace 'ca.copperlabs.mediapipe.pose_landmark' compileSdk 32 defaultConfig { diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/com/google/copperlabs_pose_landmark/ExampleInstrumentedTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/ca/copperlabs/copperlabs_pose_landmark/ExampleInstrumentedTest.java similarity index 93% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/com/google/copperlabs_pose_landmark/ExampleInstrumentedTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/ca/copperlabs/copperlabs_pose_landmark/ExampleInstrumentedTest.java index 20fb41da6..82f127338 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/com/google/copperlabs_pose_landmark/ExampleInstrumentedTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/androidTest/java/ca/copperlabs/copperlabs_pose_landmark/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.google.copperlabs_pose_landmark; +package ca.copperlabs.copperlabs_pose_landmark; import android.content.Context; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/test/java/com/google/mediapipe/solutions/lindera/ExampleUnitTest.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/ca/copperlabs/copperlabs_pose_landmark/ExampleUnitTest.java similarity index 87% rename from mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/test/java/com/google/mediapipe/solutions/lindera/ExampleUnitTest.java rename to mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/ca/copperlabs/copperlabs_pose_landmark/ExampleUnitTest.java index 251c5a509..223b5d3a9 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/test/java/com/google/mediapipe/solutions/lindera/ExampleUnitTest.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-landmark/src/test/java/ca/copperlabs/copperlabs_pose_landmark/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.google.mediapipe.solutions.lindera; +package ca.copperlabs.copperlabs_pose_landmark; import org.junit.Test; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/settings.gradle b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/settings.gradle index 94ce0bc00..c9d904ee6 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/settings.gradle +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/settings.gradle @@ -15,7 +15,7 @@ dependencyResolutionManagement { rootProject.name = "posetracking" include ':app' include ':copperlabs-pose-api' -include ':copperlabs-lindera' +include ':copperlabs-computer-vision' include ':copperlabs-pose-landmark' include ':copperlabs-pose-detection' include ':copperlabs-pose-graph'