From e6daaeca0381ced66249bbf28fcef9bcb2b01ae0 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Wed, 17 Jul 2019 12:47:35 -0300 Subject: [PATCH] Address some TODOs --- .../cameraview/CameraUtilsTest.java | 2 -- .../engine/CameraIntegrationTest.java | 18 ++++++++---------- .../video/encoding/AudioMediaEncoder.java | 1 - .../video/encoding/MediaEncoder.java | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java index d4209374..4e5e2417 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraUtilsTest.java @@ -84,8 +84,6 @@ public class CameraUtilsTest extends BaseTest { assertEquals(0, other.getPixel(0, h-1)); assertEquals(0, other.getPixel(w-1, 0)); assertEquals(0, other.getPixel(w-1, h-1)); - - // TODO: improve when we add EXIF writing to byte arrays } 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 76339f99..75fe577e 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java @@ -549,11 +549,10 @@ public abstract class CameraIntegrationTest extends BaseTest { @Test public void testEndVideoSnapshot_withMaxSize() { - // TODO - // camera.setVideoMaxSize(3000*1000); - // waitForOpen(true); - // waitForVideoStart(); - // waitForVideoEnd(true); + camera.setVideoMaxSize(3000*1000); + openSync(true); + takeVideoSnapshotSync(true); + waitForVideoResult(true); } @Test @@ -567,11 +566,10 @@ public abstract class CameraIntegrationTest extends BaseTest { @Test public void testEndVideoSnapshot_withMaxDuration() { - // TODO - // camera.setVideoMaxDuration(4000); - // waitForOpen(true); - // waitForVideoStart(); - // waitForVideoEnd(true); + camera.setVideoMaxDuration(4000); + openSync(true); + takeVideoSnapshotSync(true); + waitForVideoResult(true); } //endregion diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java index e01fe1d2..e24a6273 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java @@ -339,7 +339,6 @@ public class AudioMediaEncoder extends MediaEncoder { if (PERFORMANCE_DEBUG) { // After latest changes, the count here is not so different between MONO and STEREO. // We get about 400 frames in both cases (430 for MONO, but doesn't seem like a big issue). - // TODO CHECK: This reflects the count difference that we see in engine.write (MONO:200 STEREO:100). LOG.e("EXECUTE DELAY MILLIS:", mAvgExecuteDelay, "COUNT:", mExecuteCount); LOG.e("SEND DELAY MILLIS:", mAvgSendDelay, "COUNT:", mSendCount); } 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 fb17f8f1..eec9cbee 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 @@ -298,7 +298,7 @@ public abstract class MediaEncoder { @CallSuper protected void onStopped() { LOG.w(mName, "is being released. Notifying controller and releasing codecs."); - // TODO should we notify after this method? + // TODO should we call notifyStopped after this method ends? mController.notifyStopped(mTrackIndex); mMediaCodec.stop(); mMediaCodec.release();