CameraHAL: Old S3D display handling removed

Commented old (prior ICS) display S3D content handling removed from CameraHAL display adapter.

Change-Id: I16eb817679034d194fccfd22a31784b37de93501
Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>

4 files changed, 5 insertions, 19 deletions

diff --git a/camera/ANativeWindowDisplayAdapter.cpp b/camera/ANativeWindowDisplayAdapter.cpp
index 307c892..49204d8 100644
--- a/camera/ANativeWindowDisplayAdapter.cpp
+++ b/camera/ANativeWindowDisplayAdapter.cpp
@@ -349,7 +349,7 @@ status_t ANativeWindowDisplayAdapter::setSnapshotTimeRef(struct timeval *refTime
 #endif
 
 
-int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct timeval *refTime, S3DParameters *s3dParams)
+int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct timeval *refTime)
 {
     Semaphore sem;
     TIUTILS::Message msg;
@@ -364,12 +364,6 @@ int ANativeWindowDisplayAdapter::enableDisplay(int width, int height, struct tim
         return NO_ERROR;
     }
 
-#if 0 //TODO: s3d is not part of bringup...will reenable
-    if (s3dParams)
-        mOverlay->set_s3d_params(s3dParams->mode, s3dParams->framePacking,
-                                    s3dParams->order, s3dParams->subSampling);
-#endif
-
 #if PPM_INSTRUMENTATION || PPM_INSTRUMENTATION_ABS
 
     if ( NULL != refTime )
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index ba17822..b6c43cd 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -1661,11 +1661,11 @@ status_t CameraHal::startPreview()
 
 #if PPM_INSTRUMENTATION || PPM_INSTRUMENTATION_ABS
 
-        ret = mDisplayAdapter->enableDisplay(width, height, &mStartPreview, NULL);
+        ret = mDisplayAdapter->enableDisplay(width, height, &mStartPreview);
 
 #else
 
-        ret = mDisplayAdapter->enableDisplay(width, height, NULL, NULL);
+        ret = mDisplayAdapter->enableDisplay(width, height, NULL);
 
 #endif
 
diff --git a/camera/inc/ANativeWindowDisplayAdapter.h b/camera/inc/ANativeWindowDisplayAdapter.h
index acab47c..2163d7b 100644
--- a/camera/inc/ANativeWindowDisplayAdapter.h
+++ b/camera/inc/ANativeWindowDisplayAdapter.h
@@ -66,7 +66,7 @@ public:
     virtual int setPreviewWindow(struct preview_stream_ops *window);
     virtual int setFrameProvider(FrameNotifier *frameProvider);
     virtual int setErrorHandler(ErrorNotifier *errorNotifier);
-    virtual int enableDisplay(int width, int height, struct timeval *refTime = NULL, S3DParameters *s3dParams = NULL);
+    virtual int enableDisplay(int width, int height, struct timeval *refTime = NULL);
     virtual int disableDisplay(bool cancel_buffer = true);
     virtual status_t pauseDisplay(bool pause);
 
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index 53f5ade..805d828 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -928,21 +928,13 @@ protected:
 class DisplayAdapter : public BufferProvider, public virtual RefBase
 {
 public:
-    typedef struct S3DParameters_t
-    {
-        int mode;
-        int framePacking;
-        int order;
-        int subSampling;
-    } S3DParameters;
-
     ///Initializes the display adapter creates any resources required
     virtual int initialize() = 0;
 
     virtual int setPreviewWindow(struct preview_stream_ops *window) = 0;
     virtual int setFrameProvider(FrameNotifier *frameProvider) = 0;
     virtual int setErrorHandler(ErrorNotifier *errorNotifier) = 0;
-    virtual int enableDisplay(int width, int height, struct timeval *refTime = NULL, S3DParameters *s3dParams = NULL) = 0;
+    virtual int enableDisplay(int width, int height, struct timeval *refTime = NULL) = 0;
     virtual int disableDisplay(bool cancel_buffer = true) = 0;
     //Used for Snapshot review temp. pause
     virtual int pauseDisplay(bool pause) = 0;