openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-12-20 13:49:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!795 Fix yuv420Convert color channel shift

Browse Source 
Merge pull request !795 from shiyueeee/local
This commit is contained in:
openharmony_ci 2022-03-24 04:28:01 +00:00 committed by Gitee
commit e85083b0e0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rosen/modules/render_service/BUILD.gn
View File

@ -15,6 +15,16 @@ import("//build/ohos.gni")
## Build librender_service.so
ohos_shared_library("librender_service") {
defines = []
if ("${product_name}" == "watchos" || "${product_name}" == "Hi3516DV300" ||
"${product_name}" == "ohos-arm64" || "${product_name}" == "ohos-sdk" ||
"${product_name}" == "qemu-arm-linux-min" ||
"${product_name}" == "rk3566" || "${product_name}" == "rk3568") {
defines += []
} else {
defines += [ "PADDING_HEIGHT_32" ]
}
sources = [
"core/pipeline/rs_compatible_processor.cpp",
"core/pipeline/rs_hardware_processor.cpp",

32
rosen/modules/render_service/core/pipeline/rs_render_service_util.cpp
View File

@ -449,16 +449,32 @@ static int Table_fu2[256] = { -227, -226, -224, -222, -220, -219, -217, -215, -2
bool ConvertYUV420SPToRGBA(std::vector<uint8_t>& rgbaBuf, const sptr<OHOS::SurfaceBuffer>& srcBuf)
{
if (srcBuf == nullptr || rgbaBuf.empty()) {
ROSEN_LOGE("RsRenderServiceUtil::ConvertYUV420SPToRGBA invalid params");
return false;
}
int32_t bufferHeight = srcBuf->GetHeight();
int32_t bufferWidth = srcBuf->GetStride();
int32_t bufferStride = srcBuf->GetStride();
int32_t bufferWidth = srcBuf->GetWidth();
if (bufferStride < 1 || bufferWidth < 1 || bufferHeight < 1) {
ROSEN_LOGE("RsRenderServiceUtil::ConvertYUV420SPToRGBA invalid buffer size");
return false;
}
uint8_t* rgbaDst = &rgbaBuf[0];
auto bufferAddr = srcBuf->GetVirAddr();
uint8_t* src = static_cast<uint8_t*>(bufferAddr);
if (bufferWidth < 1 || bufferHeight < 1 || src == nullptr || rgbaDst == nullptr) {
if (src == nullptr || rgbaDst == nullptr) {
ROSEN_LOGE("RsRenderServiceUtil::ConvertYUV420SPToRGBA null buffer ptr");
return false;
}
uint8_t* ybase = src;
uint8_t* ubase = &src[bufferWidth*bufferHeight];
int32_t len = bufferStride * bufferHeight;
#ifdef PADDING_HEIGHT_32
int32_t paddingBase = 32;
int32_t paddingHeight = ((bufferHeight - 1) / paddingBase + 1) * paddingBase;
len = bufferStride * paddingHeight;
#endif
uint8_t* ubase = &src[len];
int rgb[3] = {0, 0, 0};
int idx = 0;
@ -467,9 +483,9 @@ bool ConvertYUV420SPToRGBA(std::vector<uint8_t>& rgbaBuf, const sptr<OHOS::Surfa
int bdif = 0;
for (int i = 0; i < bufferHeight; i++) {
for (int j = 0; j < bufferWidth; j++) {
int Y = static_cast<int>(ybase[i * bufferWidth + j]);
int U = static_cast<int>(ubase[i / 2 * bufferWidth + (j / 2) * 2 + 1]);
int V = static_cast<int>(ubase[i / 2 * bufferWidth + (j / 2) * 2]);
int Y = static_cast<int>(ybase[i * bufferStride + j]);
int U = static_cast<int>(ubase[i / 2 * bufferStride + (j / 2) * 2 + 1]);
int V = static_cast<int>(ubase[i / 2 * bufferStride + (j / 2) * 2]);
if (srcBuf->GetFormat() == PIXEL_FMT_YCBCR_420_SP) {
std::swap(U, V);
}
@ -644,7 +660,7 @@ bool RsRenderServiceUtil::CreateNewColorGamutBitmap(sptr<OHOS::SurfaceBuffer> bu
bool RsRenderServiceUtil::CreateYuvToRGBABitMap(sptr<OHOS::SurfaceBuffer> buffer,
std::vector<uint8_t>& newBuffer, SkBitmap& bitmap)
{
newBuffer.resize(buffer->GetStride() * buffer->GetHeight() * 4, 0); // 4 is color channel
newBuffer.resize(buffer->GetWidth() * buffer->GetHeight() * 4, 0); // 4 is color channel
if (!Detail::ConvertYUV420SPToRGBA(newBuffer, buffer)) {
return false;
}
@ -652,7 +668,7 @@ bool RsRenderServiceUtil::CreateYuvToRGBABitMap(sptr<OHOS::SurfaceBuffer> buffer
SkColorType colorType = kRGBA_8888_SkColorType;
SkImageInfo imageInfo = SkImageInfo::Make(buffer->GetWidth(), buffer->GetHeight(),
colorType, kPremul_SkAlphaType);
SkPixmap pixmap(imageInfo, newBuffer.data(), buffer->GetStride() * 4); // 4 is color channel
SkPixmap pixmap(imageInfo, newBuffer.data(), buffer->GetWidth() * 4); // 4 is color channel
return bitmap.installPixels(pixmap);
}