pull/696/head
Mattia Iavarone 6 years ago
parent f74495fe4f
commit 6fa7c4589c
  1. 2
      .github/workflows/emulator_script.sh
  2. 5
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java
  3. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java

@ -1,4 +1,4 @@
#!/usr/bin/env bash
adb logcat -c
adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I MediaEncoder:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I VideoRecorder:I *:E -v color &
adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I CameraCallbacks:I CameraIntegrationTest:I MediaEncoderEngine:I MediaEncoder:I AudioMediaEncoder:I VideoMediaEncoder:I TextureMediaEncoder:I VideoRecorder:I SnapshotVideoRecorder:I *:E -v color &
./gradlew cameraview:connectedCheck

@ -630,7 +630,8 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test
public void testEndVideo_withMaxSize() {
camera.setMode(Mode.VIDEO);
camera.setVideoMaxSize(2000*1000); // Less is risky
camera.setVideoSize(SizeSelectors.smallest());
camera.setVideoMaxSize(1000*1000);
openSync(true);
takeVideoSync(true);
waitForVideoResult(true);
@ -638,7 +639,7 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test
public void testEndVideoSnapshot_withMaxSize() {
camera.setVideoMaxSize(2000*1000);
camera.setVideoMaxSize(1000*1000);
openSync(true);
takeVideoSnapshotSync(true);
waitForVideoResult(true);

@ -231,9 +231,10 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram
}
if (mCurrentState == STATE_RECORDING) {
LOG.i("scheduling frame.");
synchronized (mEncoderEngineLock) {
if (mEncoderEngine != null) { // Can be null on teardown.
LOG.v("dispatching frame.");
LOG.i("dispatching frame.");
TextureMediaEncoder textureEncoder
= (TextureMediaEncoder) mEncoderEngine.getVideoEncoder();
TextureMediaEncoder.Frame frame = textureEncoder.acquireFrame();

Loading…
Cancel
Save