Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Code Patch for camera preview switch tests" into nyc-dev

Browse Source
This commit is contained in:
Hang Yin
2016-05-27 22:34:46 +00:00
committed by Android (Google) Code Review
parent fceaa60e24 39aafafa9a
commit 5c950a8078
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java
View File

@@ -37,6 +37,7 @@ import android.hardware.camera2.CameraManager;
import android.hardware.camera2.CameraMetadata; import android.hardware.camera2.CameraMetadata;
import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult; import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.params.StreamConfigurationMap;
import android.media.ImageReader; import android.media.ImageReader;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.os.Bundle; import android.os.Bundle;
@@ -127,6 +128,7 @@ public class Camera2SurfaceViewTestCase extends
protected List<Size> mOrderedRAW10Sizes; // In descending order. protected List<Size> mOrderedRAW10Sizes; // In descending order.
protected List<Size> mOrderedYUV420888Sizes; // In descending order. protected List<Size> mOrderedYUV420888Sizes; // In descending order.
protected HashMap<Size, Long> mMinPreviewFrameDurationMap; protected HashMap<Size, Long> mMinPreviewFrameDurationMap;
protected boolean mSupportRAW10;
protected WindowManager mWindowManager; protected WindowManager mWindowManager;
@@ -603,16 +605,21 @@ public class Camera2SurfaceViewTestCase extends
mCamera = CameraTestUtils.openCamera( mCamera = CameraTestUtils.openCamera(
mCameraManager, cameraId, mCameraListener, mHandler); mCameraManager, cameraId, mCameraListener, mHandler);
mCollector.setCameraId(cameraId); mCollector.setCameraId(cameraId);
mStaticInfo = new StaticMetadata(mCameraManager.getCameraCharacteristics(cameraId), CameraCharacteristics properties = mCameraManager.getCameraCharacteristics(cameraId);
CheckLevel.ASSERT, /*collector*/null); mStaticInfo = new StaticMetadata(properties, CheckLevel.ASSERT, /*collector*/null);
StreamConfigurationMap configMap =
properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
mSupportRAW10 = configMap.isOutputSupportedFor(ImageFormat.RAW10);
if (mStaticInfo.isColorOutputSupported()) { if (mStaticInfo.isColorOutputSupported()) {
mOrderedPreviewSizes = getSupportedPreviewSizes(cameraId, mCameraManager, mOrderedPreviewSizes = getSupportedPreviewSizes(cameraId, mCameraManager,
getPreviewSizeBound(mWindowManager, PREVIEW_SIZE_BOUND)); getPreviewSizeBound(mWindowManager, PREVIEW_SIZE_BOUND));
mOrderedVideoSizes = getSupportedVideoSizes( mOrderedVideoSizes = getSupportedVideoSizes(
cameraId, mCameraManager, PREVIEW_SIZE_BOUND); cameraId, mCameraManager, PREVIEW_SIZE_BOUND);
mOrderedStillSizes = getSupportedStillSizes(cameraId, mCameraManager, null); mOrderedStillSizes = getSupportedStillSizes(cameraId, mCameraManager, null);
if (mSupportRAW10) {
mOrderedRAW10Sizes = getSortedSizesForFormat( mOrderedRAW10Sizes = getSortedSizesForFormat(
cameraId, mCameraManager, ImageFormat.RAW10, null); cameraId, mCameraManager, ImageFormat.RAW10, null);
}
mOrderedYUV420888Sizes = getSortedSizesForFormat( mOrderedYUV420888Sizes = getSortedSizesForFormat(
cameraId, mCameraManager, ImageFormat.YUV_420_888, null); cameraId, mCameraManager, ImageFormat.YUV_420_888, null);
// Use ImageFormat.YUV_420_888 for now. TODO: need figure out what's format for preview // Use ImageFormat.YUV_420_888 for now. TODO: need figure out what's format for preview
@@ -636,6 +643,7 @@ public class Camera2SurfaceViewTestCase extends
mOrderedPreviewSizes = null; mOrderedPreviewSizes = null;
mOrderedVideoSizes = null; mOrderedVideoSizes = null;
mOrderedStillSizes = null; mOrderedStillSizes = null;
mSupportRAW10 = false;
} }
} }