diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-19 12:04:47 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-19 12:04:47 -0700 |
commit | 9c43ba08fdff49d22045dbb5f604cbfd8ec191ac (patch) | |
tree | 44ebb28eb6fbec6340e2cee6e92e30dd49f94af7 /libc2dcolorconvert | |
parent | 1d02f68b14d679ea08496bb01cde267d14140974 (diff) | |
parent | 4924b2c9b84267dd4b9e4f3b1292a28fdcb12ba6 (diff) | |
download | media-9c43ba08fdff49d22045dbb5f604cbfd8ec191ac.tar.gz |
Merge "mm-video-v4l2: Enable NV12 UBWC in C2D" into video-userspace.lnx.3.0-dev
Diffstat (limited to 'libc2dcolorconvert')
-rw-r--r-- | libc2dcolorconvert/C2DColorConverter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libc2dcolorconvert/C2DColorConverter.cpp b/libc2dcolorconvert/C2DColorConverter.cpp index 3e3dfaf0..33579318 100644 --- a/libc2dcolorconvert/C2DColorConverter.cpp +++ b/libc2dcolorconvert/C2DColorConverter.cpp @@ -433,10 +433,10 @@ size_t C2DColorConverter::calcStride(ColorConvertFormat format, size_t width) case RGB565: return ALIGN(width, ALIGN32) * 2; // RGB565 has width as twice case RGBA8888: - if (mSrcStride) - return mSrcStride * 4; - else - return ALIGN(width, ALIGN32) * 4; + if (mSrcStride) + return mSrcStride * 4; + else + return ALIGN(width, ALIGN32) * 4; case YCbCr420Tile: return ALIGN(width, ALIGN128); case YCbCr420SP: @@ -544,6 +544,7 @@ size_t C2DColorConverter::calcSize(ColorConvertFormat format, size_t width, size break; case NV12_UBWC: size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12_UBWC, width, height); + break; default: break; } |