From 19bdb6dfc2ff1357073f80ca038721759b07ec99 Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 09:15:44 +0800 Subject: [PATCH 1/6] add new interface for write and read parcel --- .../native_window/external_window.h | 25 +++++++++++++++++++ .../native_window/libnative_window.ndk.json | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index ece38e46c50..bc307756aae 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -581,6 +581,31 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId * @version 1.0 */ int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window); + +/** + * @brief Write an OHNativeWindow to an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHNativeWindow instance. + * @param parcel Indicates the pointer to an OHIPCParcel instance. + * @return Returns an error code, 0 is success, otherwise, failed. + * @since 12 + * @version 1.0 + */ +int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow* window, OHIPCParcel* parcel); + +/** + * @brief Read an OHNativeWindow from an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHIPCParcel instance. + * @return Returns the pointer to an OHNativeWindow instance. + * @since 12 + * @version 1.0 + */ +OHNativeWindow* OH_NativeWindow_ReadFromParcel(OHIPCParcel* parcel); + + #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index 8f3717f9b8b..31617129ad3 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -20,5 +20,7 @@ { "name": "OH_NativeWindow_GetSurfaceId"}, { "name": "OH_NativeWindow_CreateNativeWindowFromSurfaceId"}, { "name": "OH_NativeWindow_NativeWindowAttachBuffer" }, - { "name": "OH_NativeWindow_NativeWindowDetachBuffer" } + { "name": "OH_NativeWindow_NativeWindowDetachBuffer" }, + { "name": "OH_NativeWindow_WriteToParcel" }, + { "name": "OH_NativeWindow_ReadFromParcel" } ] \ No newline at end of file -- Gitee From 5a0f00039d68d60dd1d97f3597cce7f6f3973606 Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 06:38:10 +0000 Subject: [PATCH 2/6] Revert "add new interface for write and read parcel" This reverts commit 19bdb6dfc2ff1357073f80ca038721759b07ec99. --- .../native_window/external_window.h | 25 ------------------- .../native_window/libnative_window.ndk.json | 4 +-- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index bc307756aae..ece38e46c50 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -581,31 +581,6 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId * @version 1.0 */ int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window); - -/** - * @brief Write an OHNativeWindow to an OHIPCParcel. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow - * @param window Indicates the pointer to an OHNativeWindow instance. - * @param parcel Indicates the pointer to an OHIPCParcel instance. - * @return Returns an error code, 0 is success, otherwise, failed. - * @since 12 - * @version 1.0 - */ -int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow* window, OHIPCParcel* parcel); - -/** - * @brief Read an OHNativeWindow from an OHIPCParcel. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow - * @param window Indicates the pointer to an OHIPCParcel instance. - * @return Returns the pointer to an OHNativeWindow instance. - * @since 12 - * @version 1.0 - */ -OHNativeWindow* OH_NativeWindow_ReadFromParcel(OHIPCParcel* parcel); - - #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index 31617129ad3..8f3717f9b8b 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -20,7 +20,5 @@ { "name": "OH_NativeWindow_GetSurfaceId"}, { "name": "OH_NativeWindow_CreateNativeWindowFromSurfaceId"}, { "name": "OH_NativeWindow_NativeWindowAttachBuffer" }, - { "name": "OH_NativeWindow_NativeWindowDetachBuffer" }, - { "name": "OH_NativeWindow_WriteToParcel" }, - { "name": "OH_NativeWindow_ReadFromParcel" } + { "name": "OH_NativeWindow_NativeWindowDetachBuffer" } ] \ No newline at end of file -- Gitee From cb48b7054b74de42df45e7335dbf4bb2b0063239 Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 14:43:24 +0800 Subject: [PATCH 3/6] add new interface for write and read parcel --- .../native_window/external_window.h | 26 +++++++++++++++++++ .../native_window/libnative_window.ndk.json | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index ece38e46c50..88bafa30957 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -39,6 +39,7 @@ #include #include "buffer_handle.h" +#include "ipc_kit.h" #ifdef __cplusplus extern "C" { @@ -581,6 +582,31 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId * @version 1.0 */ int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window); + +/** + * @brief Write an OHNativeWindow to an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHNativeWindow instance. + * @param parcel Indicates the pointer to an OHIPCParcel instance. + * @return Returns an error code, 0 is success, otherwise, failed. + * @since 12 + * @version 1.0 + */ +int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow *window, OHIPCParcel *parcel); + +/** + * @brief Read an OHNativeWindow from an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHIPCParcel instance. + * @return Returns the pointer to an OHNativeWindow instance. + * @since 12 + * @version 1.0 + */ +OHNativeWindow* OH_NativeWindow_ReadFromParcel(OHIPCParcel *parcel); + + #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index 8f3717f9b8b..31617129ad3 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -20,5 +20,7 @@ { "name": "OH_NativeWindow_GetSurfaceId"}, { "name": "OH_NativeWindow_CreateNativeWindowFromSurfaceId"}, { "name": "OH_NativeWindow_NativeWindowAttachBuffer" }, - { "name": "OH_NativeWindow_NativeWindowDetachBuffer" } + { "name": "OH_NativeWindow_NativeWindowDetachBuffer" }, + { "name": "OH_NativeWindow_WriteToParcel" }, + { "name": "OH_NativeWindow_ReadFromParcel" } ] \ No newline at end of file -- Gitee From 54361d5fed423e5eaba02d0b7a1e31936b1fca8e Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 06:46:26 +0000 Subject: [PATCH 4/6] Revert "add new interface for write and read parcel" This reverts commit cb48b7054b74de42df45e7335dbf4bb2b0063239. --- .../native_window/external_window.h | 26 ------------------- .../native_window/libnative_window.ndk.json | 4 +-- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index 88bafa30957..ece38e46c50 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -39,7 +39,6 @@ #include #include "buffer_handle.h" -#include "ipc_kit.h" #ifdef __cplusplus extern "C" { @@ -582,31 +581,6 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId * @version 1.0 */ int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window); - -/** - * @brief Write an OHNativeWindow to an OHIPCParcel. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow - * @param window Indicates the pointer to an OHNativeWindow instance. - * @param parcel Indicates the pointer to an OHIPCParcel instance. - * @return Returns an error code, 0 is success, otherwise, failed. - * @since 12 - * @version 1.0 - */ -int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow *window, OHIPCParcel *parcel); - -/** - * @brief Read an OHNativeWindow from an OHIPCParcel. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow - * @param window Indicates the pointer to an OHIPCParcel instance. - * @return Returns the pointer to an OHNativeWindow instance. - * @since 12 - * @version 1.0 - */ -OHNativeWindow* OH_NativeWindow_ReadFromParcel(OHIPCParcel *parcel); - - #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index 31617129ad3..8f3717f9b8b 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -20,7 +20,5 @@ { "name": "OH_NativeWindow_GetSurfaceId"}, { "name": "OH_NativeWindow_CreateNativeWindowFromSurfaceId"}, { "name": "OH_NativeWindow_NativeWindowAttachBuffer" }, - { "name": "OH_NativeWindow_NativeWindowDetachBuffer" }, - { "name": "OH_NativeWindow_WriteToParcel" }, - { "name": "OH_NativeWindow_ReadFromParcel" } + { "name": "OH_NativeWindow_NativeWindowDetachBuffer" } ] \ No newline at end of file -- Gitee From 0cf582f2d79e78fffe01471ec6f725dc8d95479a Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 14:47:32 +0800 Subject: [PATCH 5/6] add new interface for write and read parcel --- .../native_window/external_window.h | 26 +++++++++++++++++++ .../native_window/libnative_window.ndk.json | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index ece38e46c50..b5c3fcb506d 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -39,6 +39,7 @@ #include #include "buffer_handle.h" +#include "ipc_kit.h" #ifdef __cplusplus extern "C" { @@ -581,6 +582,31 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId * @version 1.0 */ int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window); + +/** + * @brief Write an OHNativeWindow to an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHNativeWindow instance. + * @param parcel Indicates the pointer to an OHIPCParcel instance. + * @return Returns an error code, 0 is success, otherwise, failed. + * @since 12 + * @version 1.0 + */ +int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow *window, OHIPCParcel *parcel); + +/** + * @brief Read an OHNativeWindow from an OHIPCParcel. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow + * @param window Indicates the pointer to an OHIPCParcel instance. + * @return Returns the pointer to an OHNativeWindow instance. + * @since 12 + * @version 1.0 + */ +OHNativeWindow *OH_NativeWindow_ReadFromParcel(OHIPCParcel *parcel); + + #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index 8f3717f9b8b..31617129ad3 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -20,5 +20,7 @@ { "name": "OH_NativeWindow_GetSurfaceId"}, { "name": "OH_NativeWindow_CreateNativeWindowFromSurfaceId"}, { "name": "OH_NativeWindow_NativeWindowAttachBuffer" }, - { "name": "OH_NativeWindow_NativeWindowDetachBuffer" } + { "name": "OH_NativeWindow_NativeWindowDetachBuffer" }, + { "name": "OH_NativeWindow_WriteToParcel" }, + { "name": "OH_NativeWindow_ReadFromParcel" } ] \ No newline at end of file -- Gitee From 0efc65b538906e9afd142ed00c75f94c9b929651 Mon Sep 17 00:00:00 2001 From: wzn121 Date: Fri, 19 Apr 2024 07:48:19 +0000 Subject: [PATCH 6/6] update graphic/graphic_2d/native_window/external_window.h. Signed-off-by: wzn121 --- graphic/graphic_2d/native_window/external_window.h | 1 - 1 file changed, 1 deletion(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index b5c3fcb506d..f5121b2f0b9 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -606,7 +606,6 @@ int32_t OH_NativeWindow_WriteToParcel(OHNativeWindow *window, OHIPCParcel *parce */ OHNativeWindow *OH_NativeWindow_ReadFromParcel(OHIPCParcel *parcel); - #ifdef __cplusplus } #endif -- Gitee