Overlay: Close channels on s3d format change

Fix 3d to 2d video switch, make sure params are cleared and pipes closed.
Fix other 3D regressions coming out of external connect-disconnect.

CRs-fixed: 349421
(cherry picked from commit 2ec3805)

Change-Id: Ie6ba0aca2acf580081bcd6d293ddecef4143c6b3

liboverlay/overlayLib.cpp

@@ -673,16 +673,14 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
     }
 
     if (stateChange) {
-        if (mState != -1) {
-            if ((mState == OV_3D_VIDEO_3D_PANEL) ||
-                (mState == OV_3D_VIDEO_3D_TV) ||
-                (newState == OV_3D_VIDEO_3D_PANEL) ||
-                (newState == OV_3D_VIDEO_3D_TV)) {
-                LOGI("S3D state transition: closing the channels");
-                closeChannel();
-                isHDMIStateChange = false;
-                isS3DFormatChange = false;
-            }
+        if (isS3DFormatChange ||
+            (mState == OV_3D_VIDEO_3D_PANEL) ||
+            (mState == OV_3D_VIDEO_3D_TV) ||
+            (newState == OV_3D_VIDEO_3D_PANEL) ||
+            (newState == OV_3D_VIDEO_3D_TV)) {
+            LOGI("S3D state transition: closing the channels");
+            closeChannel();
+            isHDMIStateChange = false;
         }
         mExternalDisplay = hdmiConnected;
         mState = newState;
@@ -703,10 +701,8 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
                     closeExternalChannel();
                     break;
                 }
-                else if(!isS3DFormatChange)
-                    return startChannel(info, FRAMEBUFFER_0, noRot, false,
-                            mS3DFormat, VG0_PIPE, flags, num_buffers);
-                break;
+                return startChannel(info, FRAMEBUFFER_0, noRot, false,
+                        mS3DFormat, VG0_PIPE, flags, num_buffers);
             case OV_3D_VIDEO_3D_PANEL:
                 if (sHDMIAsPrimary) {
                     noRot = true;
@@ -737,7 +733,7 @@ bool Overlay::setSource(const overlay_buffer_info& info, int orientation,
                         LOGE("%s:failed to open channel %d", __func__, VG1_PIPE);
                         return false;
                     }
-                } else if (!isS3DFormatChange) {
+                } else {
                     for (int i=0; i<NUM_CHANNELS; i++) {
                         fbnum = i;
                         //start two channels for one for primary and external.
@@ -1483,6 +1479,16 @@ bool OverlayControlChannel::closeControlChannel() {
 
     mOVInfo.z_order = NO_PIPE;
     mFD = -1;
+    mNoRot = false;
+    mFBNum = -1;
+    mFBWidth = 0;
+    mFBHeight = 0;
+    mFBbpp = 0;
+    mFBystride = 0;
+    mFormat = 0;
+    mSize = 0;
+    mOrientation = 0;
+    mFormat3D = 0;
 
     return true;
 }
@@ -1913,6 +1919,13 @@ bool OverlayDataChannel::closeDataChannel() {
 
     mNumBuffers = 0;
     mCurrentItem = 0;
+    mNoRot = false;
+    mSecure = false;
+    mPmemAddr = 0;
+    mPmemOffset = 0;
+    mNewPmemOffset = 0;
+    mUpdateDataChannel = false;
+    mBufferType = 0;
 
     return true;
 }