overlay: Fix rotator output buffer size.
Fix rotator output buffer size for mdp and mdss rotators.
Output size is based on rotated width & height.
Output format can be different than source format.
It could be same if using mdss rot or using fastyuv mode in mdp rot.
Deprecate the static mapping of rotator input and output formats.
Driver will be responsible for correctly populating the dest format that its
wishes to use.
Change-Id: I17352d6d460cac24eb97083aed38668929c66807
diff --git a/liboverlay/overlayMdpRot.cpp b/liboverlay/overlayMdpRot.cpp
index d0242d6..d0a9ee5 100644
--- a/liboverlay/overlayMdpRot.cpp
+++ b/liboverlay/overlayMdpRot.cpp
@@ -111,8 +111,6 @@
mRotImgInfo.dst.width = whf.w;
mRotImgInfo.dst.height = whf.h;
-
- mBufSize = awhf.size;
}
inline void MdpRot::setFlags(const utils::eMdpFlags& flags) {
@@ -157,6 +155,12 @@
return true;
}
+uint32_t MdpRot::calcOutputBufSize() {
+ ovutils::Whf destWhf(mRotImgInfo.dst.width,
+ mRotImgInfo.dst.height, mRotImgInfo.dst.format);
+ return Rotator::calcOutputBufSize(destWhf);
+}
+
bool MdpRot::open_i(uint32_t numbufs, uint32_t bufsz)
{
OvMem mem;
@@ -201,8 +205,9 @@
bool MdpRot::remap(uint32_t numbufs) {
// if current size changed, remap
- if(mBufSize == mMem.curr().size()) {
- ALOGE_IF(DEBUG_OVERLAY, "%s: same size %d", __FUNCTION__, mBufSize);
+ uint32_t opBufSize = calcOutputBufSize();
+ if(opBufSize == mMem.curr().size()) {
+ ALOGE_IF(DEBUG_OVERLAY, "%s: same size %d", __FUNCTION__, opBufSize);
return true;
}
@@ -211,12 +216,12 @@
// ++mMem will make curr to be prev, and prev will be curr
++mMem;
- if(!open_i(numbufs, mBufSize)) {
+ if(!open_i(numbufs, opBufSize)) {
ALOGE("%s Error could not open", __FUNCTION__);
return false;
}
for (uint32_t i = 0; i < numbufs; ++i) {
- mMem.curr().mRotOffset[i] = i * mBufSize;
+ mMem.curr().mRotOffset[i] = i * opBufSize;
}
return true;
}
@@ -229,7 +234,6 @@
ovutils::memset0(mMem.prev().mRotOffset);
mMem.curr().mCurrOffset = 0;
mMem.prev().mCurrOffset = 0;
- mBufSize = 0;
mOrientation = utils::OVERLAY_TRANSFORM_0;
}