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

Commit 112458fe authored by Biswarup Pal's avatar Biswarup Pal
Browse files

Add virtual camera lens facing direction

Bug: 301023410
Test: atest virtual_camera_tests
Test: atest CtsVirtualDevicesCameraTestCases
Change-Id: I7be9af631528cba57f05c730fd6e1d4ae42dd63d
parent 6152a309
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ namespace virtualcamera {

using ::aidl::android::companion::virtualcamera::Format;
using ::aidl::android::companion::virtualcamera::IVirtualCameraCallback;
using ::aidl::android::companion::virtualcamera::LensFacing;
using ::aidl::android::companion::virtualcamera::SensorOrientation;
using ::aidl::android::companion::virtualcamera::SupportedStreamConfiguration;
using ::aidl::android::companion::virtualcamera::VirtualCameraConfiguration;
@@ -132,7 +133,7 @@ std::map<Resolution, int> getResolutionToMaxFpsMap(
// TODO(b/301023410) - Populate camera characteristics according to camera configuration.
std::optional<CameraMetadata> initCameraCharacteristics(
    const std::vector<SupportedStreamConfiguration>& supportedInputConfig,
    const SensorOrientation sensorOrientation) {
    const SensorOrientation sensorOrientation, const LensFacing lensFacing) {
  if (!std::all_of(supportedInputConfig.begin(), supportedInputConfig.end(),
                   [](const SupportedStreamConfiguration& config) {
                     return isFormatSupportedForInput(
@@ -148,7 +149,8 @@ std::optional<CameraMetadata> initCameraCharacteristics(
          .setSupportedHardwareLevel(
              ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL)
          .setFlashAvailable(false)
          .setLensFacing(ANDROID_LENS_FACING_EXTERNAL)
          .setLensFacing(
              static_cast<camera_metadata_enum_android_lens_facing>(lensFacing))
          .setSensorOrientation(static_cast<int32_t>(sensorOrientation))
          .setAvailableFaceDetectModes({ANDROID_STATISTICS_FACE_DETECT_MODE_OFF})
          .setAvailableMaxDigitalZoom(1.0)
@@ -222,7 +224,8 @@ VirtualCameraDevice::VirtualCameraDevice(
      mVirtualCameraClientCallback(configuration.virtualCameraCallback),
      mSupportedInputConfigurations(configuration.supportedStreamConfigs) {
  std::optional<CameraMetadata> metadata = initCameraCharacteristics(
      mSupportedInputConfigurations, configuration.sensorOrientation);
      mSupportedInputConfigurations, configuration.sensorOrientation,
      configuration.lensFacing);
  if (metadata.has_value()) {
    mCameraCharacteristics = *metadata;
  } else {
+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ namespace companion {
namespace virtualcamera {

using ::aidl::android::companion::virtualcamera::Format;
using ::aidl::android::companion::virtualcamera::LensFacing;
using ::aidl::android::companion::virtualcamera::SensorOrientation;
using ::aidl::android::companion::virtualcamera::SupportedStreamConfiguration;
using ::aidl::android::companion::virtualcamera::VirtualCameraConfiguration;
@@ -87,6 +88,13 @@ ndk::ScopedAStatus validateConfiguration(
        Status::EX_ILLEGAL_ARGUMENT);
  }

  if (configuration.lensFacing != LensFacing::FRONT &&
      configuration.lensFacing != LensFacing::BACK &&
      configuration.lensFacing != LensFacing::EXTERNAL) {
    return ndk::ScopedAStatus::fromServiceSpecificError(
        Status::EX_ILLEGAL_ARGUMENT);
  }

  return ndk::ScopedAStatus::ok();
}

@@ -254,6 +262,7 @@ void VirtualCameraService::enableTestCameraCmd(const int out, const int err) {
                                                  .height = kVgaHeight,
                                                  Format::YUV_420_888,
                                                  .maxFps = kMaxFps});
  configuration.lensFacing = LensFacing::EXTERNAL;
  registerCamera(mTestCameraToken, configuration, &ret);
  if (ret) {
    dprintf(out, "Successfully registered test camera %s",
+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ aidl_interface {
    unstable: true,
    srcs: [
        "android/companion/virtualcamera/Format.aidl",
        "android/companion/virtualcamera/LensFacing.aidl",
        "android/companion/virtualcamera/IVirtualCameraCallback.aidl",
        "android/companion/virtualcamera/IVirtualCameraService.aidl",
        "android/companion/virtualcamera/VirtualCameraConfiguration.aidl",
+29 −0
Original line number Diff line number Diff line
/*
 * Copyright 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.companion.virtualcamera;

/**
 * Direction that the virtual camera faces relative to the device's screen.
 *
 * @hide
 */
@Backing(type="int")
enum LensFacing {
    FRONT = 0,
    BACK = 1,
    EXTERNAL = 2,
}
+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package android.companion.virtualcamera;

import android.companion.virtualcamera.IVirtualCameraCallback;
import android.companion.virtualcamera.LensFacing;
import android.companion.virtualcamera.SensorOrientation;
import android.companion.virtualcamera.SupportedStreamConfiguration;

@@ -29,4 +30,5 @@ parcelable VirtualCameraConfiguration {
    SupportedStreamConfiguration[] supportedStreamConfigs;
    IVirtualCameraCallback virtualCameraCallback;
    SensorOrientation sensorOrientation = SensorOrientation.ORIENTATION_0;
    LensFacing lensFacing;
}
Loading