From 0721c33ebbbfa1b0c146c388ebd08476e796d4d0 Mon Sep 17 00:00:00 2001 From: zhaoxc0502 Date: Sat, 16 Jul 2022 22:52:38 +0800 Subject: [PATCH] modify imx8mm for master Signed-off-by: zhaoxc0502 --- frameworks/js/camera_napi/src/output/photo_output_napi.cpp | 2 ++ frameworks/js/camera_napi/src/output/preview_output_napi.cpp | 2 ++ frameworks/js/camera_napi/src/output/video_output_napi.cpp | 2 ++ frameworks/native/camera/BUILD.gn | 3 +++ interfaces/kits/js/camera_napi/BUILD.gn | 3 +++ services/camera_service/BUILD.gn | 3 +++ 6 files changed, 15 insertions(+) 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 4be36781c..9b65011cd 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 3aa57fc36..6a7070634 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 ba877cbc4..3c170a502 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 5f740628e..cb8393ea1 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 df3ceb28d..9642ab150 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 e9a9122cc..335f3851f 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 -- Gitee