移除手动旋转的代码

app/src/main/cpp/PhoneDevice.cpp

@@ -1131,15 +1131,6 @@ void CPhoneDevice::TurnOnCameraPower(JNIEnv* env)
     mCameraPowerLocker.lock();
     if (mCameraPowerCount == 0)
     {
-#if 0
-        if(m_sysApiClass != NULL)
-        {
-#ifdef _DEBUG
-            XYLOG(XYLOG_SEVERITY_INFO, "Set Cam3V3 Enabled ");
-#endif
-            env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_TRUE);
-        }
-#endif
         GpioControl::setCam3V3Enable(true);
     }
     mCameraPowerCount++;
@@ -1154,15 +1145,6 @@ void CPhoneDevice::TurnOffCameraPower(JNIEnv* env)
         mCameraPowerCount--;
         if (mCameraPowerCount == 0)
         {
-#if 0
-            if(m_sysApiClass != NULL)
-            {
-#ifdef _DEBUG
-                XYLOG(XYLOG_SEVERITY_INFO, "Set Cam3V3 Disabled ");
-#endif
-                env->CallStaticVoidMethod(m_sysApiClass, mSetCam3V3EnableMid, JNI_FALSE);
-            }
-#endif  // 0
             GpioControl::setCam3V3Enable(false);
         }
     }
@@ -1174,15 +1156,7 @@ void CPhoneDevice::TurnOnOtg(JNIEnv* env)
     mCameraPowerLocker.lock();
     if (mOtgCount == 0)
     {
-#if 0
+        ALOGD("setOtgState 1");
-        if(m_sysApiClass != NULL)
-        {
-#ifdef _DEBUG
-            XYLOG(XYLOG_SEVERITY_INFO, "Turn On Otg");
-#endif
-            env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_TRUE);
-        }
-#endif
         GpioControl::setOtgState(true);
     }
     mOtgCount++;
@@ -1197,15 +1171,7 @@ void CPhoneDevice::TurnOffOtg(JNIEnv* env)
         mOtgCount--;
         if (mOtgCount == 0)
         {
-#if 0
+            ALOGD("setOtgState 0");
-            if(m_sysApiClass != NULL)
-            {
-#ifdef _DEBUG
-                XYLOG(XYLOG_SEVERITY_INFO, "Turn Off Otg");
-#endif
-                env->CallStaticVoidMethod(m_sysApiClass, mTurnOtgMid, JNI_FALSE);
-            }
-#endif
             GpioControl::setOtgState(false);
         }
     }

app/src/main/cpp/camera2/ndkcamera.cpp

@@ -160,6 +160,7 @@ int NdkCamera::open(const std::string& cameraId) {
     DisplayDimension foundRes = disp;
 
 
+    ALOGD("Start ACameraManager_getCameraIdList");
     {
         ACameraIdList *camera_id_list = 0;
         for (int retry = 0; retry < 2; retry++)
@@ -194,6 +195,8 @@ int NdkCamera::open(const std::string& cameraId) {
             }
         }
 
+        ALOGD("End ACameraManager_getCameraIdList");
+
         if (!foundIt)
         {
             return 1;
@@ -744,6 +747,7 @@ void NdkCamera::on_image(const unsigned char* nv21, int nv21_width, int nv21_hei
         rotate_type = camera_facing == 0 ? 7 : 8;
     }
 
+#if 0
     cv::Mat nv21_rotated(h + h / 2, w, CV_8UC1);
     ncnn::kanna_rotate_yuv420sp(nv21, nv21_width, nv21_height, nv21_rotated.data, w, h, rotate_type);
 
@@ -758,7 +762,16 @@ void NdkCamera::on_image(const unsigned char* nv21, int nv21_width, int nv21_hei
     cv::Mat rgb(h, w, CV_8UC3);
     // ncnn::yuv420sp2rgb(nv21_rotated.data, w, h, rgb.data);
     ncnn::yuv420sp2rgb_nv12(nv21_rotated.data, w, h, rgb.data);
+#else
+
+    w = nv21_width;
+    h = nv21_height;
 
+    // nv21_rotated to rgb
+    cv::Mat rgb(h, w, CV_8UC3);
+    // ncnn::yuv420sp2rgb(nv21_rotated.data, w, h, rgb.data);
+    ncnn::yuv420sp2rgb_nv12(nv21, w, h, rgb.data);
+#endif // 0
     // cv::Mat rgb(h, w, CV_8UC3);
     // ncnn::yuv420sp2rgb_nv12(nv21, w, h, rgb.data);