diff --git a/multimedia/av_codec/audio_codec/libnative_media_acodec.ndk.json b/multimedia/av_codec/audio_codec/libnative_media_acodec.ndk.json index 47dfd626d6ba2dbae6e39e35aa809a2a393b581e..ec87a5d85222f88972fdd5cc576e2a3bf6493ef4 100644 --- a/multimedia/av_codec/audio_codec/libnative_media_acodec.ndk.json +++ b/multimedia/av_codec/audio_codec/libnative_media_acodec.ndk.json @@ -58,5 +58,9 @@ { "first_introduced": "11", "name": "OH_AudioCodec_IsValid" + }, + { + "first_introduced": "12", + "name": "OH_AudioCodec_SetDecryptionConfig" } ] diff --git a/multimedia/av_codec/audio_decoder/libnative_media_adec.ndk.json b/multimedia/av_codec/audio_decoder/libnative_media_adec.ndk.json index 89b3bac2f99e3039bcf914d804dca9960a36d786..2f11d92769bbffc922efe4ab232c7426da1ddcaa 100644 --- a/multimedia/av_codec/audio_decoder/libnative_media_adec.ndk.json +++ b/multimedia/av_codec/audio_decoder/libnative_media_adec.ndk.json @@ -58,9 +58,5 @@ { "first_introduced": "10", "name": "OH_AudioDecoder_IsValid" - }, - { - "first_introduced": "12", - "name": "OH_AudioDecoder_SetDecryptionConfig" } ] diff --git a/multimedia/av_codec/native_avcodec_audiocodec.h b/multimedia/av_codec/native_avcodec_audiocodec.h index cc34cd03786a38e9994ae155b8750d0904032375..5a29f91d99c378d05d164db9bc61b4648d6d05c0 100644 --- a/multimedia/av_codec/native_avcodec_audiocodec.h +++ b/multimedia/av_codec/native_avcodec_audiocodec.h @@ -24,6 +24,13 @@ extern "C" { #endif +/** + * @brief MediaKeySession field. + * @since 12 + * @version 1.0 + */ +typedef struct MediaKeySession MediaKeySession; + /** * @brief Create an audio encoder or decoder instance from the mime type, which is recommended in most cases. * @syscap SystemCapability.Multimedia.Media.AudioCodec @@ -201,6 +208,19 @@ OH_AVErrCode OH_AudioCodec_FreeOutputBuffer(OH_AVCodec *codec, uint32_t index); */ OH_AVErrCode OH_AudioCodec_IsValid(OH_AVCodec *codec, bool *isValid); +/** + * @brief Set decryption info. + * @syscap SystemCapability.Multimedia.Media.AudioCodec + * @param codec Pointer to an OH_AVCodec instance + * @param mediaKeySession A media key session instance with decryption function. + * @param secureAudio Require secure decoder or not. + * @return Returns AV_ERR_OK if the execution is successful, + * otherwise returns a specific error code, refer to {@link OH_AVErrCode} + * @since 12 + * @version 1.0 +*/ +OH_AVErrCode OH_AudioCodec_SetDecryptionConfig(OH_AVCodec *codec, MediaKeySession *mediaKeySession, + bool secureAudio); #ifdef __cplusplus } #endif diff --git a/multimedia/av_codec/native_avcodec_audiodecoder.h b/multimedia/av_codec/native_avcodec_audiodecoder.h index 6e4d659844f4d9e2356033dba05cd305a4c3ae88..bdadfd54de93b84bd9b169cc51be5b10e367df1e 100644 --- a/multimedia/av_codec/native_avcodec_audiodecoder.h +++ b/multimedia/av_codec/native_avcodec_audiodecoder.h @@ -24,13 +24,6 @@ extern "C" { #endif -/** - * @brief MediaKeySession field. - * @since 12 - * @version 1.0 - */ -typedef struct MediaKeySession MediaKeySession; - /** * @brief Creates an audio decoder instance from the mime type, which is recommended in most cases. * @syscap SystemCapability.Multimedia.Media.AudioDecoder @@ -251,21 +244,6 @@ OH_AVErrCode OH_AudioDecoder_FreeOutputData(OH_AVCodec *codec, uint32_t index); * @since 10 */ OH_AVErrCode OH_AudioDecoder_IsValid(OH_AVCodec *codec, bool *isValid); - -/** - * @brief Set decryption info. - * @syscap SystemCapability.Multimedia.Media.AudioDecoder - * @param codec Pointer to an OH_AVCodec instance - * @param mediaKeySession A media key session instance with decryption function. - * @param secureAudio Require secure decoder or not. - * @return Returns AV_ERR_OK if the execution is successful, - * otherwise returns a specific error code, refer to {@link OH_AVErrCode} - * @since 12 - * @version 1.0 -*/ -OH_AVErrCode OH_AudioDecoder_SetDecryptionConfig(OH_AVCodec *codec, MediaKeySession *mediaKeySession, - bool secureAudio); - #ifdef __cplusplus } #endif