xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

Browse Source
streaming
Matthew 4 months ago
parent 6162c220b4 5275d0c272
commit 0001c9dc5a
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File

22
app/src/main/cpp/camera2/ndkcamera.cpp
Unescape Escape View File

@ -1008,7 +1008,6 @@ void NdkCamera::close()
if (capture_session) if (capture_session)
{ {
// res = ACameraCaptureSession_stopRepeating(capture_session); // res = ACameraCaptureSession_stopRepeating(capture_session);
XYLOG(XYLOG_SEVERITY_INFO, "free capture_session");
ACameraCaptureSession_close(capture_session); ACameraCaptureSession_close(capture_session);
capture_session = 0; capture_session = 0;
} }
@ -1022,7 +1021,6 @@ void NdkCamera::close()
res = ACaptureRequest_removeTarget(request->request, request->imageTarget); res = ACaptureRequest_removeTarget(request->request, request->imageTarget);
ACaptureRequest_free(request->request); ACaptureRequest_free(request->request);
request->request = 0; request->request = 0;
XYLOG(XYLOG_SEVERITY_INFO, "free request");
} }
/* /*
@ -1035,26 +1033,22 @@ void NdkCamera::close()
delete request; delete request;
} }
XYLOG(XYLOG_SEVERITY_INFO, "free mCaptureRequests");
mCaptureRequests.clear(); mCaptureRequests.clear();
if (mPreviewOutputTarget != NULL) if (mPreviewOutputTarget != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mPreviewOutputTarget");
ACameraOutputTarget_free(mPreviewOutputTarget); ACameraOutputTarget_free(mPreviewOutputTarget);
mPreviewOutputTarget = 0; mPreviewOutputTarget = 0;
} }
if (mPreviewImageWindow != NULL) if (mPreviewImageWindow != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mPreviewImageWindow");
ANativeWindow_release(mPreviewImageWindow); ANativeWindow_release(mPreviewImageWindow);
mPreviewImageWindow = 0; mPreviewImageWindow = 0;
} }
if (mPreviewImageReader != NULL) if (mPreviewImageReader != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mPreviewImageReader");
AImageReader_setImageListener(mPreviewImageReader, NULL); AImageReader_setImageListener(mPreviewImageReader, NULL);
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str());
AImageReader_delete(mPreviewImageReader); AImageReader_delete(mPreviewImageReader);
@ -1065,46 +1059,36 @@ void NdkCamera::close()
if (mOutputTarget != NULL) if (mOutputTarget != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mOutputTarget");
ACameraOutputTarget_free(mOutputTarget); ACameraOutputTarget_free(mOutputTarget);
mOutputTarget = 0; mOutputTarget = 0;
} }
if (mImageWindow != NULL) if (mImageWindow != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mImageWindow");
ANativeWindow_release(mImageWindow); ANativeWindow_release(mImageWindow);
mImageWindow = 0; mImageWindow = 0;
} }
if (mImageReader != NULL) if (mImageReader != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mImageReader");
AImageReader_setImageListener(mImageReader, NULL); AImageReader_setImageListener(mImageReader, NULL);
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str());
AImageReader_delete(mImageReader); AImageReader_delete(mImageReader);
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str()); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str());
mImageReader = 0; mImageReader = 0;
} }
XYLOG(XYLOG_SEVERITY_INFO,"OutputTarget2");
if (mOutputTarget2 != NULL) if (mOutputTarget2 != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free OutputTarget2");
ACameraOutputTarget_free(mOutputTarget2); ACameraOutputTarget_free(mOutputTarget2);
mOutputTarget2 = 0; mOutputTarget2 = 0;
} }
XYLOG(XYLOG_SEVERITY_INFO,"mImageWindow2");
if (mImageWindow2 != NULL) if (mImageWindow2 != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mImageWindow2");
ANativeWindow_release(mImageWindow2); ANativeWindow_release(mImageWindow2);
mImageWindow2 = 0; mImageWindow2 = 0;
} }
XYLOG(XYLOG_SEVERITY_INFO,"mImageReader2");
if (mImageReader2 != NULL) if (mImageReader2 != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mImageReader2");
AImageReader_setImageListener(mImageReader2, NULL); AImageReader_setImageListener(mImageReader2, NULL);
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str());
AImageReader_delete(mImageReader2); AImageReader_delete(mImageReader2);
@ -1112,10 +1096,8 @@ void NdkCamera::close()
mImageReader2 = 0; mImageReader2 = 0;
} }
XYLOG(XYLOG_SEVERITY_INFO,"mPreviewSessionOutput");
if (mPreviewSessionOutput != NULL) if (mPreviewSessionOutput != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mPreviewSessionOutput");
if (capture_session_output_container) if (capture_session_output_container)
{ {
ACaptureSessionOutputContainer_remove(capture_session_output_container, mPreviewSessionOutput); ACaptureSessionOutputContainer_remove(capture_session_output_container, mPreviewSessionOutput);
@ -1126,7 +1108,6 @@ void NdkCamera::close()
if (mSessionOutput != NULL) if (mSessionOutput != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mSessionOutput");
if (capture_session_output_container) if (capture_session_output_container)
{ {
ACaptureSessionOutputContainer_remove(capture_session_output_container, mSessionOutput); ACaptureSessionOutputContainer_remove(capture_session_output_container, mSessionOutput);
@ -1136,7 +1117,6 @@ void NdkCamera::close()
} }
if (mSessionOutput2 != NULL) if (mSessionOutput2 != NULL)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free mSessionOutput2");
if (capture_session_output_container) if (capture_session_output_container)
{ {
ACaptureSessionOutputContainer_remove(capture_session_output_container, mSessionOutput2); ACaptureSessionOutputContainer_remove(capture_session_output_container, mSessionOutput2);
@ -1147,14 +1127,12 @@ void NdkCamera::close()
if (capture_session_output_container) if (capture_session_output_container)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free capture_session_output_container");
ACaptureSessionOutputContainer_free(capture_session_output_container); ACaptureSessionOutputContainer_free(capture_session_output_container);
capture_session_output_container = 0; capture_session_output_container = 0;
} }
if (camera_device) if (camera_device)
{ {
XYLOG(XYLOG_SEVERITY_INFO,"free camera_device");
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::close device %s, %p", mCameraId.c_str(), camera_device); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::close device %s, %p", mCameraId.c_str(), camera_device);
ACameraDevice_close(camera_device); ACameraDevice_close(camera_device);
//XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::closed device %s, %p", mCameraId.c_str(), camera_device); //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::closed device %s, %p", mCameraId.c_str(), camera_device);

Write Preview
Loading…
Cancel
Save