openharmony/multimedia_image_standard
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_image_standard.git synced 2026-07-01 04:19:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

upload image plugins and pixelmap fix

Browse Source 
Signed-off-by: magekkkk <lixin113@huawei.com>
This commit is contained in:
magekkkk
2021-11-15 13:09:39 +00:00
parent aea17c77f3
commit defa5d63af
23 changed files with 1216 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
Executable
View File
frameworks/innerkitsimpl/common/src/pixel_map.cpp
+235 -87
View File
@@ -22,10 +22,8 @@
#include "media_errors.h"
#include "pixel_convert_adapter.h"
#include "pixel_map_utils.h"
#include "pixel_map_parcel.h"
#include "post_proc.h"
#include "parcel.h"
#include "ipc_file_descriptor.h"
#ifndef _WIN32
#include "securec.h"
#else
@@ -35,6 +33,7 @@
#if !defined(_WIN32) && !defined(_APPLE)
#include <sys/mman.h>
#include "ashmem.h"
#include "ipc_file_descriptor.h"
#endif
namespace OHOS {
@@ -48,6 +47,9 @@ constexpr uint8_t BGRA_ALPHA_INDEX = 3;
constexpr uint8_t BGRA_BYTES = 4;
constexpr uint8_t PER_PIXEL_LEN = 1;
constexpr uint8_t FILL_NUMBER = 3;
constexpr uint8_t ALIGN_NUMBER = 4;
PixelMap::~PixelMap()
{
FreePixelMap();
@@ -111,12 +113,14 @@ void PixelMap::SetPixelsAddr(void *addr, void *context, uint32_t size, Allocator
unique_ptr<PixelMap> PixelMap::Create(const uint32_t *colors, uint32_t colorLength, const InitializationOptions &opts)
{
HiLog::Info(LABEL, "PixelMap::Create1 enter");
return Create(colors, colorLength, 0, opts.size.width, opts);
}
unique_ptr<PixelMap> PixelMap::Create(const uint32_t *colors, uint32_t colorLength, int32_t offset, int32_t stride,
const InitializationOptions &opts)
{
HiLog::Info(LABEL, "PixelMap::Create2 enter");
if (!CheckParams(colors, colorLength, offset, stride, opts)) {
return nullptr;
}
@@ -194,6 +198,7 @@ bool PixelMap::CheckParams(const uint32_t *colors, uint32_t colorLength, int32_t
unique_ptr<PixelMap> PixelMap::Create(const InitializationOptions &opts)
{
HiLog::Info(LABEL, "PixelMap::Create3 enter");
unique_ptr<PixelMap> dstPixelMap = make_unique<PixelMap>();
if (dstPixelMap == nullptr) {
HiLog::Error(LABEL, "create pixelMap pointer fail");
@@ -209,6 +214,10 @@ unique_ptr<PixelMap> PixelMap::Create(const InitializationOptions &opts)
return nullptr;
}
uint32_t bufferSize = dstPixelMap->GetByteCount();
if (bufferSize <= 0) {
HiLog::Error(LABEL, "calloc parameter bufferSize:[%{public}d] error.", bufferSize);
return nullptr;
}
uint8_t *dstPixels = static_cast<uint8_t *>(calloc(bufferSize, 1));
if (dstPixels == nullptr) {
HiLog::Error(LABEL, "allocate memory size %{public}u fail", bufferSize);
@@ -245,12 +254,14 @@ void PixelMap::UpdatePixelsAlpha(const AlphaType &alphaType, const PixelFormat &
unique_ptr<PixelMap> PixelMap::Create(PixelMap &source, const InitializationOptions &opts)
{
HiLog::Info(LABEL, "PixelMap::Create4 enter");
Rect rect;
return Create(source, rect, opts);
}
unique_ptr<PixelMap> PixelMap::Create(PixelMap &source, const Rect &srcRect, const InitializationOptions &opts)
{
HiLog::Info(LABEL, "PixelMap::Create5 enter");
ImageInfo srcImageInfo;
source.GetImageInfo(srcImageInfo);
PostProc postProc;
@@ -305,6 +316,10 @@ bool PixelMap::SourceCropAndConvert(PixelMap &source, const ImageInfo &srcImageI
const Rect &srcRect, PixelMap &dstPixelMap)
{
uint32_t bufferSize = dstPixelMap.GetByteCount();
if (bufferSize <= 0) {
HiLog::Error(LABEL, "malloc parameter bufferSize:[%{public}d] error.", bufferSize);
return false;
}
void *dstPixels = malloc(bufferSize);
if (dstPixels == nullptr) {
HiLog::Error(LABEL, "allocate memory size %{public}u fail", bufferSize);
@@ -365,10 +380,14 @@ void PixelMap::InitDstImageInfo(const InitializationOptions &opts, const ImageIn
bool PixelMap::CopyPixelMap(PixelMap &source, PixelMap &dstPixelMap)
{
uint32_t bufferSize = source.GetByteCount();
if (bufferSize == 0 || source.GetPixels() == nullptr) {
if (source.GetPixels() == nullptr) {
HiLog::Error(LABEL, "source pixelMap data invalid");
return false;
}
if (bufferSize <= 0) {
HiLog::Error(LABEL, "malloc parameter bufferSize:[%{public}d] error.", bufferSize);
return false;
}
uint8_t *dstPixels = static_cast<uint8_t *>(malloc(bufferSize));
if (dstPixels == nullptr) {
HiLog::Error(LABEL, "allocate memory size %{public}u fail", bufferSize);
@@ -466,7 +485,7 @@ uint32_t PixelMap::SetImageInfo(ImageInfo &info, bool isReused)
return ERR_IMAGE_TOO_LARGE;
}
if (info.pixelFormat == PixelFormat::ALPHA_8) {
rowDataSize_ = pixelBytes_ * ((info.size.width + 3) / 4 * 4);
rowDataSize_ = pixelBytes_ * ((info.size.width + FILL_NUMBER) / ALIGN_NUMBER * ALIGN_NUMBER);
HiLog::Info(LABEL, "ALPHA_8 rowDataSize_ %{public}d.", rowDataSize_);
} else {
rowDataSize_ = pixelBytes_ * info.size.width;
@@ -639,6 +658,7 @@ int32_t PixelMap::GetRowBytes()
int32_t PixelMap::GetByteCount()
{
HiLog::Debug(LABEL, "GetByteCount");
return rowDataSize_ * imageInfo_.size.height;
}
@@ -705,15 +725,18 @@ uint8_t PixelMap::GetARGB32ColorB(uint32_t color)
bool PixelMap::IsSameImage(const PixelMap &other)
{
if (data_ == nullptr || other.data_ == nullptr) {
HiLog::Error(LABEL, "IsSameImage data_ is nullptr.");
return false;
}
if (imageInfo_.size.width != other.imageInfo_.size.width ||
imageInfo_.size.height != other.imageInfo_.size.height ||
imageInfo_.pixelFormat != other.imageInfo_.pixelFormat || imageInfo_.alphaType != other.imageInfo_.alphaType) {
HiLog::Error(LABEL, "IsSameImage imageInfo check not OK.");
return false;
}
uint64_t size = static_cast<uint64_t>(rowDataSize_) * imageInfo_.size.height;
if (memcmp(data_, other.data_, size) != 0) {
HiLog::Error(LABEL, "IsSameImage mmemcmp check not OK.");
return false;
}
return true;
@@ -1011,7 +1034,139 @@ void *PixelMap::GetFd() const
return context_;
}
bool PixelMap::WriteFileDescriptor(Parcel &data, int fd) const
void PixelMap::ReleaseMemory(AllocatorType allocType, void *addr, void *context, uint32_t size)
{
if (allocType == AllocatorType::SHARE_MEM_ALLOC) {
#if !defined(_WIN32) && !defined(_APPLE)
int *fd = static_cast<int *>(context);
if (addr != nullptr) {
::munmap(addr, size);
}
if (fd != nullptr) {
::close(*fd);
delete fd;
}
#endif
} else if (allocType == AllocatorType::HEAP_ALLOC) {
if (addr != nullptr) {
free(addr);
addr = nullptr;
}
}
}
bool PixelMap::WriteImageData(Parcel &parcel, size_t size) const
{
const uint8_t *data = data_;
if (data == nullptr) {
HiLog::Error(LABEL, "write to parcel failed, pixel memory is null.");
return false;
}
if (data == nullptr || size > MAX_IMAGEDATA_SIZE) {
return false;
}
if (!parcel.WriteInt32(size)) {
return false;
}
if (size <= MIN_IMAGEDATA_SIZE) {
return parcel.WriteUnpadBuffer(data, size);
}
#if !defined(_WIN32) && !defined(_APPLE)
int fd = AshmemCreate("Parcel ImageData", size);
HiLog::Info(LABEL, "AshmemCreate:[%{public}d].", fd);
if (fd < 0) {
return false;
}
int result = AshmemSetProt(fd, PROT_READ | PROT_WRITE);
HiLog::Info(LABEL, "AshmemSetProt:[%{public}d].", result);
if (result < 0) {
return false;
}
void *ptr = ::mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED) {
return false;
}
HiLog::Info(LABEL, "mmap success");
if (memcpy_s(ptr, size, data, size) != EOK) {
::munmap(ptr, size);
HiLog::Error(LABEL, "WriteImageData memcpy_s error");
return false;
}
if (!WriteFileDescriptor(parcel, fd)) {
::munmap(ptr, size);
HiLog::Error(LABEL, "WriteImageData WriteFileDescriptor error");
return false;
}
HiLog::Debug(LABEL, "WriteImageData WriteFileDescriptor success");
HiLog::Debug(LABEL, "WriteImageData End");
#endif
return true;
}
uint8_t *PixelMap::ReadImageData(Parcel &parcel, int32_t bufferSize)
{
uint8_t *base = nullptr;
int fd = -1;
if (static_cast<unsigned int>(bufferSize) <= MIN_IMAGEDATA_SIZE) {
const uint8_t *ptr = parcel.ReadUnpadBuffer(bufferSize);
if (bufferSize <= 0) {
HiLog::Error(LABEL, "malloc parameter bufferSize:[%{public}d] error.", bufferSize);
return nullptr;
}
base = static_cast<uint8_t *>(malloc(bufferSize));
if (base == nullptr) {
HiLog::Error(LABEL, "alloc output pixel memory size:[%{public}d] error.", bufferSize);
return nullptr;
}
if (memcpy_s(base, bufferSize, ptr, bufferSize) != 0) {
free(base);
base = nullptr;
HiLog::Error(LABEL, "memcpy pixel data size:[%{public}d] error.", bufferSize);
return nullptr;
}
} else {
#if !defined(_WIN32) && !defined(_APPLE)
fd = ReadFileDescriptor(parcel);
if (fd < 0) {
HiLog::Error(LABEL, "read fd :[%{public}d] error", fd);
return nullptr;
}
void *ptr = ::mmap(nullptr, bufferSize, PROT_READ, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED) {
// do not close fd here. fd will be closed in FileDescriptor, ::close(fd)
HiLog::Error(LABEL, "mmap error");
return nullptr;
}
if (bufferSize <= 0) {
HiLog::Error(LABEL, "malloc parameter bufferSize:[%{public}d] error.", bufferSize);
return nullptr;
}
base = static_cast<uint8_t *>(malloc(bufferSize));
if (base == nullptr) {
HiLog::Error(LABEL, "alloc output pixel memory size:[%{public}d] error.", bufferSize);
return nullptr;
}
if (memcpy_s(base, bufferSize, ptr, bufferSize) != 0) {
free(base);
base = nullptr;
HiLog::Error(LABEL, "memcpy pixel data size:[%{public}d] error.", bufferSize);
return nullptr;
}
ReleaseMemory(AllocatorType::SHARE_MEM_ALLOC, ptr, &fd, bufferSize);
#endif
}
return base;
}
bool PixelMap::WriteFileDescriptor(Parcel &parcel, int fd)
{
if (fd < 0) {
return false;
@@ -1021,12 +1176,12 @@ bool PixelMap::WriteFileDescriptor(Parcel &data, int fd) const
return false;
}
sptr<IPCFileDescriptor> descriptor = new IPCFileDescriptor(dupFd);
return data.WriteObject<IPCFileDescriptor>(descriptor);
return parcel.WriteObject<IPCFileDescriptor>(descriptor);
}
int PixelMap::ReadFileDescriptor(Parcel &data)
int PixelMap::ReadFileDescriptor(Parcel &parcel)
{
sptr<IPCFileDescriptor> descriptor = data.ReadObject<IPCFileDescriptor>();
sptr<IPCFileDescriptor> descriptor = parcel.ReadObject<IPCFileDescriptor>();
if (descriptor == nullptr) {
return -1;
}
@@ -1037,66 +1192,70 @@ int PixelMap::ReadFileDescriptor(Parcel &data)
return dup(fd);
}
bool PixelMap::Marshalling(Parcel &data) const
bool PixelMap::WriteImageInfo(Parcel &parcel) const
{
if (!parcel.WriteInt32(imageInfo_.size.width)) {
HiLog::Error(LABEL, "write image info width:[%{public}d] to parcel failed.", imageInfo_.size.width);
return false;
}
if (!parcel.WriteInt32(imageInfo_.size.height)) {
HiLog::Error(LABEL, "write image info height:[%{public}d] to parcel failed.", imageInfo_.size.height);
return false;
}
if (!parcel.WriteInt32(static_cast<int32_t>(imageInfo_.pixelFormat))) {
HiLog::Error(LABEL, "write image info pixel format:[%{public}d] to parcel failed.", imageInfo_.pixelFormat);
return false;
}
if (!parcel.WriteInt32(static_cast<int32_t>(imageInfo_.colorSpace))) {
HiLog::Error(LABEL, "write image info color space:[%{public}d] to parcel failed.", imageInfo_.colorSpace);
return false;
}
if (!parcel.WriteInt32(static_cast<int32_t>(imageInfo_.alphaType))) {
HiLog::Error(LABEL, "write image info alpha type:[%{public}d] to parcel failed.", imageInfo_.alphaType);
return false;
}
if (!parcel.WriteInt32(imageInfo_.baseDensity)) {
HiLog::Error(LABEL, "write image info base density:[%{public}d] to parcel failed.", imageInfo_.baseDensity);
return false;
}
return true;
}
bool PixelMap::Marshalling(Parcel &parcel) const
{
int32_t PIXEL_MAP_INFO_MAX_LENGTH = 128;
int32_t bufferSize = rowDataSize_ * imageInfo_.size.height;
if (static_cast<size_t>(bufferSize + PIXEL_MAP_INFO_MAX_LENGTH) > data.GetDataCapacity() &&
!data.SetDataCapacity(bufferSize + PIXEL_MAP_INFO_MAX_LENGTH)) {
if (static_cast<size_t>(bufferSize) <= MIN_IMAGEDATA_SIZE &&
static_cast<size_t>(bufferSize + PIXEL_MAP_INFO_MAX_LENGTH) > parcel.GetDataCapacity() &&
!parcel.SetDataCapacity(bufferSize + PIXEL_MAP_INFO_MAX_LENGTH)) {
HiLog::Error(LABEL, "set parcel max capacity:[%{public}d] failed.", bufferSize + PIXEL_MAP_INFO_MAX_LENGTH);
return false;
}
if (!data.WriteInt32(imageInfo_.size.width)) {
HiLog::Error(LABEL, "write pixel map width:[%{public}d] to parcel failed.", imageInfo_.size.width);
if (!WriteImageInfo(parcel)) {
HiLog::Error(LABEL, "write image info to parcel failed.");
return false;
}
if (!data.WriteInt32(imageInfo_.size.height)) {
HiLog::Error(LABEL, "write pixel map height:[%{public}d] to parcel failed.", imageInfo_.size.height);
return false;
}
if (!data.WriteInt32(static_cast<int32_t>(imageInfo_.pixelFormat))) {
HiLog::Error(LABEL, "write pixel map pixel format:[%{public}d] to parcel failed.", imageInfo_.pixelFormat);
return false;
}
if (!data.WriteInt32(static_cast<int32_t>(imageInfo_.colorSpace))) {
HiLog::Error(LABEL, "write pixel map color space:[%{public}d] to parcel failed.", imageInfo_.colorSpace);
return false;
}
if (!data.WriteInt32(static_cast<int32_t>(imageInfo_.alphaType))) {
HiLog::Error(LABEL, "write pixel map alpha type:[%{public}d] to parcel failed.", imageInfo_.alphaType);
return false;
}
if (!data.WriteInt32(imageInfo_.baseDensity)) {
HiLog::Error(LABEL, "write pixel map base density:[%{public}d] to parcel failed.", imageInfo_.baseDensity);
return false;
}
if (!data.WriteInt32(bufferSize)) {
HiLog::Error(LABEL, "write pixel map buffer size:[%{public}d] to parcel failed.", bufferSize);
return false;
}
if (!data.WriteInt32(static_cast<int32_t>(allocatorType_))) {
if (!parcel.WriteInt32(static_cast<int32_t>(allocatorType_))) {
HiLog::Error(LABEL, "write pixel map allocator type:[%{public}d] to parcel failed.",
allocatorType_);
return false;
}
if (allocatorType_ == AllocatorType::SHARE_MEM_ALLOC) {
#if !defined(_WIN32) && !defined(_APPLE)
int *fd = static_cast<int *>(context_);
if (*fd < 0) {
HiLog::Error(LABEL, "write pixel map failed, fd < 0.");
return false;
}
if (!WriteFileDescriptor(data, *fd)) {
if (!WriteFileDescriptor(parcel, *fd)) {
HiLog::Error(LABEL, "write pixel map fd:[%{public}d] to parcel failed.", *fd);
return false;
}
#endif
} else {
const uint8_t *addr = data_;
if (addr == nullptr) {
HiLog::Error(LABEL, "write to parcel failed, pixel memory is null.");
return false;
}
if (!data.WriteBuffer(addr, bufferSize)) {
if (!WriteImageData(parcel, bufferSize)) {
HiLog::Error(LABEL, "write pixel map buffer to parcel failed.");
return false;
}
@@ -1104,32 +1263,46 @@ bool PixelMap::Marshalling(Parcel &data) const
return true;
}
PixelMap *PixelMap::Unmarshalling(Parcel &data)
bool PixelMap::ReadImageInfo(Parcel &parcel, ImageInfo &imgInfo)
{
imgInfo.size.width = parcel.ReadInt32();
HiLog::Debug(LABEL, "read pixel map width:[%{public}d] to parcel.", imgInfo.size.width);
imgInfo.size.height = parcel.ReadInt32();
HiLog::Debug(LABEL, "read pixel map height:[%{public}d] to parcel.", imgInfo.size.height);
imgInfo.pixelFormat = static_cast<PixelFormat>(parcel.ReadInt32());
HiLog::Debug(LABEL, "read pixel map pixelFormat:[%{public}d] to parcel.", imgInfo.pixelFormat);
imgInfo.colorSpace = static_cast<ColorSpace>(parcel.ReadInt32());
HiLog::Debug(LABEL, "read pixel map colorSpace:[%{public}d] to parcel.", imgInfo.colorSpace);
imgInfo.alphaType = static_cast<AlphaType>(parcel.ReadInt32());
HiLog::Debug(LABEL, "read pixel map alphaType:[%{public}d] to parcel.", imgInfo.alphaType);
imgInfo.baseDensity = parcel.ReadInt32();
return true;
}
PixelMap *PixelMap::Unmarshalling(Parcel &parcel)
{
PixelMap *pixelMap = new PixelMap();
if (pixelMap == nullptr) {
HiLog::Error(LABEL, "create pixelmap pointer fail");
return nullptr;
}
ImageInfo imgInfo;
imgInfo.size.width = data.ReadInt32();
imgInfo.size.height = data.ReadInt32();
imgInfo.pixelFormat = static_cast<PixelFormat>(data.ReadInt32());
imgInfo.colorSpace = static_cast<ColorSpace>(data.ReadInt32());
imgInfo.alphaType = static_cast<AlphaType>(data.ReadInt32());
imgInfo.baseDensity = data.ReadInt32();
int32_t bufferSize = data.ReadInt32();
AllocatorType allocType = static_cast<AllocatorType>(data.ReadInt32());
if (!pixelMap->ReadImageInfo(parcel, imgInfo)) {
HiLog::Error(LABEL, "read imageInfo fail");
return nullptr;
}
AllocatorType allocType = static_cast<AllocatorType>(parcel.ReadInt32());
int32_t bufferSize = parcel.ReadInt32();
uint8_t *base = nullptr;
void *context = nullptr;
if (allocType == AllocatorType::SHARE_MEM_ALLOC) {
int fd = ReadFileDescriptor(data);
#if !defined(_WIN32) && !defined(_APPLE)
int fd = ReadFileDescriptor(parcel);
if (fd < 0) {
HiLog::Error(LABEL, "fd < 0");
return nullptr;
}
HiLog::Debug(LABEL, "ReadFileDescriptor fd %{public}d.", fd);
void* ptr = ::mmap(nullptr, bufferSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED) {
::close(fd);
@@ -1138,49 +1311,24 @@ PixelMap *PixelMap::Unmarshalling(Parcel &data)
}
context = new int32_t();
if (context == nullptr) {
HiLog::Error(LABEL, "alloc context error.");
::munmap(ptr, bufferSize);
::close(fd);
return nullptr;
}
*static_cast<int32_t *>(context) = fd;
base = static_cast<uint8_t *>(ptr);
#endif
} else {
const uint8_t *addr = data.ReadBuffer(bufferSize);
if (addr == nullptr) {
HiLog::Error(LABEL, "read buffer from parcel failed, read buffer addr is null");
return nullptr;
}
base = static_cast<uint8_t *>(malloc(bufferSize));
base = ReadImageData(parcel, bufferSize);
if (base == nullptr) {
HiLog::Error(LABEL, "alloc output pixel memory size:[%{public}d] error.", bufferSize);
return nullptr;
}
if (memcpy_s(base, bufferSize, addr, bufferSize) != 0) {
free(base);
base = nullptr;
HiLog::Error(LABEL, "memcpy pixel data size:[%{public}d] error.", bufferSize);
HiLog::Error(LABEL, "get pixel memory size:[%{public}d] error.", bufferSize);
return nullptr;
}
}
uint32_t ret = pixelMap->SetImageInfo(imgInfo);
if (ret != SUCCESS) {
if (allocType == AllocatorType::SHARE_MEM_ALLOC) {
int *fd = static_cast<int *>(context);
if (base != nullptr) {
::munmap(base, bufferSize);
}
if (fd != nullptr) {
::close(*fd);
delete fd;
}
} else if (allocType == AllocatorType::HEAP_ALLOC) {
if (base != nullptr) {
free(base);
base = nullptr;
}
}
ReleaseMemory(allocType, base, context, bufferSize);
HiLog::Error(LABEL, "create pixel map from parcel failed, set image info error.");
return nullptr;
}
frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp
+73 -6
View File
@@ -27,6 +27,8 @@ static constexpr int32_t PIXEL_MAP_TEST_HEIGHT = 3;
static constexpr int32_t PIXEL_MAP_RGB565_BYTE = 2;
static constexpr int32_t PIXEL_MAP_RGB888_BYTE = 3;
static constexpr int32_t PIXEL_MAP_ARGB8888_BYTE = 4;
constexpr int32_t PIXEL_MAP_BIG_TEST_WIDTH = 4 * 1024;
constexpr int32_t PIXEL_MAP_BIG_TEST_HEIGHT = 3 * 100;
class ImagePixelMapTest : public testing::Test {
public:
@@ -48,7 +50,13 @@ public:
int32_t rowDataSize = pixelMapWidth;
uint32_t bufferSize = rowDataSize * pixelMapHeight;
if (bufferSize <= 0) {
return nullptr;
}
void *buffer = malloc(bufferSize);
if (buffer == nullptr) {
return nullptr;
}
char *ch = (char *)buffer;
for (unsigned int i = 0; i < bufferSize; i++) {
*(ch++) = (char)i;
@@ -58,6 +66,36 @@ public:
return pixelMap;
}
std::unique_ptr<PixelMap> ConstructBigPixmap()
{
int32_t pixelMapWidth = PIXEL_MAP_BIG_TEST_WIDTH;
int32_t pixelMapHeight = PIXEL_MAP_BIG_TEST_HEIGHT;
std::unique_ptr<PixelMap> pixelMap = std::make_unique<PixelMap>();
ImageInfo info;
info.size.width = pixelMapWidth;
info.size.height = pixelMapHeight;
info.pixelFormat = PixelFormat::RGB_888;
info.colorSpace = ColorSpace::SRGB;
pixelMap->SetImageInfo(info);
int32_t bufferSize = pixelMap->GetByteCount();
if (bufferSize <= 0) {
return nullptr;
}
std::unique_ptr<void> buffer = malloc(bufferSize);
if (buffer == nullptr) {
return nullptr;
}
char *ch = (char *)buffer;
for (int32_t i = 0; i < bufferSize; i++) {
*(ch++) = 'a';
}
pixelMap->SetPixelsAddr(buffer, nullptr, bufferSize, AllocatorType::HEAP_ALLOC, nullptr);
return pixelMap;
}
/**
* @tc.name: ImagePixelMap001
* @tc.desc: ALPHA_8 pixel format pixel map operation
@@ -469,22 +507,16 @@ HWTEST_F(ImagePixelMapTest, ImagePixelMap011, TestSize.Level3)
GTEST_LOG_(INFO) << "ImagePixelMapTest: ImagePixelMap011 start";
Parcel data;
std::unique_ptr<PixelMap> pixelmap1 = ConstructPixmap();
bool ret = pixelmap1.get()->Marshalling(data);
EXPECT_EQ(true, ret);
PixelMap *pixelmap2 = PixelMap::Unmarshalling(data);
EXPECT_EQ(pixelmap1->GetHeight(), pixelmap2->GetHeight());
EXPECT_EQ(pixelmap1->GetWidth(), pixelmap2->GetWidth());
EXPECT_EQ(pixelmap1->GetPixelFormat(), pixelmap2->GetPixelFormat());
EXPECT_EQ(pixelmap1->GetColorSpace(), pixelmap2->GetColorSpace());
EXPECT_EQ(true, pixelmap1->IsSameImage(*pixelmap2));
GTEST_LOG_(INFO) << "ImagePixelMapTest: ImagePixelMap011 end";
}
/**
@@ -513,5 +545,40 @@ HWTEST_F(ImagePixelMapTest, ImagePixelMap012, TestSize.Level3)
EXPECT_EQ(newPixelMap, nullptr);
GTEST_LOG_(INFO) << "ImagePixelMapTest: ImagePixelMap012 end";
}
/**
* @tc.name: ImagePixelMap013
* @tc.desc: test CreateFromParcel
* @tc.type: FUNC
* @tc.require: AR000FTAMO
*/
HWTEST_F(ImagePixelMapTest, ImagePixelMap013, TestSize.Level3)
{
GTEST_LOG_(INFO) << "ImagePixelMapTest: ImagePixelMap013 start";
Parcel data;
std::unique_ptr<PixelMap> pixelmap1 = ConstructBigPixmap();
EXPECT_NE(pixelmap1, nullptr);
GTEST_LOG_(INFO) << "ImagePixelMap013 ConstructPixmap success";
bool ret = pixelmap1.get()->Marshalling(data);
GTEST_LOG_(INFO) << "ImagePixelMap013 Marshalling success";
EXPECT_EQ(true, ret);
PixelMap *pixelmap2 = PixelMap::Unmarshalling(data);
GTEST_LOG_(INFO) << "ImagePixelMap013 Unmarshalling success";
GTEST_LOG_(INFO) << "ImagePixelMap013 pixelmap1 GetHeight :" << pixelmap1->GetHeight();
GTEST_LOG_(INFO) << "ImagePixelMap013 pixelmap2 GetHeight :" << pixelmap2->GetHeight();
EXPECT_EQ(pixelmap1->GetHeight(), pixelmap2->GetHeight());
GTEST_LOG_(INFO) << "ImagePixelMap013 GetHeight success";
EXPECT_EQ(pixelmap1->GetWidth(), pixelmap2->GetWidth());
GTEST_LOG_(INFO) << "ImagePixelMap013 GetWidth success";
EXPECT_EQ(pixelmap1->GetPixelFormat(), pixelmap2->GetPixelFormat());
GTEST_LOG_(INFO) << "ImagePixelMap013 GetPixelFormat success";
EXPECT_EQ(pixelmap1->GetColorSpace(), pixelmap2->GetColorSpace());
GTEST_LOG_(INFO) << "ImagePixelMap013 GetColorSpace success";
EXPECT_EQ(true, pixelmap1->IsSameImage(*pixelmap2));
GTEST_LOG_(INFO) << "ImagePixelMapTest: ImagePixelMap013 end";
}
} // namespace Multimedia
} // namespace OHOS
frameworks/kits/js/common/pixel_map_napi.cpp
+4 -13
View File
@@ -454,16 +454,11 @@ napi_value PixelMapNapi::CreatePixelMap(napi_env env, napi_callback_info info)
IMG_JS_ARGS(env, info, status, argCount, argValue, thisVar);
//we are static method!
//thisVar is nullptr here
// we are static method!
// this Var is nullptr here
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status), nullptr, HiLog::Error(LABEL, "fail to napi_get_cb_info"));
//IMG_NAPI_CHECK_RET_D(argCount >= 2, nullptr, HiLog::Error(LABEL, "CreatePixelMap args count mismatch %{public}d", argCount));
std::unique_ptr<PixelMapAsyncContext> asyncContext = std::make_unique<PixelMapAsyncContext>();
// status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->nConstructor));
// IMG_NAPI_CHECK_RET_D(IMG_IS_READY(status, asyncContext->nConstructor),
// nullptr, HiLog::Error(LABEL, "fail to unwrap context"));
status = napi_get_arraybuffer_info(env, argValue[0], &(asyncContext->colorsBuffer), &(asyncContext->colorsBufferSize));
@@ -483,7 +478,7 @@ napi_value PixelMapNapi::CreatePixelMap(napi_env env, napi_callback_info info)
napi_get_undefined(env, &result);
}
IMG_CREATE_CREATE_ASYNC_WORK(env, status, "CreatePixelMap",
IMG_CREATE_CREATE_ASYNC_WORK(env, status, "CreatePixelMap",
CreatePixelMapExec, CreatePixelMapComplete, asyncContext, asyncContext->work);
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status),
@@ -556,7 +551,6 @@ napi_value PixelMapNapi::ReadPixelsToBuffer(napi_env env, napi_callback_info inf
IMG_JS_ARGS(env, info, status, argCount, argValue, thisVar);
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status), nullptr, HiLog::Error(LABEL, "fail to napi_get_cb_info"));
//IMG_NAPI_CHECK_RET_D(argCount >= 1, nullptr, HiLog::Error(LABEL, "ReadPixelsToBuffer args count mismatch %{public}d", argCount));
std::unique_ptr<PixelMapAsyncContext> asyncContext = std::make_unique<PixelMapAsyncContext>();
status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->nConstructor));
@@ -585,7 +579,7 @@ napi_value PixelMapNapi::ReadPixelsToBuffer(napi_env env, napi_callback_info inf
napi_get_undefined(env, &result);
}
IMG_CREATE_CREATE_ASYNC_WORK(env, status, "ReadPixelsToBuffer",
IMG_CREATE_CREATE_ASYNC_WORK(env, status, "ReadPixelsToBuffer",
[](napi_env env, void *data)
{
auto context = static_cast<PixelMapAsyncContext*>(data);
@@ -615,7 +609,6 @@ napi_value PixelMapNapi::ReadPixels(napi_env env, napi_callback_info info)
IMG_JS_ARGS(env, info, status, argCount, argValue, thisVar);
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status), nullptr, HiLog::Error(LABEL, "fail to napi_get_cb_info"));
//IMG_NAPI_CHECK_RET_D(argCount >= 1, nullptr, HiLog::Error(LABEL, "ReadPixels args count mismatch %{public}d", argCount));
std::unique_ptr<PixelMapAsyncContext> asyncContext = std::make_unique<PixelMapAsyncContext>();
status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->nConstructor));
@@ -671,7 +664,6 @@ napi_value PixelMapNapi::WritePixels(napi_env env, napi_callback_info info)
IMG_JS_ARGS(env, info, status, argCount, argValue, thisVar);
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status), nullptr, HiLog::Error(LABEL, "fail to napi_get_cb_info"));
//IMG_NAPI_CHECK_RET_D(argCount >= 1, nullptr, HiLog::Error(LABEL, "WritePixels args count mismatch %{public}d", argCount));
std::unique_ptr<PixelMapAsyncContext> asyncContext = std::make_unique<PixelMapAsyncContext>();
status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->nConstructor));
@@ -728,7 +720,6 @@ napi_value PixelMapNapi::WriteBufferToPixels(napi_env env, napi_callback_info in
IMG_JS_ARGS(env, info, status, argCount, argValue, thisVar);
IMG_NAPI_CHECK_RET_D(IMG_IS_OK(status), nullptr, HiLog::Error(LABEL, "fail to napi_get_cb_info"));
//IMG_NAPI_CHECK_RET_D(argCount >= 1, nullptr, HiLog::Error(LABEL, "WriteBufferToPixels args count mismatch %{public}d", argCount));
std::unique_ptr<PixelMapAsyncContext> asyncContext = std::make_unique<PixelMapAsyncContext>();
status = napi_unwrap(env, thisVar, reinterpret_cast<void**>(&asyncContext->nConstructor));
interfaces/innerkits/include/pixel_map.h
+10 -2
View File
@@ -120,6 +120,8 @@ public:
NATIVEEXPORT bool Marshalling(Parcel &data) const override;
NATIVEEXPORT static PixelMap *Unmarshalling(Parcel &data);
private:
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);
@@ -162,8 +164,14 @@ private:
? false
: true;
}
bool WriteFileDescriptor(Parcel &data, int fd) const;
static int ReadFileDescriptor(Parcel &data);
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;
uint8_t *data_ = nullptr;
// this info SHOULD be the final info for decoded pixelmap, not the original image info
plugins/common/libs/BUILD.gn
+2
View File
@@ -40,6 +40,8 @@ group("multimediaplugin") {
# "image/libheifplugin:heifplugin",
# "image/libheifplugin:heifpluginmetadata",
"image/libbmpplugin:bmpplugin",
"image/libbmpplugin:bmppluginmetadata",
"image/libjpegplugin:jpegplugin",
"image/libjpegplugin:jpegpluginmetadata",
"image/libpngplugin:pngplugin",
plugins/common/libs/image/formatagentplugin/src/plugin_export.cpp
+27 -4
View File
@@ -27,7 +27,9 @@
#include "wbmp_format_agent.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibImageFormatAgent")
namespace {
const std::string PACKAGE_NAME = ("LibImageFormatAgent");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
@@ -41,14 +43,35 @@ PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::RawFormatAgent)
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::WbmpFormatAgent)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibImageFormatAgent" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libbmpplugin/BUILD.gn
+94
View File
@@ -0,0 +1,94 @@
# Copyright (C) 2021 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.
import("//build/ohos.gni")
import("//foundation/multimedia/image_standard/ide/image_decode_config.gni")
ohos_shared_library("bmpplugin") {
sources = [
"//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/bmp_decoder.cpp",
"//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/bmp_stream.cpp",
"//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/plugin_export.cpp",
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_standard/plugins/manager/include",
"//foundation/multimedia/image_standard/plugins/manager/include/image",
"//foundation/multimedia/image_standard/plugins/manager/include/pluginbase",
"//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/include",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
"//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include",
"//third_party/flutter/skia/include/core",
"//third_party/flutter/skia/include/codec",
"//third_party/flutter/skia",
]
if (use_mingw_win) {
defines = image_decode_windows_defines
include_dirs += [
"//foundation/multimedia/image_standard/mock/native/include",
"//foundation/multimedia/image_standard/mock/native/include/secure",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/codec",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/core",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config/win",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config",
]
deps = [
"//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_core",
"//foundation/graphic/ide/libs/skia:skia",
"//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static",
"//foundation/multimedia/image_standard/mock/native:log_mock_static",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static",
]
#libs = [ "//foundation/multimedia/image/libskia.lib" ]
} else if (use_clang_mac) {
defines = image_decode_mac_defines
include_dirs += [
"//foundation/multimedia/image_standard/mock/native/include",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/codec",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/core",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config/mac",
"${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config",
"//utils/native/base/include",
]
deps = [
"//foundation/graphic/ide/libs/skia:skia",
"//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static",
"//foundation/multimedia/image_standard/mock/native:log_mock_static",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static",
"//utils/native/base:utilsecurec",
]
} else {
include_dirs += [ "//utils/native/base/include" ]
deps = [
"//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_ohos",
"//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager",
"//utils/native/base:utils",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
#aosp_deps = [ "shared_library:libhwui" ]
}
subsystem_name = "multimedia"
part_name = "multimedia_image_standard"
}
ohos_prebuilt_etc("bmppluginmetadata") {
source = "bmpplugin.pluginmeta"
relative_install_dir = "multimediaplugin/image"
subsystem_name = "multimedia"
part_name = "multimedia_image_standard"
}
plugins/common/libs/image/libbmpplugin/bmpplugin.pluginmeta
+25
View File
@@ -0,0 +1,25 @@
{
"packageName":"LibBmpPlugin",
"version":"1.0.0.0",
"targetVersion":"1.0.0.0",
"libraryPath":"libbmpplugin.z.so",
"classes": [
{
"className":"OHOS::ImagePlugin::BmpDecoder",
"services": [
{
"interfaceID":2,
"serviceType":0
}
],
"priority":100,
"capabilities": [
{
"name":"encodeFormat",
"type":"string",
"value": "image/bmp"
}
]
}
]
}
plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h
+66
View File
@@ -0,0 +1,66 @@
/*
* Copyright (C) 2021 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 BMP_DECODER_H
#define BMP_DECODER_H
#include <cstdint>
#include <string>
#include "SkCodec.h"
#include "abs_image_decoder.h"
#include "bmp_stream.h"
#include "hilog/log.h"
#include "log_tags.h"
#include "plugin_class_base.h"
namespace OHOS {
namespace ImagePlugin {
enum class BmpDecodingState : int32_t {
UNDECIDED = 0,
SOURCE_INITED = 1,
BASE_INFO_PARSED = 2,
IMAGE_DECODING = 3,
IMAGE_ERROR = 4,
IMAGE_DECODED = 5
};
class BmpDecoder : public AbsImageDecoder, public OHOS::MultimediaPlugin::PluginClassBase {
public:
BmpDecoder() = default;
virtual ~BmpDecoder() override {};
void SetSource(InputDataStream &sourceStream) override;
void Reset() override;
uint32_t SetDecodeOptions(uint32_t index, const PixelDecodeOptions &opts, PlImageInfo &info) override;
uint32_t Decode(uint32_t index, DecodeContext &context) override;
uint32_t GetImageSize(uint32_t index, PlSize &size) override;
uint32_t PromoteIncrementalDecode(uint32_t index, ProgDecodeContext &context) override;
private:
DISALLOW_COPY_AND_MOVE(BmpDecoder);
bool DecodeHeader();
PlAlphaType ConvertToAlphaType(SkAlphaType alphaType);
SkColorType ConvertToColorType(PlPixelFormat format, PlPixelFormat &outputFormat);
uint32_t SetContextPixelsBuffer(uint64_t byteCount, DecodeContext &context);
uint32_t SetShareMemBuffer(uint64_t byteCount, DecodeContext &context);
InputDataStream *stream_ = nullptr;
std::unique_ptr<SkCodec> codec_ = nullptr;
SkImageInfo info_;
SkColorType desireColor_ = kUnknown_SkColorType;
BmpDecodingState state_ = BmpDecodingState::UNDECIDED;
};
} // namespace ImagePlugin
} // namespace OHOS
#endif // BMP_DECODER_H
plugins/common/libs/image/libbmpplugin/include/bmp_stream.h
+56
View File
@@ -0,0 +1,56 @@
/*
* Copyright (C) 2021 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 BMP_STREAM_H
#define BMP_STREAM_H
#include <cstdint>
#include <string>
#include "SkStream.h"
#include "hilog/log.h"
#include "input_data_stream.h"
#include "log_tags.h"
#include "nocopyable.h"
namespace OHOS {
namespace ImagePlugin {
class BmpStream : public SkStream {
public:
BmpStream() = default;
explicit BmpStream(InputDataStream *stream);
virtual ~BmpStream() override {};
/**
* Reads or skips size number of bytes.
* if buffer is null, skip size bytes, return how many bytes skipped.
* else copy size bytes into buffer, return how many bytes copied.
*/
size_t read(void *buffer, size_t size) override;
/**
* Peeks size number of bytes.
*/
size_t peek(void *buffer, size_t size) const override;
/**
* Returns true when all the bytes in the stream have been read.
*/
bool isAtEnd() const override;
private:
DISALLOW_COPY_AND_MOVE(BmpStream);
ImagePlugin::InputDataStream *inputStream_ = nullptr;
};
} // namespace ImagePlugin
} // namespace OHOS
#endif // BMP_STREAM_H
plugins/common/libs/image/libbmpplugin/src/bmp_decoder.cpp
+283
View File
@@ -0,0 +1,283 @@
/*
* Copyright (C) 2021 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 "bmp_decoder.h"
#include "image_utils.h"
#include "media_errors.h"
#include "securec.h"
namespace OHOS {
namespace ImagePlugin {
using namespace OHOS::HiviewDFX;
using namespace Media;
using namespace std;
static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "BmpDecoder" };
namespace {
constexpr uint32_t BMP_IMAGE_NUM = 1;
}
void BmpDecoder::SetSource(InputDataStream &sourceStream)
{
stream_ = &sourceStream;
state_ = BmpDecodingState::SOURCE_INITED;
}
void BmpDecoder::Reset()
{
if (stream_ != nullptr) {
stream_->Seek(0);
}
codec_.release();
info_.reset();
desireColor_ = kUnknown_SkColorType;
}
uint32_t BmpDecoder::GetImageSize(uint32_t index, PlSize &size)
{
if (index >= BMP_IMAGE_NUM) {
HiLog::Error(LABEL, "GetImageSize failed, invalid index:%{public}u, range:%{public}u", index, BMP_IMAGE_NUM);
return ERR_IMAGE_INVALID_PARAMETER;
}
if (state_ < BmpDecodingState::SOURCE_INITED) {
HiLog::Error(LABEL, "GetImageSize failed, invalid state:%{public}d", state_);
return ERR_MEDIA_INVALID_OPERATION;
}
if (state_ >= BmpDecodingState::BASE_INFO_PARSED) {
size.width = info_.width();
size.height = info_.height();
return SUCCESS;
}
if (!DecodeHeader()) {
HiLog::Error(LABEL, "GetImageSize failed, decode header failed, state=%{public}d", state_);
return ERR_IMAGE_DECODE_HEAD_ABNORMAL;
}
size.width = info_.width();
size.height = info_.height();
state_ = BmpDecodingState::BASE_INFO_PARSED;
return SUCCESS;
}
uint32_t BmpDecoder::SetDecodeOptions(uint32_t index, const PixelDecodeOptions &opts, PlImageInfo &info)
{
if (index >= BMP_IMAGE_NUM) {
HiLog::Error(LABEL, "SetDecodeOptions failed, invalid index:%{public}u, range:%{public}u", index,
BMP_IMAGE_NUM);
return ERR_IMAGE_INVALID_PARAMETER;
}
if (state_ < BmpDecodingState::SOURCE_INITED) {
HiLog::Error(LABEL, "SetDecodeOptions failed, invalid state %{public}d", state_);
return ERR_MEDIA_INVALID_OPERATION;
}
if (state_ >= BmpDecodingState::IMAGE_DECODING) {
Reset();
state_ = BmpDecodingState::SOURCE_INITED;
}
if (state_ < BmpDecodingState::BASE_INFO_PARSED) {
if (!DecodeHeader()) {
HiLog::Error(LABEL, "GetImageSize failed, decode header failed, state=%{public}d", state_);
return ERR_IMAGE_DECODE_HEAD_ABNORMAL;
}
state_ = BmpDecodingState::BASE_INFO_PARSED;
}
PlPixelFormat desiredFormat = opts.desiredPixelFormat;
desireColor_ = ConvertToColorType(desiredFormat, info.pixelFormat);
info.size.width = info_.width();
info.size.height = info_.height();
info.alphaType = ConvertToAlphaType(info_.alphaType());
state_ = BmpDecodingState::IMAGE_DECODING;
return SUCCESS;
}
uint32_t BmpDecoder::SetShareMemBuffer(uint64_t byteCount, DecodeContext &context)
{
int fd = AshmemCreate("BMP RawData", byteCount);
if (fd < 0) {
return ERR_SHAMEM_DATA_ABNORMAL;
}
int result = AshmemSetProt(fd, PROT_READ | PROT_WRITE);
if (result < 0) {
::close(fd);
return ERR_SHAMEM_DATA_ABNORMAL;
}
void* ptr = ::mmap(nullptr, byteCount, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED) {
::close(fd);
return ERR_SHAMEM_DATA_ABNORMAL;
}
context.pixelsBuffer.buffer = ptr;
void *fdBuffer = new int32_t();
if (fdBuffer == nullptr) {
::munmap(ptr, byteCount);
::close(fd);
context.pixelsBuffer.buffer = nullptr;
return ERR_SHAMEM_DATA_ABNORMAL;
}
*static_cast<int32_t *>(fdBuffer) = fd;
context.pixelsBuffer.context = fdBuffer;
context.pixelsBuffer.bufferSize = byteCount;
context.allocatorType = AllocatorType::SHARE_MEM_ALLOC;
context.freeFunc = nullptr;
return SUCCESS;
}
uint32_t BmpDecoder::SetContextPixelsBuffer(uint64_t byteCount, DecodeContext &context)
{
if (context.allocatorType == Media::AllocatorType::SHARE_MEM_ALLOC) {
#if !defined(_WIN32) && !defined(_APPLE)
uint32_t res = SetShareMemBuffer(byteCount, context);
if (res != SUCCESS) {
return res;
}
#endif
} else {
if (byteCount <= 0) {
HiLog::Error(LABEL, "Decode failed, byteCount is invalid value");
return ERR_MEDIA_INVALID_VALUE;
}
void *outputBuffer = malloc(byteCount);
if (outputBuffer == nullptr) {
HiLog::Error(LABEL, "Decode failed, alloc output buffer size:[%{public}llu] error",
static_cast<unsigned long long>(byteCount));
return ERR_IMAGE_MALLOC_ABNORMAL;
}
#ifdef _WIN32
memset(outputBuffer, 0, byteCount);
#else
if (memset_s(outputBuffer, byteCount, 0, byteCount) != EOK) {
HiLog::Error(LABEL, "Decode failed, memset buffer failed");
free(outputBuffer);
outputBuffer = nullptr;
return ERR_IMAGE_DECODE_FAILED;
}
#endif
context.pixelsBuffer.buffer = outputBuffer;
context.pixelsBuffer.bufferSize = byteCount;
context.pixelsBuffer.context = nullptr;
context.allocatorType = AllocatorType::HEAP_ALLOC;
context.freeFunc = nullptr;
}
return SUCCESS;
}
uint32_t BmpDecoder::Decode(uint32_t index, DecodeContext &context)
{
if (index >= BMP_IMAGE_NUM) {
HiLog::Error(LABEL, "Decode failed, invalid index:%{public}u, range:%{public}u", index, BMP_IMAGE_NUM);
return ERR_IMAGE_INVALID_PARAMETER;
}
if (codec_ == nullptr) {
HiLog::Error(LABEL, "Decode failed, codec is null");
return ERR_IMAGE_DECODE_FAILED;
}
if (state_ != BmpDecodingState::IMAGE_DECODING) {
HiLog::Error(LABEL, "Decode failed, invalid state %{public}d", state_);
return ERR_MEDIA_INVALID_OPERATION;
}
SkImageInfo dstInfo = info_.makeColorType(desireColor_);
if (ImageUtils::CheckMulOverflow(dstInfo.width(), dstInfo.height(), dstInfo.bytesPerPixel())) {
HiLog::Error(LABEL, "Decode failed, width:%{public}d, height:%{public}d is too large",
dstInfo.width(), dstInfo.height());
return ERR_IMAGE_DECODE_FAILED;
}
if (context.pixelsBuffer.buffer == nullptr) {
uint64_t byteCount = static_cast<uint64_t>(dstInfo.height()) * dstInfo.width() * dstInfo.bytesPerPixel();
uint32_t res = SetContextPixelsBuffer(byteCount, context);
if (res != SUCCESS) {
return res;
}
}
uint8_t *dstBuffer = static_cast<uint8_t *>(context.pixelsBuffer.buffer);
size_t rowBytes = dstInfo.width() * dstInfo.bytesPerPixel();
SkCodec::Result ret = codec_->getPixels(dstInfo, dstBuffer, rowBytes);
if (ret != SkCodec::kSuccess) {
HiLog::Error(LABEL, "Decode failed, get pixels failed, ret=%{public}d", ret);
state_ = BmpDecodingState::IMAGE_ERROR;
return ERR_IMAGE_DECODE_ABNORMAL;
}
state_ = BmpDecodingState::IMAGE_DECODED;
return SUCCESS;
}
uint32_t BmpDecoder::PromoteIncrementalDecode(uint32_t index, ProgDecodeContext &context)
{
// currently not support increment decode
return ERR_IMAGE_DATA_UNSUPPORT;
}
bool BmpDecoder::DecodeHeader()
{
codec_ = SkCodec::MakeFromStream(make_unique<BmpStream>(stream_));
if (codec_ == nullptr) {
HiLog::Error(LABEL, "create codec from stream failed");
return false;
}
info_ = codec_->getInfo();
return true;
}
PlAlphaType BmpDecoder::ConvertToAlphaType(SkAlphaType alphaType)
{
switch (alphaType) {
case kOpaque_SkAlphaType:
return PlAlphaType::IMAGE_ALPHA_TYPE_OPAQUE;
case kPremul_SkAlphaType:
return PlAlphaType::IMAGE_ALPHA_TYPE_PREMUL;
case kUnpremul_SkAlphaType:
return PlAlphaType::IMAGE_ALPHA_TYPE_UNPREMUL;
default:
HiLog::Error(LABEL, "known alpha type:%{public}d", alphaType);
break;
}
return PlAlphaType::IMAGE_ALPHA_TYPE_UNKNOWN;
}
SkColorType BmpDecoder::ConvertToColorType(PlPixelFormat format, PlPixelFormat &outputFormat)
{
switch (format) {
case PlPixelFormat::UNKNOWN:
case PlPixelFormat::RGBA_8888: {
outputFormat = PlPixelFormat::RGBA_8888;
return kRGBA_8888_SkColorType;
}
case PlPixelFormat::BGRA_8888: {
outputFormat = PlPixelFormat::BGRA_8888;
return kBGRA_8888_SkColorType;
}
case PlPixelFormat::ALPHA_8: {
SkColorType colorType = info_.colorType();
if (colorType == kAlpha_8_SkColorType || (colorType == kGray_8_SkColorType && info_.isOpaque())) {
outputFormat = PlPixelFormat::ALPHA_8;
return kAlpha_8_SkColorType;
}
break;
}
case PlPixelFormat::RGB_565: {
if (info_.isOpaque()) {
outputFormat = PlPixelFormat::RGB_565;
return kRGB_565_SkColorType;
}
break;
}
default: {
break;
}
}
HiLog::Debug(LABEL, "unsupported convert to format:%{public}d, set default RGBA", format);
outputFormat = PlPixelFormat::RGBA_8888;
return kRGBA_8888_SkColorType;
}
} // namespace ImagePlugin
} // namespace OHOS
plugins/common/libs/image/libbmpplugin/src/bmp_stream.cpp
+78
View File
@@ -0,0 +1,78 @@
/*
* Copyright (C) 2021 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 "bmp_stream.h"
namespace OHOS {
namespace ImagePlugin {
using namespace OHOS::HiviewDFX;
static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "BmpStream" };
BmpStream::BmpStream(InputDataStream *stream) : inputStream_(stream) {}
size_t BmpStream::read(void *buffer, size_t size)
{
if (inputStream_ == nullptr) {
HiLog::Error(LABEL, "read failed, inputStream_ is null");
return 0;
}
if (buffer == nullptr) {
size_t curPosition = static_cast<size_t>(inputStream_->Tell());
if (!inputStream_->Seek(curPosition + size)) {
HiLog::Error(LABEL, "read failed, curpositon=%{public}zu, skip size=%{public}zu", curPosition, size);
return 0;
}
return size;
}
uint32_t desireSize = static_cast<uint32_t>(size);
uint32_t bufferSize = desireSize;
uint32_t readSize = desireSize;
if (!inputStream_->Read(desireSize, static_cast<uint8_t *>(buffer), bufferSize, readSize)) {
HiLog::Error(LABEL, "read failed, desire read size=%{public}u", desireSize);
return 0;
}
return readSize;
}
size_t BmpStream::peek(void *buffer, size_t size) const
{
if (inputStream_ == nullptr) {
HiLog::Error(LABEL, "peek failed, inputStream_ is null");
return 0;
}
if (buffer == nullptr) {
HiLog::Error(LABEL, "peek failed, output buffer is null");
return 0;
}
uint32_t desireSize = static_cast<uint32_t>(size);
uint32_t bufferSize = desireSize;
uint32_t readSize = desireSize;
if (!inputStream_->Peek(desireSize, static_cast<uint8_t *>(buffer), bufferSize, readSize)) {
HiLog::Error(LABEL, "peek failed, desire peek size=%{public}u", desireSize);
return 0;
}
return readSize;
}
bool BmpStream::isAtEnd() const
{
if (inputStream_ == nullptr) {
HiLog::Error(LABEL, "get stream status failed, inputStream_ is null.");
return false;
}
size_t size = inputStream_->GetStreamSize();
return (inputStream_->Tell() == size);
}
} // namespace ImagePlugin
} // namespace OHOS
plugins/common/libs/image/libbmpplugin/src/plugin_export.cpp
+63
View File
@@ -0,0 +1,63 @@
/*
* Copyright (C) 2021 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 "plugin_export.h"
#include "bmp_decoder.h"
#include "hilog/log.h"
#include "log_tags.h"
#include "plugin_utils.h"
// plugin package name same as metadata.
namespace {
const std::string PACKAGE_NAME = ("LibBmpPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::BmpDecoder)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibBmpPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libgifplugin/src/plugin_export.cpp
+27 -4
View File
@@ -20,21 +20,44 @@
#include "gif_decoder.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibGifPlugin")
namespace {
const std::string PACKAGE_NAME = ("LibGifPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::GifDecoder)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibGifPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libheifplugin/src/plugin_export.cpp
+27 -4
View File
@@ -20,21 +20,44 @@
#include "plugin_utils.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibHeifPlugin")
namespace {
const std::string PACKAGE_NAME = ("LibHeifPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::HeifDecoder)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibHeifPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libjpegplugin/BUILD.gn
+8 -7
View File
@@ -41,25 +41,25 @@ ohos_shared_library("jpegplugin") {
include_dirs += [
"//foundation/multimedia/image_standard/mock/native/include",
"//third_party/libjpeg",
"//third_party/flutter/skia/third_party/libjpeg-turbo",
]
deps = [
"//foundation/ace/ace_engine/build/third_party/flutter/libjpeg:ace_libjpeg",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_static",
"//foundation/multimedia/image_standard/mock/native:utils_mock_static",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static",
"//third_party/libjpeg:libjpeg_static",
]
} else if (use_clang_mac) {
defines = image_decode_mac_defines
include_dirs += [
"//foundation/multimedia/image_standard/mock/native/include",
"//third_party/libjpeg",
"//third_party/flutter/skia/third_party/libjpeg-turbo",
]
deps = [
"//foundation/ace/ace_engine/build/third_party/flutter/libjpeg:ace_libjpeg",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_static",
"//foundation/multimedia/image_standard/mock/native:utils_mock_static",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static",
"//third_party/libjpeg:libjpeg_static",
]
} else {
defines = [ "DUAL_ADAPTER" ]
@@ -67,16 +67,17 @@ ohos_shared_library("jpegplugin") {
include_dirs += [ "//utils/native/base/include" ]
sources += [ "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp" ]
deps = [
#"//third_party/flutter/skia/third_party/libjpeg-turbo:libjpeg",
"//foundation/ace/ace_engine/build/third_party/flutter/libjpeg:ace_libjpeg",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/multimedia/image_standard/plugins/manager:pluginmanager",
"//third_party/libjpeg:libjpeg_static",
"//utils/native/base:utils",
]
if (DUAL_ADAPTER) {
} else {
deps += [ "//third_party/libjpeg:libjpeg_static" ]
include_dirs += [ "//third_party/libjpeg" ]
deps += [ "//foundation/ace/ace_engine/build/third_party/flutter/libjpeg:ace_libjpeg" ]
include_dirs += [ "//third_party/flutter/skia/third_party/libjpeg-turbo" ]
}
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
plugins/common/libs/image/libjpegplugin/src/plugin_export.cpp
+27 -4
View File
@@ -21,7 +21,9 @@
#include "log_tags.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibJpegPlugin")
namespace {
const std::string PACKAGE_NAME = ("LibJpegPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
@@ -31,14 +33,35 @@ PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::JpegEncoder)
#endif
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibJpegPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libpngplugin/src/plugin_export.cpp
+27 -4
View File
@@ -20,21 +20,44 @@
#include "png_decoder.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibPngPlugin")
namespace {
const std::string PACKAGE_NAME = ("LibPngPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::PngDecoder)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibPngPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/common/libs/image/libwebpplugin/src/plugin_export.cpp
+27 -4
View File
@@ -20,21 +20,44 @@
#include "webp_decoder.h"
// plugin package name same as metadata.
PLUGIN_EXPORT_REGISTER_PACKAGE("LibWebpPlugin")
namespace {
const std::string PACKAGE_NAME = ("LibWebpPlugin");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::ImagePlugin::WebpDecoder)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "LibWebpPlugin" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin.
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/manager/include/pluginbase/plugin_utils.h
+3 -1
View File
@@ -38,7 +38,9 @@ using PluginObjectCreatorFunc = OHOS::MultimediaPlugin::PluginClassBase *(*)();
// --------- a set of code fragments that helps define a simple plugin_export.cpp file ----------
#define PLUGIN_EXPORT_REGISTER_PACKAGE(packageName) \
static const std::string PACKAGE_NAME = (packageName);
namespace { \
const std::string PACKAGE_NAME = (packageName); \
}
#define PLUGIN_EXPORT_REGISTER_CLASS_BEGIN \
using ImplClassMap = std::map<const std::string, PluginObjectCreatorFunc>; \
plugins/manager/test/unittest/common/plugin_example/plugin_example2/plugin_export.cpp
+27 -4
View File
@@ -22,7 +22,9 @@
// this file shows how to easily write the plugin_export.cpp file using the code elements provided by plugin_utils.h.
// but sometimes you may need to write this file directly, see plugin_example1.
PLUGIN_EXPORT_REGISTER_PACKAGE("plugin_example2")
namespace {
const std::string PACKAGE_NAME = ("plugin_example2");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
@@ -30,15 +32,36 @@ PLUGIN_EXPORT_REGISTER_CLASS(OHOS::PluginExample::LabelDetector2)
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::PluginExample::CloudLabelDetector2)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "plugin_example2" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}
plugins/manager/test/unittest/common/plugin_example/plugin_example3/plugin_export.cpp
+27 -4
View File
@@ -22,7 +22,9 @@
// this file shows how to easily write the plugin_export.cpp file using the code elements provided by plugin_utils.h.
// but sometimes you may need to write this file directly, see plugin_example1.
PLUGIN_EXPORT_REGISTER_PACKAGE("plugin_example3")
namespace {
const std::string PACKAGE_NAME = ("plugin_example3");
}
// register implement classes of this plugin.
PLUGIN_EXPORT_REGISTER_CLASS_BEGIN
@@ -30,15 +32,36 @@ PLUGIN_EXPORT_REGISTER_CLASS(OHOS::PluginExample::LabelDetector3)
PLUGIN_EXPORT_REGISTER_CLASS(OHOS::PluginExample::CloudLabelDetector3)
PLUGIN_EXPORT_REGISTER_CLASS_END
using std::string;
using namespace OHOS::HiviewDFX;
static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_TAG_DOMAIN_ID_PLUGIN, "plugin_example3" };
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__);
#define PLUGIN_LOG_D(...) HiLog::Debug(LABEL, __VA_ARGS__)
#define PLUGIN_LOG_E(...) HiLog::Error(LABEL, __VA_ARGS__)
// define the external interface of this plugin
PLUGIN_EXPORT_DEFAULT_EXTERNAL_START()
PLUGIN_EXPORT_DEFAULT_EXTERNAL_STOP()
// PLUGIN_EXPORT_DEFAULT_EXTERNAL_CREATE()
OHOS::MultimediaPlugin::PluginClassBase *PluginExternalCreate(const string &className)
{
HiLog::Debug(LABEL, "PluginExternalCreate: create object for package: %{public}s, class: %{public}s.",
PACKAGE_NAME.c_str(), className.c_str());
auto iter = implClassMap.find(className);
if (iter == implClassMap.end()) {
HiLog::Error(LABEL, "PluginExternalCreate: failed to find class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
auto creator = iter->second;
if (creator == nullptr) {
HiLog::Error(LABEL, "PluginExternalCreate: null creator for class: %{public}s, in package: %{public}s.",
className.c_str(), PACKAGE_NAME.c_str());
return nullptr;
}
return creator();
}