Merge pull request #53 from zouxiaoh/iotg_ipu6

iotg rpl mr1 release
intel · Apr 17, 2023 · 919f58c · 919f58c
2 parents c385ed2 + a0d34dc
commit 919f58c
Show file tree

Hide file tree

Showing 21 changed files with 251 additions and 272 deletions.
diff --git a/include/api/ICamera.h b/include/api/ICamera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Intel Corporation.
+ * Copyright (C) 2015-2023 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,6 +68,8 @@
  *     Version        0.61       Add API camera_callback_register() to notify event to AAL
  *******************************************************************************
  *     Version        0.62       Add sequence in camera_get_parameters to fetch settings
+ *******************************************************************************
+ *     Version        0.63       Merge camera_device_open API with/without vc_num together
  * ------------------------------------------------------------------------------
  *
  */
@@ -231,11 +233,7 @@ void camera_callback_register(int camera_id, const camera_callback_ops_t* callba
  *   int ret = camera_device_open(camera_id);
  * \endcode
  **/
-#ifdef NO_VIRTUAL_CHANNEL
-int camera_device_open(int camera_id);
-#else
 int camera_device_open(int camera_id, int vc_num = 0);
-#endif
 
 /**
  * \brief

diff --git a/modules/algowrapper/IntelTNR7US.cpp b/modules/algowrapper/IntelTNR7US.cpp
@@ -145,7 +145,8 @@ int IntelTNR7US::asyncParamUpdate(int gain, bool forceUpdate) {
     if (mThread->task_runner()) {
         mThread->task_runner()->PostTask(
             FROM_HERE,
-            base::Bind(&IntelTNR7US::handleParamUpdate, base::Unretained(this), gain, forceUpdate));
+            base::BindOnce(&IntelTNR7US::handleParamUpdate,
+                           base::Unretained(this), gain, forceUpdate));
     }
     return OK;
 }

diff --git a/src/3a/AiqUnit.cpp b/src/3a/AiqUnit.cpp
@@ -256,9 +256,9 @@ int AiqUnit::initIntelCcaHandle(const std::vector<ConfigMode>& configModes) {
             if (graphConfig != nullptr) {
                 graphConfig->graphGetStreamIds(streamIds);
             }
-            params.dvs_ids.count = streamIds.size();
+            params.gdcConfigs.count = streamIds.size();
             for (size_t i = 0; i < streamIds.size(); ++i) {
-                params.dvs_ids.ids[i] = streamIds[i];
+                params.gdcConfigs.ids[i] = streamIds[i];
             }
             ret = mDvs->configure(cfg, &params);
             CheckAndLogError(ret != OK, UNKNOWN_ERROR, "%s, configure DVS error", __func__);

diff --git a/src/3a/Dvs.cpp b/src/3a/Dvs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2022 Intel Corporation.
+ * Copyright (C) 2017-2023 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,8 +47,8 @@ int Dvs::configure(const ConfigMode configMode, cca::cca_init_params* params) {
     CheckAndLogError(!params, BAD_VALUE, "params is nullptr");
     LOG2("@%s", __func__);
 
-    for (uint8_t i = 0; i < params->dvs_ids.count; i++) {
-        int ret = configCcaDvsData(params->dvs_ids.ids[i], configMode, params);
+    for (uint8_t i = 0; i < params->gdcConfigs.count; i++) {
+        auto ret = configCcaDvsData(params->gdcConfigs.ids[i], configMode, params);
         CheckAndLogError(ret != OK, UNKNOWN_ERROR, "%s, configure DVS data error", __func__);
     }
 
@@ -58,6 +58,7 @@ int Dvs::configure(const ConfigMode configMode, cca::cca_init_params* params) {
     }
     mTuningMode = tuningMode;
 
+    dumpDvsConfiguration(*params);
     return OK;
 }
 
@@ -82,7 +83,16 @@ int Dvs::configCcaDvsData(int32_t streamId, const ConfigMode configMode,
          resolution.input_width, resolution.input_height, resolution.output_width,
          resolution.output_height);
 
-    cca::cca_gdc_configuration* gdcConfig = &params->gdcConfig;
+    cca::cca_gdc_configuration* gdcConfig = nullptr;
+    for (size_t i = 0; i < params->gdcConfigs.count; ++i) {
+        if (params->gdcConfigs.ids[i] == static_cast<uint32_t>(streamId)) {
+            gdcConfig = &params->gdcConfigs.configs[i];
+        }
+    }
+
+    CheckAndLogError(gdcConfig == nullptr, UNKNOWN_ERROR,
+                     "%s, Cannot find correspond DVS GDC Config!", __func__);
+
     CLEAR(*gdcConfig);
     gdcConfig->gdc_filter_width = DVS_MIN_ENVELOPE / 2;
     gdcConfig->gdc_filter_height = DVS_MIN_ENVELOPE / 2;
@@ -151,7 +161,6 @@ int Dvs::configCcaDvsData(int32_t streamId, const ConfigMode configMode,
         mZoomParamMap[streamId] = zoomParam;
     }
 
-    dumpDvsConfiguration(*params);
     return OK;
 }
 
@@ -215,36 +224,7 @@ void Dvs::handleEvent(EventData eventData) {
     if (!ptzRegion.left && !ptzRegion.top && !ptzRegion.right && !ptzRegion.bottom) {
         zp.zoom_region = {gdcRegion.left, gdcRegion.top, gdcRegion.right, gdcRegion.bottom};
     } else {
-        /*
-            SCALER_CROP_REGION can adjust to a small crop region if the aspect of active
-            pixel array is not same as the crop region aspect. Crop can only on either
-            horizontally or veritacl but never both.
-            If active pixel array's aspect ratio is wider than the crop region, the region
-            should be further cropped vertically.
-        */
-        auto coord = PlatformData::getActivePixelArray(mCameraId);
-        int wpa = coord.right - coord.left;
-        int hpa = coord.bottom - coord.top;
-
-        int width = ptzRegion.right - ptzRegion.left;
-        int height = ptzRegion.bottom - ptzRegion.top;
-
-        float aspect0 = static_cast<float>(wpa) / hpa;
-        float aspect1 = static_cast<float>(width) / height;
-
-        if (std::fabs(aspect0 - aspect1) < 0.00001) {
-            zp.zoom_region = {ptzRegion.left, ptzRegion.top, ptzRegion.right, ptzRegion.bottom};
-        } else if (aspect0 > aspect1) {
-            auto croppedHeight = width / aspect0;
-            int diff = std::abs(height - croppedHeight) / 2;
-            zp.zoom_region = {ptzRegion.left, ptzRegion.top + diff, ptzRegion.right,
-                              ptzRegion.bottom - diff};
-        } else {
-            auto croppedWidth = height * aspect0;
-            int diff = std::abs(width - croppedWidth) / 2;
-            zp.zoom_region = {ptzRegion.left + diff, ptzRegion.top, ptzRegion.right - diff,
-                              ptzRegion.bottom};
-        }
+        zp.zoom_region = {ptzRegion.left, ptzRegion.top, ptzRegion.right, ptzRegion.bottom};
     }
     intelCcaHandle->updateZoom(streamId, zp);
 
