diff --git a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp index 4be36781c7bd3b3fa5cf174f5dcdb3a33508c760..9b65011cd8871c98369bb287adbd6b671da50061 100644 --- a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp +++ b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp @@ -303,6 +303,8 @@ napi_value PhotoOutputNapi::CreatePhotoOutput(napi_env env, std::string surfaceI surface->GetDefaultHeight()); #ifdef RK_CAMERA surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); +#elif NXP_CAMERA + surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); #else surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_JPEG)); #endif diff --git a/frameworks/js/camera_napi/src/output/preview_output_napi.cpp b/frameworks/js/camera_napi/src/output/preview_output_napi.cpp index 3aa57fc36bc1f972b2c604700177773dfe2dbe81..6a70706347ab91aee5e248cae593a0e4b4232eb0 100644 --- a/frameworks/js/camera_napi/src/output/preview_output_napi.cpp +++ b/frameworks/js/camera_napi/src/output/preview_output_napi.cpp @@ -272,6 +272,8 @@ napi_value PreviewOutputNapi::CreatePreviewOutput(napi_env env, uint64_t surface int32_t surfaceHeight = surface->GetDefaultHeight(); #ifdef RK_CAMERA surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); +#elif NXP_CAMERA + surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); #else surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_YCRCB_420_SP)); #endif diff --git a/frameworks/js/camera_napi/src/output/video_output_napi.cpp b/frameworks/js/camera_napi/src/output/video_output_napi.cpp index ba877cbc46142e0d5add06d71f03e39c5094e0e2..3c170a50215fa5ef40ec11dee6ca2f5db127f02c 100644 --- a/frameworks/js/camera_napi/src/output/video_output_napi.cpp +++ b/frameworks/js/camera_napi/src/output/video_output_napi.cpp @@ -381,6 +381,8 @@ napi_value VideoOutputNapi::CreateVideoOutput(napi_env env, uint64_t surfaceId) } #ifdef RK_CAMERA surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); +#elif NXP_CAMERA + surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_RGBA_8888)); #else surface->SetUserData(CameraManager::surfaceFormat, std::to_string(OHOS_CAMERA_FORMAT_YCRCB_420_SP)); #endif diff --git a/frameworks/native/camera/BUILD.gn b/frameworks/native/camera/BUILD.gn index 5f740628eaaaacd988dd55ee92a1e2c994083497..cb8393ea1c7a5d92698b8a610e119d515ce8f162 100644 --- a/frameworks/native/camera/BUILD.gn +++ b/frameworks/native/camera/BUILD.gn @@ -83,6 +83,9 @@ ohos_shared_library("camera_framework") { if (device_name == "rk3566" || device_name == "rk3568") { cflags += [ "-DRK_CAMERA" ] } + if (device_name == "imx8mm") { + cflags += [ "-DNXP_CAMERA" ] + } } cflags_cc = cflags diff --git a/interfaces/kits/js/camera_napi/BUILD.gn b/interfaces/kits/js/camera_napi/BUILD.gn index df3ceb28d46191c53aa336d955d29dbf0a9cf27b..9642ab150a03bad414778e7e78cebab50b63f1a3 100644 --- a/interfaces/kits/js/camera_napi/BUILD.gn +++ b/interfaces/kits/js/camera_napi/BUILD.gn @@ -71,6 +71,9 @@ ohos_shared_library("camera_napi") { if (device_name == "rk3566" || device_name == "rk3568") { cflags += [ "-DRK_CAMERA" ] } + if (device_name == "imx8mm") { + cflags += [ "-DNXP_CAMERA" ] + } } cflags_cc = cflags relative_install_dir = "module/multimedia" diff --git a/services/camera_service/BUILD.gn b/services/camera_service/BUILD.gn index e9a9122cc60bcf53945119e5c60df4609878a662..335f3851fbfa3785b69a196290489d79a7a09838 100644 --- a/services/camera_service/BUILD.gn +++ b/services/camera_service/BUILD.gn @@ -104,6 +104,9 @@ ohos_shared_library("camera_service") { if (device_name == "rk3566" || device_name == "rk3568") { cflags += [ "-DRK_CAMERA" ] } + if (device_name == "imx8mm") { + cflags += [ "-DNXP_CAMERA" ] + } } cflags_cc = cflags