android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

liboverlay: Setup the overlay and rotator if the geometry has changed.

Browse Source 
Setup both the overlay and rotator for every geometry change event.
The mNoRot flag decides if the rotator needs to be setup for that
particular channel. SetTranform takes care of enabling/disabling the
rotator and correcting the params when the rotation changes.

CRs-fixed: 336037 336346
(cherry picked from commit 84c7068f405189542658529cc43a3d54b49b11ca)

Change-Id: I4c4c747bf365c50c48037c657c653d4903ec7e76
This commit is contained in:
Naomi Luis 2012-02-10 14:27:44 -08:00 committed by Andrew Sutherland
parent 694752d90d
commit 452832bb84
2 changed files with 30 additions and 26 deletions

48
liboverlay/overlayLib.cpp

@ -612,7 +612,6 @@ bool Overlay::updateOverlaySource(const overlay_buffer_info& info, int orientati
needUpdateFlags = false;
if ((false == needUpdateFlags) && (false == geometryChanged)) {
objOvDataChannel[0].updateDataChannel(0, 0);
return true;
}
@ -653,8 +652,7 @@ bool Overlay::updateOverlaySource(const overlay_buffer_info& info, int orientati
return false;
}
objOvCtrlChannel[i].setSize(info.size);
int updateDataChannel = orientation ? 1:0;
ret = objOvDataChannel[i].updateDataChannel(updateDataChannel, info.size);
ret = objOvDataChannel[i].updateDataChannel(info.size);
}
}
if (ret) {
@ -1200,8 +1198,7 @@ bool OverlayControlChannel::openDevices(int fbnum) {
}
bool OverlayControlChannel::setOverlayInformation(const overlay_buffer_info& info,
int orientation, int zorder,
int flags, int requestType) {
int zorder, int flags, int requestType) {
int w = info.width;
int h = info.height;
int format = info.format;
@ -1215,7 +1212,7 @@ bool OverlayControlChannel::setOverlayInformation(const overlay_buffer_info& inf
mOVInfo.dst_rect.w = w;
mOVInfo.dst_rect.h = h;
if(format == MDP_Y_CRCB_H2V2_TILE) {
if (!orientation) {
if (mNoRot) {
mOVInfo.src_rect.w = w - ((((w-1)/64 +1)*64) - w);
mOVInfo.src_rect.h = h - ((((h-1)/32 +1)*32) - h);
} else {
@ -1232,11 +1229,19 @@ bool OverlayControlChannel::setOverlayInformation(const overlay_buffer_info& inf
}
mOVInfo.src.format = format;
if (w > mFBWidth)
mOVInfo.dst_rect.w = mFBWidth;
if (h > mFBHeight)
mOVInfo.dst_rect.h = mFBHeight;
int dst_w = w;
int dst_h = h;
if (dst_w > mFBWidth) {
dst_w = mFBWidth;
dst_h = dst_h * mFBWidth / w;
}
if (dst_h > mFBHeight) {
dst_h = mFBHeight;
dst_w = dst_w * mFBHeight / h;
}
mOVInfo.dst_rect.w = dst_w;
mOVInfo.dst_rect.h = dst_h;
mOVInfo.user_data[0] = 0;
if (requestType == NEW_REQUEST) {
mOVInfo.id = MSMFB_NEW_REQUEST;
@ -1317,13 +1322,13 @@ bool OverlayControlChannel::doFlagsNeedUpdate(int flags) {
bool OverlayControlChannel::startOVRotatorSessions(
const overlay_buffer_info& info,
int orientation, int requestType) {
int requestType) {
bool ret = true;
int w = info.width;
int h = info.height;
int format = info.format;
if (orientation) {
if (!mNoRot) {
mRotInfo.src.format = format;
mRotInfo.src.width = w;
mRotInfo.src.height = h;
@ -1389,11 +1394,11 @@ bool OverlayControlChannel::updateOverlaySource(const overlay_buffer_info& info,
if (isInterlacedContent(info.format)) {
flags |= INTERLACED_CONTENT;
}
if (!setOverlayInformation(ovBufInfo, orientation, 0, flags,
if (!setOverlayInformation(ovBufInfo, 0, flags,
UPDATE_REQUEST))
return false;
return startOVRotatorSessions(ovBufInfo, orientation, UPDATE_REQUEST);
return startOVRotatorSessions(ovBufInfo, UPDATE_REQUEST);
}
bool OverlayControlChannel::startControlChannel(int w, int h,
@ -1439,16 +1444,14 @@ bool OverlayControlChannel::startControlChannel(int w, int h,
if (zorder == NO_PIPE)
return false;
int orientation = mNoRot ? 0: 1;
overlay_buffer_info ovBufInfo;
ovBufInfo.width = w;
ovBufInfo.height = h;
ovBufInfo.format = hw_format;
if (!setOverlayInformation(ovBufInfo, orientation, zorder, flags, NEW_REQUEST))
if (!setOverlayInformation(ovBufInfo, zorder, flags, NEW_REQUEST))
return false;
return startOVRotatorSessions(ovBufInfo, orientation, NEW_REQUEST);
return startOVRotatorSessions(ovBufInfo, NEW_REQUEST);
}
bool OverlayControlChannel::closeControlChannel() {
@ -1761,7 +1764,7 @@ bool OverlayControlChannel::getSize(int& size) const {
}
OverlayDataChannel::OverlayDataChannel() : mNoRot(false), mFD(-1), mRotFD(-1),
mPmemFD(-1), mPmemAddr(0), mUpdateDataChannel(0)
mPmemFD(-1), mPmemAddr(0), mUpdateDataChannel(false)
{
//XXX: getInstance(false) implies that it should only
// use the kernel allocator. Change it to something
@ -1871,8 +1874,8 @@ bool OverlayDataChannel::mapRotatorMemory(int num_buffers, bool uiChannel, int r
return true;
}
bool OverlayDataChannel::updateDataChannel(int updateStatus, int size) {
mUpdateDataChannel = updateStatus;
bool OverlayDataChannel::updateDataChannel(int size) {
mUpdateDataChannel = true;
mNewPmemOffset = size;
return true;
}
@ -1947,7 +1950,8 @@ bool OverlayDataChannel::queueBuffer(uint32_t offset) {
LOGE("queueBuffer: mapRotatorMemory failed");
return false;
}
}
mUpdateDataChannel = false;
}
}
result = queue(offset);

8
liboverlay/overlayLib.h

@ -298,9 +298,9 @@ enum {
bool mIsChannelUpdated;
bool openDevices(int fbnum = -1);
bool setOverlayInformation(const overlay_buffer_info& info,
int orientation, int zorder = 0, int flags = 0,
int zorder = 0, int flags = 0,
int requestType = NEW_REQUEST);
bool startOVRotatorSessions(const overlay_buffer_info& info, int orientation, int requestType);
bool startOVRotatorSessions(const overlay_buffer_info& info, int requestType);
void swapOVRotWidthHeight();
int commitVisualParam(int8_t paramType, float paramValue);
void setInformationFromFlags(int flags, mdp_overlay& ov);
@ -356,7 +356,7 @@ class OverlayDataChannel {
int mRotOffset[max_num_buffers];
int mCurrentItem;
int mNumBuffers;
int mUpdateDataChannel;
bool mUpdateDataChannel;
android::sp<gralloc::IAllocController> mAlloc;
int mBufferType;
@ -380,7 +380,7 @@ public:
bool setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h);
bool getCropS3D(overlay_rect *inRect, int channel, int format, overlay_rect *rect);
bool isChannelUP() const { return (mFD > 0); }
bool updateDataChannel(int updateStatus, int size);
bool updateDataChannel(int size);
};
/*