diff --git a/WORKSPACE b/WORKSPACE index 36b0d33e5..a9824996c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -333,11 +333,11 @@ maven_install( "androidx.fragment:fragment:1.3.4", "androidx.annotation:annotation:aar:1.1.0", "androidx.appcompat:appcompat:aar:1.1.0-rc01", - "androidx.camera:camera-core:1.0.0-beta10", - "androidx.camera:camera-camera2:1.0.0-beta10", - "androidx.camera:camera-lifecycle:1.0.0-beta10", + "androidx.camera:camera-core:1.0.2", + "androidx.camera:camera-camera2:1.0.2", + "androidx.camera:camera-lifecycle:1.0.2", "androidx.constraintlayout:constraintlayout:aar:1.1.3", - "androidx.core:core:aar:1.1.0-rc03", + "androidx.core:core:aar:1.1.0", "androidx.legacy:legacy-support-v4:aar:1.0.0", "androidx.recyclerview:recyclerview:aar:1.1.0-beta02", "androidx.test.espresso:espresso-core:3.1.1", @@ -355,6 +355,10 @@ maven_install( "com.google.guava:listenablefuture:1.0", "junit:junit:4.12", "org.hamcrest:hamcrest-library:1.3", + "androidx.lifecycle:lifecycle-livedata-core:2.3.1", + "androidx.lifecycle:lifecycle-livedata:2.3.1", + "androidx.lifecycle:lifecycle-common:2.3.1", + "androidx.lifecycle:lifecycle-runtime:2.3.1", ], repositories = [ "https://maven.google.com", diff --git a/WORKSPACE-e b/WORKSPACE-e index 09d917dae..cbc93eac4 100644 --- a/WORKSPACE-e +++ b/WORKSPACE-e @@ -333,11 +333,11 @@ maven_install( "androidx.fragment:fragment:1.3.4", "androidx.annotation:annotation:aar:1.1.0", "androidx.appcompat:appcompat:aar:1.1.0-rc01", - "androidx.camera:camera-core:1.0.0-beta10", - "androidx.camera:camera-camera2:1.0.0-beta10", - "androidx.camera:camera-lifecycle:1.0.0-beta10", + "androidx.camera:camera-core:1.0.2", + "androidx.camera:camera-camera2:1.0.2", + "androidx.camera:camera-lifecycle:1.0.2", "androidx.constraintlayout:constraintlayout:aar:1.1.3", - "androidx.core:core:aar:1.1.0-rc03", + "androidx.core:core:aar:1.1.0", "androidx.legacy:legacy-support-v4:aar:1.0.0", "androidx.recyclerview:recyclerview:aar:1.1.0-beta02", "androidx.test.espresso:espresso-core:3.1.1", @@ -355,6 +355,10 @@ maven_install( "com.google.guava:listenablefuture:1.0", "junit:junit:4.12", "org.hamcrest:hamcrest-library:1.3", + "androidx.lifecycle:lifecycle-livedata-core:2.3.1", + "androidx.lifecycle:lifecycle-livedata:2.3.1", + "androidx.lifecycle:lifecycle-common:2.3.1", + "androidx.lifecycle:lifecycle-runtime:2.3.1", ], repositories = [ "https://maven.google.com", diff --git a/mediapipe/examples/android/solutions/facedetection/src/main/java/com/google/mediapipe/examples/facedetection/MainActivity.java b/mediapipe/examples/android/solutions/facedetection/src/main/java/com/google/mediapipe/examples/facedetection/MainActivity.java index b274ce289..1f1e343bc 100644 --- a/mediapipe/examples/android/solutions/facedetection/src/main/java/com/google/mediapipe/examples/facedetection/MainActivity.java +++ b/mediapipe/examples/android/solutions/facedetection/src/main/java/com/google/mediapipe/examples/facedetection/MainActivity.java @@ -35,7 +35,6 @@ import com.google.mediapipe.solutions.facedetection.FaceDetection; import com.google.mediapipe.solutions.facedetection.FaceDetectionOptions; import com.google.mediapipe.solutions.facedetection.FaceDetectionResult; import com.google.mediapipe.solutions.facedetection.FaceKeypoint; -import com.google.mediapipe.formats.proto.LocationDataProto.LocationData.RelativeKeypoint; import java.io.IOException; import java.io.InputStream; diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml b/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml new file mode 100644 index 000000000..5a1f8ccd0 --- /dev/null +++ b/mediapipe/render/android/camera/java/com/ola/olamera/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/BUILD b/mediapipe/render/android/camera/java/com/ola/olamera/BUILD similarity index 63% rename from mediapipe/render/android/camera/java/com/quark/quamera/BUILD rename to mediapipe/render/android/camera/java/com/ola/olamera/BUILD index 45a13c524..b7674e211 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/BUILD +++ b/mediapipe/render/android/camera/java/com/ola/olamera/BUILD @@ -32,6 +32,15 @@ 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 = "", + # resource_files = glob(["res/**"]), + javacopts = ["-Acom.google.auto.value.AutoBuilderIsUnstable"], + manifest = ":AndroidManifest.xml", + visibility = ["//visibility:public"], deps = [ "@maven//:com_google_guava_guava", "//third_party:androidx_annotation", @@ -39,6 +48,11 @@ android_library( "//third_party:camerax_camera2", "//third_party:camerax_core", "//third_party:camerax_lifecycle", - "@maven//:androidx_exifinterface_exifinterface", + "//third_party:lifecycle_livedata", + "//third_party:lifecycle_livedata_core", + "//third_party:androidx_core", + "//third_party:androidx_lifecycle_common", + "//third_party:androidx_lifecycle_runtime", + "@maven//:androidx_exifinterface_exifinterface", ], ) \ No newline at end of file diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/Camera2Manager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/Camera2Manager.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/Camera2Manager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/Camera2Manager.java index 937bdbd7b..e73161ba5 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/Camera2Manager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/Camera2Manager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera; +package com.ola.olamera.camera; import android.content.Context; @@ -9,12 +9,12 @@ import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.camera.CameraLifeManager; -import com.quark.quamera.camera.camera.CameraRepository; -import com.quark.quamera.camera.concurrent.CameraExecutors; -import com.quark.quamera.camera.session.SessionConfig; -import com.quark.quamera.camera.session.UserCameraSession; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.camera.CameraLifeManager; +import com.ola.olamera.camera.camera.CameraRepository; +import com.ola.olamera.camera.concurrent.CameraExecutors; +import com.ola.olamera.camera.session.SessionConfig; +import com.ola.olamera.camera.session.UserCameraSession; +import com.ola.olamera.util.Preconditions; import java.util.Iterator; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/anotaion/ExecutedBy.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/anotaion/ExecutedBy.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/anotaion/ExecutedBy.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/anotaion/ExecutedBy.java index ec4873ff9..5d215726b 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/anotaion/ExecutedBy.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/anotaion/ExecutedBy.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.anotaion; +package com.ola.olamera.camera.anotaion; /* * Copyright 2019 The Android Open Source Project diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2CameraImpl.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2CameraImpl.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2CameraImpl.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2CameraImpl.java index 898fd6c89..c01ed7315 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2CameraImpl.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2CameraImpl.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import android.annotation.SuppressLint; import android.hardware.camera2.CameraAccessException; @@ -16,18 +16,18 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.lifecycle.MutableLiveData; -import com.quark.quamera.camera.anotaion.ExecutedBy; -import com.quark.quamera.camera.concurrent.HandlerScheduledExecutorService; -import com.quark.quamera.camera.sensor.DisplayOrientationDetector; -import com.quark.quamera.camera.session.ImageCapture; -import com.quark.quamera.camera.session.InnerImageCaptureCallback; -import com.quark.quamera.camera.session.RepeatCaptureRequestConfig; -import com.quark.quamera.camera.session.SessionConfig; -import com.quark.quamera.camera.session.SingleCaptureConfig; -import com.quark.quamera.camera.session.SyncCaptureSession; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.anotaion.ExecutedBy; +import com.ola.olamera.camera.concurrent.HandlerScheduledExecutorService; +import com.ola.olamera.camera.sensor.DisplayOrientationDetector; +import com.ola.olamera.camera.session.ImageCapture; +import com.ola.olamera.camera.session.InnerImageCaptureCallback; +import com.ola.olamera.camera.session.RepeatCaptureRequestConfig; +import com.ola.olamera.camera.session.SessionConfig; +import com.ola.olamera.camera.session.SingleCaptureConfig; +import com.ola.olamera.camera.session.SyncCaptureSession; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.Preconditions; import java.util.Collections; import java.util.concurrent.Callable; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Control.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Control.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Control.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Control.java index 745ee4956..86f7a6bf7 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Control.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Control.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import android.hardware.camera2.CameraCharacteristics; @@ -9,10 +9,10 @@ import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.session.CameraCaptureCallback; -import com.quark.quamera.camera.session.RepeatCaptureRequestConfig; -import com.quark.quamera.camera.session.config.CameraConfigUtils; -import com.quark.quamera.util.ArrayUtil; +import com.ola.olamera.camera.session.CameraCaptureCallback; +import com.ola.olamera.camera.session.RepeatCaptureRequestConfig; +import com.ola.olamera.camera.session.config.CameraConfigUtils; +import com.ola.olamera.util.ArrayUtil; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Info.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Info.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Info.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Info.java index 643342a3f..1461eef95 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/Camera2Info.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/Camera2Info.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import android.graphics.Rect; @@ -9,12 +9,12 @@ import android.util.Range; import android.util.Size; import android.util.SizeF; -import com.quark.quamera.camera.sensor.DisplayOrientationDetector; -import com.quark.quamera.camera.sensor.ImageRotationHelper; -import com.quark.quamera.camera.session.CameraSelector; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; +import com.ola.olamera.camera.sensor.DisplayOrientationDetector; +import com.ola.olamera.camera.sensor.ImageRotationHelper; +import com.ola.olamera.camera.session.CameraSelector; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; import java.util.ArrayList; import java.util.Collections; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraErrorListenerHandlerWrapper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraErrorListenerHandlerWrapper.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraErrorListenerHandlerWrapper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraErrorListenerHandlerWrapper.java index 91a9f59fb..c251c9087 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraErrorListenerHandlerWrapper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraErrorListenerHandlerWrapper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import android.os.Handler; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraLifeManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraLifeManager.java similarity index 88% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraLifeManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraLifeManager.java index 0a42d407a..d150868a8 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraLifeManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraLifeManager.java @@ -1,20 +1,20 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import android.content.Context; import android.os.Build; import android.util.Size; -import com.quark.quamera.camera.preview.IPreviewView; -import com.quark.quamera.camera.sensor.DisplayOrientationDetector; -import com.quark.quamera.camera.sensor.ImageRotationHelper; -import com.quark.quamera.camera.session.CameraCaptureCallback; -import com.quark.quamera.camera.session.CameraSelector; -import com.quark.quamera.camera.session.ImageCapture; -import com.quark.quamera.camera.session.SessionConfig; -import com.quark.quamera.camera.session.SingleCaptureConfig; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.preview.IPreviewView; +import com.ola.olamera.camera.sensor.DisplayOrientationDetector; +import com.ola.olamera.camera.sensor.ImageRotationHelper; +import com.ola.olamera.camera.session.CameraCaptureCallback; +import com.ola.olamera.camera.session.CameraSelector; +import com.ola.olamera.camera.session.ImageCapture; +import com.ola.olamera.camera.session.SessionConfig; +import com.ola.olamera.camera.session.SingleCaptureConfig; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.Preconditions; import java.util.List; import java.util.concurrent.Executor; @@ -26,7 +26,6 @@ import androidx.lifecycle.Observer; //保证一次只有一个相机 //所有相机的生命管理 -@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public class CameraLifeManager { private Camera2CameraImpl mCurrentCamera; private ImageCapture mImageCapture; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatApi28Impl.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatApi28Impl.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatApi28Impl.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatApi28Impl.java index 4130053c9..0783a7a3d 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatApi28Impl.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatApi28Impl.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 2021/3/29 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatBaseImpl.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatBaseImpl.java similarity index 84% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatBaseImpl.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatBaseImpl.java index c3af0ed27..8c7438e15 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatBaseImpl.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatBaseImpl.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 2021/3/29 @@ -11,16 +11,12 @@ import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraManager; -import android.os.Build; import android.os.Handler; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; -import androidx.core.util.Preconditions; import java.util.concurrent.Executor; -@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) class CameraManagerCompatBaseImpl implements CameraManagerCompatImpl { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatImpl.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatImpl.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatImpl.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatImpl.java index ad33adbbd..c708f53ea 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraManagerCompatImpl.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraManagerCompatImpl.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 2021/3/29 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraRepository.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraRepository.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraRepository.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraRepository.java index 8d73448a7..7f2af8dc5 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraRepository.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraRepository.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 20-11-23 @@ -16,11 +16,11 @@ import android.text.TextUtils; import android.util.Log; import android.util.Size; -import com.quark.quamera.camera.anotaion.ExecutedBy; -import com.quark.quamera.camera.session.CameraSelector; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.anotaion.ExecutedBy; +import com.ola.olamera.camera.session.CameraSelector; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.Preconditions; import java.util.ArrayList; import java.util.Comparator; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraState.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraState.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraState.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraState.java index c9fa2cd0e..9466fa0fa 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraState.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraState.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 20-11-18 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraStateObservable.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraStateObservable.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraStateObservable.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraStateObservable.java index eb8d0b6d8..9433a681d 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraStateObservable.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraStateObservable.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 2021/6/6 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraSurfaceHelper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraSurfaceHelper.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraSurfaceHelper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraSurfaceHelper.java index 83aa20de6..6ec62cc83 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/CameraSurfaceHelper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/CameraSurfaceHelper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 20-11-23 @@ -15,12 +15,12 @@ import android.util.Rational; import android.util.Size; import android.view.SurfaceHolder; -import com.quark.quamera.camera.imagereader.DeferrableImageReader; -import com.quark.quamera.camera.sensor.ImageRotationHelper; -import com.quark.quamera.camera.session.ImageCapture; -import com.quark.quamera.camera.session.PreviewConfig; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.imagereader.DeferrableImageReader; +import com.ola.olamera.camera.sensor.ImageRotationHelper; +import com.ola.olamera.camera.session.ImageCapture; +import com.ola.olamera.camera.session.PreviewConfig; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraLogger; import java.util.ArrayList; import java.util.Arrays; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ComboCameraErrorListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ComboCameraErrorListener.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ComboCameraErrorListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ComboCameraErrorListener.java index f3f60bd66..1a51e4682 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ComboCameraErrorListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ComboCameraErrorListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; import java.util.List; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraErrorListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraErrorListener.java similarity index 70% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraErrorListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraErrorListener.java index e61b08ccb..6fcb09183 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraErrorListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraErrorListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; public interface ICameraErrorListener { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraStateListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraStateListener.java similarity index 80% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraStateListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraStateListener.java index b2475d9f9..938624c84 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/camera/ICameraStateListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/camera/ICameraStateListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.camera; +package com.ola.olamera.camera.camera; /* * * Creation : 2021/6/6 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/CameraExecutors.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/CameraExecutors.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/CameraExecutors.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/CameraExecutors.java index 70b55bf78..a922ca777 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/CameraExecutors.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/CameraExecutors.java @@ -1,6 +1,6 @@ -package com.quark.quamera.camera.concurrent; +package com.ola.olamera.camera.concurrent; -import com.quark.quamera.util.SequentialExecutor; +import com.ola.olamera.util.SequentialExecutor; public class CameraExecutors { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/HandlerScheduledExecutorService.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/HandlerScheduledExecutorService.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/HandlerScheduledExecutorService.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/HandlerScheduledExecutorService.java index d4a34f16d..a36fcf787 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/HandlerScheduledExecutorService.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/HandlerScheduledExecutorService.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.concurrent; +package com.ola.olamera.camera.concurrent; /* * * Creation : 2021/2/8 @@ -11,7 +11,7 @@ import android.os.Handler; import androidx.annotation.NonNull; -import com.quark.quamera.util.CameraShould; +import com.ola.olamera.util.CameraShould; import java.util.concurrent.Callable; import java.util.concurrent.Delayed; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/MainThreadExecutor.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/MainThreadExecutor.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/MainThreadExecutor.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/MainThreadExecutor.java index 2d6240ee2..97cb998da 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/concurrent/MainThreadExecutor.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/concurrent/MainThreadExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.concurrent; +package com.ola.olamera.camera.concurrent; import android.os.Handler; import android.os.Looper; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/BlockImageAnalyzer.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/BlockImageAnalyzer.java similarity index 68% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/BlockImageAnalyzer.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/BlockImageAnalyzer.java index 13c1db8bb..7252d324f 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/BlockImageAnalyzer.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/BlockImageAnalyzer.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.imagereader; +package com.ola.olamera.camera.imagereader; /* * * Creation : 2021/4/22 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/DeferrableImageReader.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/DeferrableImageReader.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/DeferrableImageReader.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/DeferrableImageReader.java index 5d7d8da80..81b1c1db3 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/DeferrableImageReader.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/DeferrableImageReader.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.imagereader; +package com.ola.olamera.camera.imagereader; /* * * Creation : 20-11-26 @@ -9,9 +9,9 @@ import android.media.ImageReader; import android.os.Build; import android.os.Handler; -import com.quark.quamera.camera.camera.CameraSurfaceHelper; -import com.quark.quamera.camera.sensor.ImageRotationHelper; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.camera.CameraSurfaceHelper; +import com.ola.olamera.camera.sensor.ImageRotationHelper; +import com.ola.olamera.util.Preconditions; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/ImageAnalyzer.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/ImageAnalyzer.java similarity index 82% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/ImageAnalyzer.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/ImageAnalyzer.java index ca35af717..966fad6dd 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/ImageAnalyzer.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/ImageAnalyzer.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.imagereader; +package com.ola.olamera.camera.imagereader; /* * * Creation : 20-12-2 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/NoBlockImageAnalyzer.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/NoBlockImageAnalyzer.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/NoBlockImageAnalyzer.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/NoBlockImageAnalyzer.java index e43a9b074..b6bbe2646 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/imagereader/NoBlockImageAnalyzer.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/imagereader/NoBlockImageAnalyzer.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.imagereader; +package com.ola.olamera.camera.imagereader; /* * * Creation : 20-12-2 @@ -13,8 +13,8 @@ import androidx.annotation.GuardedBy; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.sensor.ImageRotationHelper; -import com.quark.quamera.util.Preconditions; +import com.ola.olamera.camera.sensor.ImageRotationHelper; +import com.ola.olamera.util.Preconditions; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewSurfaceProvider.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewSurfaceProvider.java similarity index 79% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewSurfaceProvider.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewSurfaceProvider.java index c854fa9c6..61cb2bf7b 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewSurfaceProvider.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewSurfaceProvider.java @@ -1,10 +1,10 @@ -package com.quark.quamera.camera.preview; +package com.ola.olamera.camera.preview; import android.view.Surface; -import com.quark.quamera.camera.camera.Camera2CameraImpl; -import com.quark.quamera.camera.session.CameraCaptureComboCallback; +import com.ola.olamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.camera.session.CameraCaptureComboCallback; import androidx.annotation.NonNull; import androidx.camera.core.Preview; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewView.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewView.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewView.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewView.java index df430664c..f228638b9 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/IPreviewView.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/IPreviewView.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.preview; +package com.ola.olamera.camera.preview; /* * * Creation : 2021/7/12 @@ -12,7 +12,7 @@ import android.util.Size; import androidx.camera.core.FocusMeteringResult; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.render.photo.SnapShotCommand; +import com.ola.olamera.render.photo.SnapShotCommand; public interface IPreviewView { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/SurfaceTextureWrapper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/SurfaceTextureWrapper.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/SurfaceTextureWrapper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/SurfaceTextureWrapper.java index a830c65db..c1bec9fac 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/SurfaceTextureWrapper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/SurfaceTextureWrapper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.preview; +package com.ola.olamera.camera.preview; /* * * Creation : 2020/4/15 @@ -9,7 +9,7 @@ import android.graphics.SurfaceTexture; import android.util.Log; import android.view.Surface; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.util.CameraLogger; import java.util.Arrays; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPort.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPort.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPort.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPort.java index 14aab0f56..fe2d7b9c5 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPort.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPort.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.preview; +package com.ola.olamera.camera.preview; import android.view.Surface; import android.view.SurfaceView; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPorts.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPorts.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPorts.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPorts.java index ed65aadf7..6cf1efacf 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/preview/ViewPorts.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/preview/ViewPorts.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.preview; +package com.ola.olamera.camera.preview; import android.annotation.SuppressLint; import android.graphics.Matrix; @@ -29,9 +29,9 @@ import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.ImageUtils; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.ImageUtils; /** * Utility methods for calculating viewports. diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/CameraOrientationUtil.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/CameraOrientationUtil.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/CameraOrientationUtil.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/CameraOrientationUtil.java index 718587a11..cfe961a89 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/CameraOrientationUtil.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/CameraOrientationUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.sensor; +package com.ola.olamera.camera.sensor; import android.util.Log; import android.view.Surface; @@ -22,7 +22,7 @@ import android.view.Surface; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; -import com.quark.quamera.camera.session.CameraSelector; +import com.ola.olamera.camera.session.CameraSelector; /** * Contains utility methods related to camera orientation. diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/DisplayOrientationDetector.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/DisplayOrientationDetector.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/DisplayOrientationDetector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/DisplayOrientationDetector.java index 92a5dd12d..fc89bbfb2 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/DisplayOrientationDetector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/DisplayOrientationDetector.java @@ -1,12 +1,12 @@ -package com.quark.quamera.camera.sensor; +package com.ola.olamera.camera.sensor; import android.content.Context; import android.view.OrientationEventListener; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CollectionUtil; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CollectionUtil; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/IOrientationDetector.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/IOrientationDetector.java similarity index 89% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/IOrientationDetector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/IOrientationDetector.java index 7f3245407..27d028f92 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/IOrientationDetector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/IOrientationDetector.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.sensor; +package com.ola.olamera.camera.sensor; import java.util.concurrent.atomic.AtomicInteger; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/ImageRotationHelper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/ImageRotationHelper.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/ImageRotationHelper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/ImageRotationHelper.java index c1727e5af..16e12f776 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/sensor/ImageRotationHelper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/sensor/ImageRotationHelper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.sensor; +package com.ola.olamera.camera.sensor; import android.os.Build; @@ -6,8 +6,8 @@ import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.camera.Camera2Info; -import com.quark.quamera.camera.session.CameraSelector; +import com.ola.olamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.session.CameraSelector; @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/Camera2CameraCaptureResult.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/Camera2CameraCaptureResult.java similarity index 94% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/Camera2CameraCaptureResult.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/Camera2CameraCaptureResult.java index 02f686b49..e38b1f186 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/Camera2CameraCaptureResult.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/Camera2CameraCaptureResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CaptureResult; import android.os.Build; @@ -24,11 +24,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.session.CameraCaptureMetaData.AeState; -import com.quark.quamera.camera.session.CameraCaptureMetaData.AfMode; -import com.quark.quamera.camera.session.CameraCaptureMetaData.AfState; -import com.quark.quamera.camera.session.CameraCaptureMetaData.AwbState; -import com.quark.quamera.camera.session.CameraCaptureMetaData.FlashState; +import com.ola.olamera.camera.session.CameraCaptureMetaData.AeState; +import com.ola.olamera.camera.session.CameraCaptureMetaData.AfMode; +import com.ola.olamera.camera.session.CameraCaptureMetaData.AfState; +import com.ola.olamera.camera.session.CameraCaptureMetaData.AwbState; +import com.ola.olamera.camera.session.CameraCaptureMetaData.FlashState; /** * The camera2 implementation for the capture result of a single image capture. diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallback.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallback.java similarity index 94% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallback.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallback.java index ee388272e..e4f59fdfc 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallback.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallback.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import androidx.annotation.NonNull; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallbackHandlerWrapper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallbackHandlerWrapper.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallbackHandlerWrapper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallbackHandlerWrapper.java index af6282032..13c5bd539 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureCallbackHandlerWrapper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureCallbackHandlerWrapper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-12-19 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureComboCallback.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureComboCallback.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureComboCallback.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureComboCallback.java index 9be0bb991..7efb16880 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureComboCallback.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureComboCallback.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 2021/5/26 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureFailure.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureFailure.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureFailure.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureFailure.java index 167ae31de..e5e693554 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureFailure.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureFailure.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureMetaData.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureMetaData.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureMetaData.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureMetaData.java index f783e362c..3ce7d5799 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureMetaData.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureMetaData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureResult.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureResult.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureResult.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureResult.java index 13407ca0d..20a63c743 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraCaptureResult.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraCaptureResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CaptureResult; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraSelector.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraSelector.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraSelector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraSelector.java index 1c05c217f..1278f0576 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CameraSelector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CameraSelector.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-11-18 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackAdapter.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackAdapter.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackAdapter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackAdapter.java index da968c1cc..454421db7 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackAdapter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureFailure; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackHandlerWrapper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackHandlerWrapper.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackHandlerWrapper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackHandlerWrapper.java index 31e4ea808..56369f195 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureCallbackHandlerWrapper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureCallbackHandlerWrapper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureFailure; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureControlCallback.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureControlCallback.java similarity index 94% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureControlCallback.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureControlCallback.java index e296440cf..e41c531bd 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/CaptureControlCallback.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/CaptureControlCallback.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CameraCaptureSession; @@ -12,8 +12,8 @@ import android.view.Surface; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.camera.Camera2CameraImpl; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.util.CameraLogger; @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public class CaptureControlCallback extends CameraCaptureSession.CaptureCallback { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ComboSessionCaptureCallback.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ComboSessionCaptureCallback.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ComboSessionCaptureCallback.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ComboSessionCaptureCallback.java index f74da3f2b..405bb1c52 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ComboSessionCaptureCallback.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ComboSessionCaptureCallback.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureFailure; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISelector.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISelector.java similarity index 81% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISelector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISelector.java index 35e790b6d..0f0675892 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISelector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISelector.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-11-18 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISurfaceUpdateListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISurfaceUpdateListener.java similarity index 86% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISurfaceUpdateListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISurfaceUpdateListener.java index a302e427b..c82ecf374 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ISurfaceUpdateListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ISurfaceUpdateListener.java @@ -1,6 +1,6 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; -import com.quark.quamera.camera.preview.SurfaceTextureWrapper; +import com.ola.olamera.camera.preview.SurfaceTextureWrapper; public abstract class ISurfaceUpdateListener extends CameraCaptureCallback { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/IUserCameraSession.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/IUserCameraSession.java similarity index 85% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/IUserCameraSession.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/IUserCameraSession.java index d8785f05f..9e7b3569c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/IUserCameraSession.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/IUserCameraSession.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-11-18 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ImageCapture.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ImageCapture.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ImageCapture.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ImageCapture.java index a88d8db8d..6217af195 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/ImageCapture.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/ImageCapture.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 2021/4/19 @@ -16,15 +16,15 @@ import android.os.Build; import android.util.LayoutDirection; import android.util.Size; -import com.quark.quamera.camera.camera.Camera2CameraImpl; -import com.quark.quamera.camera.camera.Camera2Info; -import com.quark.quamera.camera.imagereader.DeferrableImageReader; -import com.quark.quamera.camera.preview.IPreviewView; -import com.quark.quamera.camera.preview.ViewPorts; -import com.quark.quamera.camera.session.config.CameraConfigUtils; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.ImageUtils; -import com.quark.quamera.util.Should; +import com.ola.olamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.imagereader.DeferrableImageReader; +import com.ola.olamera.camera.preview.IPreviewView; +import com.ola.olamera.camera.preview.ViewPorts; +import com.ola.olamera.camera.session.config.CameraConfigUtils; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.ImageUtils; +import com.ola.olamera.util.Should; import java.io.ByteArrayInputStream; import java.nio.ByteBuffer; @@ -38,8 +38,8 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.exifinterface.media.ExifInterface; -import static com.quark.quamera.util.ImageUtils.min; -import static com.quark.quamera.util.ImageUtils.sizeToVertexes; +import static com.ola.olamera.util.ImageUtils.min; +import static com.ola.olamera.util.ImageUtils.sizeToVertexes; @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public class ImageCapture { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/InnerImageCaptureCallback.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/InnerImageCaptureCallback.java similarity index 85% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/InnerImageCaptureCallback.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/InnerImageCaptureCallback.java index d13fa3eaa..eb6ac26cf 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/InnerImageCaptureCallback.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/InnerImageCaptureCallback.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 2021/7/13 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/PreviewConfig.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/PreviewConfig.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/PreviewConfig.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/PreviewConfig.java index 92394739f..58b862873 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/PreviewConfig.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/PreviewConfig.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.hardware.camera2.CameraCharacteristics; @@ -10,11 +10,11 @@ import android.util.Range; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.camera.Camera2Info; -import com.quark.quamera.camera.camera.CameraSurfaceHelper; -import com.quark.quamera.camera.imagereader.DeferrableImageReader; -import com.quark.quamera.camera.preview.IPreviewView; -import com.quark.quamera.camera.session.config.CameraConfigUtils; +import com.ola.olamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.camera.CameraSurfaceHelper; +import com.ola.olamera.camera.imagereader.DeferrableImageReader; +import com.ola.olamera.camera.preview.IPreviewView; +import com.ola.olamera.camera.session.config.CameraConfigUtils; import java.util.List; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/RepeatCaptureRequestConfig.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/RepeatCaptureRequestConfig.java similarity index 86% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/RepeatCaptureRequestConfig.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/RepeatCaptureRequestConfig.java index ffa7b9275..4595909ae 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/RepeatCaptureRequestConfig.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/RepeatCaptureRequestConfig.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-12-19 @@ -10,7 +10,7 @@ import android.hardware.camera2.CaptureRequest; import androidx.annotation.NonNull; -import com.quark.quamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.camera.Camera2Info; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SessionConfig.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SessionConfig.java similarity index 85% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SessionConfig.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SessionConfig.java index 2c069939f..884e9927c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SessionConfig.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SessionConfig.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import android.os.Handler; @@ -6,9 +6,9 @@ import android.os.Looper; import androidx.annotation.NonNull; -import com.quark.quamera.camera.camera.CameraErrorListenerHandlerWrapper; -import com.quark.quamera.camera.camera.ICameraErrorListener; -import com.quark.quamera.camera.session.config.CameraSelectConfig; +import com.ola.olamera.camera.camera.CameraErrorListenerHandlerWrapper; +import com.ola.olamera.camera.camera.ICameraErrorListener; +import com.ola.olamera.camera.session.config.CameraSelectConfig; public class SessionConfig { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SingleCaptureConfig.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SingleCaptureConfig.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SingleCaptureConfig.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SingleCaptureConfig.java index 2401a23d1..d09a5c6a3 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SingleCaptureConfig.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SingleCaptureConfig.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 2021/6/18 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java index d89c8f435..115089f21 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SurfaceUpdateListenerExecutorWrapper.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; import androidx.annotation.NonNull; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SyncCaptureSession.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SyncCaptureSession.java similarity index 50% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SyncCaptureSession.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SyncCaptureSession.java index 97aa371e3..5c1ef72bd 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/SyncCaptureSession.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/SyncCaptureSession.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-11-23 @@ -16,14 +16,14 @@ import android.os.Handler; import android.util.Log; import android.view.Surface; -import com.quark.quamera.camera.anotaion.ExecutedBy; -import com.quark.quamera.camera.camera.Camera2CameraImpl; -import com.quark.quamera.camera.camera.CameraState; -import com.quark.quamera.camera.imagereader.DeferrableImageReader; -import com.quark.quamera.camera.preview.IPreviewSurfaceProvider; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.TestOnly; +import com.ola.olamera.camera.anotaion.ExecutedBy; +import com.ola.olamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.camera.camera.CameraState; +import com.ola.olamera.camera.imagereader.DeferrableImageReader; +import com.ola.olamera.camera.preview.IPreviewSurfaceProvider; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.TestOnly; import java.util.ArrayList; import java.util.List; @@ -126,150 +126,156 @@ public class SyncCaptureSession { private final CaptureControlCallback mCaptureControlCallback = new CaptureControlCallback(); private void openCaptureSession(@NonNull CameraDevice cameraDevice) { - if (mSessionConfig == null) { - return; - } + synchronized (mStateLock) { + if (mSessionConfig == null) { + return; + } - try { + try { - PreviewConfig previewConfig = mSessionConfig.getPreviewConfig(); + PreviewConfig previewConfig = mSessionConfig.getPreviewConfig(); - IPreviewSurfaceProvider.SurfaceRequest request = new IPreviewSurfaceProvider.SurfaceRequest(); - request.width = previewConfig.getActualWidth(); - request.height = previewConfig.getActualHeight(); - request.camera2Camera = mCamera; - request.repeatCaptureCallback = previewConfig.getRepeatCaptureCallback(); + IPreviewSurfaceProvider.SurfaceRequest request = new IPreviewSurfaceProvider.SurfaceRequest(); + request.width = previewConfig.getActualWidth(); + request.height = previewConfig.getActualHeight(); + request.camera2Camera = mCamera; + request.repeatCaptureCallback = previewConfig.getRepeatCaptureCallback(); - Surface previewSurface = previewConfig.getPreviewView().getSurfaceProvider().provide(request); + Surface previewSurface = previewConfig.getPreviewView().getSurfaceProvider().provide(request); - //创建CaptureRequestBuilder，TEMPLATE_PREVIEW比表示预览请求 - mCaptureRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW); - //设置Surface作为预览数据的显示界面 + //创建CaptureRequestBuilder，TEMPLATE_PREVIEW比表示预览请求 + mCaptureRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW); + //设置Surface作为预览数据的显示界面 - ArrayList surfaces = new ArrayList<>(); - surfaces.add(previewSurface); + ArrayList surfaces = new ArrayList<>(); + surfaces.add(previewSurface); - mCaptureRequestBuilder.addTarget(previewSurface); + mCaptureRequestBuilder.addTarget(previewSurface); - if (mSessionConfig.getPreviewConfig().getImageReaders() != null) { - for (DeferrableImageReader imageReader : mSessionConfig.getPreviewConfig().getImageReaders()) { - if (imageReader.unWrapper() != null) { - surfaces.add(imageReader.unWrapper().getSurface()); - CameraLogger.i(Camera2CameraImpl.TAG, "add ImageReader Surface begin ( format:%d, %d*%d )", imageReader.getFormat(), imageReader.unWrapper().getWidth(), imageReader.unWrapper().getHeight()); - mCaptureRequestBuilder.addTarget(imageReader.unWrapper().getSurface()); + if (mSessionConfig.getPreviewConfig().getImageReaders() != null) { + for (DeferrableImageReader imageReader : mSessionConfig.getPreviewConfig().getImageReaders()) { + if (imageReader.unWrapper() != null) { + surfaces.add(imageReader.unWrapper().getSurface()); + CameraLogger.i(Camera2CameraImpl.TAG, "add ImageReader Surface begin ( format:%d, %d*%d )", imageReader.getFormat(), imageReader.unWrapper().getWidth(), imageReader.unWrapper().getHeight()); + mCaptureRequestBuilder.addTarget(imageReader.unWrapper().getSurface()); + } } } + + ImageCapture captureConfig = mSessionConfig.getImageCapture(); + if (captureConfig != null && captureConfig.getDeferrableImageReader() != null) { + surfaces.add(captureConfig.getDeferrableImageReader().unWrapper().getSurface()); + } + + CameraLogger.i(Camera2CameraImpl.TAG, "openCaptureSession begin ( preview: %d*%d )", + mSessionConfig.getPreviewConfig().getActualWidth(), + mSessionConfig.getPreviewConfig().getActualHeight()); + + changeState(State.OPENING); + + cameraDevice.createCaptureSession(surfaces, mStateController, mHandler); + } catch (CameraAccessException e) { + CameraLogger.e(Camera2CameraImpl.TAG, "openCaptureSession error (%s) ", e.getMessage()); + CameraShould.fail("", e); } - - ImageCapture captureConfig = mSessionConfig.getImageCapture(); - if (captureConfig != null && captureConfig.getDeferrableImageReader() != null) { - surfaces.add(captureConfig.getDeferrableImageReader().unWrapper().getSurface()); - } - - CameraLogger.i(Camera2CameraImpl.TAG, "openCaptureSession begin ( preview: %d*%d )", - mSessionConfig.getPreviewConfig().getActualWidth(), - mSessionConfig.getPreviewConfig().getActualHeight()); - - changeState(State.OPENING); - - cameraDevice.createCaptureSession(surfaces, mStateController, mHandler); - } catch (CameraAccessException e) { - CameraLogger.e(Camera2CameraImpl.TAG, "openCaptureSession error (%s) ", e.getMessage()); - CameraShould.fail("", e); } } public void capture(SingleCaptureConfig singleCaptureConfig, @NonNull CameraDevice cameraDevice, @NonNull InnerImageCaptureCallback capturedCallback) { - switch (mState) { - case OPENED: - captureInner(singleCaptureConfig, cameraDevice, capturedCallback); - break; - default: - if (capturedCallback != null) { - capturedCallback.onError(new IllegalStateException("can not capture image when " + mState)); - } + synchronized (mStateLock) { + switch (mState) { + case OPENED: + captureInner(singleCaptureConfig, cameraDevice, capturedCallback); + break; + default: + if (capturedCallback != null) { + capturedCallback.onError(new IllegalStateException("can not capture image when " + mState)); + } + } } } private void captureInner(SingleCaptureConfig singleCaptureConfig, @NonNull CameraDevice cameraDevice, @NonNull InnerImageCaptureCallback capturedCallback) { - try { + synchronized (mStateLock) { + try { - ImageCapture captureConfig = mSessionConfig.getImageCapture(); + ImageCapture captureConfig = mSessionConfig.getImageCapture(); - if (captureConfig == null) { - throw new RuntimeException("init image capture config first"); - } - - - // This is the CaptureRequest.Builder that we use to take a picture. - final CaptureRequest.Builder captureBuilder = - cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE); - - ImageReader actualImageReader = captureConfig.getDeferrableImageReader().unWrapper(); - captureBuilder.addTarget(actualImageReader.getSurface()); - - - int natureRotation = captureConfig.getDeferrableImageReader().getImageRotationHelper().getImageRotation(); - int sensorRotation = captureConfig.getDeferrableImageReader().getImageRotationHelper().getCameraSensorOrientation(); - - int jpegRotation = sensorRotation; - if (singleCaptureConfig != null && singleCaptureConfig.useNatureRotation()) { - jpegRotation = natureRotation; - } - captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, jpegRotation); - captureBuilder.set(CaptureRequest.JPEG_QUALITY, singleCaptureConfig != null ? - singleCaptureConfig.getJpegQuality() : 100); - captureConfig.fillConfig(mCamera.getCameraCharacteristics(), captureBuilder); - - //选择对应的相机，初始化默认配置 - if (mSessionConfig.getSelectConfig() != null) { - mSessionConfig.getSelectConfig().fillConfig(mCamera.getCamera2Info(), captureBuilder); - } - - //TODO NoBlockImageAnalyzer 相当于每次只有一个图片回掉,之前的回掉会给新触发的callback给替换掉 - captureConfig.getDeferrableImageReader().getNoBlockImageAnalyzer().setImageAnalyzer((image, cameraSensorRotation, imageRotation) -> { - CameraLogger.i(Camera2CameraImpl.TAG, "ImageCapture Success (%d * %d)", image.getWidth(), image.getHeight()); - capturedCallback.onCaptureSuccess(image); - }); - - CameraCaptureSession.CaptureCallback innerCallback = new CameraCaptureSession.CaptureCallback() { - - @Override - public void onCaptureFailed(@NonNull CameraCaptureSession session, - @NonNull CaptureRequest request, - @NonNull CaptureFailure failure) { - super.onCaptureFailed(session, request, failure); - capturedCallback.onError(new Exception("capture_error:" + failure.getReason())); + if (captureConfig == null) { + throw new RuntimeException("init image capture config first"); } - @Override - public void onCaptureStarted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, long timestamp, long frameNumber) { - capturedCallback.onCaptureStart(); + + // This is the CaptureRequest.Builder that we use to take a picture. + final CaptureRequest.Builder captureBuilder = + cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE); + + ImageReader actualImageReader = captureConfig.getDeferrableImageReader().unWrapper(); + captureBuilder.addTarget(actualImageReader.getSurface()); + + + int natureRotation = captureConfig.getDeferrableImageReader().getImageRotationHelper().getImageRotation(); + int sensorRotation = captureConfig.getDeferrableImageReader().getImageRotationHelper().getCameraSensorOrientation(); + + int jpegRotation = sensorRotation; + if (singleCaptureConfig != null && singleCaptureConfig.useNatureRotation()) { + jpegRotation = natureRotation; + } + captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, jpegRotation); + captureBuilder.set(CaptureRequest.JPEG_QUALITY, singleCaptureConfig != null ? + singleCaptureConfig.getJpegQuality() : 100); + captureConfig.fillConfig(mCamera.getCameraCharacteristics(), captureBuilder); + + //选择对应的相机，初始化默认配置 + if (mSessionConfig.getSelectConfig() != null) { + mSessionConfig.getSelectConfig().fillConfig(mCamera.getCamera2Info(), captureBuilder); } - @Override - public void onCaptureSequenceAborted(@NonNull CameraCaptureSession session, int sequenceId) { - super.onCaptureSequenceAborted(session, sequenceId); - capturedCallback.onError(new Exception("capture_error:onCaptureSequenceAborted")); + //TODO NoBlockImageAnalyzer 相当于每次只有一个图片回掉,之前的回掉会给新触发的callback给替换掉 + captureConfig.getDeferrableImageReader().getNoBlockImageAnalyzer().setImageAnalyzer((image, cameraSensorRotation, imageRotation) -> { + CameraLogger.i(Camera2CameraImpl.TAG, "ImageCapture Success (%d * %d)", image.getWidth(), image.getHeight()); + capturedCallback.onCaptureSuccess(image); + }); - } - }; + CameraCaptureSession.CaptureCallback innerCallback = new CameraCaptureSession.CaptureCallback() { + + @Override + public void onCaptureFailed(@NonNull CameraCaptureSession session, + @NonNull CaptureRequest request, + @NonNull CaptureFailure failure) { + super.onCaptureFailed(session, request, failure); + capturedCallback.onError(new Exception("capture_error:" + failure.getReason())); + } + + @Override + public void onCaptureStarted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, long timestamp, long frameNumber) { + capturedCallback.onCaptureStart(); + } + + @Override + public void onCaptureSequenceAborted(@NonNull CameraCaptureSession session, int sequenceId) { + super.onCaptureSequenceAborted(session, sequenceId); + capturedCallback.onError(new Exception("capture_error:onCaptureSequenceAborted")); + + } + }; - //TODO 目前只有闪光等设置了需要关闭Repeating模式，重新开启 - //但是这块改动影响了CameraCaptureState的逻辑，目前先不实现 -// mCameraCaptureSession.stopRepeating(); -// mCameraCaptureSession.abortCaptures(); + //TODO 目前只有闪光等设置了需要关闭Repeating模式，重新开启 + //但是这块改动影响了CameraCaptureState的逻辑，目前先不实现 + // mCameraCaptureSession.stopRepeating(); + // mCameraCaptureSession.abortCaptures(); - int id = mCameraCaptureSession.capture(captureBuilder.build(), innerCallback, mHandler); + int id = mCameraCaptureSession.capture(captureBuilder.build(), innerCallback, mHandler); - CameraLogger.i(Camera2CameraImpl.TAG, "send image capture request " + id); + CameraLogger.i(Camera2CameraImpl.TAG, "send image capture request " + id); - } catch (CameraAccessException e) { - CameraLogger.e(Camera2CameraImpl.TAG, "openCaptureSession error (%s) ", e.getMessage()); - CameraShould.fail("", e); - capturedCallback.onError(e); + } catch (CameraAccessException e) { + CameraLogger.e(Camera2CameraImpl.TAG, "openCaptureSession error (%s) ", e.getMessage()); + CameraShould.fail("", e); + capturedCallback.onError(e); + } } } @@ -380,68 +386,71 @@ public class SyncCaptureSession { public void doRepeatingCaptureAction(@NonNull RepeatCaptureRequestConfig config) { - mHandler.post(() -> { - switch (mState) { - case OPENED: - issueRepeatingCaptureRequests(config); - break; - default: - if (config.getCallback() != null) { - if (config.getCallbackExecutor() != null) { - config.getCallbackExecutor().execute(() -> config.getCallback().onCaptureFailed(new CameraCaptureFailure(CameraCaptureFailure.Reason.ERROR))); - } else { - config.getCallback().onCaptureFailed(new CameraCaptureFailure(CameraCaptureFailure.Reason.ERROR)); - } - break; + mHandler.post(() -> { + synchronized (mStateLock) { + switch (mState) { + case OPENED: + issueRepeatingCaptureRequests(config); + break; + default: + if (config.getCallback() != null) { + if (config.getCallbackExecutor() != null) { + config.getCallbackExecutor().execute(() -> config.getCallback().onCaptureFailed(new CameraCaptureFailure(CameraCaptureFailure.Reason.ERROR))); + } else { + config.getCallback().onCaptureFailed(new CameraCaptureFailure(CameraCaptureFailure.Reason.ERROR)); + } + break; + } } - } - }); - + } + }); } private void issueRepeatingCaptureRequests(RepeatCaptureRequestConfig action) { - if (mSessionConfig == null) { - CameraLogger.e(TAG, "Skipping issueRepeatingCaptureRequests for no configuration case."); - return; - } - - try { - - //设置反复捕获数据的请求，这样预览界面就会一直有数据显示 - List callbackList = new ArrayList<>(); - callbackList.add(mCaptureControlCallback); - - - RepeatCaptureRequestConfig requestConfig = mSessionConfig.getPreviewConfig().getRepeatCaptureRequestConfig(); - requestConfig.fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); - - callbackList.add(convert2SystemApiCaptureCallback(requestConfig.getCallbackExecutor(), requestConfig.getCallback())); - - - if (action != null) { - callbackList.add(convert2SystemApiCaptureCallback(action.getCallbackExecutor(), action.getCallback())); - action.fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); + synchronized (mStateLock) { + if (mSessionConfig == null) { + CameraLogger.e(TAG, "Skipping issueRepeatingCaptureRequests for no configuration case."); + return; } - //选择对应的相机，初始化默认配置 - if (mSessionConfig.getSelectConfig() != null) { - mSessionConfig.getSelectConfig().fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); + try { + + //设置反复捕获数据的请求，这样预览界面就会一直有数据显示 + List callbackList = new ArrayList<>(); + callbackList.add(mCaptureControlCallback); + + + RepeatCaptureRequestConfig requestConfig = mSessionConfig.getPreviewConfig().getRepeatCaptureRequestConfig(); + requestConfig.fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); + + callbackList.add(convert2SystemApiCaptureCallback(requestConfig.getCallbackExecutor(), requestConfig.getCallback())); + + + if (action != null) { + callbackList.add(convert2SystemApiCaptureCallback(action.getCallbackExecutor(), action.getCallback())); + action.fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); + } + + //选择对应的相机，初始化默认配置 + if (mSessionConfig.getSelectConfig() != null) { + mSessionConfig.getSelectConfig().fillConfig(mCamera.getCamera2Info(), mCaptureRequestBuilder); + } + + //创建捕获请求 + CaptureRequest request = mCaptureRequestBuilder.build(); + + + ComboSessionCaptureCallback comboSessionCaptureCallback = new ComboSessionCaptureCallback(callbackList); + + if (mCamera.getCameraState() == CameraState.OPEN) { + mCameraCaptureSession.setRepeatingRequest(request, comboSessionCaptureCallback, mHandler); + } + + } catch (CameraAccessException e) { + CameraLogger.e(Camera2CameraImpl.TAG, "CameraCaptureSession.openCaptureSession error (%s) ", e.getMessage()); + CameraShould.fail("", e); } - - //创建捕获请求 - CaptureRequest request = mCaptureRequestBuilder.build(); - - - ComboSessionCaptureCallback comboSessionCaptureCallback = new ComboSessionCaptureCallback(callbackList); - - if (mCamera.getCameraState() == CameraState.OPEN) { - mCameraCaptureSession.setRepeatingRequest(request, comboSessionCaptureCallback, mHandler); - } - - } catch (CameraAccessException e) { - CameraLogger.e(Camera2CameraImpl.TAG, "CameraCaptureSession.openCaptureSession error (%s) ", e.getMessage()); - CameraShould.fail("", e); } } diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/UserCameraSession.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/UserCameraSession.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/UserCameraSession.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/UserCameraSession.java index 4eec7b8b9..6ad16c511 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/UserCameraSession.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/UserCameraSession.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session; +package com.ola.olamera.camera.session; /* * * Creation : 20-11-23 @@ -7,10 +7,10 @@ package com.quark.quamera.camera.session; import android.os.Build; -import com.quark.quamera.camera.camera.Camera2Info; -import com.quark.quamera.camera.camera.CameraLifeManager; -import com.quark.quamera.camera.camera.CameraState; -import com.quark.quamera.camera.session.config.CameraSelectConfig; +import com.ola.olamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.camera.CameraLifeManager; +import com.ola.olamera.camera.camera.CameraState; +import com.ola.olamera.camera.session.config.CameraSelectConfig; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraConfigUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraConfigUtils.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraConfigUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraConfigUtils.java index 9bf55309d..bab2cac1d 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraConfigUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraConfigUtils.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session.config; +package com.ola.olamera.camera.session.config; /* * * Creation : 2021/6/30 @@ -13,7 +13,7 @@ import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import com.quark.quamera.util.ArrayUtil; +import com.ola.olamera.util.ArrayUtil; public class CameraConfigUtils { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraSelectConfig.java b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraSelectConfig.java similarity index 90% rename from mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraSelectConfig.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraSelectConfig.java index 07acea34b..59cbda567 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camera/session/config/CameraSelectConfig.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camera/session/config/CameraSelectConfig.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camera.session.config; +package com.ola.olamera.camera.session.config; /* * * Creation : 2021/5/7 @@ -9,9 +9,9 @@ import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CaptureRequest; import android.os.Build; -import com.quark.quamera.camera.camera.Camera2Info; -import com.quark.quamera.camera.session.CameraSelector; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.camera.Camera2Info; +import com.ola.olamera.camera.session.CameraSelector; +import com.ola.olamera.util.CameraLogger; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraController.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraController.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraController.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraController.java index 098ab8565..e9de54a88 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraController.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax; +package com.ola.olamera.camerax; import android.annotation.SuppressLint; import android.content.Context; @@ -28,7 +28,7 @@ import android.util.Size; import android.view.Display; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.camerax.controller.ForwardingLiveData; +import com.ola.olamera.camerax.controller.ForwardingLiveData; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraXManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraXManager.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraXManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraXManager.java index dbcc20425..116b2cd0c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/CameraXManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/CameraXManager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax; +package com.ola.olamera.camerax; /* * * Creation : 20-11-25 @@ -18,13 +18,13 @@ import android.util.Log; import android.util.Size; import android.util.SizeF; -import com.quark.quamera.camera.preview.ViewPort; -import com.quark.quamera.camera.preview.ViewPorts; -import com.quark.quamera.camera.session.SingleCaptureConfig; -import com.quark.quamera.camerax.utils.FocalLengthInfo; -import com.quark.quamera.camerax.utils.SingleThreadHandlerExecutor; -import com.quark.quamera.render.view.CameraXPreviewView; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.preview.ViewPort; +import com.ola.olamera.camera.preview.ViewPorts; +import com.ola.olamera.camera.session.SingleCaptureConfig; +import com.ola.olamera.camerax.utils.FocalLengthInfo; +import com.ola.olamera.camerax.utils.SingleThreadHandlerExecutor; +import com.ola.olamera.render.view.CameraXPreviewView; +import com.ola.olamera.util.CameraLogger; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -65,7 +65,6 @@ import androidx.lifecycle.LifecycleRegistry; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public class CameraXManager implements LifecycleOwner, ICameraManager { private LifecycleCameraController mCameraController; @@ -185,7 +184,7 @@ public class CameraXManager implements LifecycleOwner, ICameraManager { void startCamera(Size previewSize, boolean useWideCamera, boolean needBindLifecycle, boolean isLimitCaptureSize, Size maxCaptureSize); - void switchCamera(com.quark.quamera.camera.session.CameraSelector.CameraLenFacing cameraLenFacing, Size previewSize); + void switchCamera(com.ola.olamera.camera.session.CameraSelector.CameraLenFacing cameraLenFacing, Size previewSize); - void takePictureOriginalData(SingleCaptureConfig singleCaptureConfig, com.quark.quamera.camera.session.ImageCapture.OnImageCapturedCallback capturedCallback); + void takePictureOriginalData(SingleCaptureConfig singleCaptureConfig, com.ola.olamera.camera.session.ImageCapture.OnImageCapturedCallback capturedCallback); void enableFlash(boolean enable); diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/LifecycleCameraController.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/LifecycleCameraController.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/LifecycleCameraController.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/LifecycleCameraController.java index 967ffe4a8..49d7b0cd4 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/LifecycleCameraController.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/LifecycleCameraController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax; +package com.ola.olamera.camerax; import android.Manifest; import android.annotation.SuppressLint; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCameraProviderListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCameraProviderListener.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCameraProviderListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCameraProviderListener.java index 175b112dd..fe1d0c1fc 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCameraProviderListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCameraProviderListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax; +package com.ola.olamera.camerax; import androidx.camera.lifecycle.ProcessCameraProvider; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCaptureResultListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCaptureResultListener.java similarity index 86% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCaptureResultListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCaptureResultListener.java index 0a9179e40..2575cf12c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/OnCaptureResultListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/OnCaptureResultListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax; +package com.ola.olamera.camerax; import androidx.camera.core.impl.CameraCaptureResult; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/CameraViewTouchManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/CameraViewTouchManager.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/CameraViewTouchManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/CameraViewTouchManager.java index 866a3aae3..6419a63fc 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/CameraViewTouchManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/CameraViewTouchManager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.annotation.SuppressLint; import android.graphics.PointF; @@ -12,8 +12,8 @@ import android.view.ScaleGestureDetector; import android.view.ViewConfiguration; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.camerax.CameraController; -import com.quark.quamera.render.view.CameraXPreviewView; +import com.ola.olamera.camerax.CameraController; +import com.ola.olamera.render.view.CameraXPreviewView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ForwardingLiveData.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ForwardingLiveData.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ForwardingLiveData.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ForwardingLiveData.java index 77c0997d5..745b57b27 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ForwardingLiveData.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ForwardingLiveData.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ICameraViewTouchManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ICameraViewTouchManager.java similarity index 90% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ICameraViewTouchManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ICameraViewTouchManager.java index 8971edd0d..617a0ac7a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/ICameraViewTouchManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/ICameraViewTouchManager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.util.Size; import android.view.MotionEvent; @@ -8,7 +8,7 @@ import androidx.camera.core.FocusMeteringResult; import androidx.camera.core.SurfaceRequest; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.camerax.CameraController; +import com.ola.olamera.camerax.CameraController; /** * @author : liujian diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/OnGestureDetectorListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/OnGestureDetectorListener.java similarity index 84% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/OnGestureDetectorListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/OnGestureDetectorListener.java index b82b8e82b..4c7dc11b6 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/OnGestureDetectorListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/OnGestureDetectorListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; /** * 点击对焦的事件回调 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewTransformation.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewTransformation.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewTransformation.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewTransformation.java index cb0a877dc..1d8708b32 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewTransformation.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewTransformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.annotation.SuppressLint; import android.graphics.Bitmap; @@ -31,8 +31,8 @@ import android.view.SurfaceView; import android.view.TextureView; import android.view.View; -import com.quark.quamera.camerax.controller.internal.compat.quirk.PreviewOneThirdWiderQuirk; -import com.quark.quamera.camerax.controller.internal.compat.quirk.TextureViewRotationQuirk; +import com.ola.olamera.camerax.controller.internal.compat.quirk.PreviewOneThirdWiderQuirk; +import com.ola.olamera.camerax.controller.internal.compat.quirk.TextureViewRotationQuirk; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewViewMeteringPointFactory.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewViewMeteringPointFactory.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewViewMeteringPointFactory.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewViewMeteringPointFactory.java index db4b46425..c51537d64 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/PreviewViewMeteringPointFactory.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/PreviewViewMeteringPointFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.graphics.Matrix; import android.graphics.PointF; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/RotationReceiver.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/RotationReceiver.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/RotationReceiver.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/RotationReceiver.java index 02da6b660..896dafadc 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/RotationReceiver.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/RotationReceiver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.content.Context; import android.view.OrientationEventListener; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/TransformUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/TransformUtils.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/TransformUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/TransformUtils.java index 1ac010122..5a433d86e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/TransformUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/TransformUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller; +package com.ola.olamera.camerax.controller; import android.graphics.Matrix; import android.graphics.Rect; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java index 7b161e858..8ed8d4fd6 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirks.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller.internal.compat.quirk; +package com.ola.olamera.camerax.controller.internal.compat.quirk; import android.annotation.SuppressLint; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java index c838ff5c0..17f92e0d3 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/DeviceQuirksLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller.internal.compat.quirk; +package com.ola.olamera.camerax.controller.internal.compat.quirk; import java.util.ArrayList; import java.util.List; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java index d3b1a5b17..66ad599d2 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/PreviewOneThirdWiderQuirk.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller.internal.compat.quirk; +package com.ola.olamera.camerax.controller.internal.compat.quirk; import android.os.Build; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java similarity index 94% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java index e796167cd..a5b1a0c90 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/SurfaceViewStretchedQuirk.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller.internal.compat.quirk; +package com.ola.olamera.camerax.controller.internal.compat.quirk; import android.os.Build; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java index 369cdd370..db3ecfd3e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/controller/internal/compat/quirk/TextureViewRotationQuirk.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.controller.internal.compat.quirk; +package com.ola.olamera.camerax.controller.internal.compat.quirk; import android.os.Build; import android.view.TextureView; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/filter/CameraIdLensFacingCameraFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/filter/CameraIdLensFacingCameraFilter.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/filter/CameraIdLensFacingCameraFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/filter/CameraIdLensFacingCameraFilter.java index 69f706626..84cd48f6d 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/filter/CameraIdLensFacingCameraFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/filter/CameraIdLensFacingCameraFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.filter; +package com.ola.olamera.camerax.filter; import android.annotation.SuppressLint; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/CameraXCaptureResultManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/CameraXCaptureResultManager.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/CameraXCaptureResultManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/CameraXCaptureResultManager.java index 648ea9c6e..1b72bd706 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/CameraXCaptureResultManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/CameraXCaptureResultManager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.utils; +package com.ola.olamera.camerax.utils; /* * * Creation : 2021/5/26 @@ -10,9 +10,9 @@ import android.hardware.camera2.CaptureResult; import android.os.Build; import android.util.Log; -import com.quark.quamera.render.DefaultCameraRender; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraReflection; +import com.ola.olamera.render.DefaultCameraRender; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraReflection; import java.lang.ref.WeakReference; import java.lang.reflect.Field; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/FocalLengthInfo.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/FocalLengthInfo.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/FocalLengthInfo.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/FocalLengthInfo.java index 0e5204c70..1e680fb85 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/FocalLengthInfo.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/FocalLengthInfo.java @@ -1,4 +1,4 @@ -package com.quark.quamera.camerax.utils; +package com.ola.olamera.camerax.utils; public class FocalLengthInfo implements Comparable { public float focalLength = Float.MAX_VALUE; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/SingleThreadHandlerExecutor.java b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/SingleThreadHandlerExecutor.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/SingleThreadHandlerExecutor.java rename to mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/SingleThreadHandlerExecutor.java index 09a4ce948..24cd9228a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/camerax/utils/SingleThreadHandlerExecutor.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/camerax/utils/SingleThreadHandlerExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.quark.quamera.camerax.utils; +package com.ola.olamera.camerax.utils; import android.os.Handler; import android.os.HandlerThread; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/proguard.pgcfg b/mediapipe/render/android/camera/java/com/ola/olamera/proguard.pgcfg similarity index 100% rename from mediapipe/render/android/camera/java/com/quark/quamera/proguard.pgcfg rename to mediapipe/render/android/camera/java/com/ola/olamera/proguard.pgcfg diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag b/mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag new file mode 100644 index 000000000..8a668a78d --- /dev/null +++ b/mediapipe/render/android/camera/java/com/ola/olamera/rbga_2_yuv_frag.frag @@ -0,0 +1,63 @@ +precision highp float; +precision highp int; +varying vec2 textureCoordinate; +uniform sampler2D inputImageTexture; +uniform float inputImageTextureWidth; +uniform float inputImageTextureHeight; +float cY(float x,float y){ + vec4 c=texture2D(inputImageTexture,vec2(x,y)); + return 0.183 * c.r + 0.614 * c.g + 0.062 * c.b + 0.0625; +} + +vec4 cC(float x,float y,float dx,float dy){ + vec4 c0=texture2D(inputImageTexture,vec2(x,y)); + vec4 c1=texture2D(inputImageTexture,vec2(x+dx,y)); + vec4 c2=texture2D(inputImageTexture,vec2(x,y+dy)); + vec4 c3=texture2D(inputImageTexture,vec2(x+dx,y+dy)); + return (c0+c1+c2+c3)/4.; +} + +float cU(float x,float y,float dx,float dy){ + vec4 c=cC(x,y,dx,dy); + return -0.101 * c.r - 0.339 * c.g + 0.439 * c.b + 0.5000; +} + +float cV(float x,float y,float dx,float dy){ + vec4 c=cC(x,y,dx,dy); + return 0.439 * c.r - 0.399 * c.g - 0.040 * c.b + 0.5000; +} + +vec2 cPos(float t,float shiftx,float gy){ + vec2 pos=vec2(floor(inputImageTextureWidth*textureCoordinate.x),floor(inputImageTextureHeight*gy)); + return vec2(mod(pos.x*shiftx,inputImageTextureWidth),(pos.y*shiftx+floor(pos.x*shiftx/inputImageTextureWidth))*t); +} + +vec4 calculateY(){ + vec2 pos=cPos(1.,4.,textureCoordinate.y); + vec4 oColor=vec4(0); + float textureYPos=pos.y/inputImageTextureHeight; + oColor[0]=cY(pos.x/inputImageTextureWidth,textureYPos); + oColor[1]=cY((pos.x+1.)/inputImageTextureWidth,textureYPos); + oColor[2]=cY((pos.x+2.)/inputImageTextureWidth,textureYPos); + oColor[3]=cY((pos.x+3.)/inputImageTextureWidth,textureYPos); + return oColor; +} +vec4 calculateUV(float dx,float dy){ + vec2 pos=cPos(2.,4.,textureCoordinate.y-0.2500); + vec4 oColor=vec4(0); + float textureYPos=pos.y/inputImageTextureHeight; + oColor[0]= cV(pos.x/inputImageTextureWidth,textureYPos,dx,dy); + oColor[1]= cU(pos.x/inputImageTextureWidth,textureYPos,dx,dy); + oColor[2]= cV((pos.x+2.)/inputImageTextureWidth,textureYPos,dx,dy); + oColor[3]= cU((pos.x+2.)/inputImageTextureWidth,textureYPos,dx,dy); + return oColor; +} +void main() { + if(textureCoordinate.y<0.2500){ + gl_FragColor=calculateY(); + }else if(textureCoordinate.y<0.3750){ + gl_FragColor=calculateUV(1./inputImageTextureWidth,1./inputImageTextureHeight); + }else{ + gl_FragColor=vec4(0,0,0,0); + } +} \ No newline at end of file diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderExecutor.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderExecutor.java similarity index 83% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderExecutor.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderExecutor.java index 5c6b56153..6c76a9109 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderExecutor.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderExecutor.java @@ -1,11 +1,11 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; /* * * Creation : 2021/4/13 * Author : jiaming.wjm@ */ -import com.quark.quamera.render.view.AndroidGLSurfaceView; +import com.ola.olamera.render.view.AndroidGLSurfaceView; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderPipe.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderPipe.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderPipe.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderPipe.java index c482593d5..6be073b3e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/CameraVideoRenderPipe.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/CameraVideoRenderPipe.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.annotation.TargetApi; import android.content.Context; @@ -12,17 +12,17 @@ import android.os.SystemClock; import android.util.Log; import android.util.Rational; -import com.quark.quamera.camera.preview.ViewPort; -import com.quark.quamera.render.entry.FrameDetectData; -import com.quark.quamera.render.entry.RenderFlowData; -import com.quark.quamera.render.expansion.IRenderExpansion; -import com.quark.quamera.render.photo.ExportPhoto; -import com.quark.quamera.render.photo.SnapShotCommand; -import com.quark.quamera.render.view.AndroidGLSurfaceView; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.ImageUtils; +import com.ola.olamera.camera.preview.ViewPort; +import com.ola.olamera.render.entry.FrameDetectData; +import com.ola.olamera.render.entry.RenderFlowData; +import com.ola.olamera.render.expansion.IRenderExpansion; +import com.ola.olamera.render.photo.ExportPhoto; +import com.ola.olamera.render.photo.SnapShotCommand; +import com.ola.olamera.render.view.AndroidGLSurfaceView; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.ImageUtils; import java.util.ArrayList; import java.util.List; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/CropFboFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/CropFboFilter.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/CropFboFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/CropFboFilter.java index 8c14b6830..4fab4a776 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/CropFboFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/CropFboFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.annotation.TargetApi; import android.graphics.Bitmap; @@ -7,9 +7,9 @@ import android.opengl.GLES20; import android.opengl.Matrix; import android.util.Log; -import com.quark.quamera.util.GlCommonUtil; -import com.quark.quamera.util.MatrixUtils; -import com.quark.quamera.util.OpenGlUtils; +import com.ola.olamera.util.GlCommonUtil; +import com.ola.olamera.util.MatrixUtils; +import com.ola.olamera.util.OpenGlUtils; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/DefaultCameraRender.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/DefaultCameraRender.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/DefaultCameraRender.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/DefaultCameraRender.java index bc8167647..138b6e319 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/DefaultCameraRender.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/DefaultCameraRender.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; /* * * Creation : 2021/1/26 @@ -10,17 +10,17 @@ import android.os.Build; import android.os.SystemClock; import android.util.Log; -import com.quark.quamera.camera.camera.Camera2CameraImpl; -import com.quark.quamera.camera.camera.CameraState; -import com.quark.quamera.camera.camera.ICameraStateListener; -import com.quark.quamera.camera.preview.SurfaceTextureWrapper; -import com.quark.quamera.camera.session.CameraCaptureCallback; -import com.quark.quamera.camera.session.CameraCaptureComboCallback; -import com.quark.quamera.camera.session.CameraCaptureResult; -import com.quark.quamera.camerax.utils.CameraXCaptureResultManager; -import com.quark.quamera.util.Camera2CaptureResultManager; -import com.quark.quamera.util.CameraInit; -import com.quark.quamera.util.CameraShould; +import com.ola.olamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.camera.camera.CameraState; +import com.ola.olamera.camera.camera.ICameraStateListener; +import com.ola.olamera.camera.preview.SurfaceTextureWrapper; +import com.ola.olamera.camera.session.CameraCaptureCallback; +import com.ola.olamera.camera.session.CameraCaptureComboCallback; +import com.ola.olamera.camera.session.CameraCaptureResult; +import com.ola.olamera.camerax.utils.CameraXCaptureResultManager; +import com.ola.olamera.util.Camera2CaptureResultManager; +import com.ola.olamera.util.CameraInit; +import com.ola.olamera.util.CameraShould; import java.util.Map; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/GLConstant.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/GLConstant.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/GLConstant.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/GLConstant.java index 0cc9b39c5..b492611de 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/GLConstant.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/GLConstant.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; public class GLConstant { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/GlFboFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/GlFboFilter.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/GlFboFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/GlFboFilter.java index c2650afb4..2c63f8ab4 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/GlFboFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/GlFboFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.annotation.TargetApi; import android.graphics.Bitmap; @@ -8,14 +8,14 @@ import android.opengl.GLES20; import android.util.Log; -import com.quark.quamera.util.GlCommonUtil; -import com.quark.quamera.util.MatrixUtils; -import com.quark.quamera.util.OpenGlUtils; +import com.ola.olamera.util.GlCommonUtil; +import com.ola.olamera.util.MatrixUtils; +import com.ola.olamera.util.OpenGlUtils; import java.nio.FloatBuffer; import java.util.LinkedList; -import static com.quark.quamera.render.CropFboFilter.doSnapshot; +import static com.ola.olamera.render.CropFboFilter.doSnapshot; @TargetApi(18) diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraRender.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraRender.java similarity index 86% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraRender.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraRender.java index 2349c825f..ad98ca3b1 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraRender.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraRender.java @@ -1,8 +1,8 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.opengl.EGLContext; -import com.quark.quamera.camera.camera.Camera2CameraImpl; +import com.ola.olamera.camera.camera.Camera2CameraImpl; import java.util.Map; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraShowViewChangeListener.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraShowViewChangeListener.java similarity index 85% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraShowViewChangeListener.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraShowViewChangeListener.java index 2b83ea094..a0bd0a221 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/ICameraShowViewChangeListener.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/ICameraShowViewChangeListener.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; /* * * Creation : 2021/7/27 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/IGLFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/IGLFilter.java similarity index 86% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/IGLFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/IGLFilter.java index 6cf081c0a..b21938827 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/IGLFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/IGLFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; /* * * Creation : 2021/1/28 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/ScreenRenderFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/ScreenRenderFilter.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/ScreenRenderFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/ScreenRenderFilter.java index 0bb1a55fc..90124b6c9 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/ScreenRenderFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/ScreenRenderFilter.java @@ -1,13 +1,13 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.annotation.TargetApi; import android.opengl.GLES11Ext; import android.opengl.GLES20; import android.opengl.Matrix; -import com.quark.quamera.util.GlCommonUtil; -import com.quark.quamera.util.MatrixUtils; -import com.quark.quamera.util.OpenGlUtils; +import com.ola.olamera.util.GlCommonUtil; +import com.ola.olamera.util.MatrixUtils; +import com.ola.olamera.util.OpenGlUtils; import java.nio.FloatBuffer; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/SnapshotFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/SnapshotFilter.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/SnapshotFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/SnapshotFilter.java index 38e1f0438..41fe83609 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/SnapshotFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/SnapshotFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render; +package com.ola.olamera.render; import android.annotation.TargetApi; import android.graphics.Bitmap; @@ -8,19 +8,19 @@ import android.opengl.GLES11Ext; import android.opengl.GLES20; import android.util.Log; -import com.quark.quamera.render.photo.ExportPhoto; -import com.quark.quamera.render.photo.SnapShotCommand; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.GlCommonUtil; -import com.quark.quamera.util.MatrixUtils; -import com.quark.quamera.util.OpenGlUtils; +import com.ola.olamera.render.photo.ExportPhoto; +import com.ola.olamera.render.photo.SnapShotCommand; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.GlCommonUtil; +import com.ola.olamera.util.MatrixUtils; +import com.ola.olamera.util.OpenGlUtils; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.LinkedList; -import static com.quark.quamera.render.ScreenRenderFilter.getVexPositionMatrix; +import static com.ola.olamera.render.ScreenRenderFilter.getVexPositionMatrix; @TargetApi(18) diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumer.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumer.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumer.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumer.java index ae6aeab6b..37f9ad83b 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumer.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumer.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * @@ -20,15 +20,15 @@ import android.view.Surface; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.anotaion.ExecutedBy; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; +import com.ola.olamera.camera.anotaion.ExecutedBy; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import static com.quark.quamera.render.detector.AlgTextureConsumer.OutputType.NV21; +import static com.ola.olamera.render.detector.AlgTextureConsumer.OutputType.NV21; @RequiresApi(api = Build.VERSION_CODES.KITKAT) diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumerCompat.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumerCompat.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumerCompat.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumerCompat.java index c613efacb..f06c8f3c6 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/AlgTextureConsumerCompat.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/AlgTextureConsumerCompat.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/29 @@ -11,8 +11,8 @@ import android.os.Build; import androidx.annotation.NonNull; -import com.quark.quamera.render.entry.RenderFlowData; -import com.quark.quamera.render.expansion.IRenderExpansion; +import com.ola.olamera.render.entry.RenderFlowData; +import com.ola.olamera.render.expansion.IRenderExpansion; public class AlgTextureConsumerCompat implements IAlgTextureConsumer, IRenderExpansion { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/BaseAlgDetector.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/BaseAlgDetector.java similarity index 94% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/BaseAlgDetector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/BaseAlgDetector.java index 2ad3904ea..c97d8e1b4 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/BaseAlgDetector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/BaseAlgDetector.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/29 @@ -10,7 +10,7 @@ import androidx.annotation.GuardedBy; public abstract class BaseAlgDetector implements IAlgDetector { - @GuardedBy("mStateLock") + // @GuardedBy("mStateLock") protected volatile State mState = State.UNINITIALIZED; @Override diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/GLAlgSurfaceProcessPipe.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/GLAlgSurfaceProcessPipe.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/GLAlgSurfaceProcessPipe.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/GLAlgSurfaceProcessPipe.java index f11fa74fb..325043d2a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/GLAlgSurfaceProcessPipe.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/GLAlgSurfaceProcessPipe.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; import android.content.Context; import android.opengl.EGL14; @@ -9,9 +9,9 @@ import android.opengl.EGLExt; import android.opengl.EGLSurface; import android.view.Surface; -import com.quark.quamera.render.GlFboFilter; -import com.quark.quamera.render.ScreenRenderFilter; -import com.quark.quamera.render.view.BasePreviewView; +import com.ola.olamera.render.GlFboFilter; +import com.ola.olamera.render.ScreenRenderFilter; +import com.ola.olamera.render.view.BasePreviewView; public class GLAlgSurfaceProcessPipe { diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgDetector.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgDetector.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgDetector.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgDetector.java index c3975cf8d..406a1bbc0 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgDetector.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgDetector.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/29 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgTextureConsumer.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgTextureConsumer.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgTextureConsumer.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgTextureConsumer.java index 7db6f9404..e431c1897 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/IAlgTextureConsumer.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/IAlgTextureConsumer.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/29 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/NV21RenderExpansion.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/NV21RenderExpansion.java similarity index 95% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/NV21RenderExpansion.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/NV21RenderExpansion.java index ae85d7513..c50c0d8b7 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/NV21RenderExpansion.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/NV21RenderExpansion.java @@ -1,19 +1,19 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/12/22 * Author : jiaming.wjm@ */ -import static com.quark.quamera.render.detector.IAlgDetector.InputDataType.NV21; +import static com.ola.olamera.render.detector.IAlgDetector.InputDataType.NV21; import android.content.Context; import android.opengl.EGL14; import androidx.annotation.NonNull; -import com.quark.quamera.render.entry.RenderFlowData; -import com.quark.quamera.render.expansion.IRenderExpansion; +import com.ola.olamera.render.entry.RenderFlowData; +import com.ola.olamera.render.expansion.IRenderExpansion; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/RenderExpansionManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/RenderExpansionManager.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/RenderExpansionManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/RenderExpansionManager.java index c4e831ca4..1390719e3 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/RenderExpansionManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/RenderExpansionManager.java @@ -1,21 +1,21 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/29 * Author : jiaming.wjm@ */ -import static com.quark.quamera.render.detector.IAlgDetector.InputDataType.NV21; +import static com.ola.olamera.render.detector.IAlgDetector.InputDataType.NV21; import android.content.Context; import android.opengl.EGL14; import androidx.annotation.NonNull; -import com.quark.quamera.render.entry.RenderFlowData; -import com.quark.quamera.render.expansion.IRenderExpansion; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.CollectionUtil; +import com.ola.olamera.render.entry.RenderFlowData; +import com.ola.olamera.render.expansion.IRenderExpansion; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.CollectionUtil; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/Rgba2YuvFilter.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/Rgba2YuvFilter.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/detector/Rgba2YuvFilter.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/detector/Rgba2YuvFilter.java index b15a4e97c..860f1d79b 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/detector/Rgba2YuvFilter.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/detector/Rgba2YuvFilter.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.detector; +package com.ola.olamera.render.detector; /* * * Creation : 2021/1/26 @@ -10,11 +10,10 @@ import android.opengl.GLES20; import android.util.Log; -import com.quark.quamera.R; -import com.quark.quamera.render.IGLFilter; -import com.quark.quamera.util.GlCommonUtil; -import com.quark.quamera.util.MatrixUtils; -import com.quark.quamera.util.OpenGlUtils; +import com.ola.olamera.render.IGLFilter; +import com.ola.olamera.util.GlCommonUtil; +import com.ola.olamera.util.MatrixUtils; +import com.ola.olamera.util.OpenGlUtils; import java.nio.FloatBuffer; import java.util.Locale; @@ -100,11 +99,11 @@ public class Rgba2YuvFilter implements IGLFilter { private void loadShaderAndParams() { if (RGBA_2_YUV_VERTEX == null) { - RGBA_2_YUV_VERTEX = OpenGlUtils.readRawShaderFile(mContext, R.raw.rgba_2_yuv_vertex); + RGBA_2_YUV_VERTEX = OpenGlUtils.readRawShaderFile(mContext, "rgba_2_yuv_vertex.vert"); } if (RGBA_2_YUV_FRAGMENT == null) { - RGBA_2_YUV_FRAGMENT = OpenGlUtils.readRawShaderFile(mContext, R.raw.rbga_2_yuv_frag); + RGBA_2_YUV_FRAGMENT = OpenGlUtils.readRawShaderFile(mContext, "rbga_2_yuv_frag.frag"); } checkGlError("initSH_S"); diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/entry/FrameDetectData.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/entry/FrameDetectData.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/entry/FrameDetectData.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/entry/FrameDetectData.java index 7c5374e2a..3cdb42831 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/entry/FrameDetectData.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/entry/FrameDetectData.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.entry; +package com.ola.olamera.render.entry; /* * * Creation : 2021/3/15 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/entry/RenderFlowData.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/entry/RenderFlowData.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/entry/RenderFlowData.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/entry/RenderFlowData.java index 66f72624d..f069e7f8a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/entry/RenderFlowData.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/entry/RenderFlowData.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package com.quark.quamera.render.entry; +package com.ola.olamera.render.entry; import java.util.HashMap; import java.util.LinkedList; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/GLThread.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/GLThread.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/GLThread.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/GLThread.java index edc929b0d..94646cbc4 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/GLThread.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/GLThread.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.quark.quamera.render.expansion; +package com.ola.olamera.render.expansion; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.METHOD; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IAlgDetectRender.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IAlgDetectRender.java similarity index 59% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IAlgDetectRender.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IAlgDetectRender.java index fcac5c883..b35f7c1ed 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IAlgDetectRender.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IAlgDetectRender.java @@ -1,11 +1,11 @@ -package com.quark.quamera.render.expansion; +package com.ola.olamera.render.expansion; /* * * Creation : 2021/3/15 * Author : jiaming.wjm@ */ -import com.quark.quamera.render.entry.FrameDetectData; +import com.ola.olamera.render.entry.FrameDetectData; public interface IAlgDetectRender { FrameDetectData getDetectData(); diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IRenderExpansion.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IRenderExpansion.java similarity index 88% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IRenderExpansion.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IRenderExpansion.java index 4a6dec677..af11ff36a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/IRenderExpansion.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/IRenderExpansion.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.expansion; +package com.ola.olamera.render.expansion; /* * * Creation : 2021/2/25 @@ -7,7 +7,7 @@ package com.quark.quamera.render.expansion; import androidx.annotation.NonNull; -import com.quark.quamera.render.entry.RenderFlowData; +import com.ola.olamera.render.entry.RenderFlowData; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/RenderExpansion.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/RenderExpansion.java similarity index 76% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/RenderExpansion.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/RenderExpansion.java index 4a112c404..05d8c5d93 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/expansion/RenderExpansion.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/expansion/RenderExpansion.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.expansion; +package com.ola.olamera.render.expansion; /* * * Creation : 2021/12/15 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/photo/ExportPhoto.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/photo/ExportPhoto.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/photo/ExportPhoto.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/photo/ExportPhoto.java index fd5f5d0d8..306804f5d 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/photo/ExportPhoto.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/photo/ExportPhoto.java @@ -3,11 +3,11 @@ // (powered by Fernflower decompiler) // -package com.quark.quamera.render.photo; +package com.ola.olamera.render.photo; import android.graphics.Bitmap; -import com.quark.quamera.render.entry.FrameDetectData; +import com.ola.olamera.render.entry.FrameDetectData; import java.util.ArrayList; import java.util.List; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/photo/SnapShotCommand.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/photo/SnapShotCommand.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/photo/SnapShotCommand.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/photo/SnapShotCommand.java index 1859a509a..a00b8f23c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/photo/SnapShotCommand.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/photo/SnapShotCommand.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package com.quark.quamera.render.photo; +package com.ola.olamera.render.photo; import android.graphics.Matrix; import android.graphics.Rect; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/AndroidGLSurfaceView.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/AndroidGLSurfaceView.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/view/AndroidGLSurfaceView.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/view/AndroidGLSurfaceView.java index 590cbee4a..ef28d5c49 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/AndroidGLSurfaceView.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/AndroidGLSurfaceView.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.view; +package com.ola.olamera.render.view; /* * Copyright (C) 2008 The Android Open Source Project diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/BasePreviewView.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/BasePreviewView.java similarity index 92% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/view/BasePreviewView.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/view/BasePreviewView.java index 066de3789..55605130c 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/BasePreviewView.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/BasePreviewView.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.view; +package com.ola.olamera.render.view; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -18,17 +18,17 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.quark.quamera.camera.preview.IPreviewView; -import com.quark.quamera.camera.preview.ViewPort; -import com.quark.quamera.camerax.controller.OnGestureDetectorListener; -import com.quark.quamera.render.CameraVideoRenderExecutor; -import com.quark.quamera.render.CameraVideoRenderPipe; -import com.quark.quamera.render.detector.RenderExpansionManager; -import com.quark.quamera.render.expansion.IRenderExpansion; -import com.quark.quamera.render.photo.SnapShotCommand; -import com.quark.quamera.util.CameraLogger; -import com.quark.quamera.util.CameraShould; -import com.quark.quamera.util.Should; +import com.ola.olamera.camera.preview.IPreviewView; +import com.ola.olamera.camera.preview.ViewPort; +import com.ola.olamera.camerax.controller.OnGestureDetectorListener; +import com.ola.olamera.render.CameraVideoRenderExecutor; +import com.ola.olamera.render.CameraVideoRenderPipe; +import com.ola.olamera.render.detector.RenderExpansionManager; +import com.ola.olamera.render.expansion.IRenderExpansion; +import com.ola.olamera.render.photo.SnapShotCommand; +import com.ola.olamera.util.CameraLogger; +import com.ola.olamera.util.CameraShould; +import com.ola.olamera.util.Should; import java.util.concurrent.Executor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraVideoView.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraVideoView.java similarity index 90% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraVideoView.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraVideoView.java index e09c8a7d6..578a6eb9a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraVideoView.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraVideoView.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.view; +package com.ola.olamera.render.view; import android.annotation.SuppressLint; @@ -8,10 +8,10 @@ import android.util.AttributeSet; import android.view.Surface; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.camera.preview.IPreviewSurfaceProvider; -import com.quark.quamera.camera.preview.SurfaceTextureWrapper; -import com.quark.quamera.render.DefaultCameraRender; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.preview.IPreviewSurfaceProvider; +import com.ola.olamera.camera.preview.SurfaceTextureWrapper; +import com.ola.olamera.render.DefaultCameraRender; +import com.ola.olamera.util.CameraLogger; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraXPreviewView.java b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraXPreviewView.java similarity index 91% rename from mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraXPreviewView.java rename to mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraXPreviewView.java index 9cd73ea96..48c7fb54e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/render/view/CameraXPreviewView.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/render/view/CameraXPreviewView.java @@ -1,4 +1,4 @@ -package com.quark.quamera.render.view; +package com.ola.olamera.render.view; import android.annotation.SuppressLint; @@ -10,14 +10,14 @@ import android.util.Size; import android.view.MotionEvent; import com.google.common.util.concurrent.ListenableFuture; -import com.quark.quamera.camera.preview.IPreviewSurfaceProvider; -import com.quark.quamera.camera.preview.SurfaceTextureWrapper; -import com.quark.quamera.camerax.CameraController; -import com.quark.quamera.camerax.controller.CameraViewTouchManager; -import com.quark.quamera.camerax.controller.ICameraViewTouchManager; -import com.quark.quamera.camerax.controller.OnGestureDetectorListener; -import com.quark.quamera.render.DefaultCameraRender; -import com.quark.quamera.util.CameraLogger; +import com.ola.olamera.camera.preview.IPreviewSurfaceProvider; +import com.ola.olamera.camera.preview.SurfaceTextureWrapper; +import com.ola.olamera.camerax.CameraController; +import com.ola.olamera.camerax.controller.CameraViewTouchManager; +import com.ola.olamera.camerax.controller.ICameraViewTouchManager; +import com.ola.olamera.camerax.controller.OnGestureDetectorListener; +import com.ola.olamera.render.DefaultCameraRender; +import com.ola.olamera.util.CameraLogger; import androidx.annotation.AnyThread; import androidx.annotation.GuardedBy; @@ -40,7 +40,7 @@ public class CameraXPreviewView extends BasePreviewView { private static final String TAG = "CameraPreviewView"; private ICameraViewTouchManager mManager; - @GuardedBy("mSurfaceLock") + // @GuardedBy("mSurfaceLock") private DefaultCameraRender mDefaultCameraRender; diff --git a/mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert b/mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert new file mode 100644 index 000000000..7510e1936 --- /dev/null +++ b/mediapipe/render/android/camera/java/com/ola/olamera/rgba_2_yuv_vertex.vert @@ -0,0 +1,11 @@ + attribute vec4 position; + attribute vec4 inputTextureCoordinate; + uniform mat4 mvp; + + varying vec2 textureCoordinate; + + void main() + { + gl_Position = mvp * position; + textureCoordinate = inputTextureCoordinate.xy; + } \ No newline at end of file diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/ArrayUtil.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/ArrayUtil.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/ArrayUtil.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/ArrayUtil.java index 48719aad3..574313df6 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/ArrayUtil.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/ArrayUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.quark.quamera.util; +package com.ola.olamera.util; import androidx.annotation.RestrictTo; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/Camera2CaptureResultManager.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/Camera2CaptureResultManager.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/Camera2CaptureResultManager.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/Camera2CaptureResultManager.java index caa2f9c6d..b14e7470a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/Camera2CaptureResultManager.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/Camera2CaptureResultManager.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 2021/5/26 @@ -11,8 +11,8 @@ import android.util.Log; import androidx.annotation.RequiresApi; -import com.quark.quamera.camera.session.CameraCaptureResult; -import com.quark.quamera.render.DefaultCameraRender; +import com.ola.olamera.camera.session.CameraCaptureResult; +import com.ola.olamera.render.DefaultCameraRender; import java.lang.ref.WeakReference; import java.lang.reflect.Field; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraInit.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraInit.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/CameraInit.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/CameraInit.java index 6f3b835fa..9aa2d1e90 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraInit.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraInit.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 2021/4/15 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraLogger.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraLogger.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/CameraLogger.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/CameraLogger.java index 8faf198ac..db134c87a 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraLogger.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraLogger.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 20-11-19 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraReflection.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraReflection.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/CameraReflection.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/CameraReflection.java index a390cd1bd..e1e7d1ed9 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraReflection.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraReflection.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraShould.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraShould.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/CameraShould.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/CameraShould.java index 920ec70d5..be0e2cad0 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/CameraShould.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/CameraShould.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import android.text.TextUtils; import android.util.Log; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/CollectionUtil.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/CollectionUtil.java similarity index 98% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/CollectionUtil.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/CollectionUtil.java index 083729a8d..ad5755da9 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/CollectionUtil.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/CollectionUtil.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import androidx.annotation.RestrictTo; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/GlCommonUtil.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/GlCommonUtil.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/GlCommonUtil.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/GlCommonUtil.java index 0cdd935c4..ba4ec9583 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/GlCommonUtil.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/GlCommonUtil.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package com.quark.quamera.util; +package com.ola.olamera.util; import android.annotation.TargetApi; import android.graphics.Bitmap; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/IOUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/IOUtils.java similarity index 93% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/IOUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/IOUtils.java index 4424aa9c2..943e72480 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/IOUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/IOUtils.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 2021/2/20 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/ImageUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/ImageUtils.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/ImageUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/ImageUtils.java index 9b6b2aa3a..5c10324f7 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/ImageUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/ImageUtils.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 2021/7/13 @@ -15,7 +15,7 @@ import android.util.Log; import android.util.Rational; import android.util.Size; -import com.quark.quamera.camera.preview.ViewPort; +import com.ola.olamera.camera.preview.ViewPort; import androidx.annotation.IntRange; import androidx.annotation.NonNull; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/MatrixUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/MatrixUtils.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/MatrixUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/MatrixUtils.java index 956d00a5c..709f1b78e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/MatrixUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/MatrixUtils.java @@ -3,7 +3,7 @@ // (powered by Fernflower decompiler) // -package com.quark.quamera.util; +package com.ola.olamera.util; import android.opengl.Matrix; import android.os.Build; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/OpenGlUtils.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/OpenGlUtils.java similarity index 84% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/OpenGlUtils.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/OpenGlUtils.java index 97590821c..6658c838e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/OpenGlUtils.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/OpenGlUtils.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import android.content.Context; import android.opengl.Matrix; @@ -18,13 +18,15 @@ import java.nio.FloatBuffer; public class OpenGlUtils { - public static String readRawShaderFile(Context context, int shareId) { + public static String readRawShaderFile(Context context, String fileName) { BufferedReader br = null; String line; StringBuffer sb = new StringBuffer(); try { - InputStream is = context.getResources().openRawResource(shareId); + // InputStream is = context.getResources().openRawResource(shareId); + InputStream is = context.getResources().getAssets().open(fileName); + br = new BufferedReader(new InputStreamReader(is)); while ((line = br.readLine()) != null) { sb.append(line); diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/Preconditions.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/Preconditions.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/Preconditions.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/Preconditions.java index f17417a9c..bf0e66e3e 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/Preconditions.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/Preconditions.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import androidx.annotation.RestrictTo; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/SequentialExecutor.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/SequentialExecutor.java similarity index 97% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/SequentialExecutor.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/SequentialExecutor.java index 1d9fb00db..b850c7a62 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/SequentialExecutor.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/SequentialExecutor.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; /* * * Creation : 20-11-13 diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/Should.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/Should.java similarity index 99% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/Should.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/Should.java index 2242f19c9..dbfa57f95 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/Should.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/Should.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import android.text.TextUtils; import android.util.Log; diff --git a/mediapipe/render/android/camera/java/com/quark/quamera/util/TestOnly.java b/mediapipe/render/android/camera/java/com/ola/olamera/util/TestOnly.java similarity index 96% rename from mediapipe/render/android/camera/java/com/quark/quamera/util/TestOnly.java rename to mediapipe/render/android/camera/java/com/ola/olamera/util/TestOnly.java index 32d6e2b38..53ab05e57 100644 --- a/mediapipe/render/android/camera/java/com/quark/quamera/util/TestOnly.java +++ b/mediapipe/render/android/camera/java/com/ola/olamera/util/TestOnly.java @@ -1,4 +1,4 @@ -package com.quark.quamera.util; +package com.ola.olamera.util; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/mediapipe/render/demo/android/java/com/quark/quamerademo/ActivityCameraSession.java b/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java similarity index 89% rename from mediapipe/render/demo/android/java/com/quark/quamerademo/ActivityCameraSession.java rename to mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java index fec2a146f..dc33c5e3a 100644 --- a/mediapipe/render/demo/android/java/com/quark/quamerademo/ActivityCameraSession.java +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/ActivityCameraSession.java @@ -1,4 +1,4 @@ -package com.quark.quamerademo; +package com.ola.quamerademo; /* * * Creation : 20-11-25 @@ -23,24 +23,24 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.quark.quamera.camera.Camera2Manager; -import com.quark.quamera.camera.camera.CameraState; -import com.quark.quamera.camera.concurrent.MainThreadExecutor; -import com.quark.quamera.camera.preview.IPreviewSurfaceProvider; -import com.quark.quamera.camera.preview.IPreviewView; -import com.quark.quamera.camera.preview.SurfaceTextureWrapper; -import com.quark.quamera.camera.session.CameraCaptureCallback; -import com.quark.quamera.camera.session.CameraCaptureCallbackHandlerWrapper; -import com.quark.quamera.camera.session.CameraCaptureResult; -import com.quark.quamera.camera.session.CameraSelector; -import com.quark.quamera.camera.session.PreviewConfig; -import com.quark.quamera.camera.session.SessionConfig; -import com.quark.quamera.camera.session.UserCameraSession; -import com.quark.quamera.render.DefaultCameraRender; -import com.quark.quamera.render.detector.IAlgTextureConsumer; -import com.quark.quamera.render.photo.ExportPhoto; -import com.quark.quamera.render.photo.SnapShotCommand; -import com.quark.quamera.render.view.CameraVideoView; +import com.ola.olamera.camera.Camera2Manager; +import com.ola.olamera.camera.camera.CameraState; +import com.ola.olamera.camera.concurrent.MainThreadExecutor; +import com.ola.olamera.camera.preview.IPreviewSurfaceProvider; +import com.ola.olamera.camera.preview.IPreviewView; +import com.ola.olamera.camera.preview.SurfaceTextureWrapper; +import com.ola.olamera.camera.session.CameraCaptureCallback; +import com.ola.olamera.camera.session.CameraCaptureCallbackHandlerWrapper; +import com.ola.olamera.camera.session.CameraCaptureResult; +import com.ola.olamera.camera.session.CameraSelector; +import com.ola.olamera.camera.session.PreviewConfig; +import com.ola.olamera.camera.session.SessionConfig; +import com.ola.olamera.camera.session.UserCameraSession; +import com.ola.olamera.render.DefaultCameraRender; +import com.ola.olamera.render.detector.IAlgTextureConsumer; +import com.ola.olamera.render.photo.ExportPhoto; +import com.ola.olamera.render.photo.SnapShotCommand; +import com.ola.olamera.render.view.CameraVideoView; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/mediapipe/render/demo/android/java/com/quark/quamerademo/AndroidManifest.xml b/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml similarity index 95% rename from mediapipe/render/demo/android/java/com/quark/quamerademo/AndroidManifest.xml rename to mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml index 18ea30302..9401d3ed7 100644 --- a/mediapipe/render/demo/android/java/com/quark/quamerademo/AndroidManifest.xml +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/mediapipe/render/demo/android/java/com/quark/quamerademo/BUILD b/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD similarity index 92% rename from mediapipe/render/demo/android/java/com/quark/quamerademo/BUILD rename to mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD index 1be8863b7..884a06fb9 100644 --- a/mediapipe/render/demo/android/java/com/quark/quamerademo/BUILD +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/BUILD @@ -36,7 +36,7 @@ android_binary( srcs = glob(["*.java"]), assets = [], assets_dir = "", - manifest = "//mediapipe/render/demo/android/java/com/quark/quamerademo:AndroidManifest.xml", + manifest = "//mediapipe/render/demo/android/java/com/ola/quamerademo:AndroidManifest.xml", multidex = "native", deps = [ ":ola_render_jni_lib", diff --git a/mediapipe/render/demo/android/java/com/quark/quamerademo/MainActivity.java b/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java similarity index 96% rename from mediapipe/render/demo/android/java/com/quark/quamerademo/MainActivity.java rename to mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java index 7ff9d0187..daed689dc 100644 --- a/mediapipe/render/demo/android/java/com/quark/quamerademo/MainActivity.java +++ b/mediapipe/render/demo/android/java/com/ola/olamerademo/MainActivity.java @@ -1,4 +1,4 @@ -package com.quark.quamerademo; +package com.ola.quamerademo; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; @@ -9,7 +9,7 @@ import android.Manifest; import android.content.pm.PackageManager; import android.os.Bundle; -import com.quark.quamera.render.view.CameraVideoView; +import com.ola.olamera.render.view.CameraVideoView; public class MainActivity extends AppCompatActivity { diff --git a/mediapipe/render/module/beauty/android/framework/AndroidManifest.xml b/mediapipe/render/module/beauty/android/framework/AndroidManifest.xml index 5a1f8ccd0..190870960 100644 --- a/mediapipe/render/module/beauty/android/framework/AndroidManifest.xml +++ b/mediapipe/render/module/beauty/android/framework/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.ola.olamera"> diff --git a/third_party/BUILD b/third_party/BUILD index e2044cfd9..a5b69f88d 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -245,6 +245,20 @@ android_library( ], ) +android_library( + name = "androidx_lifecycle_common", + exports = [ + "@maven//:androidx_lifecycle_lifecycle_common", + ], +) +android_library( + name = "androidx_lifecycle_runtime", + exports = [ + "@maven//:androidx_lifecycle_lifecycle_runtime", + ], +) + + android_library( name = "androidx_legacy_support_v4", exports = [ @@ -280,6 +294,21 @@ android_library( ], ) +android_library( + name = "lifecycle_livedata", + exports = [ + "@maven//:androidx_lifecycle_lifecycle_livedata", + ], +) + +android_library( + name = "lifecycle_livedata_core", + exports = [ + "@maven//:androidx_lifecycle_lifecycle_livedata_core", + ], +) + + android_library( name = "camerax_lifecycle", exports = [