commit f481670d1fbde472cf667b4fe2d3413fd91fe7af
author Emilian Peev <epeev@google.com> Fri Apr 03 15:44:51 2020 -0700
committer Emilian Peev <epeev@google.com> Thu Jan 07 10:01:10 2021 -0800
tree 1df805ec242077d2f32421f9e32ed466eae62116
parent ca362e8f614f535d3adc62840d5a4c416bb17e63

Camera: Remove "camera3.h" dependencies

Migrate and rework all "camera3.h" types
so that camerserver can be built without
this header file.

Bug: 153383067
Test: Camera CTS

Change-Id: Iad056c641e2c72c053f59ab9a05dbeb7ce394646

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
index ba68a63..c28f427 100644
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
@@ -261,7 +261,7 @@
 
 
 void SessionConfigurationUtils::mapStreamInfo(const OutputStreamInfo &streamInfo,
-            camera3_stream_rotation_t rotation, String8 physicalId,
+            camera3::camera_stream_rotation_t rotation, String8 physicalId,
             hardware::camera::device::V3_4::Stream *stream /*out*/) {
     if (stream == nullptr) {
         return;
@@ -373,7 +373,7 @@
     }
     *earlyExit = false;
     auto ret = Camera3Device::mapToStreamConfigurationMode(
-            static_cast<camera3_stream_configuration_mode_t> (operatingMode),
+            static_cast<camera_stream_configuration_mode_t> (operatingMode),
             /*out*/ &streamConfiguration.operationMode);
     if (ret != OK) {
         String8 msg = String8::format(
@@ -432,7 +432,7 @@
             if (surfaceType == OutputConfiguration::SURFACE_TYPE_SURFACE_VIEW) {
                 streamInfo.consumerUsage |= GraphicBuffer::USAGE_HW_COMPOSER;
             }
-            mapStreamInfo(streamInfo, CAMERA3_STREAM_ROTATION_0, physicalCameraId,
+            mapStreamInfo(streamInfo, camera3::CAMERA_STREAM_ROTATION_0, physicalCameraId,
                     &streamConfiguration.streams[streamIdx++]);
             isStreamInfoValid = true;
 
@@ -487,12 +487,12 @@
 
                     for (const auto& compositeStream : compositeStreams) {
                         mapStreamInfo(compositeStream,
-                                static_cast<camera3_stream_rotation_t> (it.getRotation()),
+                                static_cast<camera_stream_rotation_t> (it.getRotation()),
                                 physicalCameraId, &streamConfiguration.streams[streamIdx++]);
                     }
                 } else {
                     mapStreamInfo(streamInfo,
-                            static_cast<camera3_stream_rotation_t> (it.getRotation()),
+                            static_cast<camera_stream_rotation_t> (it.getRotation()),
                             physicalCameraId, &streamConfiguration.streams[streamIdx++]);
                 }
                 isStreamInfoValid = true;