From 40e05a621fde70a2cb9ee19a3403e02d900d13e3 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 22 Jul 2024 17:48:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= 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 | 12 ++++++++++++ .../native_avscreen_capture_base.h | 12 ++++++++++++ .../native_avscreen_capture_errors.h | 14 +++++++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index 07ecc8ab7c6..ef7f9fcc587 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -12,6 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + /** + * @file native_avscreen_capture.h + * + * @brief Declare screen capture related interfaces. + * + * @library libnative_avscreen_capture.so + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @kit MediaKit + * @since 10 + * @version 1.0 + */ #ifndef NATIVE_AVSCREEN_CAPTURE_H #define NATIVE_AVSCREEN_CAPTURE_H diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index 8fc870335e8..134fc37bec0 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -13,6 +13,18 @@ * limitations under the License. */ + /** + * @file native_avscreen_capture_base.h + * + * @brief Declare screen capture related struct. + * + * @library libnative_avscreen_capture.so + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @kit MediaKit + * @since 10 + * @version 1.0 + */ + #ifndef NATIVE_AVSCREEN_CAPTURE_BASE_H #define NATIVE_AVSCREEN_CAPTURE_BASE_H diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 963396da200..6b20ceba57e 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -12,7 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + + /** + * @file native_avscreen_capture_errors.h + * + * @brief Declare screen capture related error. + * + * @library libnative_avscreen_capture.so + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @kit MediaKit + * @since 10 + * @version 1.0 + */ + #ifndef NATIVE_AVSCREEN_CAPTURE_ERRORS_H #define NATIVE_AVSCREEN_CAPTURE_ERRORS_H -- Gitee From 241c67d23ecf8a8f84e23573fa78a1989ece6ed9 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 22 Jul 2024 19:36:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= 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 | 9 +++++++++ .../player_framework/native_avscreen_capture_base.h | 9 +++++++++ .../player_framework/native_avscreen_capture_errors.h | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index ef7f9fcc587..bb32d83e5ba 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -13,6 +13,15 @@ * limitations under the License. */ + /** + * @addtogroup AVScreenCapture + * @{ + * + * @brief Provides APIs of request capability for Screen Capture. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since 10 + */ + /** * @file native_avscreen_capture.h * diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index 134fc37bec0..2903c8176e5 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -13,6 +13,15 @@ * limitations under the License. */ + /** + * @addtogroup AVScreenCapture + * @{ + * + * @brief Provides APIs of request capability for Screen Capture. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since 10 + */ + /** * @file native_avscreen_capture_base.h * diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 6b20ceba57e..7a471f13f56 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -13,6 +13,15 @@ * limitations under the License. */ + /** + * @addtogroup AVScreenCapture + * @{ + * + * @brief Provides APIs of request capability for Screen Capture. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since 10 + */ + /** * @file native_avscreen_capture_errors.h * -- Gitee From 964c2a897634e02e27b0b512c9b2593e1cdf696d Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 22 Jul 2024 22:58:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= 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 | 9 +++++---- .../player_framework/native_avscreen_capture_base.h | 11 ++++++----- .../player_framework/native_avscreen_capture_errors.h | 11 ++++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index bb32d83e5ba..4f475897bda 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -12,17 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** + +/** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @since 10 + * @version 1.0 */ - /** +/** * @file native_avscreen_capture.h * * @brief Declare screen capture related interfaces. diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index 2903c8176e5..7978e93a27c 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -13,16 +13,17 @@ * limitations under the License. */ - /** +/** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @since 10 + * @version 1.0 */ - - /** + +/** * @file native_avscreen_capture_base.h * * @brief Declare screen capture related struct. @@ -33,7 +34,7 @@ * @since 10 * @version 1.0 */ - + #ifndef NATIVE_AVSCREEN_CAPTURE_BASE_H #define NATIVE_AVSCREEN_CAPTURE_BASE_H diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 7a471f13f56..1a572705a46 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -12,16 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** + +/** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @since 10 + * @version 1.0 */ - + /** * @file native_avscreen_capture_errors.h * @@ -33,7 +34,7 @@ * @since 10 * @version 1.0 */ - + #ifndef NATIVE_AVSCREEN_CAPTURE_ERRORS_H #define NATIVE_AVSCREEN_CAPTURE_ERRORS_H -- Gitee From 87cd507bb6b3a67692a8fef3c3906225e09109ff Mon Sep 17 00:00:00 2001 From: liyang Date: Tue, 23 Jul 2024 08:58:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyang --- .../player_framework/native_avscreen_capture_base.h | 10 ---------- .../player_framework/native_avscreen_capture_errors.h | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index 7978e93a27c..fa496b68deb 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -13,16 +13,6 @@ * limitations under the License. */ -/** - * @addtogroup AVScreenCapture - * @{ - * - * @brief Provides APIs of request capability for Screen Capture. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 10 - * @version 1.0 - */ - /** * @file native_avscreen_capture_base.h * diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 1a572705a46..90187dfab25 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -13,16 +13,6 @@ * limitations under the License. */ -/** - * @addtogroup AVScreenCapture - * @{ - * - * @brief Provides APIs of request capability for Screen Capture. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 10 - * @version 1.0 - */ - /** * @file native_avscreen_capture_errors.h * -- Gitee From b2dc4732e67cc0ee05fbf8e893ef091520fce46d Mon Sep 17 00:00:00 2001 From: liyang Date: Tue, 23 Jul 2024 21:08:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= 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 | 10 ++++------ .../native_avscreen_capture_base.h | 14 +++++++++++--- .../native_avscreen_capture_errors.h | 18 +++++++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index 4f475897bda..ed4cd2bbf07 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -12,15 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + /** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @since 10 - * @version 1.0 */ /** @@ -32,7 +30,6 @@ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @kit MediaKit * @since 10 - * @version 1.0 */ #ifndef NATIVE_AVSCREEN_CAPTURE_H @@ -389,4 +386,5 @@ OH_AVSCREEN_CAPTURE_ErrCode OH_AVScreenCapture_ContentFilter_AddWindowContent( } #endif -#endif // NATIVE_AVSCREEN_CAPTURE_H \ No newline at end of file +#endif // NATIVE_AVSCREEN_CAPTURE_H +/** @} */ \ No newline at end of file diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index fa496b68deb..4cd3e089ebe 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -13,6 +13,14 @@ * limitations under the License. */ +/** + * @addtogroup AVScreenCapture + * @{ + * + * @brief Provides APIs of request capability for Screen Capture. + * @since 10 + */ + /** * @file native_avscreen_capture_base.h * @@ -22,9 +30,8 @@ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @kit MediaKit * @since 10 - * @version 1.0 */ - + #ifndef NATIVE_AVSCREEN_CAPTURE_BASE_H #define NATIVE_AVSCREEN_CAPTURE_BASE_H @@ -515,4 +522,5 @@ typedef void (*OH_AVScreenCapture_OnBufferAvailable)(OH_AVScreenCapture *capture } #endif -#endif // NATIVE_AVSCREEN_CAPTURE_BASE_H \ No newline at end of file +#endif // NATIVE_AVSCREEN_CAPTURE_BASE_H +/** @} */ \ No newline at end of file diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 90187dfab25..272b7169657 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -12,8 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** + +/** + * @addtogroup AVScreenCapture + * @{ + * + * @brief Provides APIs of request capability for Screen Capture. + * @since 10 + */ + +/** * @file native_avscreen_capture_errors.h * * @brief Declare screen capture related error. @@ -22,9 +30,8 @@ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture * @kit MediaKit * @since 10 - * @version 1.0 */ - + #ifndef NATIVE_AVSCREEN_CAPTURE_ERRORS_H #define NATIVE_AVSCREEN_CAPTURE_ERRORS_H @@ -94,4 +101,5 @@ typedef enum OH_AVSCREEN_CAPTURE_ErrCode { } #endif -#endif // NATIVE_AVSCREEN_CAPTURE_ERRORS_H \ No newline at end of file +#endif // NATIVE_AVSCREEN_CAPTURE_ERRORS_H +/** @} */ \ No newline at end of file -- Gitee From b68afc9fbbf506c5194c0ad2285afa07da6cbf1b Mon Sep 17 00:00:00 2001 From: liyang Date: Wed, 24 Jul 2024 09:16:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=BD=95=E5=B1=8Fkit=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=95=B4=E6=94=B9?= 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 | 2 +- multimedia/player_framework/native_avscreen_capture_base.h | 2 +- multimedia/player_framework/native_avscreen_capture_errors.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/player_framework/native_avscreen_capture.h b/multimedia/player_framework/native_avscreen_capture.h index ed4cd2bbf07..cf0a1532c49 100644 --- a/multimedia/player_framework/native_avscreen_capture.h +++ b/multimedia/player_framework/native_avscreen_capture.h @@ -16,7 +16,7 @@ /** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @since 10 */ diff --git a/multimedia/player_framework/native_avscreen_capture_base.h b/multimedia/player_framework/native_avscreen_capture_base.h index 4cd3e089ebe..34eb708d4b6 100644 --- a/multimedia/player_framework/native_avscreen_capture_base.h +++ b/multimedia/player_framework/native_avscreen_capture_base.h @@ -16,7 +16,7 @@ /** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @since 10 */ diff --git a/multimedia/player_framework/native_avscreen_capture_errors.h b/multimedia/player_framework/native_avscreen_capture_errors.h index 272b7169657..673d53bcf7c 100644 --- a/multimedia/player_framework/native_avscreen_capture_errors.h +++ b/multimedia/player_framework/native_avscreen_capture_errors.h @@ -16,7 +16,7 @@ /** * @addtogroup AVScreenCapture * @{ - * + * * @brief Provides APIs of request capability for Screen Capture. * @since 10 */ -- Gitee