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

Commit b187ec98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose SENSOR_READOUT_TIMESTAMP characteristic for virtual camera" into main

parents 86c275a5 a984ffbf

services/camera/virtualcamera/VirtualCameraDevice.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,8 @@ std::optional<CameraMetadata> initCameraCharacteristics( 
          .setLensFacing(

          .setLensFacing(

              static_cast<camera_metadata_enum_android_lens_facing>(lensFacing))

              static_cast<camera_metadata_enum_android_lens_facing>(lensFacing))

          .setSensorOrientation(static_cast<int32_t>(sensorOrientation))

          .setSensorOrientation(static_cast<int32_t>(sensorOrientation))

          .setSensorReadoutTimestamp(

              ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED)

          .setAvailableFaceDetectModes({ANDROID_STATISTICS_FACE_DETECT_MODE_OFF})

          .setAvailableFaceDetectModes({ANDROID_STATISTICS_FACE_DETECT_MODE_OFF})

          .setAvailableMaxDigitalZoom(1.0)

          .setAvailableMaxDigitalZoom(1.0)

          .setControlAvailableModes({ANDROID_CONTROL_MODE_AUTO})

          .setControlAvailableModes({ANDROID_CONTROL_MODE_AUTO})

services/camera/virtualcamera/util/MetadataBuilder.cc

+8 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,14 @@ MetadataBuilder& MetadataBuilder::setLensFacing( 
  return *this;

  return *this;

}

}





MetadataBuilder& MetadataBuilder::setSensorReadoutTimestamp(

    const camera_metadata_enum_android_sensor_readout_timestamp_t

        sensorReadoutTimestamp) {

  mEntryMap[ANDROID_SENSOR_READOUT_TIMESTAMP] =

      std::vector<uint8_t>({static_cast<uint8_t>(sensorReadoutTimestamp)});

  return *this;

}



MetadataBuilder& MetadataBuilder::setSensorOrientation(int32_t sensorOrientation) {

MetadataBuilder& MetadataBuilder::setSensorOrientation(int32_t sensorOrientation) {

  mEntryMap[ANDROID_SENSOR_ORIENTATION] =

  mEntryMap[ANDROID_SENSOR_ORIENTATION] =

      std::vector<int32_t>({sensorOrientation});

      std::vector<int32_t>({sensorOrientation});

services/camera/virtualcamera/util/MetadataBuilder.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,11 @@ class MetadataBuilder { 
  MetadataBuilder& setLensFacing(

  MetadataBuilder& setLensFacing(

      camera_metadata_enum_android_lens_facing lensFacing);

      camera_metadata_enum_android_lens_facing lensFacing);





  // See ANDROID_SENSOR_READOUT_TIMESTAMP in CameraMetadataTag.aidl.

  MetadataBuilder& setSensorReadoutTimestamp(

      camera_metadata_enum_android_sensor_readout_timestamp_t

          sensorReadoutTimestamp);



  // See ANDROID_SENSOR_ORIENTATION in CameraMetadataTag.aidl.

  // See ANDROID_SENSOR_ORIENTATION in CameraMetadataTag.aidl.

  MetadataBuilder& setSensorOrientation(int32_t sensorOrientation);

  MetadataBuilder& setSensorOrientation(int32_t sensorOrientation);