friendlyelec
/
rk35xx-android14
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: aiq: disable BAYERTNR_V30 and YUVME_V1 for rk3576

Browse Source 
This fixes following log storm:
  rkisp rkisp-vir1: no bay3d buffer available
  rkisp rkisp-vir1: yuvme need bay3d enable together

Signed-off-by: hmz007 <hmz007@gmail.com>
master
hmz007 7 months ago
parent e7f6ec1cd2
commit f815d40eae
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
external/camera_engine_rkaiq/RkAiqCamGroupManager.cpp vendored
Unescape View File

@ -701,7 +701,9 @@ RkAiqCamGroupManager::newAlgoHandle(RkAiqAlgoDesComm* algo, int hw_ver)
NEW_ALGO_HANDLE(AgainV2, AGAIN);
#endif
#if defined(ISP_HW_V39)
#if (RKAIQ_HAVE_YUVME_V1)
NEW_ALGO_HANDLE(AyuvmeV1, AMD);
#endif
#if (USE_NEWSTRUCT == 0)
NEW_ALGO_HANDLE(AcnrV31, ACNR);
#endif

6
external/camera_engine_rkaiq/aiq_core/RkAiqCoreConfigV39.h vendored
Unescape View File

@ -58,7 +58,9 @@
#include "aynrV24/rk_aiq_aynr_algo_itf_v24.h"
#include "ayuvmeV1/rk_aiq_ayuvme_algo_itf_v1.h"
#include "newStruct/demosaic/include/demosaic_algo_api.h"
#if (RKAIQ_HAVE_BAYERTNR_V30)
#include "newStruct/bayertnr/include/bayertnr_algo_api.h"
#endif
#include "newStruct/gamma/include/gamma_algo_api.h"
#include "newStruct/ynr/include/ynr_algo_api.h"
#include "newStruct/drc/include/drc_algo_api.h"
@ -348,8 +350,10 @@ const static struct RkAiqAlgoDesCommExt g_camgroup_algos[] = {
#if USE_NEWSTRUCT
{ &g_RkIspAlgoDescCamgroupBtnr.common, RK_AIQ_CORE_ANALYZE_OTHER, 40, 40, 40, {0, 0} },
#else
#if (RKAIQ_HAVE_BAYERTNR_V30)
{ &g_RkIspAlgoDescCamgroupAbayertnrV30.common, RK_AIQ_CORE_ANALYZE_OTHER, 30, 30, 30, {0, 0} },
#endif
#endif
#if USE_NEWSTRUCT
{ &g_RkIspAlgoDescCamgroupSharp.common, RK_AIQ_CORE_ANALYZE_OTHER, 34, 34, 34, {0, 0} },
#else
@ -361,7 +365,9 @@ const static struct RkAiqAlgoDesCommExt g_camgroup_algos[] = {
#else
{ &g_RkIspAlgoDescCamgroupAdhaz.common, RK_AIQ_CORE_ANALYZE_DHAZ, 0, 1, 0, {0, 0} },
#endif
#if (RKAIQ_HAVE_YUVME_V1)
{ &g_RkIspAlgoDescCamgroupAyuvmeV1.common, RK_AIQ_CORE_ANALYZE_OTHER, 1, 1, 1, {0, 0} },
#endif
#endif
{ NULL, RK_AIQ_CORE_ANALYZE_ALL, 0, 0, 0, {0, 0} },
// clang-format on

6
external/camera_engine_rkaiq/cmake/BuildOptions.cmake vendored
Unescape View File

@ -136,8 +136,6 @@ elseif (RKAIQ_ISP_VERSION STREQUAL "20")
set(RKAIQ_HAVE_FEC TRUE CACHE INTERNAL "Build rkaiq's FEC" FORCE)
endif()
if (RKAIQ_ISP_VERSION STREQUAL "39")
set(RKAIQ_HAVE_AWB_V20 FALSE CACHE INTERNAL "Build rkaiq's AWB version 20" FORCE)
set(RKAIQ_HAVE_AWB_V21 FALSE CACHE INTERNAL "Build rkaiq's AWB version 21" FORCE)
@ -176,14 +174,14 @@ if (RKAIQ_ISP_VERSION STREQUAL "39")
set(RKAIQ_HAVE_BAYERTNR_V2 FALSE CACHE INTERNAL "Build rkaiq's BAYERTNR version 2" FORCE)
set(RKAIQ_HAVE_BAYERTNR_V23 FALSE CACHE INTERNAL "Build rkaiq's BAYERTNR version 23" FORCE)
set(RKAIQ_HAVE_BAYERTNR_V23_LITE FALSE CACHE INTERNAL "Build rkaiq's BAYERTNR version 23Lite" FORCE)
set(RKAIQ_HAVE_BAYERTNR_V30 TRUE CACHE INTERNAL "Build rkaiq's BAYERTNR version 30" FORCE)
#set(RKAIQ_HAVE_BAYERTNR_V30 TRUE CACHE INTERNAL "Build rkaiq's BAYERTNR version 30" FORCE)
set(RKAIQ_HAVE_GAIN_V1 FALSE CACHE INTERNAL "Build rkaiq's GAIN version 1" FORCE)
set(RKAIQ_HAVE_GAIN_V2 TRUE CACHE INTERNAL "Build rkaiq's GAIN version 2" FORCE)
set(RKAIQ_HAVE_BLC_V1 FALSE CACHE INTERNAL "Build rkaiq's BLC version 1" FORCE)
set(RKAIQ_HAVE_BLC_V32 TRUE CACHE INTERNAL "Build rkaiq's BLC version 32" FORCE)
set(RKAIQ_HAVE_ANR_V1 FALSE CACHE INTERNAL "Build rkaiq's ANR version 1" FORCE)
set(RKAIQ_HAVE_AMD_V1 FALSE CACHE INTERNAL "Build rkaiq's AMD version 1" FORCE)
set(RKAIQ_HAVE_YUVME_V1 TRUE CACHE INTERNAL "Build rkaiq's YUVME version 1" FORCE)
#set(RKAIQ_HAVE_YUVME_V1 TRUE CACHE INTERNAL "Build rkaiq's YUVME version 1" FORCE)
set(RKAIQ_HAVE_PDAF TRUE CACHE INTERNAL "Build rkaiq's PDAF" FORCE)
set(RKAIQ_HAVE_AF_V20 FALSE CACHE INTERNAL "Build rkaiq's AF version 20" FORCE)
set(RKAIQ_HAVE_AF_V30 FALSE CACHE INTERNAL "Build rkaiq's AF version 30" FORCE)

10
external/camera_engine_rkaiq/hwi/isp39/Isp39Params.cpp vendored
Unescape View File

@ -2974,6 +2974,16 @@ bool Isp39Params::convert3aResultsToIspCfg(SmartPtr<cam3aResult>& result, void*
#if RKAIQ_HAVE_RGBIR_REMOSAIC_V10
RkAiqIspRgbirParamsProxy* params = result.get_cast_ptr<RkAiqIspRgbirParamsProxy>();
if (params) convertAiqRgbirToIsp39Params(isp_cfg, params->data()->result);
#endif
}
case RESULT_TYPE_IE_PARAM:
{
#if RKAIQ_HAVE_AIE_V10
#if USE_NEWSTRUCT
RkAiqIspIeParamsProxy* params = result.get_cast_ptr<RkAiqIspIeParamsProxy>();
if (params)
convertAiqIeToIsp20Params(isp_cfg_p, params->data().ptr());
#endif
#endif
}
break;

4
external/camera_engine_rkaiq/rkaiq_switchs.go vendored
Unescape View File

@ -448,14 +448,14 @@ func rkaiq_macro_switch(soc string) map[string]bool {
macros_map["RKAIQ_HAVE_BAYERTNR_V2"] = false
macros_map["RKAIQ_HAVE_BAYERTNR_V23"] = false
macros_map["RKAIQ_HAVE_BAYERTNR_V23_LITE"] = false
macros_map["RKAIQ_HAVE_BAYERTNR_V30"] = true
macros_map["RKAIQ_HAVE_BAYERTNR_V30"] = false
macros_map["RKAIQ_HAVE_GAIN_V1"] = false
macros_map["RKAIQ_HAVE_GAIN_V2"] = true
macros_map["RKAIQ_HAVE_BLC_V1"] = false
macros_map["RKAIQ_HAVE_BLC_V32"] = true
macros_map["RKAIQ_HAVE_ANR_V1"] = false
macros_map["RKAIQ_HAVE_AMD_V1"] = false
macros_map["RKAIQ_HAVE_YUVME_V1"] = true
macros_map["RKAIQ_HAVE_YUVME_V1"] = false
macros_map["RKAIQ_HAVE_PDAF"] = true
macros_map["RKAIQ_HAVE_AF_V20"] = false
macros_map["RKAIQ_HAVE_AF_V30"] = false

Write Preview
Loading…
Cancel
Save