diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java index 3866dd70..e10f608e 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java @@ -31,7 +31,7 @@ import com.otaliastudios.cameraview.frame.FrameProcessor; import com.otaliastudios.cameraview.size.SizeSelectors; import com.otaliastudios.cameraview.tools.Emulator; import com.otaliastudios.cameraview.tools.Op; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.WorkerHandler; import com.otaliastudios.cameraview.overlay.Overlay; import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.tools.Retry; @@ -45,7 +45,6 @@ import androidx.test.rule.GrantPermissionRule; import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentMatcher; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfilesTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfilesTest.java index 169e1c48..0e21d72c 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfilesTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfilesTest.java @@ -8,6 +8,7 @@ import androidx.test.filters.SmallTest; import com.otaliastudios.cameraview.BaseTest; import com.otaliastudios.cameraview.CameraUtils; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.tools.SdkExclude; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CropHelperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CropHelperTest.java index da016339..fd53ce6c 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CropHelperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/CropHelperTest.java @@ -4,6 +4,7 @@ package com.otaliastudios.cameraview.internal.utils; import android.graphics.Rect; import com.otaliastudios.cameraview.BaseTest; +import com.otaliastudios.cameraview.internal.CropHelper; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/OrientationHelperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/OrientationHelperTest.java index b5fde579..7bc56824 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/OrientationHelperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/OrientationHelperTest.java @@ -6,6 +6,7 @@ import androidx.test.filters.SmallTest; import android.view.OrientationEventListener; import com.otaliastudios.cameraview.BaseTest; +import com.otaliastudios.cameraview.internal.OrientationHelper; import org.junit.After; import org.junit.Before; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/RotationHelperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/RotationHelperTest.java index b2be77bc..829a5b3f 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/RotationHelperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/RotationHelperTest.java @@ -8,6 +8,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.otaliastudios.cameraview.BaseTest; +import com.otaliastudios.cameraview.internal.RotationHelper; import com.otaliastudios.cameraview.size.Size; import org.junit.Test; diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/WorkerHandlerTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/WorkerHandlerTest.java index 57d531c4..f94859ff 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/WorkerHandlerTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/internal/utils/WorkerHandlerTest.java @@ -4,6 +4,7 @@ package com.otaliastudios.cameraview.internal.utils; import com.google.android.gms.tasks.Task; import com.google.android.gms.tasks.Tasks; import com.otaliastudios.cameraview.BaseTest; +import com.otaliastudios.cameraview.internal.WorkerHandler; import com.otaliastudios.cameraview.tools.Op; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java index c6b9f15a..a8380ef1 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java @@ -2,16 +2,6 @@ package com.otaliastudios.cameraview; import android.graphics.ImageFormat; -import android.hardware.Camera; -import android.hardware.camera2.CameraAccessException; -import android.hardware.camera2.CameraCharacteristics; -import android.hardware.camera2.CameraManager; -import android.hardware.camera2.params.StreamConfigurationMap; -import android.media.CamcorderProfile; -import android.media.MediaRecorder; -import android.os.Build; -import android.util.Range; -import android.util.Rational; import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Control; @@ -20,26 +10,21 @@ import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.PictureFormat; import com.otaliastudios.cameraview.controls.Preview; -import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; -import com.otaliastudios.cameraview.engine.mappers.Camera2Mapper; import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Mode; import com.otaliastudios.cameraview.controls.VideoCodec; import com.otaliastudios.cameraview.controls.WhiteBalance; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.List; import java.util.Set; /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java index b12b12b6..17e06cf2 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java @@ -11,8 +11,8 @@ import android.os.Handler; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; -import com.otaliastudios.cameraview.internal.utils.ExifHelper; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.ExifHelper; +import com.otaliastudios.cameraview.internal.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 dec8b883..5dbd656b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -66,8 +66,8 @@ import com.otaliastudios.cameraview.gesture.PinchGestureFinder; import com.otaliastudios.cameraview.gesture.ScrollGestureFinder; import com.otaliastudios.cameraview.gesture.TapGestureFinder; 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.CropHelper; +import com.otaliastudios.cameraview.internal.OrientationHelper; import com.otaliastudios.cameraview.markers.AutoFocusMarker; import com.otaliastudios.cameraview.markers.AutoFocusTrigger; import com.otaliastudios.cameraview.markers.MarkerLayout; 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 069864c3..95549c64 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java @@ -37,7 +37,7 @@ import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Mode; import com.otaliastudios.cameraview.controls.WhiteBalance; -import com.otaliastudios.cameraview.internal.utils.CropHelper; +import com.otaliastudios.cameraview.internal.CropHelper; import com.otaliastudios.cameraview.metering.MeteringRegions; import com.otaliastudios.cameraview.metering.MeteringTransform; import com.otaliastudios.cameraview.picture.Full1PictureRecorder; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java index a3313c85..7e09f588 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java @@ -60,7 +60,7 @@ import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.frame.FrameManager; import com.otaliastudios.cameraview.frame.ImageFrameManager; import com.otaliastudios.cameraview.gesture.Gesture; -import com.otaliastudios.cameraview.internal.utils.CropHelper; +import com.otaliastudios.cameraview.internal.CropHelper; import com.otaliastudios.cameraview.metering.MeteringRegions; import com.otaliastudios.cameraview.picture.Full2PictureRecorder; import com.otaliastudios.cameraview.picture.Snapshot2PictureRecorder; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java index e2c4733d..2817bbdb 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/CameraEngine.java @@ -2,7 +2,6 @@ package com.otaliastudios.cameraview.engine; import android.content.Context; import android.graphics.PointF; -import android.graphics.RectF; import android.location.Location; @@ -29,7 +28,7 @@ import com.otaliastudios.cameraview.engine.offset.Angles; import com.otaliastudios.cameraview.engine.offset.Reference; import com.otaliastudios.cameraview.frame.Frame; import com.otaliastudios.cameraview.frame.FrameManager; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.WorkerHandler; import com.otaliastudios.cameraview.picture.PictureRecorder; import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.controls.Audio; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera1Options.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera1Options.java index af629578..40266e84 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera1Options.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera1Options.java @@ -13,7 +13,7 @@ import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.PictureFormat; import com.otaliastudios.cameraview.controls.WhiteBalance; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera2Options.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera2Options.java index 91a37a0d..43c99876 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera2Options.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/options/Camera2Options.java @@ -21,7 +21,7 @@ import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.PictureFormat; import com.otaliastudios.cameraview.controls.WhiteBalance; import com.otaliastudios.cameraview.engine.mappers.Camera2Mapper; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/orchestrator/CameraOrchestrator.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/orchestrator/CameraOrchestrator.java index 45166288..d703eabf 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/orchestrator/CameraOrchestrator.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/orchestrator/CameraOrchestrator.java @@ -8,7 +8,7 @@ import com.google.android.gms.tasks.Task; import com.google.android.gms.tasks.TaskCompletionSource; import com.google.android.gms.tasks.Tasks; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.WorkerHandler; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/CamcorderProfiles.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/CamcorderProfiles.java index 93ec596e..9ea2f933 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/CamcorderProfiles.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import android.annotation.SuppressLint; import android.media.CamcorderProfile; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/CropHelper.java similarity index 96% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/CropHelper.java index f7f71ee7..649acc80 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/CropHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import android.graphics.Rect; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/ExifHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/ExifHelper.java similarity index 96% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/ExifHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/ExifHelper.java index a890124f..8a150419 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/ExifHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/ExifHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import androidx.exifinterface.media.ExifInterface; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/OrientationHelper.java similarity index 99% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/OrientationHelper.java index 36c5f1d5..de47526a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/OrientationHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import android.content.Context; import android.hardware.SensorManager; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/Pool.java similarity index 98% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/Pool.java index d7c8b57c..5010b15b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/Pool.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import com.otaliastudios.cameraview.CameraLogger; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/RotationHelper.java similarity index 97% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/RotationHelper.java index bed0f90c..88225e25 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/RotationHelper.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/WorkerHandler.java similarity index 99% rename from cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java rename to cameraview/src/main/java/com/otaliastudios/cameraview/internal/WorkerHandler.java index 81743f8d..e5cb9702 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/WorkerHandler.java @@ -1,4 +1,4 @@ -package com.otaliastudios.cameraview.internal.utils; +package com.otaliastudios.cameraview.internal; import android.os.Handler; import android.os.HandlerThread; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java index 7690419b..1260015a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full1PictureRecorder.java @@ -4,10 +4,9 @@ import android.hardware.Camera; import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.engine.Camera1Engine; -import com.otaliastudios.cameraview.internal.utils.ExifHelper; +import com.otaliastudios.cameraview.internal.ExifHelper; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.exifinterface.media.ExifInterface; import java.io.ByteArrayInputStream; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java index f4ed71c7..10ea5775 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Full2PictureRecorder.java @@ -15,8 +15,8 @@ import com.otaliastudios.cameraview.engine.Camera2Engine; import com.otaliastudios.cameraview.engine.action.Action; import com.otaliastudios.cameraview.engine.action.ActionHolder; import com.otaliastudios.cameraview.engine.action.BaseAction; -import com.otaliastudios.cameraview.internal.utils.ExifHelper; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.ExifHelper; +import com.otaliastudios.cameraview.internal.WorkerHandler; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot1PictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot1PictureRecorder.java index 71104f4e..ab4533d3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot1PictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/Snapshot1PictureRecorder.java @@ -7,9 +7,9 @@ import android.hardware.Camera; import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.offset.Reference; -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.internal.CropHelper; +import com.otaliastudios.cameraview.internal.RotationHelper; +import com.otaliastudios.cameraview.internal.WorkerHandler; import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.Size; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java index 29f359ef..76d6c3f5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotGlPictureRecorder.java @@ -19,8 +19,8 @@ import com.otaliastudios.cameraview.engine.offset.Reference; 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.WorkerHandler; +import com.otaliastudios.cameraview.internal.CropHelper; +import com.otaliastudios.cameraview.internal.WorkerHandler; import com.otaliastudios.cameraview.overlay.OverlayDrawer; import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.RendererFrameCallback; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full1VideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full1VideoRecorder.java index f3b6e740..ecb4caab 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full1VideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full1VideoRecorder.java @@ -6,7 +6,7 @@ import android.media.MediaRecorder; import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.engine.Camera1Engine; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full2VideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full2VideoRecorder.java index 71e7e47a..3a99ef9e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full2VideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/Full2VideoRecorder.java @@ -12,7 +12,7 @@ import com.otaliastudios.cameraview.engine.action.Action; import com.otaliastudios.cameraview.engine.action.ActionHolder; import com.otaliastudios.cameraview.engine.action.BaseAction; import com.otaliastudios.cameraview.engine.action.CompletionCallback; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java index b52f40ee..c5a4a4e3 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java @@ -8,7 +8,7 @@ import com.otaliastudios.cameraview.VideoResult; import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.VideoCodec; import com.otaliastudios.cameraview.internal.DeviceEncoders; -import com.otaliastudios.cameraview.internal.utils.CamcorderProfiles; +import com.otaliastudios.cameraview.internal.CamcorderProfiles; import com.otaliastudios.cameraview.size.Size; import androidx.annotation.NonNull; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java index 41db0fee..20e0a42b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.video.encoding; -import com.otaliastudios.cameraview.internal.utils.Pool; +import com.otaliastudios.cameraview.internal.Pool; import java.nio.ByteBuffer; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java index d8124e47..a4cd6513 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java @@ -1,6 +1,6 @@ package com.otaliastudios.cameraview.video.encoding; -import com.otaliastudios.cameraview.internal.utils.Pool; +import com.otaliastudios.cameraview.internal.Pool; /** * A simple {@link Pool(int, Factory)} implementation for input buffers. diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java index 43be4d05..1b234a91 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.WorkerHandler; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java index 744bf6a6..09d093e5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java @@ -4,10 +4,9 @@ import android.annotation.SuppressLint; import android.media.MediaFormat; import android.media.MediaMuxer; import android.os.Build; -import android.text.format.DateFormat; import com.otaliastudios.cameraview.CameraLogger; -import com.otaliastudios.cameraview.internal.utils.WorkerHandler; +import com.otaliastudios.cameraview.internal.WorkerHandler; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java index d1a145a4..19919ff4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java @@ -3,7 +3,7 @@ package com.otaliastudios.cameraview.video.encoding; import android.media.MediaCodec; import android.os.Build; -import com.otaliastudios.cameraview.internal.utils.Pool; +import com.otaliastudios.cameraview.internal.Pool; import androidx.annotation.RequiresApi; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java index 66df9bab..61d495cf 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java @@ -13,7 +13,7 @@ import com.otaliastudios.cameraview.filter.Filter; 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.Pool; +import com.otaliastudios.cameraview.internal.Pool; /** * Default implementation for video encoding. diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/ExifHelperTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/ExifHelperTest.java index 319f2096..4e56073e 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/ExifHelperTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/ExifHelperTest.java @@ -3,6 +3,8 @@ package com.otaliastudios.cameraview.internal.utils; import androidx.exifinterface.media.ExifInterface; +import com.otaliastudios.cameraview.internal.ExifHelper; + import org.junit.Test; import static junit.framework.Assert.assertNotNull; diff --git a/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/PoolTest.java b/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/PoolTest.java index 90fb874c..4dbf0f7b 100644 --- a/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/PoolTest.java +++ b/cameraview/src/test/java/com/otaliastudios/cameraview/internal/utils/PoolTest.java @@ -1,6 +1,8 @@ package com.otaliastudios.cameraview.internal.utils; +import com.otaliastudios.cameraview.internal.Pool; + import org.junit.After; import org.junit.Before; import org.junit.Test;