Repackage everything else

pull/482/head
Mattia Iavarone 6 years ago
parent 04b075ee46
commit 0d69df4b4e
  1. 5
      cameraview/build.gradle
  2. 14
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/BaseTest.java
  3. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraLoggerTest.java
  4. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java
  5. 1
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraPreviewTest.java
  6. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java
  7. 3
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewCallbacksTest.java
  8. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraViewTest.java
  9. 1
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CropHelperTest.java
  10. 1
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/GestureLayoutTest.java
  11. 1
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/GridLinesLayoutTest.java
  12. 4
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java
  13. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/Mapper1Test.java
  14. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/OrientationHelperTest.java
  15. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/PictureRecorderTest.java
  16. 2
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/VideoRecorderTest.java
  17. 3
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/WorkerHandlerTest.java
  18. 3
      cameraview/src/main/gles/com/otaliastudios/cameraview/EncoderThread.java
  19. 0
      cameraview/src/main/java/com/otaliastudios/cameraview/BitmapCallback.java
  20. 0
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraLogger.java
  21. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java
  22. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java
  23. 6
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  24. 0
      cameraview/src/main/java/com/otaliastudios/cameraview/FileCallback.java
  25. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/RendererThread.java
  26. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java
  27. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper.java
  28. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Mapper1.java
  29. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/frame/Frame.java
  30. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameManager.java
  31. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/frame/FrameProcessor.java
  32. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/GridLinesLayout.java
  33. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglBaseSurface.java
  34. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglCore.java
  35. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglElement.java
  36. 5
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java
  37. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglWindowSurface.java
  38. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CamcorderProfiles.java
  39. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/CropHelper.java
  40. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/OrientationHelper.java
  41. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Pool.java
  42. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/RotationHelper.java
  43. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/Task.java
  44. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/utils/WorkerHandler.java
  45. 7
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/FullPictureRecorder.java
  46. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/PictureRecorder.java
  47. 13
      cameraview/src/main/java/com/otaliastudios/cameraview/picture/SnapshotPictureRecorder.java
  48. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/RendererThread.java
  49. 12
      cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java
  50. 15
      cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java
  51. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/VideoRecorder.java
  52. 6
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java
  53. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/ByteBufferPool.java
  54. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/EncoderThread.java
  55. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBuffer.java
  56. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/InputBufferPool.java
  57. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaCodecBuffers.java
  58. 6
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java
  59. 5
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java
  60. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBuffer.java
  61. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/OutputBufferPool.java
  62. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java
  63. 2
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/VideoMediaEncoder.java
  64. 2
      cameraview/src/test/java/com/otaliastudios/cameraview/FrameManagerTest.java
  65. 2
      cameraview/src/test/java/com/otaliastudios/cameraview/FrameTest.java

