commit afd4d5db363a7bd9495e346b3d47a0dbd699a32e
author Greg Hackmann <ghackmann@google.com> Fri Jan 11 15:13:38 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 11 15:13:38 2013 -0800
tree e3794593c9f16e1b215f4914327329bceab9e6ee
parent 7bfc1ef50251fe84d138cea9c7e8c1c41ded6861
parent fe7c2607ce58e81c1983851e996572b82683f030

Merge changes I2d46ea67,I495816ec,I652b6edb,Ia465f8bc,I575bef5d,I75f0d096,I28fa1db0,Ie5931a15

* changes:
  omx: use hardware CSC for encoding surface textures
  omx: move csc (de)initialization to common venc
  omx: handle csc errors
  omx: always set ion fds for encoder's csc target buffers
  csc: add csc_set_method()
  csc: handle Gscaler errors
  csc: recognize custom ARGB_8888 pixel format
  csc: fix custom ARGB_8888 pixel format's name

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 5b399ec..ea90d05 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -3229,14 +3229,6 @@
             } else {
                 shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
             }
-            if (m_wideAspect) {
-//                shot_ext->setfile = ISS_SUB_SCENARIO_VIDEO;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = 30;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = 30;
-            }
-            else {
-//                shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
-            }
             if (triggered)
                 shot_ext->shot.ctl.aa.afTrigger = 1;