use hdi colorgamut type

Signed-off-by: stonesxd <shixindong@huawei.com>
Change-Id: I5953b7c1ef0ecdc66b2942c1840d7fe526078e69
This commit is contained in:
stonesxd
2022-03-14 16:14:27 +08:00
parent 5559b4f029
commit 91cba4d2cf
4 changed files with 8 additions and 9 deletions
@@ -19,7 +19,6 @@
#include <vector>
#include <mutex>
#include <pixel_map.h>
#include <surface.h>
#include "display.h"
#include "dm_common.h"
+1 -1
View File
@@ -139,7 +139,7 @@ bool SurfaceReader::ProcessBuffer(const sptr<SurfaceBuffer> &buf)
ImageInfo info;
info.size.width = static_cast<int32_t>(width);
info.size.height = static_cast<int32_t>(height);
info.pixelFormat = PixelFormat::RGBA_8888;
info.pixelFormat = OHOS::Media::PixelFormat::RGBA_8888;
info.colorSpace = ColorSpace::SRGB;
pixelMap->SetImageInfo(info);
+3 -3
View File
@@ -200,11 +200,11 @@ private:
// colorspace, gamut
using ColorSpaceConvertMap = struct {
ColorSpace colorSpace;
SurfaceColorGamut sufaceColorGamut;
ColorGamut sufaceColorGamut;
};
static const ColorSpaceConvertMap colorSpaceConvertMap[];
static ColorSpace GetColorSpaceFromSurfaceGamut(SurfaceColorGamut surfaceColorGamut);
static SurfaceColorGamut GetSurfaceGamutFromColorSpace(ColorSpace colorSpace);
static ColorSpace GetColorSpaceFromSurfaceGamut(ColorGamut ColorGamut);
static ColorGamut GetSurfaceGamutFromColorSpace(ColorSpace colorSpace);
std::shared_ptr<VsyncStation::VsyncCallback> callback_ =
std::make_shared<VsyncStation::VsyncCallback>(VsyncStation::VsyncCallback());
+4 -4
View File
@@ -384,24 +384,24 @@ std::string WindowImpl::GetContentInfo()
return uiContent_->GetContentInfo();
}
ColorSpace WindowImpl::GetColorSpaceFromSurfaceGamut(SurfaceColorGamut surfaceColorGamut)
ColorSpace WindowImpl::GetColorSpaceFromSurfaceGamut(ColorGamut ColorGamut)
{
for (auto item: colorSpaceConvertMap) {
if (item.sufaceColorGamut == surfaceColorGamut) {
if (item.sufaceColorGamut == ColorGamut) {
return item.colorSpace;
}
}
return ColorSpace::COLOR_SPACE_DEFAULT;
}
SurfaceColorGamut WindowImpl::GetSurfaceGamutFromColorSpace(ColorSpace colorSpace)
ColorGamut WindowImpl::GetSurfaceGamutFromColorSpace(ColorSpace colorSpace)
{
for (auto item: colorSpaceConvertMap) {
if (item.colorSpace == colorSpace) {
return item.sufaceColorGamut;
}
}
return SurfaceColorGamut::COLOR_GAMUT_SRGB;
return ColorGamut::COLOR_GAMUT_SRGB;
}
bool WindowImpl::IsSupportWideGamut()