展讯相机添加设置项（VendorTag)

已于 2023-07-12 18:02:31 修改
阅读量126 收藏
点赞数
文章标签： android
于 2023-07-12 17:45:50 首次发布
版权声明：本文为博主原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://blog.csdn.net/beyond_zhou/article/details/131687134
版权

添加自定义水印开关为例：
底层添加

diff --git a/vendor/sprd/modules/libcamera/common/inc/cmr_common.h b/vendor/sprd/modules/libcamera/common/inc/cmr_common.h
index a83a90eb89d..ef6a1bedf47 100755
--- a/vendor/sprd/modules/libcamera/common/inc/cmr_common.h
+++ b/vendor/sprd/modules/libcamera/common/inc/cmr_common.h
@@ -2067,6 +2067,7 @@ enum camera_param_type {
     CAMERA_PARAM_SPRD_CALLBACK_EXPO_TIME,
     CAMERA_PARAM_SPRD_CALLBACK_SENSITIVITY,
     CAMERA_PARAM_SPRD_CALLBACK_AE_MODE,
+    CAMERA_PARAM_SPRD_CUSTOMIZE_WATERMARK_ENABLED, //bv zhoudengfu add for customize water mark 20230627
     CAMERA_PARAM_TYPE_MAX
 };
 
diff --git a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Channel.cpp b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Channel.cpp
index 3e1ca323490..b8cb7891f55 100755
--- a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Channel.cpp
+++ b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Channel.cpp
@@ -1944,6 +1944,12 @@ int SprdCamera3MetadataChannel::start(uint32_t frame_number) {
             HAL_LOGV("ANDROID_SPRD_TIMEWATERMARK_ENABLED");
             mOEMIf->SetCameraParaTag(ANDROID_SPRD_TIMEWATERMARK_ENABLED);
             break;
+        //bv zhoudengfu add for customize water mark start 20230627
+        case ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED:
+            HAL_LOGV("ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED");
+            mOEMIf->SetCameraParaTag(ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED);
+            break;
+        //bv zhoudengfu add for customize water mark end 20230627
         case ANDROID_SPRD_ADJUST_FLASH_LEVEL:
             HAL_LOGV("ANDROID_SPRD_ADJUST_FLASH_LEVEL");
             mOEMIf->SetCameraParaTag(ANDROID_SPRD_ADJUST_FLASH_LEVEL);
diff --git a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3OEMIf.cpp b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3OEMIf.cpp
index c2148c7e52e..1bb0346bed9 100755
--- a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3OEMIf.cpp
+++ b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3OEMIf.cpp
@@ -10201,6 +10201,16 @@ int SprdCamera3OEMIf::SetCameraParaTag(cmr_int cameraParaTag) {
                  CAMERA_PARAM_SPRD_TIME_WATERMARK_ENABLED,
                  sprdInfo->sprd_is_time_watermark);
     } break;
