Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e040418f authored by Zhijun He's avatar Zhijun He
Browse files

Camera2: Add high speed video support 

Below tags are added/updated:
- Add HIGH_SPEED_VIDEO in android.control.sceneMode
- android.control.availableHighSpeedVideoConfigurations

Change-Id: Ice2497c81d9feead7519f5d11f2bd5598093b4bc
parent 2cb86c72

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12517,6 +12517,7 @@ package android.hardware.camera2 { 
    field public static final int CONTROL_SCENE_MODE_DISABLED = 0; // 0x0

    field public static final int CONTROL_SCENE_MODE_FACE_PRIORITY = 1; // 0x1

    field public static final int CONTROL_SCENE_MODE_FIREWORKS = 12; // 0xc

    field public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17; // 0x11

    field public static final int CONTROL_SCENE_MODE_LANDSCAPE = 4; // 0x4

    field public static final int CONTROL_SCENE_MODE_NIGHT = 5; // 0x5

    field public static final int CONTROL_SCENE_MODE_NIGHT_PORTRAIT = 6; // 0x6

core/java/android/hardware/camera2/CameraCharacteristics.java

+28 −0
Original line number Diff line number Diff line
@@ -465,6 +465,34 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<Integer> CONTROL_MAX_REGIONS_AF =

            new Key<Integer>("android.control.maxRegionsAf", int.class);



    /**

     * <p>List of available high speed video size and fps range configurations

     * supported by the camera device, in the format of (width, height, fps_min, fps_max).</p>

     * <p>When HIGH_SPEED_VIDEO is supported in {@link CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES android.control.availableSceneModes},

     * this metadata will list the supported high speed video size and fps range

     * configurations. All the sizes listed in this configuration will be a subset

     * of the sizes reported by StreamConfigurationMap#getOutputSizes for processed

     * non-stalling formats.</p>

     * <p>For the high speed video use case, where the application will set

     * {@link CaptureRequest#CONTROL_SCENE_MODE android.control.sceneMode} to HIGH_SPEED_VIDEO in capture requests, the application must

     * select the video size and fps range from this metadata to configure the recording and

     * preview streams and setup the recording requests. For example, if the application intends

     * to do high speed recording, it can select the maximum size reported by this metadata to

     * configure output streams. Once the size is selected, application can filter this metadata

     * by selected size and get the supported fps ranges, and use these fps ranges to setup the

     * recording requests.</p>

     * <p>For normal video recording use case, where some application will NOT set

     * {@link CaptureRequest#CONTROL_SCENE_MODE android.control.sceneMode} to HIGH_SPEED_VIDEO in capture requests, the fps ranges

     * reported in this metadata must not be used to setup capture requests, or it will cause

     * request error.</p>

     *

     * @see CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES

     * @see CaptureRequest#CONTROL_SCENE_MODE

     * @hide

     */

    public static final Key<int[]> CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS =

            new Key<int[]>("android.control.availableHighSpeedVideoConfigurations", int[].class);



    /**

     * <p>The set of edge enhancement modes supported by this camera device.</p>

     * <p>This tag lists the valid modes for {@link CaptureRequest#EDGE_MODE android.edge.mode}.</p>

core/java/android/hardware/camera2/CameraMetadata.java

+78 −0
Original line number Diff line number Diff line
@@ -1393,6 +1393,84 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int CONTROL_SCENE_MODE_BARCODE = 16;



    /**

     * <p>Optimized for high speed video recording (frame rate &gt;=60fps) use case.</p>

     * <p>The supported high speed video sizes and fps ranges are specified in

     * android.control.availableHighSpeedVideoConfigurations. To get desired

     * output frame rates, the application is only allowed to select video size

     * and fps range combinations listed in this static metadata. The fps range

     * can be control via {@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange}.</p>

     * <p>In this mode, the camera device will override aeMode, awbMode, and afMode to

     * ON, ON, and CONTINUOUS_VIDEO, respectively. All post-processing block mode

     * controls will be overridden to be FAST. Therefore, no manual control of capture

     * and post-processing parameters is possible. All other controls operate the

     * same as when {@link CaptureRequest#CONTROL_MODE android.control.mode} == AUTO. This means that all other

     * android.control.* fields continue to work, such as</p>

     * <ul>

     * <li>{@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange}</li>

     * <li>{@link CaptureRequest#CONTROL_AE_EXPOSURE_COMPENSATION android.control.aeExposureCompensation}</li>

     * <li>{@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock}</li>

     * <li>{@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}</li>

     * <li>{@link CaptureRequest#CONTROL_EFFECT_MODE android.control.effectMode}</li>

     * <li>{@link CaptureRequest#CONTROL_AE_REGIONS android.control.aeRegions}</li>

     * <li>{@link CaptureRequest#CONTROL_AF_REGIONS android.control.afRegions}</li>

     * <li>{@link CaptureRequest#CONTROL_AWB_REGIONS android.control.awbRegions}</li>

     * <li>{@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger}</li>

     * <li>{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger}</li>

     * </ul>

     * <p>Outside of android.control.*, the following controls will work:</p>

     * <ul>

     * <li>{@link CaptureRequest#FLASH_MODE android.flash.mode} (automatic flash for still capture will not work since aeMode is ON)</li>

     * <li>{@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode} (if it is supported)</li>

     * <li>{@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}</li>

     * <li>{@link CaptureRequest#STATISTICS_FACE_DETECT_MODE android.statistics.faceDetectMode}</li>

     * </ul>

     * <p>For high speed recording use case, the actual maximum supported frame rate may

     * be lower than what camera can output, depending on the destination Surfaces for

     * the image data. For example, if the destination surface is from video encoder,

     * the application need check if the video encoder is capable of supporting the

     * high frame rate for a given video size, or it will end up with lower recording

     * frame rate. If the destination surface is from preview window, the preview frame

     * rate will be bounded by the screen refresh rate.</p>

     * <p>The camera device will only support up to 2 output high speed streams

     * (processed non-stalling format defined in android.request.maxNumOutputStreams)

     * in this mode. This control will be effective only if all of below conditions are true:</p>

     * <ul>

     * <li>The application created no more than maxNumHighSpeedStreams processed non-stalling

     * format output streams, where maxNumHighSpeedStreams is calculated as

     * min(2, android.request.maxNumOutputStreams[Processed (but not-stalling)]).</li>

     * <li>The stream sizes are selected from the sizes reported by

     * android.control.availableHighSpeedVideoConfigurations.</li>

     * <li>No processed non-stalling or raw streams are configured.</li>

     * </ul>

     * <p>When above conditions are NOT satistied, the controls of this mode and

     * {@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange} will be ignored by the camera device,

     * the camera device will fall back to {@link CaptureRequest#CONTROL_MODE android.control.mode} <code>==</code> AUTO,

     * and the returned capture result metadata will give the fps range choosen

     * by the camera device.</p>

     * <p>Switching into or out of this mode may trigger some camera ISP/sensor

     * reconfigurations, which may introduce extra latency. It is recommended that

     * the application avoids unnecessary scene mode switch as much as possible.</p>

     *

     * @see CaptureRequest#CONTROL_AE_EXPOSURE_COMPENSATION

     * @see CaptureRequest#CONTROL_AE_LOCK

     * @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER

     * @see CaptureRequest#CONTROL_AE_REGIONS

     * @see CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE

     * @see CaptureRequest#CONTROL_AF_REGIONS

     * @see CaptureRequest#CONTROL_AF_TRIGGER

     * @see CaptureRequest#CONTROL_AWB_LOCK

     * @see CaptureRequest#CONTROL_AWB_REGIONS

     * @see CaptureRequest#CONTROL_EFFECT_MODE

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureRequest#FLASH_MODE

     * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE

     * @see CaptureRequest#CONTROL_SCENE_MODE

     */

    public static final int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17;



    //

    // Enumeration values for CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE

    //

core/java/android/hardware/camera2/CaptureRequest.java

+1 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see #CONTROL_SCENE_MODE_PARTY

     * @see #CONTROL_SCENE_MODE_CANDLELIGHT

     * @see #CONTROL_SCENE_MODE_BARCODE

     * @see #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO

     */

    public static final Key<Integer> CONTROL_SCENE_MODE =

            new Key<Integer>("android.control.sceneMode", int.class);

core/java/android/hardware/camera2/CaptureResult.java

+1 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see #CONTROL_SCENE_MODE_PARTY

     * @see #CONTROL_SCENE_MODE_CANDLELIGHT

     * @see #CONTROL_SCENE_MODE_BARCODE

     * @see #CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO

     */

    public static final Key<Integer> CONTROL_SCENE_MODE =

            new Key<Integer>("android.control.sceneMode", int.class);