Merge "Remove android.hardware.graphics.common-V5 from virtual camera aidl" into main

6 files changed, 41 insertions, 10 deletions

diff --git a/devices/VirtualCamera/VirtualCameraSession.cc b/devices/VirtualCamera/VirtualCameraSession.cc
index 70991a5..f3bbb74 100644
--- a/devices/VirtualCamera/VirtualCameraSession.cc
+++ b/devices/VirtualCamera/VirtualCameraSession.cc
@@ -65,6 +65,7 @@ namespace android {
 namespace companion {
 namespace virtualcamera {
 
+using ::aidl::android::companion::virtualcamera::Format;
 using ::aidl::android::companion::virtualcamera::IVirtualCameraCallback;
 using ::aidl::android::hardware::camera::common::Status;
 using ::aidl::android::hardware::camera::device::BufferCache;
@@ -240,7 +241,7 @@ ndk::ScopedAStatus VirtualCameraSession::configureStreams(
     // create single texture.
     mVirtualCameraClientCallback->onStreamConfigured(
         /*streamId=*/0, aidl::android::view::Surface(inputSurface.get()),
-        inputWidth, inputHeight, PixelFormat::YCBCR_420_888);
+        inputWidth, inputHeight, Format::YUV_420_888);
   }
 
   mFirstRequest.store(true);
diff --git a/devices/VirtualCamera/aidl/Android.bp b/devices/VirtualCamera/aidl/Android.bp
index ad79320..9105b09 100644
--- a/devices/VirtualCamera/aidl/Android.bp
+++ b/devices/VirtualCamera/aidl/Android.bp
@@ -7,12 +7,12 @@ aidl_interface {
     name: "virtual_camera_service_aidl",
     unstable: true,
     srcs: [
+        "android/companion/virtualcamera/Format.aidl",
         "android/companion/virtualcamera/IVirtualCameraCallback.aidl",
         "android/companion/virtualcamera/IVirtualCameraService.aidl",
         "android/companion/virtualcamera/VirtualCameraConfiguration.aidl",
         "android/companion/virtualcamera/SupportedStreamConfiguration.aidl",
     ],
-    imports: ["android.hardware.graphics.common-V5"],
     local_include_dir: ".",
     include_dirs: [
         "frameworks/native/aidl/gui",
diff --git a/devices/VirtualCamera/aidl/android/companion/virtualcamera/Format.aidl b/devices/VirtualCamera/aidl/android/companion/virtualcamera/Format.aidl
new file mode 100644
index 0000000..d9b90a6
--- /dev/null
+++ b/devices/VirtualCamera/aidl/android/companion/virtualcamera/Format.aidl
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2023 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;
+
+/**
+ * Pixel format supported by a virtual camera stream.
+ *
+ * @hide
+ */
+@Backing(type="int")
+enum Format {
+    UNKNOWN = 0,
+    YUV_420_888 = 0x23,
+}
diff --git a/devices/VirtualCamera/aidl/android/companion/virtualcamera/IVirtualCameraCallback.aidl b/devices/VirtualCamera/aidl/android/companion/virtualcamera/IVirtualCameraCallback.aidl
index ff296b4..eadfa61 100644
--- a/devices/VirtualCamera/aidl/android/companion/virtualcamera/IVirtualCameraCallback.aidl
+++ b/devices/VirtualCamera/aidl/android/companion/virtualcamera/IVirtualCameraCallback.aidl
@@ -16,8 +16,8 @@
 
 package android.companion.virtualcamera;
 
+import android.companion.virtualcamera.Format;
 import android.view.Surface;
-import android.hardware.graphics.common.PixelFormat;
 
 /**
  * AIDL Interface to receive callbacks from virtual camera instance.
@@ -31,12 +31,12 @@ oneway interface IVirtualCameraCallback {
      * terminateStream call is received.
      *
      * @param streamId - id of the video stream.
-     * @param surface - Surface representing virtual camera sensor.
+     * @param surface - Surface representing the virtual camera sensor.
      * @param width - width of the surface.
      * @param height - height of the surface.
      * @param pixelFormat - pixel format of the surface.
      */
-    void onStreamConfigured(int streamId, in Surface surface, int width, int height,in PixelFormat pixelFormat);
+    void onStreamConfigured(int streamId, in Surface surface, int width, int height, in Format pixelFormat);
 
     /**
      * Called when the corresponding stream is no longer in use. Implementation should dispose of
diff --git a/devices/VirtualCamera/aidl/android/companion/virtualcamera/SupportedStreamConfiguration.aidl b/devices/VirtualCamera/aidl/android/companion/virtualcamera/SupportedStreamConfiguration.aidl
index ba940da..7070cbd 100644
--- a/devices/VirtualCamera/aidl/android/companion/virtualcamera/SupportedStreamConfiguration.aidl
+++ b/devices/VirtualCamera/aidl/android/companion/virtualcamera/SupportedStreamConfiguration.aidl
@@ -15,7 +15,7 @@
  */
 package android.companion.virtualcamera;
 
-import android.hardware.graphics.common.PixelFormat;
+import android.companion.virtualcamera.Format;
 
 /**
  * Configuration supported by virtual camera owner.
@@ -25,5 +25,5 @@ import android.hardware.graphics.common.PixelFormat;
 parcelable SupportedStreamConfiguration {
     int width;
     int height;
-    PixelFormat pixelFormat = PixelFormat.UNSPECIFIED;
+    Format pixelFormat = Format.UNKNOWN;
 }
diff --git a/devices/VirtualCamera/tests/VirtualCameraSessionTest.cc b/devices/VirtualCamera/tests/VirtualCameraSessionTest.cc
index ec91590..bb03701 100644
--- a/devices/VirtualCamera/tests/VirtualCameraSessionTest.cc
+++ b/devices/VirtualCamera/tests/VirtualCameraSessionTest.cc
@@ -36,6 +36,7 @@ namespace {
 const std::string kCameraName = "virtual_camera";
 
 using ::aidl::android::companion::virtualcamera::BnVirtualCameraCallback;
+using ::aidl::android::companion::virtualcamera::Format;
 using ::aidl::android::hardware::camera::device::BnCameraDeviceCallback;
 using ::aidl::android::hardware::camera::device::BufferRequest;
 using ::aidl::android::hardware::camera::device::BufferRequestStatus;
@@ -79,7 +80,7 @@ class MockCameraDeviceCallback : public BnCameraDeviceCallback {
 class MockVirtualCameraCallback : public BnVirtualCameraCallback {
  public:
   MOCK_METHOD(ndk::ScopedAStatus, onStreamConfigured,
-              (int, const Surface&, int32_t, int32_t, PixelFormat), (override));
+              (int, const Surface&, int32_t, int32_t, Format), (override));
   MOCK_METHOD(ndk::ScopedAStatus, onStreamClosed, (int), (override));
 };
 
@@ -112,8 +113,9 @@ TEST_F(VirtualCameraSessionTest, ConfigureTriggersClientConfigureCallback) {
   StreamConfiguration streamConfiguration;
   streamConfiguration.streams = {createStream(streamId, width, height, format)};
   std::vector<HalStream> halStreams;
-  EXPECT_CALL(*mMockVirtualCameraClientCallback,
-              onStreamConfigured(streamId, _, width, height, format));
+  EXPECT_CALL(
+      *mMockVirtualCameraClientCallback,
+      onStreamConfigured(streamId, _, width, height, Format::YUV_420_888));
 
   ASSERT_TRUE(
       mVirtualCameraSession->configureStreams(streamConfiguration, &halStreams)