From 1314a98c3a52ca998f7e7034af70dfde37b9f269 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Wed, 7 Aug 2024 07:53:06 +0000 Subject: [PATCH 1/3] update multimedia/drm_framework/libnative_drm.ndk.json. Signed-off-by: baoxy92 --- multimedia/drm_framework/libnative_drm.ndk.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/multimedia/drm_framework/libnative_drm.ndk.json b/multimedia/drm_framework/libnative_drm.ndk.json index 0e453e4d5..7e0949b81 100644 --- a/multimedia/drm_framework/libnative_drm.ndk.json +++ b/multimedia/drm_framework/libnative_drm.ndk.json @@ -115,13 +115,17 @@ "first_introduced": "11", "name": "OH_MediaKeySession_Destroy" }, + { + "first_introduced": "11", + "name": "OH_MediaKeySession_SetMediaKeySessionCallback" + }, { "first_introduced": "12", "name": "OH_MediaKeySystem_GetMediaKeySystems" }, { "first_introduced": "12", - "name": "OH_MediaKeySession_SetMediaKeySessionCallback" + "name": "OH_MediaKeySession_SetCallback" }, { "first_introduced": "12", -- Gitee From 22ef8ba0c84ca81cf43237710952ca7467bb5bf2 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Thu, 8 Aug 2024 11:00:20 +0000 Subject: [PATCH 2/3] update multimedia/drm_framework/common/native_drm_common.h. Signed-off-by: baoxy92 --- multimedia/drm_framework/common/native_drm_common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/multimedia/drm_framework/common/native_drm_common.h b/multimedia/drm_framework/common/native_drm_common.h index 386f3162e..410a27f20 100644 --- a/multimedia/drm_framework/common/native_drm_common.h +++ b/multimedia/drm_framework/common/native_drm_common.h @@ -486,6 +486,11 @@ typedef struct DRM_MediaKeySystemInfo { DRM_PsshInfo psshInfo[MAX_PSSH_INFO_COUNT]; } DRM_MediaKeySystemInfo; +/** +* @brief Callback for getting media key system information from media source. +* @since 11 +* @version 1.0 +*/ typedef void (*DRM_MediaKeySystemInfoCallback)(DRM_MediaKeySystemInfo *mediaKeySystemInfo); /** -- Gitee From e524f08385b266c37cb382af149e15efd89b72d2 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Thu, 8 Aug 2024 11:01:51 +0000 Subject: [PATCH 3/3] update multimedia/av_codec/native_avdemuxer.h. Signed-off-by: baoxy92 --- multimedia/av_codec/native_avdemuxer.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/multimedia/av_codec/native_avdemuxer.h b/multimedia/av_codec/native_avdemuxer.h index 7b2117ebc..cab1e2132 100644 --- a/multimedia/av_codec/native_avdemuxer.h +++ b/multimedia/av_codec/native_avdemuxer.h @@ -47,6 +47,12 @@ typedef struct OH_AVDemuxer OH_AVDemuxer; * @since 11 */ typedef struct DRM_MediaKeySystemInfo DRM_MediaKeySystemInfo; + +/** +* @brief Callback for getting media key system information from media source. +* @since 11 +* @version 1.0 +*/ typedef void (*DRM_MediaKeySystemInfoCallback)(DRM_MediaKeySystemInfo* mediaKeySystemInfo); /** -- Gitee