调整hdr的代码

app/src/main/cpp/camera2/ndkcamera.cpp

@@ -2540,7 +2540,7 @@ void NdkCamera::SetupHDR(ACameraMetadata* characteristics, ACaptureRequest* requ
 {
     // 1. 设置基础的相机参数
     camera_status_t status;
-    // __system_property_set("vendor.mfll.force", "1");
+    __system_property_set("vendor.forceset.hdrmode", "1");
 #if 0
     int32_t tagCount = 0;
     const uint32_t* tags = nullptr;
@@ -2575,18 +2575,17 @@ void NdkCamera::SetupHDR(ACameraMetadata* characteristics, ACaptureRequest* requ
         }
     }
 
-    // 2. 设置 MediaTek 特定的 MFNR 参数
+    // 2. 设置 MediaTek 特定的 HDR 参数
     // 使用 vendor tag 描述符
-    // int32_t mfbMode = MTK_MFNR_FEATURE_MFB_AUTO; // 1 Enable MFNR
-    int32_t hdrMode = MTK_HDR_FEATURE_HDR_MODE_ON; // 1 Enable MFNR
+    int32_t hdrMode = MTK_HDR_FEATURE_HDR_MODE_AUTO; // 1 Enable MFNR
     uint8_t aeMode = MTK_CONTROL_AE_MODE_ON;
-    // status = ACaptureRequest_setEntry_u8(request, MTK_CONTROL_AE_MODE, 1, &aeMode);
+    status = ACaptureRequest_setEntry_u8(request, MTK_CONTROL_AE_MODE, 1, &aeMode);
 
     // int32_t mfbMode = ais ? 2 : 1; // 1 Enable MFNR
     status = ACaptureRequest_setEntry_i32(request, MTK_HDR_FEATURE_HDR_MODE, 1, &hdrMode);
     if (status != ACAMERA_OK)
     {
-        ALOGE("Failed to set MTK_MFNR_FEATURE_MFB_MODE, status: %d", status);
+        ALOGE("Failed to set MTK_HDR_FEATURE_HDR_MODE, status: %d", status);
     }
 
     // int32_t ispTuning = (mfbMode != 0) ? MTK_CONTROL_CAPTURE_HINT_FOR_ISP_TUNING_MFNR : MTK_CONTROL_CAPTURE_HINT_FOR_ISP_TUNING_DEFAULT_NONE;