diff --git a/common/BUILD.gn b/common/BUILD.gn index c71fd76726c5e46486be81036e8232541d69880a..8337ecbb8366ceb133598f6adfcfaf74163aa7bd 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("distributed_camera_utils") { ] if (!distributed_camera_common) { - cflags += [ "-DPRODUCT_M40" ] + cflags += [ "-DDCAMERA_MMAP_RESERVE" ] } sources = [ diff --git a/common/src/utils/dcamera_buffer_handle.cpp b/common/src/utils/dcamera_buffer_handle.cpp index f827dda88af6b8fc899573bf529f9b7e3774dde1..f40e3a6a73b2d8285586fd831241e208aa738733 100644 --- a/common/src/utils/dcamera_buffer_handle.cpp +++ b/common/src/utils/dcamera_buffer_handle.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace DistributedHardware { -#ifdef PRODUCT_M40 +#ifdef DCAMERA_MMAP_RESERVE void* DCameraMemoryMap(const BufferHandle *buffer) { if (buffer == nullptr) { diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index ca78e3a8be2515aaaf539daa7de3d73d172a7a98..445474fb03f77fd01fbc1606cfc08f84e0f45d9d 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -60,7 +60,7 @@ ohos_executable("dcamera_client_demo") { ] if (!distributed_camera_common) { - cflags += [ "-DPRODUCT_M40" ] + cflags += [ "-DDCAMERA_YUV" ] } deps = [ diff --git a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h index 8408cc0ce738f3b894e51e162e17d496a392cc9c..a97e8c470277828dfda35a4c20d21bdcd6601f64 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h +++ b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h @@ -70,7 +70,7 @@ public: address_ = static_cast(buffer->GetVirAddr()); buffer->GetExtraData()->ExtraGet("dataSize", dataSize_); -#ifdef PRODUCT_M40 +#ifdef DCAMERA_YUV actualSize_ = width_ * height_ * YUV_BYTES_PER_PIXEL / Y2UV_RATIO; #else actualSize_ = width_ * height_ * RGB_BYTES_PER_PIXEL; diff --git a/services/cameraservice/cameraoperator/client/test/sample/main.cpp b/services/cameraservice/cameraoperator/client/test/sample/main.cpp index 04b421d84dc080a9eaaddf083add61f45a445e4f..b519e37feb1f66212d3c03817057d2fdb2f75b32 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/main.cpp +++ b/services/cameraservice/cameraoperator/client/test/sample/main.cpp @@ -43,7 +43,7 @@ static std::shared_ptr g_photoInfo = nullptr; static std::shared_ptr g_previewInfo = nullptr; static std::shared_ptr g_videoInfo = nullptr; -#ifdef PRODUCT_M40 +#ifdef DCAMERA_YUV constexpr int32_t PHOTO_FORMAT = camera_format_t::OHOS_CAMERA_FORMAT_JPEG; constexpr int32_t PREVIEW_FORMAT = camera_format_t::OHOS_CAMERA_FORMAT_YCRCB_420_SP; constexpr int32_t VIDEO_FORMAT = camera_format_t::OHOS_CAMERA_FORMAT_YCRCB_420_SP;