@@ -257,39 +237,45 @@ void Dvs::handleEvent(EventData eventData) {
 void Dvs::dumpDvsConfiguration(const cca::cca_init_params& config) {
     if (!Log::isLogTagEnabled(GET_FILE_SHIFT(Dvs), CAMERA_DEBUG_LOG_LEVEL3)) return;
 
-    LOG3("config.dvsOutputType %d", config.dvsOutputType);
-    LOG3("config.enableVideoStablization %d", config.enableVideoStablization);
-    LOG3("config.dvsZoomRatio %f", config.dvsZoomRatio);
-    LOG3("config.gdcConfig.pre_gdc_top_padding %d", config.gdcConfig.pre_gdc_top_padding);
-    LOG3("config.gdcConfig.pre_gdc_bottom_padding %d", config.gdcConfig.pre_gdc_bottom_padding);
-    LOG3("config.gdcConfig.gdc_filter_width %d", config.gdcConfig.gdc_filter_width);
-    LOG3("config.gdcConfig.gdc_filter_height %d", config.gdcConfig.gdc_filter_height);
-    LOG3("config.gdcConfig.splitMetadata[0](oydim_uv) %d", config.gdcConfig.splitMetadata[0]);
-    LOG3("config.gdcConfig.splitMetadata[1](oxdim_uv) %d", config.gdcConfig.splitMetadata[1]);
-    LOG3("config.gdcConfig.splitMetadata[2](oydim_y) %d", config.gdcConfig.splitMetadata[2]);
-    LOG3("config.gdcConfig.splitMetadata[3](oxdim_y) %d", config.gdcConfig.splitMetadata[3]);
-    LOG3("config.gdcConfig.gdc_resolution_info.input_width %d, input_height %d",
-         config.gdcConfig.gdc_resolution_info.input_width,
-         config.gdcConfig.gdc_resolution_info.input_height);
-    LOG3("config.gdcConfig.gdc_resolution_info.output_width %d, output_height %d",
-         config.gdcConfig.gdc_resolution_info.output_width,
-         config.gdcConfig.gdc_resolution_info.output_height);
-    LOG3("config.gdcConfig.gdc_resolution_info.input_crop.left %d, top %d, right %d, bottom %d",
-         config.gdcConfig.gdc_resolution_info.input_crop.left,
-         config.gdcConfig.gdc_resolution_info.input_crop.top,
-         config.gdcConfig.gdc_resolution_info.input_crop.right,
-         config.gdcConfig.gdc_resolution_info.input_crop.bottom);
-    LOG3("config.gdcConfig.gdc_resolution_history.input_width %d, input_height %d",
-         config.gdcConfig.gdc_resolution_history.input_width,
-         config.gdcConfig.gdc_resolution_history.input_height);
-    LOG3("config.gdcConfig.gdc_resolution_history.output_width %d, output_height %d",
-         config.gdcConfig.gdc_resolution_history.output_width,
-         config.gdcConfig.gdc_resolution_history.output_height);
-    LOG3("config.gdcConfig.gdc_resolution_history.input_crop.left %d, top %d, right %d, bottom %d",
-         config.gdcConfig.gdc_resolution_history.input_crop.left,
-         config.gdcConfig.gdc_resolution_history.input_crop.top,
-         config.gdcConfig.gdc_resolution_history.input_crop.right,
-         config.gdcConfig.gdc_resolution_history.input_crop.bottom);
+    LOG3("config: config.dvsOutputType %d", config.dvsOutputType);
+    LOG3("config: config.enableVideoStablization %d", config.enableVideoStablization);
+    LOG3("config: config.dvsZoomRatio %f", config.dvsZoomRatio);
+
+    for (size_t i = 0; i < config.gdcConfigs.count; ++i) {
+        LOG3("GDC Config for steeam: %d", config.gdcConfigs.ids[i]);
+
+        auto gdcConfig = config.gdcConfigs.configs[i];
+        LOG3("gdcConfig.pre_gdc_top_padding %d", gdcConfig.pre_gdc_top_padding);
+        LOG3("gdcConfig.pre_gdc_bottom_padding %d", gdcConfig.pre_gdc_bottom_padding);
+        LOG3("gdcConfig.gdc_filter_width %d", gdcConfig.gdc_filter_width);
+        LOG3("gdcConfig.gdc_filter_height %d", gdcConfig.gdc_filter_height);
+        LOG3("gdcConfig.splitMetadata[0](oydim_uv) %d", gdcConfig.splitMetadata[0]);
+        LOG3("gdcConfig.splitMetadata[1](oxdim_uv) %d", gdcConfig.splitMetadata[1]);
+        LOG3("gdcConfig.splitMetadata[2](oydim_y) %d", gdcConfig.splitMetadata[2]);
+        LOG3("gdcConfig.splitMetadata[3](oxdim_y) %d", gdcConfig.splitMetadata[3]);
+        LOG3("gdcConfig.gdc_resolution_info.input_width %d, input_height %d",
+            gdcConfig.gdc_resolution_info.input_width,
+            gdcConfig.gdc_resolution_info.input_height);
+        LOG3("gdcConfig.gdc_resolution_info.output_width %d, output_height %d",
+            gdcConfig.gdc_resolution_info.output_width,
+            gdcConfig.gdc_resolution_info.output_height);
+        LOG3("gdcConfig.gdc_resolution_info.input_crop.left %d, top %d, right %d, bottom %d",
+            gdcConfig.gdc_resolution_info.input_crop.left,
+            gdcConfig.gdc_resolution_info.input_crop.top,
+            gdcConfig.gdc_resolution_info.input_crop.right,
+            gdcConfig.gdc_resolution_info.input_crop.bottom);
+        LOG3("gdcConfig.gdc_resolution_history.input_width %d, input_height %d",
+            gdcConfig.gdc_resolution_history.input_width,
+            gdcConfig.gdc_resolution_history.input_height);
+        LOG3("gdcConfig.gdc_resolution_history.output_width %d, output_height %d",
+            gdcConfig.gdc_resolution_history.output_width,
+            gdcConfig.gdc_resolution_history.output_height);
+        LOG3("gdcConfig.gdc_resolution_history.input_crop.left %d, top %d, right %d, bottom %d",
+            gdcConfig.gdc_resolution_history.input_crop.left,
+            gdcConfig.gdc_resolution_history.input_crop.top,
+            gdcConfig.gdc_resolution_history.input_crop.right,
+            gdcConfig.gdc_resolution_history.input_crop.bottom);
+    }
 }
 
 }  // namespace icamera
