From 711313db366ec69eaa5611ea4115d62f77a9ce69 Mon Sep 17 00:00:00 2001 From: yuanjinghua Date: Thu, 21 Mar 2024 15:58:47 +0800 Subject: [PATCH] New Feature. bugfix for screencapture OnVideoAvailble and callback set Signed-off-by: yuanjinghua --- .../native/capi/screencapture/native_avscreen_capture.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frameworks/native/capi/screencapture/native_avscreen_capture.cpp b/frameworks/native/capi/screencapture/native_avscreen_capture.cpp index 53c590fd6..cb5cdfe76 100644 --- a/frameworks/native/capi/screencapture/native_avscreen_capture.cpp +++ b/frameworks/native/capi/screencapture/native_avscreen_capture.cpp @@ -288,6 +288,7 @@ public: } dataCallback_->OnBufferAvailable(capture_, OH_AVScreenCaptureBufferType::OH_SCREEN_CAPTURE_BUFFERTYPE_VIDEO); + return; } if (capture_ != nullptr && callback_.onVideoBufferAvailable != nullptr) { callback_.onVideoBufferAvailable(capture_, isReady); @@ -758,7 +759,7 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_SetStateCallback(struct OH_AVScre CHECK_AND_RETURN_RET_LOG(errCode == AV_SCREEN_CAPTURE_ERR_OK, errCode, "SetStateCallback is null"); if (screenCaptureObj->callback_ == nullptr || - screenCaptureObj->callback_->SetStateChangeCallback(callback, userData)) { + !screenCaptureObj->callback_->SetStateChangeCallback(callback, userData)) { return AV_SCREEN_CAPTURE_ERR_NO_MEMORY; } return AV_SCREEN_CAPTURE_ERR_OK; @@ -776,7 +777,7 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_SetErrorCallback(struct OH_AVScre OH_AVSCREEN_CAPTURE_ErrCode errCode = AVScreenCaptureSetCallback(capture, screenCaptureObj); CHECK_AND_RETURN_RET_LOG(errCode == AV_SCREEN_CAPTURE_ERR_OK, errCode, "SetErrorCallback is null"); - if (screenCaptureObj->callback_ == nullptr || screenCaptureObj->callback_->SetErrorCallback(callback, userData)) { + if (screenCaptureObj->callback_ == nullptr || !screenCaptureObj->callback_->SetErrorCallback(callback, userData)) { return AV_SCREEN_CAPTURE_ERR_NO_MEMORY; } return AV_SCREEN_CAPTURE_ERR_OK; @@ -795,7 +796,7 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_SetDataCallback(struct OH_AVScree CHECK_AND_RETURN_RET_LOG(errCode == AV_SCREEN_CAPTURE_ERR_OK, errCode, "SetDataCallback is null"); if (screenCaptureObj->callback_ == nullptr || - screenCaptureObj->callback_->SetDataCallback(callback, userData)) { + !screenCaptureObj->callback_->SetDataCallback(callback, userData)) { return AV_SCREEN_CAPTURE_ERR_NO_MEMORY; } return AV_SCREEN_CAPTURE_ERR_OK; -- Gitee