+    //bv zhoudengfu add for customize water mark start 20230627
+    case ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED: {
+        SPRD_DEF_Tag *sprdInfo;
+        sprdInfo = mSetting->getSPRDDEFTagPTR();
+        SET_PARM(mHalOem, mCameraHandle,
+                 CAMERA_PARAM_SPRD_CUSTOMIZE_WATERMARK_ENABLED,
+                 sprdInfo->sprd_is_customize_watermark);
+    } break;
+    //bv zhoudengfu add for customize water mark end 20230627
+
     case ANDROID_SPRD_SUPER_MACROPHOTO_ENABLE: {
         SPRD_DEF_Tag *sprdInfo;
         sprdInfo = mSetting->getSPRDDEFTagPTR();
diff --git a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.cpp b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.cpp
index e949bd968d8..c39fcbebdd3 100755
--- a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.cpp
+++ b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.cpp
@@ -4972,6 +4972,10 @@ int SprdCamera3Setting::constructDefaultMetadata(int type,
                        &sprdWaterMarkEnabled, 1);
     requestInfo.update(ANDROID_SPRD_TIMEWATERMARK_ENABLED,
                        &sprdWaterMarkEnabled, 1);
+    //bv zhoudengfu add for customize water mark start 20230627
+    requestInfo.update(ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED,
+                       &sprdWaterMarkEnabled, 1);
+    //bv zhoudengfu add for customize water mark end 20230627
 
     uint8_t sprd_calibration_otp_result = 0;
     requestInfo.update(ANDROID_SPRD_CALIBRATION_OTP_RESULT,
@@ -6240,6 +6244,16 @@ int SprdCamera3Setting::updateWorkParameters(
             ANDROID_SPRD_TIMEWATERMARK_ENABLED, 1);
     }
 
+    //bv zhoudengfu add for customize water mark start 20230627
+    if (frame_settings.exists(ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED)) {
+        valueU8 =
+            frame_settings.find(ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED).data.u8[0];
+        GET_VALUE_IF_DIF(
+            s_setting[mCameraId].sprddefInfo.sprd_is_customize_watermark, valueU8,
+            ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED, 1);
+    }
+    //bv zhoudengfu add for customize water mark end 20230627
+
     if (frame_settings.exists(ANDROID_SPRD_ULTRA_DISTORTION_CORRECT_ENABLE)) {
         valueU8 =
             frame_settings.find(ANDROID_SPRD_ULTRA_DISTORTION_CORRECT_ENABLE).data.u8[0];
diff --git a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.h b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.h
index c0757acd812..b1ae6b1ada3 100755
--- a/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.h
+++ b/vendor/sprd/modules/libcamera/hal3_2v6/SprdCamera3Setting.h
@@ -494,6 +494,7 @@ typedef struct {
     uint8_t gesture_detect_enable;
     uint8_t gesture_detect_current;
     uint8_t is_first_request;
+    uint8_t sprd_is_customize_watermark; //bv zhoudengfu add for customize water mark 20230627
 } SPRD_DEF_Tag;
 
 typedef struct {
diff --git a/vendor/sprd/modules/libcamera/include/SprdCamera3.h b/vendor/sprd/modules/libcamera/include/SprdCamera3.h
index fad7ae58802..d91779d781f 100755
--- a/vendor/sprd/modules/libcamera/include/SprdCamera3.h
+++ b/vendor/sprd/modules/libcamera/include/SprdCamera3.h
@@ -276,6 +276,7 @@ static tags_info_t
         {"sprdGesturedetectEnabled", TYPE_BYTE},
         {"sprdGesturedetectCurrent", TYPE_BYTE},
         {"sprdBypassBlcEnable", TYPE_BYTE},
+        {"sprdCustomizeWatermarkEnabled", TYPE_BYTE}, //bv zhoudengfu add for customize water mark 20230627
 };
 
 tags_info_t *cam_tag_info[ANDROID_VENDOR_SECTION_COUNT] = {
diff --git a/vendor/sprd/modules/libcamera/include/SprdCamera3Tags.h b/vendor/sprd/modules/libcamera/include/SprdCamera3Tags.h
index 5dc6feed997..c7c436b1062 100755
--- a/vendor/sprd/modules/libcamera/include/SprdCamera3Tags.h
+++ b/vendor/sprd/modules/libcamera/include/SprdCamera3Tags.h
@@ -137,6 +137,9 @@ typedef enum sprd_camera_ext_tags {
     ANDROID_SPRD_GESTUREDETECT_ENABLED,
     ANDROID_SPRD_GESTUREDETECT_CURRENT,
     ANDROID_SPRD_BYPASS_BLC_ENABLE,
+    //bv zhoudengfu add for customize water mark start 20230627
+    ANDROID_SPRD_CUSTOMIZE_WATERMARK_ENABLED,
+    //bv zhoudengfu add for customize water mark end 20230627
     VENDOR_SECTION_END,
     /*not parameter but only flag between framework and hal*/
     /*sprd add flag end*/
diff --git a/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_setting.h b/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_setting.h
index d68aa9db907..32292ea0a49 100755
--- a/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_setting.h
+++ b/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_setting.h
@@ -124,6 +124,7 @@ enum setting_cmd_type {
     SETTING_RESET_CALLBACK_STREAM_INFO,
     SETTING_CTRL_AE_CAP_PARAM,
     SETTING_CLEAR_AE_CAP_PARAM,
+    SETTING_GET_SPRD_CUSTOMIZE_WATERMARK, //bv zhoudengfu add for customize water mark 20230627
     SETTING_TYPE_MAX
 };
 
diff --git a/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_watermark.h b/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_watermark.h
index 88f0f2b033b..65335468570 100644
--- a/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_watermark.h
+++ b/vendor/sprd/modules/libcamera/oem2v6/inc/cmr_watermark.h
@@ -5,6 +5,8 @@
 
 #define WATERMARK_LOGO (1 << 0)
 #define WATERMARK_TIME (1 << 1)
+#define WATERMARK_CUSTOMIZE (1 << 2) //bv zhoudengfu add for customize water mark 20230627
+
 
 typedef struct {
     int imgW;
diff --git a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_oem.c b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_oem.c
index 74b14a61d67..50f5888d136 100755
--- a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_oem.c
+++ b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_oem.c
@@ -5748,6 +5748,13 @@ cmr_u32 camera_get_watermark_flag(cmr_handle oem_handle) {
     if (setting_param.cmd_type_value)
         watermark_flag |= WATERMARK_TIME;
 
+    //bv zhoudengfu add for customize water mark start 20230627    
+    ret = cmr_setting_ioctl(setting_cxt->setting_handle,
+                            SETTING_GET_SPRD_CUSTOMIZE_WATERMARK, &setting_param);
+    if (setting_param.cmd_type_value)
+        watermark_flag |= WATERMARK_CUSTOMIZE;
+    //bv zhoudengfu add for customize water mark end 20230627    
+
     return watermark_flag;
 }
 
@@ -15541,6 +15548,13 @@ cmr_int camera_set_setting(cmr_handle oem_handle, enum camera_param_type id,
         ret = cmr_setting_ioctl(cxt->setting_cxt.setting_handle, id,
                                 &setting_param);
         break;
+    //bv zhoudengfu add for customize water mark start 20230627
+    case CAMERA_PARAM_SPRD_CUSTOMIZE_WATERMARK_ENABLED:
+    setting_param.cmd_type_value = param;
+    ret = cmr_setting_ioctl(cxt->setting_cxt.setting_handle, id,
+                            &setting_param);
+    break;
+    //bv zhoudengfu add for customize water mark end 20230627
     case CAMERA_PARAM_SPRD_AUTOCHASING_REGION_ENABLE:
         setting_param.cmd_type_value = param;
         ret = cmr_setting_ioctl(cxt->setting_cxt.setting_handle, id,
diff --git a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_setting.c b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_setting.c
index 655c03e9758..005f610bb3e 100755
--- a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_setting.c
+++ b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_setting.c
@@ -195,6 +195,7 @@ struct setting_hal_param {
     cmr_uint p2p_enable;//picture in picture
     cmr_uint sprd_logo_watermark;
     cmr_uint sprd_time_watermark;
+    cmr_uint sprd_customize_watermark; //bv zhoudengfu add 20230627
     struct img_size originalPictureSize;
     cmr_uint is_super_macrophoto;
     cmr_uint is_enable_flash_cali;
@@ -2892,6 +2893,31 @@ static cmr_int setting_get_time_watermark(struct setting_component *cpt,
     return ret;
 }
 
+//bv zhoudengfu add for customize water mark start 20230627
+static cmr_int setting_set_customize_watermark(struct setting_component *cpt,
+                                struct setting_cmd_parameter *parm) {
+    cmr_int ret = 0;
+    struct setting_hal_param *hal_param = get_hal_param(cpt, parm->camera_id);
+
+    hal_param->sprd_customize_watermark = parm->cmd_type_value;
+    CMR_LOGD("customize watermark=%d", hal_param->sprd_customize_watermark);
+
+    return ret;
+}
+
+static cmr_int setting_get_customize_watermark(struct setting_component *cpt,
+                                struct setting_cmd_parameter *parm) {
+    cmr_int ret = 0;
+    struct setting_hal_param *hal_param = get_hal_param(cpt, parm->camera_id);
+
+    parm->cmd_type_value = hal_param->sprd_customize_watermark;
+    CMR_LOGD("customize watermark=%d", hal_param->sprd_customize_watermark);
+
+    return ret;
+}
+//bv zhoudengfu add for customize water mark end 20230627
+
+
 static cmr_int setting_set_environment(struct setting_component *cpt,
                                        struct setting_cmd_parameter *parm) {
     ATRACE_BEGIN(__FUNCTION__);
@@ -4584,10 +4610,18 @@ static setting_ioctl_fun_ptr setting_list[SETTING_TYPE_MAX] = {
                              setting_set_logo_watermark,
     [CAMERA_PARAM_SPRD_TIME_WATERMARK_ENABLED] =
                              setting_set_time_watermark,
+    //bv zhoudengfu add for customize water mark start 20230627                         
+    [CAMERA_PARAM_SPRD_CUSTOMIZE_WATERMARK_ENABLED] =
+                             setting_set_customize_watermark,
+    //bv zhoudengfu add for customize water mark end 20230627                                                  
     [SETTING_GET_SPRD_LOGO_WATERMARK] =
                              setting_get_logo_watermark,
     [SETTING_GET_SPRD_TIME_WATERMARK] =
                              setting_get_time_watermark,
+    //bv zhoudengfu add for customize water mark start 20230627                         
+    [SETTING_GET_SPRD_CUSTOMIZE_WATERMARK] =
+                             setting_get_customize_watermark,   
+    //bv zhoudengfu add for customize water mark end 20230627                                                                     
     [SETTING_CTRL_AE_NOTIFY] =
                              setting_ctrl_ae_adjust,
     [SETTING_CLEAR_AE_NOTIFY] =
diff --git a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_watermark.c b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_watermark.c
index 86fc2f6f37d..f9142563d8f 100755
--- a/vendor/sprd/modules/libcamera/oem2v6/src/cmr_watermark.c
+++ b/vendor/sprd/modules/libcamera/oem2v6/src/cmr_watermark.c
@@ -11,12 +11,18 @@
 
 #include "cmr_watermark.h"
 #include "math.h"
-
+#include "errno.h"
+#include "string.h"
 /* max number of char for time watermark */
 #define TIMESTAMP_CHAR_MAX (20)
 /* watermark source file path, attention: total(PATH+NAME) should < 256 */
 #define CAMERA_LOGO_PATH "/vendor/logo/"
 
+//#define CAMERA_CUSTOMIZE_LOGO_PATH "/data/data/com.android.camera2/files/watermark.rgba" //bv zhoudengfu add for customize water mark 20230627
+
+//#define CAMERA_CUSTOMIZE_LOGO_PATH "/storage/emulated/0/Documents/watermark.rgba"
+#define CAMERA_CUSTOMIZE_LOGO_PATH "/data/data/com.android.camera2/files/watermark.rgba"
+
 
 /* local function */
 static int camera_select_time_file(sizeParam_t *pt);
@@ -498,7 +504,8 @@ static int camera_get_logo_data(unsigned char *logo, sizeParam_t *size) {
         CMR_LOGE("file name too long");
         return -1;
     }
-    strcat(tmp_name, size->filename);
+    strcat(tmp_name, "watermark.rgba");
+    CMR_LOGW("open watermark path = %s",tmp_name);
     FILE *fp = fopen(tmp_name, "rb");
     if (fp) {
         len = (unsigned int)fread(logo, 1, size->logoW * size->logoH * 4, fp);
@@ -510,6 +517,33 @@ static int camera_get_logo_data(unsigned char *logo, sizeParam_t *size) {
 
     return -ENOENT;
 }
+
+//bv zhoudengfu add for customize water mark start 20230627
+static int camera_get_customize_logo_data(unsigned char *logo, sizeParam_t *size) {
+    char tmp_name[256];
+    unsigned int len = 0;
+
+    strcpy(tmp_name, CAMERA_CUSTOMIZE_LOGO_PATH);
+    if (strlen(tmp_name) + strlen(size->filename) > sizeof(tmp_name)) {
+        CMR_LOGE("file name too long");
+        return -1;
+    }
+    CMR_LOGW("open customize watermark path = %s",tmp_name);
+    FILE *fp = fopen(tmp_name, "rb");
+    if (fp) {
+        len = (unsigned int)fread(logo, 1, size->logoW * size->logoH * 4, fp);
+        fclose(fp);
+        if (len == size->logoW * size->logoH * 4)
+            return 0;
+    }
+
+    CMR_LOGW("open customize watermark fail errno = %d reason = %s", errno, strerror(errno));
+    CMR_LOGW("open customize watermark src file failed");
+
+    return -ENOENT;
+}
+//bv zhoudengfu add for customize water mark end 20230627
+
 /* combine image as:2019-10-10 10:37:45 with src
  * input: time source(rgba)
  * output: timestamp image as 2019-10-10 10:37:45, vertical
@@ -836,6 +870,38 @@ int watermark_add_yuv(int flag, unsigned char *pyuv, sizeParam_t *sizeparam,
     }
 _END_LOGO:
 
+//bv zhoudengfu add for customize water mark start 20230627
+    // customize watermark
+    if (flag & WATERMARK_CUSTOMIZE) {
+        flag &= (~WATERMARK_CUSTOMIZE);
+        ret = camera_select_logo(sizeparam);
+        if (ret) {
+            CMR_LOGW("Get logo src fail %d", ret);
+            goto _END_LOGO_CUSTOMIZE;
+        }
+        pwmark = (unsigned char *)malloc(sizeparam->logoW * sizeparam->logoH * 4);
+        if (NULL == pwmark) {
+            CMR_LOGE("Alloc mem for logo fail");
+            goto _END_LOGO_CUSTOMIZE;
+        }
+        /* If get pos from camera_select_logo, remove the code below
+         * pos: need align 2
+         */
+        sizeparam->posX = 0;
+        sizeparam->posY = 0;
+        ret = camera_get_customize_logo_data(pwmark, sizeparam);
+        if (ret) {
+            free(pwmark);
+            goto _END_LOGO_CUSTOMIZE;
+        }
+        ret = sprd_fusion_yuv420_rgba(pyuv, pwmark, sizeparam);
+        if (ret == 0)
+            flag |= WATERMARK_CUSTOMIZE;
+        free(pwmark);
+    }
+_END_LOGO_CUSTOMIZE:
+//bv zhoudengfu add for customize water mark end 20230627
+
     // time watermark
     if (flag & WATERMARK_TIME) {
         flag &= (~WATERMARK_TIME);

上层添加

```java
diff --git a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdAndroidCamera2Settings.java b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdAndroidCamera2Settings.java
index 9b73ead..c5975a7 100644
--- a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdAndroidCamera2Settings.java
+++ b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdAndroidCamera2Settings.java
@@ -246,6 +246,15 @@ public class SprdAndroidCamera2Settings extends AndroidCamera2Settings {
             Log.i(TAG, " set CONTROL_SPRD_FAST_THUMB: mFastThumbEnable = " + mFastThumbEnable);
             requestSettings.set(CONTROL_SPRD_FAST_THUMB, mFastThumbEnable);
         }
+
+        //bv zhoudengfu add for bv customize water mark start 20230609
+        if(mCurrentEnableCustomizeWatermark!= -1){
+            Log.i(TAG, " set ANDROID_SPRD_ENABLED: mCurrentEnableCustomizeWatermark = "
+                    + mCurrentEnableCustomizeWatermark);
+            requestSettings.set(ANDROID_SPRD_CUSTOMIZEWATERMARK_ENABLED, mCurrentEnableCustomizeWatermark);
+        }
+        //bv zhoudengfu add for bv customize water mark end 20230609
+
     }
 
     protected MeteringRectangle[] legacyAreasToMeteringRectanglesOnlyPreview(
diff --git a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCameraSettings.java b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCameraSettings.java
index b31474d..33b4937 100644
--- a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCameraSettings.java
+++ b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCameraSettings.java
@@ -82,6 +82,10 @@ public abstract class SprdCameraSettings {
     protected int mCurrentEnableFaceAttributes= -1;
     protected int mCurrentEnableSmileShutter= -1;
     protected boolean mCurrentGestureCapture = false;
+    //bv zhoudengfu add for bv customize water mark start 20230609
+    protected int mCurrentEnableCustomizeWatermark = -1;
+    //bv zhoudengfu add for bv customize water mark end 20230609
+
 
     protected static final int[] MAKE_UP_DEFAULT_VALUE = new int[]{0,0,0,0,0,0,0,0,0};
     protected boolean mCurrentNeedThumb = false;
@@ -163,6 +167,9 @@ public abstract class SprdCameraSettings {
         mCurrentSlidePosition = src.mCurrentSlidePosition;
         mSuperMacroPhotoEnable = src.mSuperMacroPhotoEnable;
         mCurrentGestureCapture = src.mCurrentGestureCapture;
+        //bv zhoudengfu add for bv customize water mark start 20230609
+        mCurrentEnableCustomizeWatermark = src.mCurrentEnableCustomizeWatermark;
+        //bv zhoudengfu add for bv customize water mark end 20230609
     }
 
     public void setAntibanding(CameraCapabilities.Antibanding antibanding) {
@@ -221,6 +228,11 @@ public abstract class SprdCameraSettings {
     }
     public int getLogoWatermarkEnable() { return mCurrentEnableLogoWatermark; }
     public int getTimeWatermarkEnable() { return mCurrentEnableTimeWatermark; }
+    //bv zhoudengfu add for bv customize water mark start 20230609
+    public void setCustomizeWatermarkEnable(int enable) { mCurrentEnableCustomizeWatermark = enable; }
+    public int getCustomizeWatermarkEnable() { return mCurrentEnableCustomizeWatermark; }
+    //bv zhoudengfu add for bv customize water mark end 20230609
+
     /*
      * SPRD Bug:474721 Feature:Contrast. @{
      */
diff --git a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCaptureRequest.java b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCaptureRequest.java
index 42ae68b..87a7cee 100644
--- a/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCaptureRequest.java
+++ b/DK_AWCamera/portability/src/com/android/ex/camera2/portability/SprdCaptureRequest.java
@@ -150,4 +150,10 @@ public class SprdCaptureRequest {
 
     public static final Key<Integer> CONTROL_SPRD_AWB_CT_VALUE = new Key<Integer>(
             "com.addParameters.sprdAwbCtValue", int.class);
+
+    //bv zhoudengfu add for bv customize water mark start 20230609
+    public static final Key<Integer> ANDROID_SPRD_CUSTOMIZEWATERMARK_ENABLED = new Key<Integer>(
+            "com.addParameters.sprdCustomizeWatermarkEnabled", int.class);
+    //bv zhoudengfu add for bv customize water mark end 20230609
+
 }
在适当地方设置其值
```java
        mCameraSettings.setCustomizeWatermarkEnable(1);
        if(mCameraDevice != null) {
            mCameraDevice.applySettings(mCameraSettings);
        }
Noodles_Sophie
关注
  • 0
    点赞
  • 踩
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
展讯SC9820E驱动配置之camera配置
u011405142的博客
12-25 5735
展讯智能机android平台sc8920e添加新摄像头驱动主要改4个方面. 1.添加驱动文件 摄像头驱动主要在目录: vendor/sprd/modules/libcamera/sensor下添加及改动. 比如现在添加的是bf20a1f驱动: 一般是在sensor/sensor_drv/classic/下添加: 2.修改配置文件 文件:vendor/sprd/modul...
展讯camera驱动调试
whyqcwy的专栏
06-03 3750
camera驱动目录： vendor/sprd/modules/libcamera/sensor/sensor_drv/classic/Galaxycore/gc030a/ kernel/drivers/misc/sprd_camera/sensor/csi2/csi_sprd/r2p0/csi_driver.c kernel/arch/arm/boot/dts/sp7731e-1h10-nati...
展讯平台Camera tuning总结.pdf
02-09
展讯平台Camera tuning总结。。。 1 展讯新算法平台关于 BV 环境的划分 1.1 展讯新算法中关于调试环境选择： (1) Common：当不符合出 common 以外的环境判定条件时，使用改组参数； 一般的，LSC/CMC/AWB 包含 common 参数； (2) Lowlight：灯箱调试使用 T 光 50 LUX 环境； (3) Outdoor/Highlight：以 D65 为准 (4) Indoor：包含灯箱中的 D65、Tl84、CWF、A、H 光； 1.2 Smart_light 对环境进行划分 Smart light 是根据 BV 值的条件，对 low_light、inoor、outdoor、high_light 环境做划分
android camera hal3 新增vendor tag
xuhui_7810的专栏
09-07 5949
前段时间，我在android8.1的系统层上，新增了一个usbcamera hal，和一个虚拟摄像头hal。在实际使用的过程中，遇到了一个问题——客户app在用camera api接口调用usbcamera或virtual camera时，希望能够知道当前调用的是系统本身的mipi摄像头，还是usbcamera或virtualcamera。也就是说，客户想知道，我当前调用的摄像头，是个什么东西。 要实现这个功能，有三种方法。第一种，是最下乘的方法，也就是在hal层，open ...
【分析笔记】展讯 RDA8810PL 平台 Camera 驱动分析和移植（Android 4.4 ）
lovemengx的博客
03-28 1385
前言概述 因以下原因，导致不得不通过代码分析来学习如何在该平台下进行摄像头驱动移植 香橙派开发商（迅龙软件）仅提供能跑起来的源代码、固件，以及简单的编译文档，不提供其它技术支持 baidu、google 所找到的修改方式与所拿到的源代码完全不符，因此无借鉴价值 笔记主要以了解移植驱动所需要做的工作为目标导向，通过分析相关源码的方式一步一步地抽丝剥茧而形成的记录。 记录目的，一来可以借助笔记......
MTK Camera自定义Vendor Tag（一）：理论
Flying snow
07-30 1610
MTK Camera自定义Vendor Tag
AndroidR上展讯CameraAPP的openCamera流程
u010869159的博客
03-29 663
看展讯平台的Camera有一段时间了，今天来整理下openCamera的流程。 其实，CameraAPP的主要逻辑可分为两大部分：界面显示 + camera处理。 展讯和MTK平台CameraAPP的共同点是两者都有Module的概念，即不同的Module处理app中不同的模式，比如拍照模式、美颜模式、录像模式等等。 但是在与camera这个硬件设备打交道的时候，设计却明显不同。MTK平台app是将界面显示的处理与camera处理均放在当前Module中处理，而展讯平台是Module只处理与当前模式相关的界
展讯手电筒菜单模块添加
04-02
1.手电筒菜单添加步骤及其相关的代码 2.手电筒模块添加步骤及其相关的代码 3.GPIO，pinmap配置 4.原理图 5.流程总结
展讯方案刷机工具驱动
01-12
展讯方案刷机工具驱动
MTK 以及 展讯主要平台对LCD 、camera的支持
05-28
描述了MTK以及展讯平台对于LCD/Camera的支持情况
展讯 camera_启动速度优化
05-31
展讯 camera_启动速度优化
展讯平台手机camera驱动移植_2
01-03
平台:展讯 安卓:10 导入驱动程序及调试参数文件 将驱动文件及调试参数拷贝进文件夹 vendor/sprd/modules/libcamera/sensor/sensor_drv/classic/Galaxycore/gc5025_hlt_k131 包括各种 .h .c .mk文件，这些是驱动的实现代码。 parameters文件夹包含若干的文件，均为相关的参数，如果驱动和参数文件夹是厂商较新提供的再点亮时可基本不做更改都能点亮。（后期需要调试效果再进行更改）。 在下列文件里添加相关的sensor信息，申明外部函数 vendor/sprd / modules/libcamera/
Android Camera HAL V3 Vendor Tag及V1，V3参数转换
小贼哥的技术花园
01-17 1万+
转眼一看，上一次发博文都快是三年之前了，惭愧。主要是三年前找的这份工作，虽然是世界500强的技术大牛公司，但是工作可一点都不高大上，非常的忙，一天不但要处理各种camera的bug，还要开发camera的各种feature和sensor驱动，还要和内部、外部的人斗智斗勇，你懂的。忙的三年了才有闲心来发表这片博文。 牢骚已完，言归正传。 在Android 5.0上，Google正式的将Camer
Android Camera HAL3 Vendor Tag 定制私有化
huifeidedabian的博客
03-28 4366
最近需要搞个私有参数下来作为apk 设置开关使用，想到之前HAL1 的使用过增加 Parameters 来实现，所以有自然想到了现在的 vendor tag，下面是android source code 的使用，可以作为例子。 其实mtk自己已经实现了一套，只是作为参考代码没有这么清晰。 代码路径：vendor/mediatek/hardware/mtkcam/utils/metadata/ven...
【Camera专题】Sprd-深入浅出Camera驱动框架1(HAL层-Kernel层)
热门推荐
测试0901-1
10-10 1万+
一、前言 本文主要研究展讯平台Camera驱动和HAL层代码架构，熟悉展讯Camera的控制流程。 平台：Sprd-展讯平台 Hal版本：【HAL3】 知识点如下： 从HAL层到deiver层 1.Camera的打开(open)、初始化(init)和供电(power on)调用流程 2.预...
展讯8825camera驱动流程
shchen的专栏
08-21 1655
http://liemlin.blog.163.com/blog/static/2247900212013101121841408/
展讯驱动入门
入门虽易，精通不易，且学且珍惜！
02-23 9120
展讯驱动入门 fastboot download cmd:    fastboot flash uboot u-boot.bin    fastboot flash boot boot.img LCM 基础知识：http://blog.chinaunix.net/uid-28454895-id-4216124.html code path: kernel/drivers/video/s
展讯平台camera tuning客观流程
lw123456_的博客
07-13 2301
一、步骤 1.首先aoto tuning 生成一版初版参数，然后编译成so文件（本次练习没有编译）。 2.做一个曝光表，然后定标LNC。 3.然后进行AWB标定，其中AWB标定分为gray chart和color chart标定，直接拍定标图进行标定，然后将boundary进行完善，保证boundary达到基本的要求。 4.配置一个Gamma表。 5.CMC的标定。 6.然后进行NR的标定，先配置config表，然后拍图标定bayer nr和BPC标定。 7.最后，根据客观自测不过项，进行微调，达到客观标准
展讯oem锁设置后又被重置了
最新发布
07-14
对于展讯OEM锁设置后又被重置的问题，您可以尝试以下几个步骤： 1. 确保您在设置OEM锁之前已经获取了足够的权限，以防止被重置。通常需要root或者管理员权限才能成功设置OEM锁。 2. 检查设备是否有任何第三方软件...

“相关推荐”对你有帮助么？

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

个

红包个数最小为10个

元

红包金额最低5元

当前余额3.43元 前往充值 >
需支付：10.00元
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付元
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明：

1.余额是钱包充值的虚拟货币，按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载，可以购买VIP、付费专栏及课程。

余额充值