diff --git a/src/core/CameraDevice.cpp b/src/core/CameraDevice.cpp
@@ -135,9 +135,6 @@ int CameraDevice::init() {
     ret = m3AControl->init();
     CheckAndLogError((ret != OK), ret, "%s: Init 3A Unit falied", __func__);
 
-    ret = mLensCtrl->init();
-    CheckAndLogError((ret != OK), ret, "%s: Init Lens falied", __func__);
-
     mRequestThread->run("RequestThread", PRIORITY_NORMAL);
 
     mState = DEVICE_INIT;
@@ -753,6 +750,7 @@ int CameraDevice::stop() {
     mRequestThread->clearRequests();
 
     m3AControl->stop();
+    mLensCtrl->stop();
 
     if (mState == DEVICE_START) stopLocked();
 
@@ -873,7 +871,10 @@ int CameraDevice::qbuf(camera_buffer_t** ubuffer, int bufferNum, const Parameter
         AutoMutex m(mDeviceLock);
         if (mState == DEVICE_CONFIGURE || mState == DEVICE_STOP) {
             // Start 3A here then the HAL can run 3A for request
-            int ret = m3AControl->start();
+            int ret = mLensCtrl->start();
+            CheckAndLogError((ret != OK), ret, "%s: Start Lens falied", __func__);
+
+            ret = m3AControl->start();
             CheckAndLogError((ret != OK), BAD_VALUE, "Start 3a unit failed with ret:%d.", ret);
 
             mState = DEVICE_BUFFER_READY;

diff --git a/src/core/IspParamAdaptor.cpp b/src/core/IspParamAdaptor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2022 Intel Corporation.
+ * Copyright (C) 2015-2023 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -250,8 +250,12 @@ int IspParamAdaptor::configure(const stream_t& stream, ConfigMode configMode, Tu
             // Use the tuning mode in graph to update the isp tuning data
             if (ispTuningIndex != -1) {
                 uint8_t lardTag = cca::CCA_LARD_ISP;
-                ia_lard_input_params lardParam = {};
-                lardParam.isp_mode_index = ispTuningIndex;
+                ia_lard_input_params lardParam = {
+                    IA_MKN_CHTOUL('D', 'F', 'L', 'T'),
+                    IA_MKN_CHTOUL('D', 'F', 'L', 'T'),
+                    static_cast<uint32_t>(ispTuningIndex),
+                    IA_MKN_CHTOUL('D', 'F', 'L', 'T')
+                };
                 cca::cca_nvm tmpNvm = {};
 
                 ia_err iaErr =
@@ -274,6 +278,7 @@ int IspParamAdaptor::configure(const stream_t& stream, ConfigMode configMode, Tu
         inputParams->seq_id = -1;
         initInputParams(inputParams);
         inputParams->stream_id = ispParamIt.first;
+        inputParams->dvs_id = inputParams->stream_id;
 
         ia_isp_bxt_program_group* pgPtr = mGraphConfig->getProgramGroup(ispParamIt.first);
         CheckAndLogError(!pgPtr, UNKNOWN_ERROR,

diff --git a/src/core/LensHw.cpp b/src/core/LensHw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2021 Intel Corporation
+ * Copyright (C) 2016-2023 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,10 @@
 
 #define LOG_TAG LensHw
 
-#include "LensHw.h"
+#include "src/core/LensHw.h"
+
+#include <string>
+
 #include "iutils/CameraLog.h"
 #include "V4l2DeviceFactory.h"
 #include "PlatformData.h"
@@ -31,7 +34,7 @@ LensHw::LensHw(int cameraId)
 
 LensHw::~LensHw() {}
 
-int LensHw::init() {
+int LensHw::start() {
     std::string lensName = PlatformData::getLensName(mCameraId);
     if (lensName.empty()) {
         LOG1("<id%d>@%s No HW Lens", mCameraId, __func__);
@@ -51,6 +54,18 @@ int LensHw::init() {
     return OK;
 }
 
+void LensHw::stop() {
+    if (!mLensSubdev) return;
+
+    // close the lens sub device
+    std::string subDevName;
+    CameraUtils::getSubDeviceName(mLensName.c_str(), subDevName);
+    if (!subDevName.empty()) {
+        V4l2DeviceFactory::releaseSubDev(mCameraId, subDevName);
+        mLensSubdev = nullptr;
+    }
+}
+
 /**
  * focus with absolute value
  */

diff --git a/src/core/LensHw.h b/src/core/LensHw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2021 Intel Corporation
+ * Copyright (C) 2016-2023 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,8 @@ class LensHw {
     LensHw(int cameraId);
     ~LensHw();
 
-    int init();
+    int start();
+    void stop();
 
     const char* getLensName(void);
 

diff --git a/src/core/RequestThread.cpp b/src/core/RequestThread.cpp
@@ -320,9 +320,11 @@ bool RequestThread::threadLoop() {
 
         if (blockRequest()) {
             int ret = mRequestSignal.waitRelative(lock, kWaitDuration * SLOWLY_MULTIPLIER);
-            CheckWarning(ret == TIMED_OUT, true,
-                         "wait event time out, %d requests processing, %zu requests in HAL",
-                         mRequestsInProcessing, mPendingRequests.size());
+            if (ret == TIMED_OUT) {
+                LOG2("wait event time out, %d requests processing, %zu requests in HAL",
+                     mRequestsInProcessing, mPendingRequests.size());
+                return true;
+            }
 
             if (blockRequest()) {
                 LOG2("Pending request processing, mBlockRequest %d, Req in processing %d",

diff --git a/src/core/psysprocessor/PolicyManager.cpp b/src/core/psysprocessor/PolicyManager.cpp
@@ -149,7 +149,10 @@ int PolicyManager::wait(std::string executorName, int64_t sequence) {
         LOG2("%s: need wait for other executors.", executorName.c_str());
         const int64_t kWaitDuration = 66000000;  // 66ms
         int ret = bundle->mCondition.waitRelative(lock, kWaitDuration * SLOWLY_MULTIPLIER);
-        CheckWarning(ret == TIMED_OUT, ret, "%s: wait executors timeout", executorName.c_str());
+        if (ret == TIMED_OUT) {
+            LOG2("%s: wait executors timeout", executorName.c_str());
+            return ret;
+        }
     } else {
         bundle->mWaitingCount = 0;
         bundle->mCondition.broadcast();