Remove video snapshot tests from API22

pull/696/head
Mattia Iavarone 6 years ago
parent 70c28d175c
commit f91dd78edf
  1. 4
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/CameraIntegrationTest.java
  2. 9
      cameraview/src/main/java/com/otaliastudios/cameraview/video/FullVideoRecorder.java
  3. 12
      cameraview/src/main/java/com/otaliastudios/cameraview/video/SnapshotVideoRecorder.java

@ -624,6 +624,7 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test @Test
@Retry(emulatorOnly = true) @Retry(emulatorOnly = true)
@SdkExclude(maxSdkVersion = 22, emulatorOnly = true)
public void testStartEndVideoSnapshot() { public void testStartEndVideoSnapshot() {
// TODO should check api level for snapshot? // TODO should check api level for snapshot?
openSync(true); openSync(true);
@ -654,6 +655,7 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test @Test
@Retry(emulatorOnly = true) @Retry(emulatorOnly = true)
@SdkExclude(maxSdkVersion = 22, emulatorOnly = true)
public void testStartEndVideoSnapshot_withManualStop() { public void testStartEndVideoSnapshot_withManualStop() {
openSync(true); openSync(true);
takeVideoSnapshotSync(true); takeVideoSnapshotSync(true);
@ -697,6 +699,7 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test @Test
@Retry(emulatorOnly = true) @Retry(emulatorOnly = true)
@SdkExclude(maxSdkVersion = 22, emulatorOnly = true)
public void testEndVideoSnapshot_withMaxSize() { public void testEndVideoSnapshot_withMaxSize() {
openSync(true); openSync(true);
camera.setSnapshotMaxWidth(480); camera.setSnapshotMaxWidth(480);
@ -725,6 +728,7 @@ public abstract class CameraIntegrationTest<E extends CameraEngine> extends Base
@Test @Test
@Retry(emulatorOnly = true) @Retry(emulatorOnly = true)
@SdkExclude(maxSdkVersion = 22, emulatorOnly = true)
public void testEndVideoSnapshot_withMaxDuration() { public void testEndVideoSnapshot_withMaxDuration() {
camera.setVideoMaxDuration(4000); camera.setVideoMaxDuration(4000);
openSync(true); openSync(true);

@ -157,8 +157,15 @@ public abstract class FullVideoRecorder extends VideoRecorder {
LOG.i("prepareMediaRecorder:", "Checking DeviceEncoders...", LOG.i("prepareMediaRecorder:", "Checking DeviceEncoders...",
"videoOffset:", videoEncoderOffset, "videoOffset:", videoEncoderOffset,
"audioOffset:", audioEncoderOffset); "audioOffset:", audioEncoderOffset);
DeviceEncoders encoders = new DeviceEncoders(DeviceEncoders.MODE_RESPECT_ORDER, DeviceEncoders encoders;
try {
encoders = new DeviceEncoders(DeviceEncoders.MODE_RESPECT_ORDER,
videoType, audioType, videoEncoderOffset, audioEncoderOffset); videoType, audioType, videoEncoderOffset, audioEncoderOffset);
} catch (RuntimeException e) {
LOG.w("prepareMediaRecorder:", "Could not respect encoders parameters.",
"Trying again without checking encoders.");
return prepareMediaRecorder(stub, false);
}
try { try {
newVideoSize = encoders.getSupportedVideoSize(stub.size); newVideoSize = encoders.getSupportedVideoSize(stub.size);
newVideoBitRate = encoders.getSupportedVideoBitRate(stub.videoBitRate); newVideoBitRate = encoders.getSupportedVideoBitRate(stub.videoBitRate);

@ -173,6 +173,18 @@ public class SnapshotVideoRecorder extends VideoRecorder implements RendererFram
LOG.i("Checking DeviceEncoders...", LOG.i("Checking DeviceEncoders...",
"videoOffset:", videoEncoderOffset, "videoOffset:", videoEncoderOffset,
"audioOffset:", audioEncoderOffset); "audioOffset:", audioEncoderOffset);
try {
deviceEncoders = new DeviceEncoders(DeviceEncoders.MODE_RESPECT_ORDER,
videoType, audioType, videoEncoderOffset, audioEncoderOffset);
} catch (RuntimeException e) {
LOG.w("Could not respect encoders parameters.",
"Going on again without checking encoders, possibly failing.");
newVideoSize = mResult.size;
newVideoBitRate = mResult.videoBitRate;
newVideoFrameRate = mResult.videoFrameRate;
newAudioBitRate = mResult.audioBitRate;
break;
}
deviceEncoders = new DeviceEncoders(DeviceEncoders.MODE_PREFER_HARDWARE, deviceEncoders = new DeviceEncoders(DeviceEncoders.MODE_PREFER_HARDWARE,
videoType, audioType, videoEncoderOffset, audioEncoderOffset); videoType, audioType, videoEncoderOffset, audioEncoderOffset);
try { try {

Loading…
Cancel
Save