diff --git a/display_server/rosen/modules/platform/image_native/image_type.h b/display_server/rosen/modules/platform/image_native/image_type.h deleted file mode 100644 index 5e8684de9daeb67f497c322e72f3ac9d01650631..0000000000000000000000000000000000000000 --- a/display_server/rosen/modules/platform/image_native/image_type.h +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef INTERFACES_INNERKITS_INCLUDE_IMAGE_TYPE_H_ -#define INTERFACES_INNERKITS_INCLUDE_IMAGE_TYPE_H_ - -#include - -namespace OHOS { -namespace Media { -#ifdef _WIN32 -#define NATIVEEXPORT __declspec(dllexport) -#else -#define NATIVEEXPORT -#endif - -enum class AllocatorType : int32_t { - // keep same with java AllocatorType - DEFAULT = 0, - HEAP_ALLOC = 1, - SHARE_MEM_ALLOC = 2, - CUSTOM_ALLOC = 3, // external -}; - -enum class ColorSpace : int32_t { - // unknown color space. - UNKNOWN = 0, - - // based on SMPTE RP 431-2-2007 & IEC 61966-2.1:1999. - DISPLAY_P3 = 1, - - // standard Red Green Blue based on IEC 61966-2.1:1999. - SRGB = 2, - - // SRGB with a linear transfer function based on IEC 61966-2.1:1999. - LINEAR_SRGB = 3, - - // based on IEC 61966-2-2:2003. - EXTENDED_SRGB = 4, - - // based on IEC 61966-2-2:2003. - LINEAR_EXTENDED_SRGB = 5, - - // based on standard illuminant D50 as the white point. - GENERIC_XYZ = 6, - - // based on CIE XYZ D50 as the profile conversion space. - GENERIC_LAB = 7, - - // based on SMPTE ST 2065-1:2012. - ACES = 8, - - // based on Academy S-2014-004. - ACES_CG = 9, - - // based on Adobe RGB (1998). - ADOBE_RGB_1998 = 10, - - // based on SMPTE RP 431-2-2007. - DCI_P3 = 11, - - // based on Rec. ITU-R BT.709-5. - ITU_709 = 12, - - // based on Rec. ITU-R BT.2020-1. - ITU_2020 = 13, - - // based on ROMM RGB ISO 22028-2:2013. - ROMM_RGB = 14, - - // based on 1953 standard. - NTSC_1953 = 15, - - // based on SMPTE C. - SMPTE_C = 16, -}; - -enum class EncodedFormat : int32_t { - UNKNOWN = 0, - JPEG = 1, - PNG = 2, - GIF = 3, - HEIF = 4, -}; - -enum class PixelFormat : int32_t { - UNKNOWN = 0, - ARGB_8888 = 1, // Each pixel is stored on 4 bytes. - RGB_565 = 2, // Each pixel is stored on 2 bytes - RGBA_8888 = 3, - BGRA_8888 = 4, - RGB_888 = 5, - ALPHA_8 = 6, - RGBA_F16 = 7, - NV21 = 8, // Each pixel is sorted on 3/2 bytes. - NV12 = 9, - CMYK = 10, -}; - -enum class AlphaType : int32_t { - IMAGE_ALPHA_TYPE_UNKNOWN = 0, - IMAGE_ALPHA_TYPE_OPAQUE = 1, // image pixels are stored as opaque. - IMAGE_ALPHA_TYPE_PREMUL = 2, // image have alpha component, and all pixels have premultiplied by alpha value. - IMAGE_ALPHA_TYPE_UNPREMUL = 3, // image have alpha component, and all pixels stored without premultiply alpha value. -}; - -enum class MemoryUsagePreference : int32_t { - DEFAULT = 0, - LOW_RAM = 1, // low memory -}; - -enum class FinalOutputStep : int32_t { - NO_CHANGE = 0, - CONVERT_CHANGE = 1, - ROTATE_CHANGE = 2, - SIZE_CHANGE = 3, - DENSITY_CHANGE = 4 -}; - -struct Position { - int32_t x = 0; - int32_t y = 0; -}; - -struct Rect { - int32_t left = 0; - int32_t top = 0; - int32_t width = 0; - int32_t height = 0; -}; - -struct Size { - int32_t width = 0; - int32_t height = 0; -}; - -struct ImageInfo { - Size size; - PixelFormat pixelFormat = PixelFormat::UNKNOWN; - ColorSpace colorSpace = ColorSpace::SRGB; - AlphaType alphaType = AlphaType::IMAGE_ALPHA_TYPE_UNKNOWN; - int32_t baseDensity = 0; -}; - -struct DecodeOptions { - int32_t fitDensity = 0; - Rect CropRect; - Size desiredSize; - Rect desiredRegion; - float rotateDegrees = 0; - uint32_t rotateNewDegrees = 0; - static constexpr uint32_t DEFAULT_SAMPLE_SIZE = 1; - uint32_t sampleSize = DEFAULT_SAMPLE_SIZE; - PixelFormat desiredPixelFormat = PixelFormat::UNKNOWN; - AllocatorType allocatorType = AllocatorType::HEAP_ALLOC; - ColorSpace desiredColorSpace = ColorSpace::SRGB; - bool allowPartialImage = true; - bool editable = false; - MemoryUsagePreference preference = MemoryUsagePreference::DEFAULT; -}; - -enum class ScaleMode : int32_t { - FIT_TARGET_SIZE = 0, - CENTER_CROP = 1, -}; - -enum class IncrementalMode { FULL_DATA = 0, INCREMENTAL_DATA = 1 }; -} // namespace Media -} // namespace OHOS - -#endif // INTERFACES_INNERKITS_INCLUDE_IMAGE_TYPE_H_ diff --git a/display_server/rosen/modules/platform/image_native/pixel_map.cpp b/display_server/rosen/modules/platform/image_native/pixel_map.cpp deleted file mode 100644 index 7c11be606eed0ec13d9024f69985a4374113f563..0000000000000000000000000000000000000000 --- a/display_server/rosen/modules/platform/image_native/pixel_map.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "pixel_map.h" - -namespace OHOS { -namespace Media { -std::unique_ptr PixelMap::Create(const InitializationOptions &opts) -{ - return nullptr; -} - -int32_t PixelMap::GetRowBytes() -{ - return 0; -} - -int32_t PixelMap::GetWidth() -{ - return 0; -} - -int32_t PixelMap::GetHeight() -{ - return 0; -} - -const uint32_t *PixelMap::GetPixel32(int32_t x, int32_t y) -{ - return nullptr; -} - -void PixelMap::GetImageInfo(ImageInfo &imageInfo) -{ -} - -const uint8_t *PixelMap::GetPixels() -{ - return nullptr; -} - -PixelMap *PixelMap::Unmarshalling(Parcel &data) -{ - return nullptr; -} -} // namespace Media -} // namespace OHOS diff --git a/display_server/rosen/modules/platform/image_native/pixel_map.h b/display_server/rosen/modules/platform/image_native/pixel_map.h deleted file mode 100644 index bc8f3cbd77c9b5aeccdb52c9cff61c9ec6c71148..0000000000000000000000000000000000000000 --- a/display_server/rosen/modules/platform/image_native/pixel_map.h +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef INTERFACES_INNERKITS_INCLUDE_PIXEL_MAP_H_ -#define INTERFACES_INNERKITS_INCLUDE_PIXEL_MAP_H_ - -#include -#include -#ifdef IMAGE_COLORSPACE_FLAG -#include "color_space.h" -#endif -#include "image_type.h" -#include "parcel.h" - -namespace OHOS { -namespace Media { -class RosenImageWrapper; -using TransColorProc = bool (*)(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); -using CustomFreePixelMap = void (*)(void *addr, void *context, uint32_t size); - -struct InitializationOptions { - Size size; - PixelFormat pixelFormat = PixelFormat::UNKNOWN; - AlphaType alphaType = AlphaType::IMAGE_ALPHA_TYPE_UNKNOWN; - ScaleMode scaleMode = ScaleMode::FIT_TARGET_SIZE; - bool editable = false; - bool useSourceIfMatch = false; -}; - -// Build ARGB_8888 pixel value -constexpr uint8_t ARGB_MASK = 0xFF; -constexpr uint8_t ARGB_A_SHIFT = 24; -constexpr uint8_t ARGB_R_SHIFT = 16; -constexpr uint8_t ARGB_G_SHIFT = 8; -constexpr uint8_t ARGB_B_SHIFT = 0; -// Define pixel map malloc max size 600MB -constexpr int32_t PIXEL_MAP_MAX_RAM_SIZE = 600 * 1024 * 1024; - -class PixelMap : public Parcelable { -public: - PixelMap() = default; - virtual ~PixelMap(); - NATIVEEXPORT static std::unique_ptr Create(const uint32_t *colors, uint32_t colorLength, - const InitializationOptions &opts); - NATIVEEXPORT static std::unique_ptr Create(const uint32_t *colors, uint32_t colorLength, int32_t offset, - int32_t stride, const InitializationOptions &opts); - NATIVEEXPORT static std::unique_ptr Create(const InitializationOptions &opts); - NATIVEEXPORT static std::unique_ptr Create(PixelMap &source, const InitializationOptions &opts); - NATIVEEXPORT static std::unique_ptr Create(PixelMap &source, const Rect &srcRect, - const InitializationOptions &opts); - NATIVEEXPORT uint32_t SetImageInfo(ImageInfo &info); - NATIVEEXPORT uint32_t SetImageInfo(ImageInfo &info, bool isReused); - NATIVEEXPORT const uint8_t *GetPixel(int32_t x, int32_t y); - NATIVEEXPORT const uint8_t *GetPixel8(int32_t x, int32_t y); - NATIVEEXPORT const uint16_t *GetPixel16(int32_t x, int32_t y); - NATIVEEXPORT const uint32_t *GetPixel32(int32_t x, int32_t y); - NATIVEEXPORT bool GetARGB32Color(int32_t x, int32_t y, uint32_t &color); - NATIVEEXPORT void SetPixelsAddr(void *addr, void *context, uint32_t size, AllocatorType type, - CustomFreePixelMap func); - NATIVEEXPORT int32_t GetPixelBytes(); - NATIVEEXPORT int32_t GetRowBytes(); - NATIVEEXPORT int32_t GetByteCount(); - NATIVEEXPORT int32_t GetWidth(); - NATIVEEXPORT int32_t GetHeight(); - NATIVEEXPORT int32_t GetBaseDensity(); - NATIVEEXPORT void scale(float xAxis, float yAxis); - NATIVEEXPORT void translate(float xAxis, float yAxis); - NATIVEEXPORT void rotate(float degrees); - NATIVEEXPORT void flip(bool xAxis, bool yAxis); - NATIVEEXPORT uint32_t crop(const Rect &rect); - NATIVEEXPORT void GetImageInfo(ImageInfo &imageInfo); - NATIVEEXPORT PixelFormat GetPixelFormat(); - NATIVEEXPORT ColorSpace GetColorSpace(); - NATIVEEXPORT AlphaType GetAlphaType(); - NATIVEEXPORT uint32_t SetAlpha(const float percent); - NATIVEEXPORT const uint8_t *GetPixels(); - NATIVEEXPORT uint8_t GetARGB32ColorA(uint32_t color); - NATIVEEXPORT uint8_t GetARGB32ColorR(uint32_t color); - NATIVEEXPORT uint8_t GetARGB32ColorG(uint32_t color); - NATIVEEXPORT uint8_t GetARGB32ColorB(uint32_t color); - // Config the pixel map parameter - NATIVEEXPORT bool IsSameImage(const PixelMap &other); - NATIVEEXPORT uint32_t ReadPixels(const uint64_t &bufferSize, const uint32_t &offset, const uint32_t &stride, - const Rect ®ion, uint8_t *dst); - NATIVEEXPORT uint32_t ReadPixels(const uint64_t &bufferSize, uint8_t *dst); - NATIVEEXPORT uint32_t ReadPixel(const Position &pos, uint32_t &dst); - NATIVEEXPORT uint32_t ResetConfig(const Size &size, const PixelFormat &format); - NATIVEEXPORT bool SetAlphaType(const AlphaType &alphaType); - NATIVEEXPORT uint32_t WritePixel(const Position &pos, const uint32_t &color); - NATIVEEXPORT uint32_t WritePixels(const uint8_t *source, const uint64_t &bufferSize, const uint32_t &offset, - const uint32_t &stride, const Rect ®ion); - NATIVEEXPORT uint32_t WritePixels(const uint8_t *source, const uint64_t &bufferSize); - NATIVEEXPORT bool WritePixels(const uint32_t &color); - NATIVEEXPORT void FreePixelMap(); - NATIVEEXPORT AllocatorType GetAllocatorType(); - NATIVEEXPORT void *GetFd() const; - - NATIVEEXPORT uint32_t GetCapacity() - { - return pixelsSize_; - } - - NATIVEEXPORT bool IsEditable() - { - return editable_; - } - - // judgement whether create pixelmap use source as result - NATIVEEXPORT bool IsSourceAsResponse() - { - return useSourceAsResponse_; - } - - NATIVEEXPORT void *GetWritablePixels() const - { - return static_cast(data_); - } - - NATIVEEXPORT bool Marshalling(Parcel &data) const override; - NATIVEEXPORT static PixelMap *Unmarshalling(Parcel &data); - NATIVEEXPORT bool EncodeTlv(std::vector &buff) const; - NATIVEEXPORT static PixelMap *DecodeTlv(std::vector &buff); - -#ifdef IMAGE_COLORSPACE_FLAG - // -------[inner api for ImageSource/ImagePacker codec] it will get a colorspace object pointer----begin---- - NATIVEEXPORT void InnerSetColorSpace(const OHOS::ColorManager::ColorSpace &grColorSpace); - NATIVEEXPORT OHOS::ColorManager::ColorSpace InnerGetGrColorSpace(); - NATIVEEXPORT std::shared_ptr InnerGetGrColorSpacePtr() - { - return grColorSpace_; - } - // -------[inner api for ImageSource/ImagePacker codec] it will get a colorspace object pointer----end------- -#endif - -private: - static constexpr uint8_t TLV_VARINT_BITS = 7; - static constexpr uint8_t TLV_VARINT_MASK = 0x7F; - static constexpr uint8_t TLV_VARINT_MORE = 0x80; - static constexpr uint8_t TLV_END = 0x00; - static constexpr uint8_t TLV_IMAGE_WIDTH = 0x01; - static constexpr uint8_t TLV_IMAGE_HEIGHT = 0x02; - static constexpr uint8_t TLV_IMAGE_PIXELFORMAT = 0x03; - static constexpr uint8_t TLV_IMAGE_COLORSPACE = 0x04; - static constexpr uint8_t TLV_IMAGE_ALPHATYPE = 0x05; - static constexpr uint8_t TLV_IMAGE_BASEDENSITY = 0x06; - static constexpr uint8_t TLV_IMAGE_ALLOCATORTYPE = 0x07; - static constexpr uint8_t TLV_IMAGE_DATA = 0x08; - static constexpr size_t MAX_IMAGEDATA_SIZE = 128 * 1024 * 1024; // 128M - static constexpr size_t MIN_IMAGEDATA_SIZE = 32 * 1024; // 32k - friend class ImageSource; - static bool ALPHA8ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool RGB565ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool ARGB8888ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool RGBA8888ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool BGRA8888ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool RGB888ToARGB(const uint8_t *in, uint32_t inCount, uint32_t *out, uint32_t outCount); - static bool CheckParams(const uint32_t *colors, uint32_t colorLength, int32_t offset, int32_t stride, - const InitializationOptions &opts); - static void UpdatePixelsAlpha(const AlphaType &alphaType, const PixelFormat &pixelFormat, uint8_t *dstPixels, - PixelMap dstPixelMap); - static void InitDstImageInfo(const InitializationOptions &opts, const ImageInfo &srcImageInfo, - ImageInfo &dstImageInfo); - static bool CopyPixelMap(PixelMap &source, PixelMap &dstPixelMap); - static bool SourceCropAndConvert(PixelMap &source, const ImageInfo &srcImageInfo, const ImageInfo &dstImageInfo, - const Rect &srcRect, PixelMap &dstPixelMap); - static bool IsSameSize(const Size &src, const Size &dst); - static bool ScalePixelMap(const Size &targetSize, const Size &dstSize, const ScaleMode &scaleMode, - PixelMap &dstPixelMap); - bool GetPixelFormatDetail(const PixelFormat format); - bool CheckPixelsInput(const uint8_t *dst, const uint64_t &bufferSize, const uint32_t &offset, - const uint32_t &stride, const Rect ®ion); - void ReleaseSharedMemory(void *addr, void *context, uint32_t size); - void SetEditable(bool editable) - { - editable_ = editable; - } - - void ResetPixelMap() - { - rowDataSize_ = 0; - pixelBytes_ = 0; - colorProc_ = nullptr; - } - - bool CheckValidParam(int32_t x, int32_t y) - { - return (data_ == nullptr) || (x >= imageInfo_.size.width) || (x < 0) || (y >= imageInfo_.size.height) || - (y < 0) || (pixelsSize_ < static_cast(rowDataSize_) * imageInfo_.size.height) - ? false - : true; - } - - static void ReleaseMemory(AllocatorType allocType, void *addr, void *context, uint32_t size); - bool WriteImageData(Parcel &parcel, size_t size) const; - static uint8_t *ReadImageData(Parcel &parcel, int32_t size); - static int ReadFileDescriptor(Parcel &parcel); - static bool WriteFileDescriptor(Parcel &parcel, int fd); - bool ReadImageInfo(Parcel &parcel, ImageInfo &imgInfo); - bool WriteImageInfo(Parcel &parcel) const; - void WriteUint8(std::vector &buff, uint8_t value) const; - static uint8_t ReadUint8(std::vector &buff, int32_t &cursor); - uint8_t GetVarintLen(int32_t value) const; - void WriteVarint(std::vector &buff, int32_t value) const; - static int32_t ReadVarint(std::vector &buff, int32_t &cursor); - void WriteData(std::vector &buff, const uint8_t *data, int32_t size) const; - static uint8_t *ReadData(std::vector &buff, int32_t size, int32_t &cursor); - static void ReadTlvAttr(std::vector &buff, ImageInfo &info, int32_t &type, int32_t &size, uint8_t **data); - - uint8_t *data_ = nullptr; - // this info SHOULD be the final info for decoded pixelmap, not the original image info - ImageInfo imageInfo_; - int32_t rowDataSize_ = 0; - int32_t pixelBytes_ = 0; - TransColorProc colorProc_ = nullptr; - void *context_ = nullptr; - CustomFreePixelMap custFreePixelMap_ = nullptr; - AllocatorType allocatorType_ = AllocatorType::HEAP_ALLOC; - uint32_t pixelsSize_ = 0; - bool editable_ = false; - bool useSourceAsResponse_ = false; - - // only used by rosen backend - std::shared_ptr rosenImageWrapper_; - friend class PixelMapRosenUtils; - -#ifdef IMAGE_COLORSPACE_FLAG - std::shared_ptr grColorSpace_ = nullptr; -#else - std::shared_ptr grColorSpace_ = nullptr; -#endif -}; -} // namespace Media -} // namespace OHOS - -#endif // INTERFACES_INNERKITS_INCLUDE_PIXEL_MAP_H_ diff --git a/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.cpp b/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.cpp deleted file mode 100644 index 88c2e602eaf02b738c648ea3eaa1ebce22f51abf..0000000000000000000000000000000000000000 --- a/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "pixel_map_rosen_utils.h" - -#include "include/core/SkImage.h" -#include "pixel_map.h" - -namespace OHOS { -namespace Media { - -bool PixelMapRosenUtils::UploadToGpu( - std::shared_ptr pixelMap, GrContext *context, bool buildMips, bool limitToMaxTextureSize) -{ - return false; -} - -sk_sp PixelMapRosenUtils::ExtractSkImage(std::shared_ptr pixelMap) -{ - return nullptr; -} - -} // namespace Media -} // namespace OHOS diff --git a/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.h b/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.h deleted file mode 100644 index 3e764b666d3e3b157073f2613588c0aab7c12b8b..0000000000000000000000000000000000000000 --- a/display_server/rosen/modules/platform/image_native/pixel_map_rosen_utils.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef PIXEL_MAP_ROSEN_UTILS_H_ -#define PIXEL_MAP_ROSEN_UTILS_H_ - -#include "pixel_map.h" - -template -class sk_sp; -class SkImage; -class GrContext; - -namespace OHOS { -namespace Media { -class PixelMapRosenUtils { -public: - NATIVEEXPORT static bool UploadToGpu( - std::shared_ptr pixelMap, GrContext *context, bool buildMips, bool limitToMaxTextureSize = false); - NATIVEEXPORT static sk_sp ExtractSkImage(std::shared_ptr pixelMap); -}; -} // namespace Media -} // namespace OHOS - -#endif // PIXEL_MAP_ROSEN_UTILS_H_ diff --git a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn index 8c298f094bcb0f9df9da3c97a2c0b6cfb58bf60e..ca0a47065de2b1375669e04be1b40c4000eb8fa1 100644 --- a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn @@ -160,7 +160,6 @@ ft_source_set("render_service_base_src") { ] deps = [ "../src/platform/fangtian:rosen_fangtian_sources", - "mock:mock_image_native", ] if (enable_export_macro) { @@ -190,6 +189,7 @@ ft_source_set("render_service_base_src") { "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:eventhandler", "//build/gn/configs/system_libs:skia", + "//build/gn/configs/system_libs:image", ] public_deps = [ diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn index 1ea79bd319eebf389ba2b1c328503fea5b615791..77b5c1911614b2f0af97ee375e020dc39d68e94a 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn @@ -112,5 +112,6 @@ ft_source_set("rosen_fangtian_sources") { "$rosen_root/modules/composer/vsync/ft_build:libvsync", "$display_server_root/utils/sync_fence/ft_build:sync_fence", "$display_server_root/utils/sandbox/ft_build:sandbox_utils", + "//build/gn/configs/system_libs:image", ] } diff --git a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn index b3d4a3c0206804dcff9736c5494e8310228422e9..919410abd10c77bef1ca0a47c84e62b9f11ec67d 100644 --- a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn @@ -120,6 +120,7 @@ ft_source_set("render_service_client_src") { "//build/gn/configs/system_libs:ipc_core", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:hitrace_meter", + "//build/gn/configs/system_libs:image", ] public_configs = [ ":render_service_client_public_config" ] diff --git a/window_manager/ft_pointer_draw/BUILD.gn b/window_manager/ft_pointer_draw/BUILD.gn index 864f784544a82fa0aa4f4837bc49e6a111d8461e..5a6635abfa77e55b714f19ff32ac1af61410d8e1 100644 --- a/window_manager/ft_pointer_draw/BUILD.gn +++ b/window_manager/ft_pointer_draw/BUILD.gn @@ -19,7 +19,6 @@ config("pointer_draw_config") { cflags = [ "-Wno-c++11-narrowing", - "-DUSE_IMITATE_POINTER", ] include_dirs = [