@ -30,11 +30,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
sourceSets {
main.java.srcDirs += 'src/main/utils'
main.java.srcDirs += 'src/main/gles'
}
} }
dependencies { dependencies {

@ -3,19 +3,17 @@ package com.otaliastudios.cameraview;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.YuvImage;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.PowerManager; 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.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import android.view.View; import android.view.View;
import com.otaliastudios.cameraview.internal.utils.Task;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -24,17 +22,13 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.mockito.stubbing.Stubber; import org.mockito.stubbing.Stubber;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import static android.content.Context.KEYGUARD_SERVICE; import static android.content.Context.KEYGUARD_SERVICE;
import static android.content.Context.POWER_SERVICE; import static android.content.Context.POWER_SERVICE;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class BaseTest { public class BaseTest {

@ -1,6 +1,8 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import com.otaliastudios.cameraview.internal.utils.Task;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -6,6 +6,8 @@ import android.hardware.Camera;
import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Audio;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; 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.gesture.GestureAction;
import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Grid;
import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Hdr;

@ -5,6 +5,7 @@ import android.content.Context;
import androidx.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.otaliastudios.cameraview.internal.utils.Task;
import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.preview.CameraPreview;
import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.AspectRatio;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import com.otaliastudios.cameraview.internal.utils.Task;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -11,8 +11,11 @@ import android.view.ViewGroup;
import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Audio;
import com.otaliastudios.cameraview.engine.CameraEngine; 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.Gesture;
import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.gesture.GestureAction;
import com.otaliastudios.cameraview.internal.utils.Task;
import com.otaliastudios.cameraview.preview.CameraPreview; import com.otaliastudios.cameraview.preview.CameraPreview;
import org.junit.After; import org.junit.After;

@ -15,6 +15,8 @@ import com.otaliastudios.cameraview.controls.ControlParser;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;
import com.otaliastudios.cameraview.engine.CameraEngine; 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.Gesture;
import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.gesture.GestureAction;
import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Grid;

@ -3,6 +3,7 @@ package com.otaliastudios.cameraview;
import android.graphics.Rect; import android.graphics.Rect;
import com.otaliastudios.cameraview.internal.utils.CropHelper;
import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.AspectRatio;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -12,6 +12,7 @@ import android.view.View;
import com.otaliastudios.cameraview.gesture.Gesture; import com.otaliastudios.cameraview.gesture.Gesture;
import com.otaliastudios.cameraview.gesture.GestureLayout; import com.otaliastudios.cameraview.gesture.GestureLayout;
import com.otaliastudios.cameraview.internal.utils.Task;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.junit.Before; import org.junit.Before;

@ -2,6 +2,7 @@ package com.otaliastudios.cameraview;
import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Grid;
import com.otaliastudios.cameraview.internal.GridLinesLayout;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;

@ -13,6 +13,10 @@ import com.otaliastudios.cameraview.controls.Mode;
import com.otaliastudios.cameraview.controls.WhiteBalance; import com.otaliastudios.cameraview.controls.WhiteBalance;
import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.Camera1Engine;
import com.otaliastudios.cameraview.engine.CameraEngine; 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 com.otaliastudios.cameraview.size.Size;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

@ -7,6 +7,8 @@ import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;
import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Hdr;
import com.otaliastudios.cameraview.controls.WhiteBalance; 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.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -5,6 +5,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import android.view.OrientationEventListener; import android.view.OrientationEventListener;
import com.otaliastudios.cameraview.internal.utils.OrientationHelper;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

@ -1,6 +1,8 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import com.otaliastudios.cameraview.picture.PictureRecorder;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -1,6 +1,8 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import com.otaliastudios.cameraview.video.VideoRecorder;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -1,6 +1,9 @@
package com.otaliastudios.cameraview; 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.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

@ -1,3 +0,0 @@
package com.otaliastudios.cameraview;
@interface EncoderThread {}

@ -9,6 +9,8 @@ import com.otaliastudios.cameraview.controls.Audio;
import com.otaliastudios.cameraview.controls.Control; import com.otaliastudios.cameraview.controls.Control;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; 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.gesture.GestureAction;
import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Grid;
import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Hdr;

@ -9,6 +9,8 @@ import android.hardware.Camera;
import android.os.Handler; import android.os.Handler;
import com.otaliastudios.cameraview.controls.Facing; 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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;

@ -35,6 +35,8 @@ import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;
import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.Camera1Engine;
import com.otaliastudios.cameraview.engine.CameraEngine; 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.Gesture;
import com.otaliastudios.cameraview.gesture.GestureAction; import com.otaliastudios.cameraview.gesture.GestureAction;
import com.otaliastudios.cameraview.controls.Grid; 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.PinchGestureLayout;
import com.otaliastudios.cameraview.gesture.ScrollGestureLayout; import com.otaliastudios.cameraview.gesture.ScrollGestureLayout;
import com.otaliastudios.cameraview.gesture.TapGestureLayout; 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.CameraPreview;
import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.GlCameraPreview;
import com.otaliastudios.cameraview.preview.SurfaceCameraPreview; import com.otaliastudios.cameraview.preview.SurfaceCameraPreview;

@ -1,3 +0,0 @@
package com.otaliastudios.cameraview;
@interface RendererThread {}

@ -19,7 +19,7 @@ import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.CameraOptions; import com.otaliastudios.cameraview.CameraOptions;
import com.otaliastudios.cameraview.CameraView; import com.otaliastudios.cameraview.CameraView;
import com.otaliastudios.cameraview.CropHelper; 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.FullPictureRecorder;
import com.otaliastudios.cameraview.FullVideoRecorder; import com.otaliastudios.cameraview.FullVideoRecorder;
import com.otaliastudios.cameraview.GlCameraPreview; import com.otaliastudios.cameraview.GlCameraPreview;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.engine;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.engine;
import android.hardware.Camera; import android.hardware.Camera;
import android.os.Build; import android.os.Build;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.frame;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.frame;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -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.NonNull;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
@ -13,6 +13,7 @@ import android.util.TypedValue;
import android.view.View; import android.view.View;
import com.otaliastudios.cameraview.controls.Grid; import com.otaliastudios.cameraview.controls.Grid;
import com.otaliastudios.cameraview.internal.utils.Task;
class GridLinesLayout extends View { class GridLinesLayout extends View {

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.egl;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.opengl.EGL14; import android.opengl.EGL14;
@ -24,6 +24,8 @@ import android.os.Build;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import android.util.Log; import android.util.Log;
import com.otaliastudios.cameraview.CameraLogger;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.egl;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.opengl.EGL14; import android.opengl.EGL14;

@ -1,9 +1,11 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.egl;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.Matrix; import android.opengl.Matrix;
import com.otaliastudios.cameraview.CameraLogger;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

@ -1,9 +1,10 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.egl;
import android.opengl.GLES11Ext; import android.opengl.GLES11Ext;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.Matrix;
import com.otaliastudios.cameraview.CameraLogger;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.egl;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.os.Build; import android.os.Build;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.CamcorderProfile; import android.media.CamcorderProfile;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import android.graphics.Rect; import android.graphics.Rect;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import android.content.Context; import android.content.Context;
import android.hardware.SensorManager; import android.hardware.SensorManager;

@ -1,4 +1,6 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import com.otaliastudios.cameraview.CameraLogger;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

@ -1,9 +1,11 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.internal.utils;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.Looper; import android.os.Looper;
import com.otaliastudios.cameraview.CameraLogger;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;

@ -1,6 +1,11 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.picture;
import android.hardware.Camera; 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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.exifinterface.media.ExifInterface; import androidx.exifinterface.media.ExifInterface;

@ -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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;

@ -1,6 +1,5 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.picture;
import android.annotation.SuppressLint;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.ImageFormat; import android.graphics.ImageFormat;
@ -12,11 +11,21 @@ import android.opengl.EGL14;
import android.opengl.EGLContext; import android.opengl.EGLContext;
import android.opengl.Matrix; import android.opengl.Matrix;
import android.os.Build; import android.os.Build;
import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.PictureResult;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.Camera1Engine;
import com.otaliastudios.cameraview.engine.CameraEngine; 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.CameraPreview;
import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.GlCameraPreview;
import com.otaliastudios.cameraview.preview.RendererThread;
import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.size.AspectRatio;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;

@ -0,0 +1,3 @@
package com.otaliastudios.cameraview.preview;
public @interface RendererThread {}

@ -1,12 +1,16 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video;
import android.hardware.Camera; import android.hardware.Camera;
import android.media.CamcorderProfile; import android.media.CamcorderProfile;
import android.media.MediaRecorder; 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.Audio;
import com.otaliastudios.cameraview.controls.VideoCodec;
import com.otaliastudios.cameraview.engine.Camera1Engine; import com.otaliastudios.cameraview.engine.Camera1Engine;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import com.otaliastudios.cameraview.utils.CamcorderProfiles;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -57,9 +61,9 @@ class FullVideoRecorder extends VideoRecorder {
} }
mMediaRecorder.setVideoSize(mSize.getWidth(), mSize.getHeight()); mMediaRecorder.setVideoSize(mSize.getWidth(), mSize.getHeight());
switch (mResult.getVideoCodec()) { switch (mResult.getVideoCodec()) {
case H_263: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); break; case VideoCodec.H_263: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); break;
case H_264: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264); break; case VideoCodec.H_264: mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264); break;
case DEVICE_DEFAULT: mMediaRecorder.setVideoEncoder(mProfile.videoCodec); break; case VideoCodec.DEVICE_DEFAULT: mMediaRecorder.setVideoEncoder(mProfile.videoCodec); break;
} }
if (mResult.videoBitRate <= 0) { if (mResult.videoBitRate <= 0) {
mMediaRecorder.setVideoEncodingBitRate(mProfile.videoBitRate); mMediaRecorder.setVideoEncodingBitRate(mProfile.videoBitRate);

@ -1,11 +1,18 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.opengl.EGL14; import android.opengl.EGL14;
import android.os.Build; 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.Audio;
import com.otaliastudios.cameraview.controls.VideoCodec;
import com.otaliastudios.cameraview.preview.GlCameraPreview; import com.otaliastudios.cameraview.preview.GlCameraPreview;
import com.otaliastudios.cameraview.preview.RendererThread;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -75,9 +82,9 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren
height = height % 2 == 0 ? height : height + 1; height = height % 2 == 0 ? height : height + 1;
String type = ""; String type = "";
switch (mResult.codec) { switch (mResult.codec) {
case H_263: type = "video/3gpp"; break; // MediaFormat.MIMETYPE_VIDEO_H263; case VideoCodec.H_263: type = "video/3gpp"; break; // MediaFormat.MIMETYPE_VIDEO_H263;
case H_264: type = "video/avc"; break; // MediaFormat.MIMETYPE_VIDEO_AVC: case VideoCodec.H_264: type = "video/avc"; break; // MediaFormat.MIMETYPE_VIDEO_AVC:
case DEVICE_DEFAULT: type = "video/avc"; break; case VideoCodec.DEVICE_DEFAULT: type = "video/avc"; break;
} }
LOG.w("Creating frame encoder. Rotation:", mResult.rotation); LOG.w("Creating frame encoder. Rotation:", mResult.rotation);
TextureMediaEncoder.Config config = new TextureMediaEncoder.Config(width, height, TextureMediaEncoder.Config config = new TextureMediaEncoder.Config(width, height,

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.AudioFormat; import android.media.AudioFormat;
@ -11,7 +11,9 @@ import android.media.MediaRecorder;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Message; 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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;

@ -1,4 +1,6 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import com.otaliastudios.cameraview.utils.Pool;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

@ -0,0 +1,3 @@
package com.otaliastudios.cameraview.video.encoding;
@interface EncoderThread {}

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

@ -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<InputBuffer> { class InputBufferPool extends Pool<InputBuffer> {

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.os.Build; import android.os.Build;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.MediaCodec; import android.media.MediaCodec;
@ -8,7 +8,9 @@ import android.os.Build;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import android.util.Log;
import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.internal.utils.WorkerHandler;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

@ -1,8 +1,11 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.media.MediaFormat; import android.media.MediaFormat;
import android.media.MediaMuxer; import android.media.MediaMuxer;
import android.os.Build; import android.os.Build;
import com.otaliastudios.cameraview.CameraLogger;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.media.MediaCodec; import android.media.MediaCodec;

@ -1,7 +1,9 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.media.MediaCodec; import android.media.MediaCodec;
import com.otaliastudios.cameraview.utils.Pool;
class OutputBufferPool extends Pool<OutputBuffer> { class OutputBufferPool extends Pool<OutputBuffer> {
OutputBufferPool(final int trackIndex) { OutputBufferPool(final int trackIndex) {

@ -1,9 +1,15 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.opengl.EGLContext; import android.opengl.EGLContext;
import android.opengl.Matrix; import android.opengl.Matrix;
import android.os.Build; 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.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;

@ -1,4 +1,4 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview.video.encoding;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaCodecInfo; import android.media.MediaCodecInfo;

@ -1,6 +1,8 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import com.otaliastudios.cameraview.frame.Frame;
import com.otaliastudios.cameraview.frame.FrameManager;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import org.junit.After; import org.junit.After;

@ -3,6 +3,8 @@ package com.otaliastudios.cameraview;
import android.graphics.ImageFormat; import android.graphics.ImageFormat;
import com.otaliastudios.cameraview.frame.Frame;
import com.otaliastudios.cameraview.frame.FrameManager;
import com.otaliastudios.cameraview.size.Size; import com.otaliastudios.cameraview.size.Size;
import org.junit.After; import org.junit.After;

Loading…
Cancel
Save