From eb36fbe764d1b7427183834b9d53965832cda860 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 26 Apr 2024 14:50:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?avscreencapture=E6=94=AF=E6=8C=81pc?= =?UTF-8?q?=E7=AB=AF=E6=8E=92=E9=99=A4=E6=8C=87=E5=AE=9AwindowID=E7=AA=97?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyang --- .../player_framework/native_avscreen_capture.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index 178866899..8cc18eaf2 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -302,6 +302,19 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ContentFilter_AddAudioContent( OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ExcludeContent(struct OH_AVScreenCapture *capture, struct OH_AVScreenCapture_ContentFilter *filter); +/** + * @brief Add Window content to the screen capture content filter + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @param filter Pointer to an OH_AVScreenCapture_ContentFilter instance + * @param Pointer to windowIDs to be added + * @param windowCount to be added + * @return Returns AV_SCREEN_CAPTURE_ERR_OK if the execution is successful, + * otherwise returns a specific error code, refer to {@link OH_AVSCREEN_CAPTURE_ErrCode} + * @since 12 + * @version 1.0 + */ +OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ContentFilter_AddWindowContent( + struct OH_AVScreenCapture_ContentFilter *filter, int32_t *windowIDs, int32_t windowCount); #ifdef __cplusplus } #endif -- Gitee From b685ce8d9199fae2772ce2131b77352dbb78b703 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 3 May 2024 19:47:17 +0800 Subject: [PATCH 2/5] Screen capture ContentFilter API Changes in SDK Signed-off-by: liyang --- .../libnative_avscreen_capture.ndk.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json index f3fa01d66..f0a7081da 100644 --- a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json +++ b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json @@ -70,5 +70,21 @@ { "first_introduced": "12", "name": "OH_AVScreenCapture_SetErrorCallback" + }, + { + "first_introduced": "12", + "name": "OH_AVScreenCapture_CreateContentFilter" + }, + { + "first_introduced": "12", + "name": "OH_AVScreenCapture_ReleaseContentFilter" + }, + { + "first_introduced": "12", + "name": "OH_AVScreenCapture_ContentFilter_AddAudioContent" + }, + { + "first_introduced": "12", + "name": "OH_AVScreenCapture_ExcludeContent" } ] \ No newline at end of file -- Gitee From 6ea3c5bc6b18b423b53b9390a57a02f1af96f234 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 3 May 2024 19:49:54 +0800 Subject: [PATCH 3/5] Screen capture ContentFilter API Changes in SDK Signed-off-by: liyang --- .../avscreen_capture/libnative_avscreen_capture.ndk.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json index f0a7081da..35becaca0 100644 --- a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json +++ b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json @@ -86,5 +86,9 @@ { "first_introduced": "12", "name": "OH_AVScreenCapture_ExcludeContent" + }, + { + "first_introduced": "12", + "name": "OH_AVScreenCapture_ContentFilter_AddWindowContent" } ] \ No newline at end of file -- Gitee From 8c9db40b0c9cb329bfe6e1b7489f68f421802a79 Mon Sep 17 00:00:00 2001 From: liyang Date: Sat, 11 May 2024 09:21:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=89=E5=B1=8F=E5=B9=95=E5=BD=95?= =?UTF-8?q?=E5=88=B6=E6=8E=92=E9=99=A4=E6=8C=87=E5=AE=9Awindowid=E7=9A=84?= =?UTF-8?q?=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyang --- multimedia/player_framework/native_avscreen_capture.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index 8cc18eaf2..2d07068fd 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -308,8 +308,9 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ExcludeContent(struct OH_AVScreen * @param filter Pointer to an OH_AVScreenCapture_ContentFilter instance * @param Pointer to windowIDs to be added * @param windowCount to be added - * @return Returns AV_SCREEN_CAPTURE_ERR_OK if the execution is successful, - * otherwise returns a specific error code, refer to {@link OH_AVSCREEN_CAPTURE_ErrCode} + * @return Function result code. + * {@link AV_SCREEN_CAPTURE_ERR_OK} if the execution is successful. + * {@link AV_SCREEN_CAPTURE_ERR_INVALID_VAL} input filter is nullptr or input windowIDs invalid. * @since 12 * @version 1.0 */ -- Gitee From ef8a0d13e4f10b230d6dce03854e8480cde87ea4 Mon Sep 17 00:00:00 2001 From: liyang Date: Sat, 11 May 2024 14:31:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8C=89=E5=B1=8F=E5=B9=95=E5=BD=95?= =?UTF-8?q?=E5=88=B6=E6=8E=92=E9=99=A4=E6=8C=87=E5=AE=9Awindowid=E7=9A=84?= =?UTF-8?q?=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyang --- multimedia/player_framework/native_avscreen_capture.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index 2d07068fd..8cc18eaf2 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -308,9 +308,8 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ExcludeContent(struct OH_AVScreen * @param filter Pointer to an OH_AVScreenCapture_ContentFilter instance * @param Pointer to windowIDs to be added * @param windowCount to be added - * @return Function result code. - * {@link AV_SCREEN_CAPTURE_ERR_OK} if the execution is successful. - * {@link AV_SCREEN_CAPTURE_ERR_INVALID_VAL} input filter is nullptr or input windowIDs invalid. + * @return Returns AV_SCREEN_CAPTURE_ERR_OK if the execution is successful, + * otherwise returns a specific error code, refer to {@link OH_AVSCREEN_CAPTURE_ErrCode} * @since 12 * @version 1.0 */ -- Gitee