From 0d69df4b4ee1c3837b3e57476d67c29fb7ab155f Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Fri, 21 Jun 2019 09:23:43 -0500 Subject: [PATCH] Repackage everything else --- cameraview/build.gradle | 5 ----- .../com/otaliastudios/cameraview/BaseTest.java | 14 ++++---------- .../cameraview/CameraLoggerTest.java | 2 ++ .../cameraview/CameraOptions1Test.java | 2 ++ .../cameraview/CameraPreviewTest.java | 1 + .../otaliastudios/cameraview/CameraUtilsTest.java | 2 ++ .../cameraview/CameraViewCallbacksTest.java | 3 +++ .../otaliastudios/cameraview/CameraViewTest.java | 2 ++ .../otaliastudios/cameraview/CropHelperTest.java | 1 + .../cameraview/GestureLayoutTest.java | 1 + .../cameraview/GridLinesLayoutTest.java | 1 + .../otaliastudios/cameraview/IntegrationTest.java | 4 ++++ .../com/otaliastudios/cameraview/Mapper1Test.java | 2 ++ .../cameraview/OrientationHelperTest.java | 2 ++ .../cameraview/PictureRecorderTest.java | 2 ++ .../cameraview/VideoRecorderTest.java | 2 ++ .../cameraview/WorkerHandlerTest.java | 3 +++ .../otaliastudios/cameraview/EncoderThread.java | 3 --- .../otaliastudios/cameraview/BitmapCallback.java | 0 .../otaliastudios/cameraview/CameraLogger.java | 0 .../otaliastudios/cameraview/CameraOptions.java | 2 ++ .../com/otaliastudios/cameraview/CameraUtils.java | 2 ++ .../com/otaliastudios/cameraview/CameraView.java | 6 ++++++ .../otaliastudios/cameraview/FileCallback.java | 0 .../otaliastudios/cameraview/RendererThread.java | 3 --- .../cameraview/engine/Camera1Engine.java | 2 +- .../cameraview/{ => engine}/Mapper.java | 2 +- .../cameraview/{ => engine}/Mapper1.java | 2 +- .../cameraview/{ => frame}/Frame.java | 2 +- .../cameraview/{ => frame}/FrameManager.java | 2 +- .../cameraview/{ => frame}/FrameProcessor.java | 4 +++- .../{ => internal}/GridLinesLayout.java | 3 ++- .../cameraview/internal/egl}/EglBaseSurface.java | 4 +++- .../cameraview/internal/egl}/EglCore.java | 2 +- .../cameraview/internal/egl}/EglElement.java | 4 +++- .../cameraview/internal/egl}/EglViewport.java | 5 +++-- .../internal/egl}/EglWindowSurface.java | 2 +- .../{ => internal/utils}/CamcorderProfiles.java | 2 +- .../cameraview/internal/utils}/CropHelper.java | 2 +- .../internal/utils}/OrientationHelper.java | 2 +- .../cameraview/internal/utils}/Pool.java | 4 +++- .../internal/utils}/RotationHelper.java | 2 +- .../cameraview/internal/utils}/Task.java | 2 +- .../cameraview/internal/utils}/WorkerHandler.java | 4 +++- .../{ => picture}/FullPictureRecorder.java | 7 ++++++- .../cameraview/{ => picture}/PictureRecorder.java | 4 +++- .../{ => picture}/SnapshotPictureRecorder.java | 13 +++++++++++-- .../cameraview/preview/RendererThread.java | 3 +++ .../cameraview/{ => video}/FullVideoRecorder.java | 12 ++++++++---- .../{ => video}/SnapshotVideoRecorder.java | 15 +++++++++++---- .../cameraview/{ => video}/VideoRecorder.java | 2 +- .../video/encoding}/AudioMediaEncoder.java | 6 ++++-- .../video/encoding}/ByteBufferPool.java | 4 +++- .../cameraview/video/encoding/EncoderThread.java | 3 +++ .../cameraview/video/encoding}/InputBuffer.java | 2 +- .../video/encoding}/InputBufferPool.java | 4 ++-- .../video/encoding}/MediaCodecBuffers.java | 2 +- .../cameraview/video/encoding}/MediaEncoder.java | 6 ++++-- .../video/encoding}/MediaEncoderEngine.java | 5 ++++- .../cameraview/video/encoding}/OutputBuffer.java | 2 +- .../video/encoding}/OutputBufferPool.java | 4 +++- .../video/encoding}/TextureMediaEncoder.java | 8 +++++++- .../video/encoding}/VideoMediaEncoder.java | 2 +- .../cameraview/FrameManagerTest.java | 2 ++ .../com/otaliastudios/cameraview/FrameTest.java | 2 ++ 65 files changed, 157 insertions(+), 68 deletions(-) delete mode 100644 cameraview/src/main/gles/com/otaliastudios/cameraview/EncoderThread.java rename cameraview/src/main/{utils => java}/com/otaliastudios/cameraview/BitmapCallback.java (100%) rename cameraview/src/main/{utils => java}/com/otaliastudios/cameraview/CameraLogger.java (100%) rename cameraview/src/main/{utils => java}/com/otaliastudios/cameraview/CameraUtils.java (99%) rename cameraview/src/main/{utils => java}/com/otaliastudios/cameraview/FileCallback.java (100%) delete mode 100644 cameraview/src/main/java/com/otaliastudios/cameraview/RendererThread.java rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => engine}/Mapper.java (93%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => engine}/Mapper1.java (98%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => frame}/Frame.java (98%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => frame}/FrameManager.java (98%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => frame}/FrameProcessor.java (90%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => internal}/GridLinesLayout.java (96%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/egl}/EglBaseSurface.java (98%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/egl}/EglCore.java (99%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/egl}/EglElement.java (97%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/egl}/EglViewport.java (98%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/egl}/EglWindowSurface.java (98%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => internal/utils}/CamcorderProfiles.java (98%) rename cameraview/src/main/{utils/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/CropHelper.java (95%) rename cameraview/src/main/{utils/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/OrientationHelper.java (97%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/Pool.java (95%) rename cameraview/src/main/{utils/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/RotationHelper.java (97%) rename cameraview/src/main/{utils/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/Task.java (96%) rename cameraview/src/main/{utils/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/internal/utils}/WorkerHandler.java (96%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => picture}/FullPictureRecorder.java (92%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => picture}/PictureRecorder.java (91%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => picture}/SnapshotPictureRecorder.java (94%) create mode 100644 cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererThread.java rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => video}/FullVideoRecorder.java (90%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => video}/SnapshotVideoRecorder.java (89%) rename cameraview/src/main/java/com/otaliastudios/cameraview/{ => video}/VideoRecorder.java (95%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/AudioMediaEncoder.java (98%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/ByteBufferPool.java (77%) create mode 100644 cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/EncoderThread.java rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/InputBuffer.java (76%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/InputBufferPool.java (73%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/MediaCodecBuffers.java (96%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/MediaEncoder.java (98%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/MediaEncoderEngine.java (98%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/OutputBuffer.java (75%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/OutputBufferPool.java (82%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/TextureMediaEncoder.java (94%) rename cameraview/src/main/{gles/com/otaliastudios/cameraview => java/com/otaliastudios/cameraview/video/encoding}/VideoMediaEncoder.java (98%) diff --git a/cameraview/build.gradle b/cameraview/build.gradle index ffca450f..08238ef7 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -30,11 +30,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - sourceSets { - main.java.srcDirs += 'src/main/utils' - main.java.srcDirs += 'src/main/gles' - } } dependencies { diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java index 769c78d4..a2363b2c 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java @@ -3,19 +3,17 @@ package com.otaliastudios.cameraview; import android.app.KeyguardManager; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Rect; -import android.graphics.YuvImage; import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; -import androidx.test.annotation.UiThreadTest; -import androidx.test.espresso.core.internal.deps.guava.collect.ObjectArrays; + import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.rule.ActivityTestRule; + import android.view.View; +import com.otaliastudios.cameraview.internal.utils.Task; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -24,17 +22,13 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.mockito.stubbing.Stubber; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.util.concurrent.CountDownLatch; import static android.content.Context.KEYGUARD_SERVICE; import static android.content.Context.POWER_SERVICE; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class BaseTest { diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraLoggerTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraLoggerTest.java index 8a3dcbbb..43b562c0 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraLoggerTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraLoggerTest.java @@ -1,6 +1,8 @@ package com.otaliastudios.cameraview; +import com.otaliastudios.cameraview.internal.utils.Task; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java index 175891af..15c3e52d 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java @@ -6,6 +6,8 @@ import android.hardware.Camera; import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; +import com.otaliastudios.cameraview.engine.Mapper; +import com.otaliastudios.cameraview.engine.Mapper1; import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Hdr; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraPreviewTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraPreviewTest.java index 81ac3e55..7c62e844 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraPreviewTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraPreviewTest.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.test.rule.ActivityTestRule; import android.view.ViewGroup; +import com.otaliastudios.cameraview.internal.utils.Task; import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java index d87d2064..314c874c 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java @@ -6,6 +6,8 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.Color; +import com.otaliastudios.cameraview.internal.utils.Task; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java index 1dacdf10..ed407677 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java @@ -11,8 +11,11 @@ import android.view.ViewGroup; import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.engine.CameraEngine; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.gesture.GestureAction; +import com.otaliastudios.cameraview.internal.utils.Task; import com.otaliastudios.cameraview.preview.CameraPreview; import org.junit.After; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java index 2bfa4be1..bb92b31a 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java @@ -15,6 +15,8 @@ import com.otaliastudios.cameraview.controls.ControlParser; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.engine.CameraEngine; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.controls.Grid; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CropHelperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CropHelperTest.java index be36e795..7330d5ef 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CropHelperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CropHelperTest.java @@ -3,6 +3,7 @@ package com.otaliastudios.cameraview; import android.graphics.Rect; +import com.otaliastudios.cameraview.internal.utils.CropHelper; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GestureLayoutTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GestureLayoutTest.java index b5cd720d..65eec527 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GestureLayoutTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GestureLayoutTest.java @@ -12,6 +12,7 @@ import android.view.View; import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.gesture.GestureLayout; +import com.otaliastudios.cameraview.internal.utils.Task; import org.hamcrest.Matchers; import org.junit.Before; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GridLinesLayoutTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GridLinesLayoutTest.java index c151fe40..fb951982 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GridLinesLayoutTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/GridLinesLayoutTest.java @@ -2,6 +2,7 @@ package com.otaliastudios.cameraview; import com.otaliastudios.cameraview.controls.Grid; +import com.otaliastudios.cameraview.internal.GridLinesLayout; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.MediumTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java index 7855ce16..2e073c74 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java @@ -13,6 +13,10 @@ import com.otaliastudios.cameraview.controls.Mode; import com.otaliastudios.cameraview.controls.WhiteBalance; import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.CameraEngine; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameProcessor; +import com.otaliastudios.cameraview.internal.utils.Task; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/Mapper1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/Mapper1Test.java index 30338923..882683bd 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/Mapper1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/Mapper1Test.java @@ -7,6 +7,8 @@ import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.WhiteBalance; +import com.otaliastudios.cameraview.engine.Mapper; +import com.otaliastudios.cameraview.engine.Mapper1; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java index ff251639..e2baf05e 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java @@ -5,6 +5,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import android.view.OrientationEventListener; +import com.otaliastudios.cameraview.internal.utils.OrientationHelper; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureRecorderTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureRecorderTest.java index 9264dfd4..ecae5d2b 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureRecorderTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureRecorderTest.java @@ -1,6 +1,8 @@ package com.otaliastudios.cameraview; +import com.otaliastudios.cameraview.picture.PictureRecorder; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/VideoRecorderTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/VideoRecorderTest.java index 32de8692..f77ce6c1 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/VideoRecorderTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/VideoRecorderTest.java @@ -1,6 +1,8 @@ package com.otaliastudios.cameraview; +import com.otaliastudios.cameraview.video.VideoRecorder; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/WorkerHandlerTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/WorkerHandlerTest.java index 3f1f386d..a9c05ca3 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/WorkerHandlerTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/WorkerHandlerTest.java @@ -1,6 +1,9 @@ package com.otaliastudios.cameraview; +import com.otaliastudios.cameraview.internal.utils.Task; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EncoderThread.java b/cameraview/src/main/gles/com/otaliastudios/cameraview/EncoderThread.java deleted file mode 100644 index 3ccfcc51..00000000 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EncoderThread.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.otaliastudios.cameraview; - -@interface EncoderThread {} diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/BitmapCallback.java b/cameraview/src/main/java/com/otaliastudios/cameraview/BitmapCallback.java similarity index 100% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/BitmapCallback.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/BitmapCallback.java diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraLogger.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraLogger.java similarity index 100% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/CameraLogger.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraLogger.java diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java index 88219070..fe303975 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java @@ -9,6 +9,8 @@ import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Control; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; +import com.otaliastudios.cameraview.engine.Mapper; +import com.otaliastudios.cameraview.engine.Mapper1; import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Hdr; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java similarity index 99% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java index 80ccea00..11cb0eec 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/CameraUtils.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java @@ -9,6 +9,8 @@ import android.hardware.Camera; import android.os.Handler; import com.otaliastudios.cameraview.controls.Facing; +import com.otaliastudios.cameraview.engine.Mapper1; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index c442df70..39be18d0 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -35,6 +35,8 @@ import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.CameraEngine; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.controls.Grid; @@ -48,6 +50,10 @@ import com.otaliastudios.cameraview.gesture.GestureParser; import com.otaliastudios.cameraview.gesture.PinchGestureLayout; import com.otaliastudios.cameraview.gesture.ScrollGestureLayout; import com.otaliastudios.cameraview.gesture.TapGestureLayout; +import com.otaliastudios.cameraview.internal.GridLinesLayout; +import com.otaliastudios.cameraview.internal.utils.CropHelper; +import com.otaliastudios.cameraview.internal.utils.OrientationHelper; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.SurfaceCameraPreview; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/FileCallback.java b/cameraview/src/main/java/com/otaliastudios/cameraview/FileCallback.java similarity index 100% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/FileCallback.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/FileCallback.java diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/RendererThread.java b/cameraview/src/main/java/com/otaliastudios/cameraview/RendererThread.java deleted file mode 100644 index adb78e91..00000000 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/RendererThread.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.otaliastudios.cameraview; - -@interface RendererThread {} diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java index ace6df28..8243f371 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java @@ -19,7 +19,7 @@ import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraOptions; import com.otaliastudios.cameraview.CameraView; import com.otaliastudios.cameraview.CropHelper; -import com.otaliastudios.cameraview.Frame; +import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.FullPictureRecorder; import com.otaliastudios.cameraview.FullVideoRecorder; import com.otaliastudios.cameraview.GlCameraPreview; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper.java similarity index 93% rename from cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper.java index 87432753..3a0494fd 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.engine; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper1.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/Mapper1.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper1.java index b186bf41..6f953727 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper1.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.engine; import android.hardware.Camera; import android.os.Build; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Frame.java b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/Frame.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/Frame.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/frame/Frame.java index 5c162eef..8a174952 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Frame.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/Frame.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.frame; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/FrameManager.java b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameManager.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/FrameManager.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameManager.java index 7042ce07..e2404762 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/FrameManager.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameManager.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.frame; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/FrameProcessor.java b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameProcessor.java similarity index 90% rename from cameraview/src/main/java/com/otaliastudios/cameraview/FrameProcessor.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameProcessor.java index d428ac83..22ae5f99 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/FrameProcessor.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameProcessor.java @@ -1,4 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.frame; + +import com.otaliastudios.cameraview.CameraView; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/GridLinesLayout.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/GridLinesLayout.java similarity index 96% rename from cameraview/src/main/java/com/otaliastudios/cameraview/GridLinesLayout.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/GridLinesLayout.java index d7faf122..0425227b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/GridLinesLayout.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/GridLinesLayout.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal; import android.content.Context; import android.graphics.Canvas; @@ -13,6 +13,7 @@ import android.util.TypedValue; import android.view.View; import com.otaliastudios.cameraview.controls.Grid; +import com.otaliastudios.cameraview.internal.utils.Task; class GridLinesLayout extends View { diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglBaseSurface.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglBaseSurface.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/EglBaseSurface.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglBaseSurface.java index 4e3393e2..9b9c0b86 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglBaseSurface.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglBaseSurface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.egl; import android.graphics.Bitmap; import android.opengl.EGL14; @@ -24,6 +24,8 @@ import android.os.Build; import androidx.annotation.RequiresApi; import android.util.Log; +import com.otaliastudios.cameraview.CameraLogger; + import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglCore.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglCore.java similarity index 99% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/EglCore.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglCore.java index 62f1f6d9..761f363d 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglCore.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglCore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.egl; import android.graphics.SurfaceTexture; import android.opengl.EGL14; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglElement.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglElement.java similarity index 97% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/EglElement.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglElement.java index 64b08d1d..8af7787d 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglElement.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglElement.java @@ -1,9 +1,11 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.egl; import android.opengl.GLES20; import android.opengl.Matrix; +import com.otaliastudios.cameraview.CameraLogger; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglViewport.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/EglViewport.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java index 25a5da28..314cf468 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglViewport.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java @@ -1,9 +1,10 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.egl; import android.opengl.GLES11Ext; import android.opengl.GLES20; -import android.opengl.Matrix; + +import com.otaliastudios.cameraview.CameraLogger; import java.nio.FloatBuffer; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglWindowSurface.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglWindowSurface.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/EglWindowSurface.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglWindowSurface.java index 7daeeffd..9e47afbc 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/EglWindowSurface.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglWindowSurface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.egl; import android.graphics.SurfaceTexture; import android.os.Build; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CamcorderProfiles.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/CamcorderProfiles.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java index 26147a20..bd896f5c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CamcorderProfiles.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import android.annotation.SuppressLint; import android.media.CamcorderProfile; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/CropHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java similarity index 95% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/CropHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java index 768a0172..b143da6d 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/CropHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import android.graphics.Rect; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java similarity index 97% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java index ddbbfd40..5b1f79e9 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import android.content.Context; import android.hardware.SensorManager; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/Pool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java similarity index 95% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/Pool.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java index 36ffaf22..5b9e3dcd 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/Pool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java @@ -1,4 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; + +import com.otaliastudios.cameraview.CameraLogger; import java.util.concurrent.LinkedBlockingQueue; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java similarity index 97% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java index 311968ff..f538371e 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/RotationHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/Task.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Task.java similarity index 96% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/Task.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Task.java index 61750c94..991e57b1 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/Task.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Task.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java similarity index 96% rename from cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java index aeb1e040..bbb24218 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java @@ -1,9 +1,11 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.internal.utils; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; +import com.otaliastudios.cameraview.CameraLogger; + import androidx.annotation.NonNull; import java.lang.ref.WeakReference; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/FullPictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/FullPictureRecorder.java similarity index 92% rename from cameraview/src/main/java/com/otaliastudios/cameraview/FullPictureRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/picture/FullPictureRecorder.java index 0f6a98ed..97e2c925 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/FullPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/FullPictureRecorder.java @@ -1,6 +1,11 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.picture; import android.hardware.Camera; + +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.CameraUtils; +import com.otaliastudios.cameraview.PictureResult; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.exifinterface.media.ExifInterface; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/PictureRecorder.java similarity index 91% rename from cameraview/src/main/java/com/otaliastudios/cameraview/PictureRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/picture/PictureRecorder.java index b703ce56..3568ce1f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/PictureRecorder.java @@ -1,4 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.picture; + +import com.otaliastudios.cameraview.PictureResult; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotPictureRecorder.java similarity index 94% rename from cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotPictureRecorder.java index fdc5b7e5..33cd5786 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotPictureRecorder.java @@ -1,6 +1,5 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.picture; -import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.graphics.Bitmap; import android.graphics.ImageFormat; @@ -12,11 +11,21 @@ import android.opengl.EGL14; import android.opengl.EGLContext; import android.opengl.Matrix; import android.os.Build; + +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.CameraEngine; +import com.otaliastudios.cameraview.internal.egl.EglCore; +import com.otaliastudios.cameraview.internal.egl.EglViewport; +import com.otaliastudios.cameraview.internal.egl.EglWindowSurface; +import com.otaliastudios.cameraview.internal.utils.CropHelper; +import com.otaliastudios.cameraview.internal.utils.RotationHelper; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.preview.GlCameraPreview; +import com.otaliastudios.cameraview.preview.RendererThread; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererThread.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererThread.java new file mode 100644 index 00000000..8f071bdb --- /dev/null +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererThread.java @@ -0,0 +1,3 @@ +package com.otaliastudios.cameraview.preview; + +public @interface RendererThread {} diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/FullVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java similarity index 90% rename from cameraview/src/main/java/com/otaliastudios/cameraview/FullVideoRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java index 134bf611..87b7131f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/FullVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java @@ -1,12 +1,16 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video; import android.hardware.Camera; import android.media.CamcorderProfile; import android.media.MediaRecorder; +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.controls.Audio; +import com.otaliastudios.cameraview.controls.VideoCodec; import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.size.Size; +import com.otaliastudios.cameraview.utils.CamcorderProfiles; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -57,9 +61,9 @@ class FullVideoRecorder extends VideoRecorder { } mMediaRecorder.setVideoSize(mSize.getWidth(), mSize.getHeight()); switch (mResult.getVideoCodec()) { - case H_263: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); break; - case H_264: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264); break; - case DEVICE_DEFAULT: mMediaRecorder.setVideoEncoder(mProfile.videoCodec); break; + case VideoCodec.H_263: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); break; + case VideoCodec.H_264: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264); break; + case VideoCodec.DEVICE_DEFAULT: mMediaRecorder.setVideoEncoder(mProfile.videoCodec); break; } if (mResult.videoBitRate <= 0) { mMediaRecorder.setVideoEncodingBitRate(mProfile.videoBitRate); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java similarity index 89% rename from cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java index 35294bd5..d1952781 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java @@ -1,11 +1,18 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video; import android.graphics.SurfaceTexture; import android.opengl.EGL14; import android.os.Build; +import com.otaliastudios.cameraview.AudioMediaEncoder; +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.MediaEncoderEngine; +import com.otaliastudios.cameraview.TextureMediaEncoder; +import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.controls.Audio; +import com.otaliastudios.cameraview.controls.VideoCodec; import com.otaliastudios.cameraview.preview.GlCameraPreview; +import com.otaliastudios.cameraview.preview.RendererThread; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; @@ -75,9 +82,9 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren height = height % 2 == 0 ? height : height + 1; String type = ""; switch (mResult.codec) { - case H_263: type = "video/3gpp"; break; // MediaFormat.MIMETYPE_VIDEO_H263; - case H_264: type = "video/avc"; break; // MediaFormat.MIMETYPE_VIDEO_AVC: - case DEVICE_DEFAULT: type = "video/avc"; break; + case VideoCodec.H_263: type = "video/3gpp"; break; // MediaFormat.MIMETYPE_VIDEO_H263; + case VideoCodec.H_264: type = "video/avc"; break; // MediaFormat.MIMETYPE_VIDEO_AVC: + case VideoCodec.DEVICE_DEFAULT: type = "video/avc"; break; } LOG.w("Creating frame encoder. Rotation:", mResult.rotation); TextureMediaEncoder.Config config = new TextureMediaEncoder.Config(width, height, diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/VideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java similarity index 95% rename from cameraview/src/main/java/com/otaliastudios/cameraview/VideoRecorder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java index afd176c4..7febb512 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/VideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java index 32dce9c8..6df5360a 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.annotation.SuppressLint; import android.media.AudioFormat; @@ -11,7 +11,9 @@ import android.media.MediaRecorder; import android.os.Build; import android.os.Handler; import android.os.Message; -import android.util.Log; + +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/ByteBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java similarity index 77% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/ByteBufferPool.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java index 8e2a2aac..87c6ac93 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/ByteBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java @@ -1,4 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; + +import com.otaliastudios.cameraview.utils.Pool; import java.nio.ByteBuffer; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/EncoderThread.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/EncoderThread.java new file mode 100644 index 00000000..2e65d1a7 --- /dev/null +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/EncoderThread.java @@ -0,0 +1,3 @@ +package com.otaliastudios.cameraview.video.encoding; + +@interface EncoderThread {} diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/InputBuffer.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBuffer.java similarity index 76% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/InputBuffer.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBuffer.java index 9cc1369d..dc715699 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/InputBuffer.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBuffer.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import java.nio.ByteBuffer; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/InputBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java similarity index 73% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/InputBufferPool.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java index c99d0780..65f4ebde 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/InputBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java @@ -1,6 +1,6 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; -import java.nio.ByteBuffer; +import com.otaliastudios.cameraview.utils.Pool; class InputBufferPool extends Pool { diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaCodecBuffers.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaCodecBuffers.java similarity index 96% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/MediaCodecBuffers.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaCodecBuffers.java index 4f134b08..3cec938a 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaCodecBuffers.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaCodecBuffers.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.media.MediaCodec; import android.os.Build; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java index e82e8c1e..c0b5023e 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.annotation.SuppressLint; import android.media.MediaCodec; @@ -8,7 +8,9 @@ import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import android.util.Log; + +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.internal.utils.WorkerHandler; import java.nio.ByteBuffer; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoderEngine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoderEngine.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java index 0b9fa771..48b24303 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/MediaEncoderEngine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java @@ -1,8 +1,11 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.media.MediaFormat; import android.media.MediaMuxer; import android.os.Build; + +import com.otaliastudios.cameraview.CameraLogger; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBuffer.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBuffer.java similarity index 75% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBuffer.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBuffer.java index b3f72a97..357e73b8 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBuffer.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBuffer.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.media.MediaCodec; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java similarity index 82% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBufferPool.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java index 9e77f862..301503df 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/OutputBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java @@ -1,7 +1,9 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.media.MediaCodec; +import com.otaliastudios.cameraview.utils.Pool; + class OutputBufferPool extends Pool { OutputBufferPool(final int trackIndex) { diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/TextureMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java similarity index 94% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/TextureMediaEncoder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java index 27e90060..d8ebb6f8 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/TextureMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java @@ -1,9 +1,15 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.opengl.EGLContext; import android.opengl.Matrix; import android.os.Build; +import com.otaliastudios.cameraview.CameraLogger; +import com.otaliastudios.cameraview.internal.egl.EglCore; +import com.otaliastudios.cameraview.internal.egl.EglViewport; +import com.otaliastudios.cameraview.internal.egl.EglWindowSurface; +import com.otaliastudios.cameraview.utils.Pool; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/VideoMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/VideoMediaEncoder.java similarity index 98% rename from cameraview/src/main/gles/com/otaliastudios/cameraview/VideoMediaEncoder.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/VideoMediaEncoder.java index 13c4599a..a17a2328 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/VideoMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/VideoMediaEncoder.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview; +package com.otaliastudios.cameraview.video.encoding; import android.media.MediaCodec; import android.media.MediaCodecInfo; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java index 951d8154..ee92bce9 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java @@ -1,6 +1,8 @@ package com.otaliastudios.cameraview; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameManager; import com.otaliastudios.cameraview.size.Size; import org.junit.After; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java index da23e478..7060779d 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java @@ -3,6 +3,8 @@ package com.otaliastudios.cameraview; import android.graphics.ImageFormat; +import com.otaliastudios.cameraview.frame.Frame; +import com.otaliastudios.cameraview.frame.FrameManager; import com.otaliastudios.cameraview.size.Size; import org.junit.After;