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

overlay: Close correct channels during state change events.

Browse Source 
When there is a state change, open/close only the required channels
instead of blindly closing all the channels. When HDMI is connected,
open the overlay for queueing the frames on the external, and when
hdmi is disconnected, only close the external overlay channel.

CRs-fixed: 333324
(cherry picked from commit a6b5ac4c385e03b3c798bb07d0d3ba6140aebbe8)

Change-Id: I7333a6fe106cd0aa99471542daf3c84c04c5d056
This commit is contained in:
Naomi Luis 2012-01-27 19:08:01 -08:00 committed by Andrew Sutherland
parent 37c2692006
commit d8588e1c12
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libhwcomposer/hwcomposer.cpp
View File

@ -678,10 +678,9 @@ static void handleHDMIStateChange(hwc_composer_device_t *dev, int externaltype)
if(ctx && ctx->mOverlayLibObject) {
overlay::Overlay *ovLibObject = ctx->mOverlayLibObject;
ovLibObject->setHDMIStatus(externaltype);
if (!externaltype) {
// Close the overlay channels if HDMI is disconnected
ovLibObject->closeChannel();
// Close the external overlay channels if HDMI is disconnected
ovLibObject->closeExternalChannel();
}
}
#endif

37
liboverlay/overlayLib.cpp
View File

@ -448,6 +448,13 @@ bool Overlay::closeChannel() {
return true;
}
void Overlay::closeExternalChannel() {
if (objOvCtrlChannel[VG1_PIPE].isChannelUP()) {
objOvCtrlChannel[VG1_PIPE].closeControlChannel();
objOvDataChannel[VG1_PIPE].closeDataChannel();
}
}
bool Overlay::getPosition(int& x, int& y, uint32_t& w, uint32_t& h, int channel) {
return objOvCtrlChannel[channel].getPosition(x, y, w, h);
}
@ -643,16 +650,17 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
// If there is 3D content; the effective format passed by the client is:
// effectiveFormat = 3D_IN | 3D_OUT | ColorFormat
int newState = mState;
bool stateChange = false, ret = false;
bool stateChange = false, ret = true;
bool isHDMIStateChange = (mHDMIConnected != hdmiConnected) && (mState != -1);
unsigned int format3D = getS3DFormat(info.format);
int colorFormat = getColorFormat(info.format);
if (-1 == mState) {
if (isHDMIStateChange || -1 == mState) {
// we were mirroring UI. Also HDMI state stored was stale
newState = getOverlayConfig (format3D, false, hdmiConnected);
stateChange = (mState == newState) ? false : true;
}
if (stateChange) {
closeChannel();
mHDMIConnected = hdmiConnected;
mState = newState;
mS3DFormat = format3D;
@ -666,11 +674,18 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
int fbnum = 0;
switch(mState) {
case OV_2D_VIDEO_ON_PANEL:
if(isHDMIStateChange) {
//close HDMI Only
closeExternalChannel();
break;
}
case OV_3D_VIDEO_2D_PANEL:
closeChannel();
return startChannel(info, FRAMEBUFFER_0, noRot, false,
mS3DFormat, VG0_PIPE, waitForVsync, num_buffers);
break;
case OV_3D_VIDEO_3D_PANEL:
closeChannel();
if (sHDMIAsPrimary) {
noRot = true;
waitForVsync = true;
@ -685,7 +700,22 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
}
break;
case OV_2D_VIDEO_ON_TV:
if(isHDMIStateChange) {
//start only HDMI channel
noRot = true;
bool waitForVsync = true;
if(!startChannel(info, FRAMEBUFFER_1, noRot, false, mS3DFormat,
VG1_PIPE, waitForVsync, num_buffers)) {
LOGE("%s:failed to open channel %d", __func__, VG1_PIPE);
return false;
}
overlay_rect rect;
objOvCtrlChannel[VG1_PIPE].getAspectRatioPosition(info.width,
info.height, &rect);
return setChannelPosition(rect.x, rect.y, rect.w, rect.h, VG1_PIPE);
}
case OV_3D_VIDEO_2D_TV:
closeChannel();
for (int i=0; i<NUM_CHANNELS; i++) {
fbnum = i;
//start two channels for one for primary and external.
@ -705,6 +735,7 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
return true;
break;
case OV_3D_VIDEO_3D_TV:
closeChannel();
for (int i=0; i<NUM_CHANNELS; i++) {
if(!startChannel(info, FRAMEBUFFER_1, true, false,
mS3DFormat, i, waitForVsync, num_buffers)) {

3
liboverlay/overlayLib.h
View File

@ -430,8 +430,7 @@ public:
void setVisualParam(int8_t paramType, float paramValue);
bool waitForHdmiVsync(int channel);
int getChannelStatus() const { return (mChannelUP ? OVERLAY_CHANNEL_UP: OVERLAY_CHANNEL_DOWN); }
void setHDMIStatus (bool isHDMIConnected) { mHDMIConnected = isHDMIConnected; mState = -1; }
int getHDMIStatus() const {return (mHDMIConnected ? HDMI_ON : HDMI_OFF); }
void closeExternalChannel();
private:
bool setChannelPosition(int x, int y, uint32_t w, uint32_t h, int channel = 0);