增加拍照错误处理

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

@@ -82,7 +82,8 @@ static void onSessionClosed(void* context, ACameraCaptureSession *session)
 
 void onCaptureFailed(void* context, ACameraCaptureSession* session, ACaptureRequest* request, ACameraCaptureFailure* failure)
 {
-    XYLOG(XYLOG_SEVERITY_WARNING, "onCaptureFailed session=%p request=%p reason=%d", session, request, failure->reason);
+    // XYLOG(XYLOG_SEVERITY_WARNING, "onCaptureFailed session=%p request=%p reason=%d", session, request, failure->reason);
+    ((NdkCamera*)context)->onCaptureProgressed(session, request, failure);
 }
 
 void onCaptureSequenceCompleted(void* context, ACameraCaptureSession* session, int sequenceId, int64_t frameNumber)
@@ -811,7 +812,7 @@ int NdkCamera::open(const std::string& cameraId) {
         camera_capture_session_capture_callbacks.onCaptureStarted = 0;
         camera_capture_session_capture_callbacks.onCaptureProgressed = ::onCaptureProgressed;
         camera_capture_session_capture_callbacks.onCaptureCompleted = ::onCaptureCompleted;
-        camera_capture_session_capture_callbacks.onCaptureFailed = onCaptureFailed;
+        camera_capture_session_capture_callbacks.onCaptureFailed = ::onCaptureFailed;
         camera_capture_session_capture_callbacks.onCaptureSequenceCompleted = onCaptureSequenceCompleted;
         camera_capture_session_capture_callbacks.onCaptureSequenceAborted = onCaptureSequenceAborted;
         camera_capture_session_capture_callbacks.onCaptureBufferLost = 0;
@@ -1223,7 +1224,7 @@ void NdkCamera::onSessionReady(ACameraCaptureSession *session)
     camera_capture_session_capture_callbacks.onCaptureStarted = 0;
     camera_capture_session_capture_callbacks.onCaptureProgressed = ::onCaptureProgressed;
     camera_capture_session_capture_callbacks.onCaptureCompleted = ::onCaptureCompleted;
-    camera_capture_session_capture_callbacks.onCaptureFailed = onCaptureFailed;
+    camera_capture_session_capture_callbacks.onCaptureFailed = ::onCaptureFailed;
     camera_capture_session_capture_callbacks.onCaptureSequenceCompleted = onCaptureSequenceCompleted;
     camera_capture_session_capture_callbacks.onCaptureSequenceAborted = onCaptureSequenceAborted;
     camera_capture_session_capture_callbacks.onCaptureBufferLost = 0;
@@ -1518,6 +1519,15 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
     // __android_log_print(ANDROID_LOG_WARN, "NdkCamera", "onCaptureCompleted %p %p %p", session, request, result);
 }
 
+void NdkCamera::onCaptureFailed(ACameraCaptureSession* session, ACaptureRequest* request, ACameraCaptureFailure* failure)
+{
+    XYLOG(XYLOG_SEVERITY_WARNING, "onCaptureFailed session=%p request=%p reason=%d", session, request, failure->reason);
+
+    char msg[32] = { 0 };
+    snprintf(msg, sizeof(msg), "CaptureFailed reason=%d", failure->reason);
+    on_error(msg);
+}
+
 void NdkCamera::onAvailabilityCallback(const char* cameraId)
 {
     std::string s(cameraId);

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

@@ -135,6 +135,7 @@ public:
 
     void onCaptureProgressed(ACameraCaptureSession* session, ACaptureRequest* request, const ACameraMetadata* result);
     void onCaptureCompleted(ACameraCaptureSession* session, ACaptureRequest* request, const ACameraMetadata* result);
+    void onCaptureFailed(ACameraCaptureSession* session, ACaptureRequest* request, ACameraCaptureFailure* failure);
     void onSessionReady(ACameraCaptureSession *session);
 
     const CAPTURE_RESULT& getCaptureResult() const