From b60b974c873a795603d625a6ce63d88601746a60 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 09:30:26 +0800 Subject: [PATCH 01/11] fix format Signed-off-by: y30025806 Change-Id: Id67197506fa90c041cde8457a863ce5b0a44aaa2 --- multimedia/av_codec/native_avcodec_base.h | 391 ++++++++++++++++++---- 1 file changed, 330 insertions(+), 61 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index bb5e95075..54baff7ab 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -162,7 +162,7 @@ typedef struct OH_AVCodecCallback { } OH_AVCodecCallback; /** - * @brief the function pointer will be called to get sequence media data + * @brief the function pointer will be called to get sequence media data. * @syscap SystemCapability.Multimedia.Media.CodecBase * @param data OH_AVBuffer buffer to fill * @param length expected to read size; @@ -183,26 +183,47 @@ typedef struct OH_AVDataSource { } OH_AVDataSource; /** - * @brief Enumerates the MIME types of audio and video codecs + * @brief Enumerates the MIME types of audio and video codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 * @version 1.0 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC; +/** + * @brief Enumerates the MIME types of audio and video codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC; /** - * @brief Enumerates the MIME types of audio and video codecs + * @brief Enumerates the MIME types of audio and video codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; +/** + * @brief Enumerates the MIME types of audio and video codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; +/** + * @brief Enumerates the MIME types of audio and video codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG; +/** + * @brief Enumerates the MIME types of audio and video codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; /** - * @brief Enumerates the types of audio and video muxer + * @brief Enumerates the types of audio and video muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @deprecated since 11 * @since 10 @@ -210,23 +231,53 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4; /** - * @brief Enumerates the types of audio and video muxer + * @brief Enumerates the types of audio and video muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; +/** + * @brief Enumerates the types of audio and video muxer. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; +/** + * @brief Enumerates the types of audio and video muxer. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; /** - * @brief Enumerates the MIME types of audio codecs + * @brief Enumerates the MIME types of audio codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VIVID; +/** + * @brief Enumerates the MIME types of audio codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_NB; +/** + * @brief Enumerates the MIME types of audio codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_WB; +/** + * @brief Enumerates the MIME types of audio codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_OPUS; +/** + * @brief Enumerates the MIME types of audio codecs. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_G711MU; /** @@ -254,49 +305,117 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_APE; extern const char *OH_AVCODEC_MIMETYPE_SUBTITLE_SRT; /** - * @brief The extra data's key of surface Buffer + * @brief Key for timeStamp in surface's extraData, value type is int64. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 * @version 1.0 */ -/* Key for timeStamp in surface's extraData, value type is int64 */ extern const char *OH_ED_KEY_TIME_STAMP; -/* Key for endOfStream in surface's extraData, value type is bool */ +/** + * @brief Key for endOfStream in surface's extraData, value type is bool. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_ED_KEY_EOS; /** - * @brief Provides the uniform key for storing the media description. + * @brief Key for track type, value type is int32_t, see @OH_MediaType. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 * @version 1.0 */ -/* Key for track type, value type is int32_t, see @OH_MediaType. */ extern const char *OH_MD_KEY_TRACK_TYPE; -/* Key for codec mime type, value type is string. */ +/** + * @brief Key for codec mime type, value type is string. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_CODEC_MIME; -/* Key for file duration, value type is int64_t. */ +/** + * @brief Key for file duration, value type is int64_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_DURATION; -/* Key for bitrate, value type is int64_t. */ +/** + * @brief Key for bitrate, value type is int64_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_BITRATE; -/* Key for max input size, value type is int32_t */ +/** + * @brief Key for max input size, value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_MAX_INPUT_SIZE; -/* Key for video width, value type is int32_t */ +/** + * @brief Key for video width, value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_WIDTH; -/* Key for video height, value type is int32_t */ +/** + * @brief Key for video height, value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_HEIGHT; -/* Key for video pixel format, value type is int32_t, see @OH_AVPixelFormat */ +/** + * @brief Key for video pixel format, value type is int32_t, see @OH_AVPixelFormat. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_PIXEL_FORMAT; -/* key for audio raw format, value type is int32_t , see @AudioSampleFormat */ +/** + * @brief key for audio raw format, value type is int32_t , see @AudioSampleFormat. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_AUDIO_SAMPLE_FORMAT; -/* Key for video frame rate, value type is double. */ +/** + * @brief Key for video frame rate, value type is double. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_FRAME_RATE; -/* video encode bitrate mode, the value type is int32_t, see @OH_VideoEncodeBitrateMode */ +/** + * @brief video encode bitrate mode, the value type is int32_t, see @OH_VideoEncodeBitrateMode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_VIDEO_ENCODE_BITRATE_MODE; -/* encode profile, the value type is int32_t. see @OH_AVCProfile, OH_HEVCProfile, OH_AACProfile. */ +/** + * @brief encode profile, the value type is int32_t. see @OH_AVCProfile, OH_HEVCProfile, OH_AACProfile. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_PROFILE; -/* Key for audio channel count, value type is int32_t */ +/** + * @brief Key for audio channel count, value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_AUD_CHANNEL_COUNT; -/* Key for audio sample rate, value type is int32_t */ +/** + * @brief Key for audio sample rate, value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + * @version 1.0 + */ extern const char *OH_MD_KEY_AUD_SAMPLE_RATE; /** * @brief Key for the interval of key frame. value type is int32_t, the unit is milliseconds. A negative value means no @@ -306,86 +425,236 @@ extern const char *OH_MD_KEY_AUD_SAMPLE_RATE; * @since 9 */ extern const char *OH_MD_KEY_I_FRAME_INTERVAL; -/* Key of the surface rotation angle. value type is int32_t: should be {0, 90, 180, 270}, default is 0. */ +/** + * @brief Key of the surface rotation angle. value type is int32_t: should be {0, 90, 180, 270}, default is 0. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 9 + */ extern const char *OH_MD_KEY_ROTATION; /** - * @brief Provides the uniform key for storing the media description. + * @brief Key for video YUV value range flag, value type is bool, true for full range, false for limited range. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ -/* Key for video YUV value range flag, value type is bool, true for full range, false for limited range */ extern const char *OH_MD_KEY_RANGE_FLAG; -/* Key for video color primaries, value type is int32_t, see @OH_ColorPrimary */ +/** + * @brief Key for video color primaries, value type is int32_t, see @OH_ColorPrimary. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_COLOR_PRIMARIES; -/* Key for video transfer characteristics, value type is int32_t, see @OH_TransferCharacteristic */ +/** + * @brief Key for video transfer characteristics, value type is int32_t, see @OH_TransferCharacteristic. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_TRANSFER_CHARACTERISTICS; -/* Key for video matrix coefficients, value type is int32_t, see @OH_MatrixCoefficient */ +/** + * @brief Key for video matrix coefficients, value type is int32_t, see @OH_MatrixCoefficient. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_MATRIX_COEFFICIENTS; -/* Key for the request an I-Frame immediately, value type is bool */ +/** + * @brief Key for the request an I-Frame immediately, value type is bool. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_REQUEST_I_FRAME; -/* Key for the desired encoding quality, value type is int32_t, this key is only - * supported for encoders that are configured in constant quality mode */ +/** + * @brief Key for the desired encoding quality, value type is int32_t, this key is only. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_QUALITY; -/* Key of the codec specific data. value type is a uint8_t pointer */ +/** + * @brief Key of the codec specific data. value type is a uint8_t pointer. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_CODEC_CONFIG; -/* source format Key for title, value type is string */ +/** + * @brief source format Key for title, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_TITLE; -/* source format Key for artist, value type is string */ +/** + * @brief source format Key for artist, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_ARTIST; -/* source format Key for album, value type is string */ +/** + * @brief source format Key for album, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_ALBUM; -/* source format Key for album artist, value type is string */ +/** + * @brief source format Key for album artist, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_ALBUM_ARTIST; -/* source format Key for date, value type is string */ +/** + * @brief source format Key for date, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_DATE; -/* source format Key for comment, value type is string */ +/** + * @brief source format Key for comment, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_COMMENT; -/* source format Key for genre, value type is string */ +/** + * @brief source format Key for genre, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_GENRE; -/* source format Key for copyright, value type is string */ +/** + * @brief source format Key for copyright, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_COPYRIGHT; -/* source format Key for language, value type is string */ +/** + * @brief source format Key for language, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_LANGUAGE; -/* source format Key for description, value type is string */ +/** + * @brief source format Key for description, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_DESCRIPTION; -/* source format Key for lyrics, value type is string */ +/** + * @brief source format Key for lyrics, value type is string. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_LYRICS; -/* source format Key for track count, value type is int32_t */ +/** + * @brief source format Key for track count, value type is int32_t. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_TRACK_COUNT; -/* Key for the desired encoding channel layout, value type is int64_t, this key is only supported for encoders */ +/** + * @brief Key for the desired encoding channel layout, value type is int64_t, this key is only supported for encoders. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_CHANNEL_LAYOUT; -/* Key for bits per coded sample, value type is int32_t, supported for flac encoder, see @OH_BitsPerSample */ +/** + * @brief Key for bits per coded sample, value type is int32_t, supported for flac encoder, see @OH_BitsPerSample. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_BITS_PER_CODED_SAMPLE; -/* Key for the aac format, value type is int32_t, supported for aac decoder */ +/** + * @brief Key for the aac format, value type is int32_t, supported for aac decoder. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_AAC_IS_ADTS; -/* Key for aac sbr mode, value type is int32_t, supported for aac encoder */ +/** + * @brief Key for aac sbr mode, value type is int32_t, supported for aac encoder. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_SBR; -/* Key for flac compliance level, value type is int32_t */ +/** + * @brief Key for flac compliance level, value type is int32_t. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_COMPLIANCE_LEVEL; -/* Key for vorbis identification header, value type is a uint8_t pointer, supported only for vorbis decoder */ +/** + * @brief Key for vorbis identification header, value type is a uint8_t pointer, supported only for vorbis decoder. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_IDENTIFICATION_HEADER; -/* Key for vorbis setup header, value type is a uint8_t pointer, supported only for vorbis decoder */ +/** + * @brief Key for vorbis setup header, value type is a uint8_t pointer, supported only for vorbis decoder. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_SETUP_HEADER; -/* Key for video scale type, value type is int32_t, see @OH_ScalingMode */ +/** + * @brief Key for video scale type, value type is int32_t, see @OH_ScalingMode. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_KEY_SCALING_MODE; -/* Key for max input buffer count, value type is int32_t */ +/** + * @brief Key for max input buffer count, value type is int32_t. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_MAX_INPUT_BUFFER_COUNT; -/* Key for max output buffer count, value type is int32_t */ +/** + * @brief Key for max output buffer count, value type is int32_t. + * supported for encoders that are configured in constant quality mode. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + */ extern const char *OH_MD_MAX_OUTPUT_BUFFER_COUNT; /** - * @brief Provides the uniform key for storing the media description. + * @brief Key for audio codec compression level, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ -/* Key for audio codec compression level, value type is int32_t */ extern const char *OH_MD_KEY_AUDIO_COMPRESSION_LEVEL; -/* Key of the video is hdr vivid. value type is bool */ +/** + * @brief Key of the video is hdr vivid. value type is bool. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_MD_KEY_VIDEO_IS_HDR_VIVID; -/* Key for number of audio objects. value type is int32_t */ +/** + * @brief Key for number of audio objects. value type is int32_t. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_MD_KEY_AUDIO_OBJECT_NUMBER; -/* Key for meta data of audio vivid. value type is a uint8_t pointer */ +/** + * @brief Key for meta data of audio vivid. value type is a uint8_t pointer. + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 11 + */ extern const char *OH_MD_KEY_AUDIO_VIVID_METADATA; /** -- Gitee From 3c54574b96d7c347eb29cadf3717dfc34decd8e5 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 11:13:47 +0800 Subject: [PATCH 02/11] fix format Signed-off-by: y30025806 Change-Id: Ib8fdd9e40a99ae69eea2fee6df0c46a59e77b0f9 --- multimedia/av_codec/native_avcodec_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 54baff7ab..1a63f6d18 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -334,7 +334,7 @@ extern const char *OH_MD_KEY_TRACK_TYPE; */ extern const char *OH_MD_KEY_CODEC_MIME; /** - * @brief Key for file duration, value type is int64_t. + * @brief Key for file duration in microseconds, value type is int64_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 * @version 1.0 -- Gitee From 8d68ea8e619eb78fe4f58043b563f106d2c13593 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 19:58:01 +0800 Subject: [PATCH 03/11] fix format Signed-off-by: y30025806 Change-Id: Ifa7b687382c44bb530a7e3fbb0323d57680dd3da --- multimedia/av_codec/native_avcapability.h | 5 +++ .../av_codec/native_avcodec_audiocodec.h | 2 -- .../av_codec/native_avcodec_audiodecoder.h | 14 -------- multimedia/av_codec/native_avcodec_base.h | 36 ++++++------------- .../av_codec/native_avcodec_videodecoder.h | 22 +++--------- .../av_codec/native_avcodec_videoencoder.h | 16 --------- multimedia/av_codec/native_avdemuxer.h | 14 +++++--- multimedia/av_codec/native_avmuxer.h | 5 +++ multimedia/av_codec/native_avsource.h | 5 +++ 9 files changed, 40 insertions(+), 79 deletions(-) diff --git a/multimedia/av_codec/native_avcapability.h b/multimedia/av_codec/native_avcapability.h index 1f7c35270..08655ba20 100644 --- a/multimedia/av_codec/native_avcapability.h +++ b/multimedia/av_codec/native_avcapability.h @@ -35,6 +35,11 @@ extern "C" { #endif +/** + * @brief Forward declaration of OH_AVCapability. + * + * @since 10 + */ typedef struct OH_AVCapability OH_AVCapability; /** diff --git a/multimedia/av_codec/native_avcodec_audiocodec.h b/multimedia/av_codec/native_avcodec_audiocodec.h index 44e61002c..ecae242b5 100644 --- a/multimedia/av_codec/native_avcodec_audiocodec.h +++ b/multimedia/av_codec/native_avcodec_audiocodec.h @@ -38,7 +38,6 @@ extern "C" { /** * @brief MediaKeySession field. * @since 12 - * @version 1.0 */ typedef struct MediaKeySession MediaKeySession; @@ -281,7 +280,6 @@ OH_AVErrCode OH_AudioCodec_IsValid(OH_AVCodec *codec, bool *isValid); * the mediaKeySession is nullptr or invalid. * {@link AV_ERR_INVALID_STATE} 8 - If the codec service is invalid. * @since 12 - * @version 1.0 */ OH_AVErrCode OH_AudioCodec_SetDecryptionConfig(OH_AVCodec *codec, MediaKeySession *mediaKeySession, bool secureAudio); diff --git a/multimedia/av_codec/native_avcodec_audiodecoder.h b/multimedia/av_codec/native_avcodec_audiodecoder.h index f2df2b0e0..dcf4fbd54 100644 --- a/multimedia/av_codec/native_avcodec_audiodecoder.h +++ b/multimedia/av_codec/native_avcodec_audiodecoder.h @@ -43,7 +43,6 @@ extern "C" { * @deprecated since 11 * @useinstead OH_AudioCodec_CreateByMime * @since 9 - * @version 1.0 */ OH_AVCodec *OH_AudioDecoder_CreateByMime(const char *mime); @@ -56,7 +55,6 @@ OH_AVCodec *OH_AudioDecoder_CreateByMime(const char *mime); * @deprecated since 11 * @useinstead OH_AudioCodec_CreateByName * @since 9 - * @version 1.0 */ OH_AVCodec *OH_AudioDecoder_CreateByName(const char *name); @@ -69,7 +67,6 @@ OH_AVCodec *OH_AudioDecoder_CreateByName(const char *name); * @deprecated since 11 * @useinstead OH_AudioCodec_Destroy * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Destroy(OH_AVCodec *codec); @@ -85,7 +82,6 @@ OH_AVErrCode OH_AudioDecoder_Destroy(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_RegisterCallback * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_SetCallback(OH_AVCodec *codec, OH_AVCodecAsyncCallback callback, void *userData); @@ -100,7 +96,6 @@ OH_AVErrCode OH_AudioDecoder_SetCallback(OH_AVCodec *codec, OH_AVCodecAsyncCallb * @deprecated since 11 * @useinstead OH_AudioCodec_Configure * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); @@ -114,7 +109,6 @@ OH_AVErrCode OH_AudioDecoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); * @deprecated since 11 * @useinstead OH_AudioCodec_Prepare * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Prepare(OH_AVCodec *codec); @@ -128,7 +122,6 @@ OH_AVErrCode OH_AudioDecoder_Prepare(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_Start * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Start(OH_AVCodec *codec); @@ -143,7 +136,6 @@ OH_AVErrCode OH_AudioDecoder_Start(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_Stop * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Stop(OH_AVCodec *codec); @@ -158,7 +150,6 @@ OH_AVErrCode OH_AudioDecoder_Stop(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_Flush * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Flush(OH_AVCodec *codec); @@ -172,7 +163,6 @@ OH_AVErrCode OH_AudioDecoder_Flush(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_Reset * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_Reset(OH_AVCodec *codec); @@ -188,7 +178,6 @@ OH_AVErrCode OH_AudioDecoder_Reset(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_GetOutputDescription * @since 9 - * @version 1.0 */ OH_AVFormat *OH_AudioDecoder_GetOutputDescription(OH_AVCodec *codec); @@ -203,7 +192,6 @@ OH_AVFormat *OH_AudioDecoder_GetOutputDescription(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_AudioCodec_SetParameter * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format); @@ -223,7 +211,6 @@ OH_AVErrCode OH_AudioDecoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format * @deprecated since 11 * @useinstead OH_AudioCodec_PushInputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_PushInputData(OH_AVCodec *codec, uint32_t index, OH_AVCodecBufferAttr attr); @@ -237,7 +224,6 @@ OH_AVErrCode OH_AudioDecoder_PushInputData(OH_AVCodec *codec, uint32_t index, OH * @deprecated since 11 * @useinstead OH_AudioCodec_FreeOutputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_AudioDecoder_FreeOutputData(OH_AVCodec *codec, uint32_t index); diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 1a63f6d18..41e8edef5 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -36,7 +36,17 @@ extern "C" { #endif +/** + * @brief Forward declaration of OHNativeWindow. + * + * @since 10 + */ typedef struct NativeWindow OHNativeWindow; +/** + * @brief Forward declaration of OH_AVCodec. + * + * @since 10 + */ typedef struct OH_AVCodec OH_AVCodec; /** @@ -47,7 +57,6 @@ typedef struct OH_AVCodec OH_AVCodec; * @param errorCode specific error code * @param userData User specific data * @since 9 - * @version 1.0 */ typedef void (*OH_AVCodecOnError)(OH_AVCodec *codec, int32_t errorCode, void *userData); @@ -60,7 +69,6 @@ typedef void (*OH_AVCodecOnError)(OH_AVCodec *codec, int32_t errorCode, void *us * @param format New output stream description information * @param userData User specific data * @since 9 - * @version 1.0 */ typedef void (*OH_AVCodecOnStreamChanged)(OH_AVCodec *codec, OH_AVFormat *format, void *userData); @@ -75,7 +83,6 @@ typedef void (*OH_AVCodecOnStreamChanged)(OH_AVCodec *codec, OH_AVFormat *format * @deprecated since 11 * @useinstead OH_AVCodecOnNeedInputBuffer * @since 9 - * @version 1.0 */ typedef void (*OH_AVCodecOnNeedInputData)(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data, void *userData); @@ -93,7 +100,6 @@ typedef void (*OH_AVCodecOnNeedInputData)(OH_AVCodec *codec, uint32_t index, OH_ * @deprecated since 11 * @useinstead OH_AVCodecOnNewOutputBuffer * @since 9 - * @version 1.0 */ typedef void (*OH_AVCodecOnNewOutputData)(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data, OH_AVCodecBufferAttr *attr, void *userData); @@ -134,7 +140,6 @@ typedef void (*OH_AVCodecOnNewOutputBuffer)(OH_AVCodec *codec, uint32_t index, O * @deprecated since 11 * @useinstead OH_AVCodecCallback * @since 9 - * @version 1.0 */ typedef struct OH_AVCodecAsyncCallback { OH_AVCodecOnError onError; @@ -186,14 +191,12 @@ typedef struct OH_AVDataSource { * @brief Enumerates the MIME types of audio and video codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC; /** * @brief Enumerates the MIME types of audio and video codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC; @@ -308,14 +311,12 @@ extern const char *OH_AVCODEC_MIMETYPE_SUBTITLE_SRT; * @brief Key for timeStamp in surface's extraData, value type is int64. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_ED_KEY_TIME_STAMP; /** * @brief Key for endOfStream in surface's extraData, value type is bool. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_ED_KEY_EOS; @@ -323,98 +324,84 @@ extern const char *OH_ED_KEY_EOS; * @brief Key for track type, value type is int32_t, see @OH_MediaType. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_TRACK_TYPE; /** * @brief Key for codec mime type, value type is string. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_CODEC_MIME; /** * @brief Key for file duration in microseconds, value type is int64_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_DURATION; /** * @brief Key for bitrate, value type is int64_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_BITRATE; /** * @brief Key for max input size, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_MAX_INPUT_SIZE; /** * @brief Key for video width, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_WIDTH; /** * @brief Key for video height, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_HEIGHT; /** * @brief Key for video pixel format, value type is int32_t, see @OH_AVPixelFormat. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_PIXEL_FORMAT; /** * @brief key for audio raw format, value type is int32_t , see @AudioSampleFormat. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_AUDIO_SAMPLE_FORMAT; /** * @brief Key for video frame rate, value type is double. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_FRAME_RATE; /** * @brief video encode bitrate mode, the value type is int32_t, see @OH_VideoEncodeBitrateMode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_VIDEO_ENCODE_BITRATE_MODE; /** * @brief encode profile, the value type is int32_t. see @OH_AVCProfile, OH_HEVCProfile, OH_AACProfile. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_PROFILE; /** * @brief Key for audio channel count, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_AUD_CHANNEL_COUNT; /** * @brief Key for audio sample rate, value type is int32_t. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ extern const char *OH_MD_KEY_AUD_SAMPLE_RATE; /** @@ -885,7 +872,6 @@ extern const char *OH_MD_KEY_START_TIME; * @brief Media type. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ typedef enum OH_MediaType { /* track is audio. */ @@ -898,7 +884,6 @@ typedef enum OH_MediaType { * @brief AAC Profile * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ typedef enum OH_AACProfile { AAC_PROFILE_LC = 0, @@ -908,7 +893,6 @@ typedef enum OH_AACProfile { * @brief AVC Profile * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 - * @version 1.0 */ typedef enum OH_AVCProfile { AVC_PROFILE_BASELINE = 0, diff --git a/multimedia/av_codec/native_avcodec_videodecoder.h b/multimedia/av_codec/native_avcodec_videodecoder.h index 7d09fe721..3b2e17c52 100644 --- a/multimedia/av_codec/native_avcodec_videodecoder.h +++ b/multimedia/av_codec/native_avcodec_videodecoder.h @@ -35,6 +35,11 @@ extern "C" { #endif +/** + * @brief Forward declaration of MediaKeySession. + * + * @since 10 + */ typedef struct MediaKeySession MediaKeySession; /** @@ -44,7 +49,6 @@ typedef struct MediaKeySession MediaKeySession; * @return Returns a Pointer to an OH_AVCodec instance. * Return nullptr if memory ran out or the mime type is not supported. * @since 9 - * @version 1.0 */ OH_AVCodec *OH_VideoDecoder_CreateByMime(const char *mime); @@ -56,7 +60,6 @@ OH_AVCodec *OH_VideoDecoder_CreateByMime(const char *mime); * @return Returns a Pointer to an OH_AVCodec instance. * Return nullptr if memory ran out or the decoder name is not supported. * @since 9 - * @version 1.0 */ OH_AVCodec *OH_VideoDecoder_CreateByName(const char *name); @@ -71,7 +74,6 @@ OH_AVCodec *OH_VideoDecoder_CreateByName(const char *name); * {@link AV_ERR_UNKNOWN}, unknown error. * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Destroy(OH_AVCodec *codec); @@ -92,7 +94,6 @@ OH_AVErrCode OH_VideoDecoder_Destroy(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_VideoDecoder_RegisterCallback * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_SetCallback(OH_AVCodec *codec, OH_AVCodecAsyncCallback callback, void *userData); @@ -129,7 +130,6 @@ OH_AVErrCode OH_VideoDecoder_RegisterCallback(OH_AVCodec *codec, OH_AVCodecCallb * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_SetSurface(OH_AVCodec *codec, OHNativeWindow *window); @@ -147,7 +147,6 @@ OH_AVErrCode OH_VideoDecoder_SetSurface(OH_AVCodec *codec, OHNativeWindow *windo * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state, must be called before Prepare. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); @@ -164,7 +163,6 @@ OH_AVErrCode OH_VideoDecoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Prepare(OH_AVCodec *codec); @@ -181,7 +179,6 @@ OH_AVErrCode OH_VideoDecoder_Prepare(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Start(OH_AVCodec *codec); @@ -198,7 +195,6 @@ OH_AVErrCode OH_VideoDecoder_Start(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Stop(OH_AVCodec *codec); @@ -216,7 +212,6 @@ OH_AVErrCode OH_VideoDecoder_Stop(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Flush(OH_AVCodec *codec); @@ -233,7 +228,6 @@ OH_AVErrCode OH_VideoDecoder_Flush(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_Reset(OH_AVCodec *codec); @@ -246,7 +240,6 @@ OH_AVErrCode OH_VideoDecoder_Reset(OH_AVCodec *codec); * @return Returns a pointer to an OH_AVFormat instance. * Return nullptr if the decoder is nullptr or invaild. * @since 9 - * @version 1.0 */ OH_AVFormat *OH_VideoDecoder_GetOutputDescription(OH_AVCodec *codec); @@ -264,7 +257,6 @@ OH_AVFormat *OH_VideoDecoder_GetOutputDescription(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format); @@ -290,7 +282,6 @@ OH_AVErrCode OH_VideoDecoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format * @deprecated since 11 * @useinstead OH_VideoDecoder_PushInputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_PushInputData(OH_AVCodec *codec, uint32_t index, OH_AVCodecBufferAttr attr); @@ -312,7 +303,6 @@ OH_AVErrCode OH_VideoDecoder_PushInputData(OH_AVCodec *codec, uint32_t index, OH * @deprecated since 11 * @useinstead OH_VideoDecoder_RenderOutputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_RenderOutputData(OH_AVCodec *codec, uint32_t index); @@ -332,7 +322,6 @@ OH_AVErrCode OH_VideoDecoder_RenderOutputData(OH_AVCodec *codec, uint32_t index) * @deprecated since 11 * @useinstead OH_VideoDecoder_FreeOutputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_FreeOutputData(OH_AVCodec *codec, uint32_t index); @@ -424,7 +413,6 @@ OH_AVErrCode OH_VideoDecoder_IsValid(OH_AVCodec *codec, bool *isValid); * {@link AV_ERR_INVALID_VAL} 3 - If the codec instance is nullptr or invalid, * the mediaKeySession is nullptr or invalid. * @since 11 - * @version 1.0 */ OH_AVErrCode OH_VideoDecoder_SetDecryptionConfig(OH_AVCodec *codec, MediaKeySession *mediaKeySession, bool secureVideoPath); diff --git a/multimedia/av_codec/native_avcodec_videoencoder.h b/multimedia/av_codec/native_avcodec_videoencoder.h index 4bd5e825b..b770fd3a6 100644 --- a/multimedia/av_codec/native_avcodec_videoencoder.h +++ b/multimedia/av_codec/native_avcodec_videoencoder.h @@ -57,7 +57,6 @@ typedef void (*OH_VideoEncoder_OnNeedInputParameter)(OH_AVCodec *codec, uint32_t * @return Returns a Pointer to an OH_AVCodec instance. * Return nullptr if memory ran out or the mime type is not supported. * @since 9 - * @version 1.0 */ OH_AVCodec *OH_VideoEncoder_CreateByMime(const char *mime); @@ -69,7 +68,6 @@ OH_AVCodec *OH_VideoEncoder_CreateByMime(const char *mime); * @return Returns a Pointer to an OH_AVCodec instance. * Return nullptr if memory ran out or the encoder name is not supported. * @since 9 - * @version 1.0 */ OH_AVCodec *OH_VideoEncoder_CreateByName(const char *name); @@ -84,7 +82,6 @@ OH_AVCodec *OH_VideoEncoder_CreateByName(const char *name); * {@link AV_ERR_UNKNOWN}, unknown error. * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Destroy(OH_AVCodec *codec); @@ -105,7 +102,6 @@ OH_AVErrCode OH_VideoEncoder_Destroy(OH_AVCodec *codec); * @deprecated since 11 * @useinstead OH_VideoEncoder_RegisterCallback * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_SetCallback(OH_AVCodec *codec, OH_AVCodecAsyncCallback callback, void *userData); @@ -163,7 +159,6 @@ OH_AVErrCode OH_VideoEncoder_RegisterParameterCallback(OH_AVCodec *codec, * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state, must be called before Prepare. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); @@ -180,7 +175,6 @@ OH_AVErrCode OH_VideoEncoder_Configure(OH_AVCodec *codec, OH_AVFormat *format); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Prepare(OH_AVCodec *codec); @@ -197,7 +191,6 @@ OH_AVErrCode OH_VideoEncoder_Prepare(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Start(OH_AVCodec *codec); @@ -213,7 +206,6 @@ OH_AVErrCode OH_VideoEncoder_Start(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Stop(OH_AVCodec *codec); @@ -231,7 +223,6 @@ OH_AVErrCode OH_VideoEncoder_Stop(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Flush(OH_AVCodec *codec); @@ -248,7 +239,6 @@ OH_AVErrCode OH_VideoEncoder_Flush(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_Reset(OH_AVCodec *codec); @@ -261,7 +251,6 @@ OH_AVErrCode OH_VideoEncoder_Reset(OH_AVCodec *codec); * @return Returns a pointer to an OH_AVFormat instance. * Return nullptr if the codec is nullptr or invaild. * @since 9 - * @version 1.0 */ OH_AVFormat *OH_VideoEncoder_GetOutputDescription(OH_AVCodec *codec); @@ -279,7 +268,6 @@ OH_AVFormat *OH_VideoEncoder_GetOutputDescription(OH_AVCodec *codec); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format); @@ -297,7 +285,6 @@ OH_AVErrCode OH_VideoEncoder_SetParameter(OH_AVCodec *codec, OH_AVFormat *format * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_GetSurface(OH_AVCodec *codec, OHNativeWindow **window); @@ -317,7 +304,6 @@ OH_AVErrCode OH_VideoEncoder_GetSurface(OH_AVCodec *codec, OHNativeWindow **wind * @deprecated since 11 * @useinstead OH_VideoEncoder_FreeOutputBuffer * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_FreeOutputData(OH_AVCodec *codec, uint32_t index); @@ -334,7 +320,6 @@ OH_AVErrCode OH_VideoEncoder_FreeOutputData(OH_AVCodec *codec, uint32_t index); * {@link AV_ERR_SERVICE_DIED}, avcodec service is died. * {@link AV_ERR_INVALID_STATE}, this interface was called in invalid state. * @since 9 - * @version 1.0 */ OH_AVErrCode OH_VideoEncoder_NotifyEndOfStream(OH_AVCodec *codec); @@ -444,7 +429,6 @@ OH_AVErrCode OH_VideoEncoder_IsValid(OH_AVCodec *codec, bool *isValid); * @brief The bitrate mode of video encoder. * @syscap SystemCapability.Multimedia.Media.VideoEncoder * @since 9 - * @version 1.0 */ typedef enum OH_VideoEncodeBitrateMode { /* constant bit rate mode. */ diff --git a/multimedia/av_codec/native_avdemuxer.h b/multimedia/av_codec/native_avdemuxer.h index 42d9fc59b..f2ccd837d 100644 --- a/multimedia/av_codec/native_avdemuxer.h +++ b/multimedia/av_codec/native_avdemuxer.h @@ -35,7 +35,17 @@ extern "C" { #endif +/** + * @brief Forward declaration of OH_AVDemuxer. + * + * @since 10 + */ typedef struct OH_AVDemuxer OH_AVDemuxer; +/** + * @brief Forward declaration of DRM_MediaKeySystemInfo. + * + * @since 10 + */ typedef struct DRM_MediaKeySystemInfo DRM_MediaKeySystemInfo; typedef void (*DRM_MediaKeySystemInfoCallback)(DRM_MediaKeySystemInfo* mediaKeySystemInfo); @@ -45,7 +55,6 @@ typedef void (*DRM_MediaKeySystemInfoCallback)(DRM_MediaKeySystemInfo* mediaKeyS * @param mediaKeySystemInfo DRM information. * @return DRM_ERR_INVALID_VAL when the params checked failure, return DRM_ERR_OK when function called successfully. * @since 12 - * @version 1.0 */ typedef void (*Demuxer_MediaKeySystemInfoCallback)(OH_AVDemuxer *demuxer, DRM_MediaKeySystemInfo *mediaKeySystemInfo); @@ -177,7 +186,6 @@ OH_AVErrCode OH_AVDemuxer_SeekToTime(OH_AVDemuxer *demuxer, int64_t millisecond, * {@link AV_ERR_OPERATE_NOT_PERMIT} 2 - If the demuxer engine is not inited or init failed. * {@link AV_ERR_INVALID_VAL} 3 - If the demuxer instance is nullptr or invalid. * @since 11 - * @version 1.0 */ OH_AVErrCode OH_AVDemuxer_SetMediaKeySystemInfoCallback(OH_AVDemuxer *demuxer, DRM_MediaKeySystemInfoCallback callback); @@ -191,7 +199,6 @@ OH_AVErrCode OH_AVDemuxer_SetMediaKeySystemInfoCallback(OH_AVDemuxer *demuxer, * {@link AV_ERR_OPERATE_NOT_PERMIT} 2 - If the demuxer engine is not inited or init failed. * {@link AV_ERR_INVALID_VAL} 3 - If the demuxer instance is nullptr or invalid. * @since 12 - * @version 1.0 */ OH_AVErrCode OH_AVDemuxer_SetDemuxerMediaKeySystemInfoCallback(OH_AVDemuxer *demuxer, Demuxer_MediaKeySystemInfoCallback callback); @@ -206,7 +213,6 @@ OH_AVErrCode OH_AVDemuxer_SetDemuxerMediaKeySystemInfoCallback(OH_AVDemuxer *dem * {@link AV_ERR_INVALID_VAL} 3 - If the demuxer instance is nullptr or invalid * or the mediaKeySystemInfo is nullptr. * @since 11 - * @version 1.0 */ OH_AVErrCode OH_AVDemuxer_GetMediaKeySystemInfo(OH_AVDemuxer *demuxer, DRM_MediaKeySystemInfo *mediaKeySystemInfo); diff --git a/multimedia/av_codec/native_avmuxer.h b/multimedia/av_codec/native_avmuxer.h index 6e38a1090..e4d712889 100644 --- a/multimedia/av_codec/native_avmuxer.h +++ b/multimedia/av_codec/native_avmuxer.h @@ -35,6 +35,11 @@ extern "C" { #endif +/** + * @brief Forward declaration of OH_AVMuxer. + * + * @since 10 + */ typedef struct OH_AVMuxer OH_AVMuxer; /** diff --git a/multimedia/av_codec/native_avsource.h b/multimedia/av_codec/native_avsource.h index 7cdd8e97d..17d195750 100644 --- a/multimedia/av_codec/native_avsource.h +++ b/multimedia/av_codec/native_avsource.h @@ -36,6 +36,11 @@ extern "C" { #endif +/** + * @brief Forward declaration of OH_AVSource. + * + * @since 10 + */ typedef struct OH_AVSource OH_AVSource; /** -- Gitee From 3e5a456bd2bf1a8789aca353ded2e2ee089504a6 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 22:05:18 +0800 Subject: [PATCH 04/11] fix format Signed-off-by: y30025806 Change-Id: Iabe8433d4d1bb3c478cba11e1f1375c697b9ea65 --- multimedia/av_codec/native_avcodec_base.h | 2 +- multimedia/av_codec/native_avdemuxer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 41e8edef5..07d54f76b 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -45,7 +45,7 @@ typedef struct NativeWindow OHNativeWindow; /** * @brief Forward declaration of OH_AVCodec. * - * @since 10 + * @since 9 */ typedef struct OH_AVCodec OH_AVCodec; diff --git a/multimedia/av_codec/native_avdemuxer.h b/multimedia/av_codec/native_avdemuxer.h index f2ccd837d..f3af8689a 100644 --- a/multimedia/av_codec/native_avdemuxer.h +++ b/multimedia/av_codec/native_avdemuxer.h @@ -44,7 +44,7 @@ typedef struct OH_AVDemuxer OH_AVDemuxer; /** * @brief Forward declaration of DRM_MediaKeySystemInfo. * - * @since 10 + * @since 11 */ typedef struct DRM_MediaKeySystemInfo DRM_MediaKeySystemInfo; typedef void (*DRM_MediaKeySystemInfoCallback)(DRM_MediaKeySystemInfo* mediaKeySystemInfo); -- Gitee From 5bc92ddaa27c241509011c4d19279335e8a68cdb Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 22:08:06 +0800 Subject: [PATCH 05/11] fix format Signed-off-by: y30025806 Change-Id: I9bf8ed08da8f71cf25b2bc38ffe20dfc607166af --- multimedia/av_codec/native_avcodec_videodecoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/av_codec/native_avcodec_videodecoder.h b/multimedia/av_codec/native_avcodec_videodecoder.h index 3b2e17c52..979a5c472 100644 --- a/multimedia/av_codec/native_avcodec_videodecoder.h +++ b/multimedia/av_codec/native_avcodec_videodecoder.h @@ -38,7 +38,7 @@ extern "C" { /** * @brief Forward declaration of MediaKeySession. * - * @since 10 + * @since 11 */ typedef struct MediaKeySession MediaKeySession; -- Gitee From 5062d3ffb256b62c25471c693d87aa9578c56ae1 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 22:10:13 +0800 Subject: [PATCH 06/11] fix format Signed-off-by: y30025806 Change-Id: I4b973ff607ba575ce496eab9461867dc1ee04dd4 --- multimedia/av_codec/native_avcodec_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 07d54f76b..ed3049f40 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -39,7 +39,7 @@ extern "C" { /** * @brief Forward declaration of OHNativeWindow. * - * @since 10 + * @since 9 */ typedef struct NativeWindow OHNativeWindow; /** -- Gitee From 1f501ab27fff8859cd938657b1f52f3081acb281 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 22:32:30 +0800 Subject: [PATCH 07/11] fix format Signed-off-by: y30025806 Change-Id: Id9b7ca3cdcabd2b699889a0ceddd9de14ad8ac0a --- multimedia/av_codec/native_avcodec_base.h | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index ed3049f40..0347e9662 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -188,45 +188,45 @@ typedef struct OH_AVDataSource { } OH_AVDataSource; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of video avc codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of audio aac codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of audio flac codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of audio vorbis codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of audio mpeg codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG; /** - * @brief Enumerates the MIME types of audio and video codecs. + * @brief Enumerates the mime types of video hevc codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; /** - * @brief Enumerates the types of audio and video muxer. + * @brief Enumerates the mime types of video mpeg4 muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @deprecated since 11 * @since 10 @@ -234,57 +234,57 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4; /** - * @brief Enumerates the types of audio and video muxer. + * @brief Enumerates the mime types of video jpg muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; /** - * @brief Enumerates the types of audio and video muxer. + * @brief Enumerates the mime types of video png muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; /** - * @brief Enumerates the types of audio and video muxer. + * @brief Enumerates the mime types of video bmp muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; /** - * @brief Enumerates the MIME types of audio codecs. + * @brief Enumerates the mime types of audio vivid codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VIVID; /** - * @brief Enumerates the MIME types of audio codecs. + * @brief Enumerates the mime types of audio amrnb codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_NB; /** - * @brief Enumerates the MIME types of audio codecs. + * @brief Enumerates the mime types of audio amrwb codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_WB; /** - * @brief Enumerates the MIME types of audio codecs. + * @brief Enumerates the mime types of audio opus codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_OPUS; /** - * @brief Enumerates the MIME types of audio codecs. + * @brief Enumerates the mime types of audio g711mu codecs. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_G711MU; /** - * @brief Enumerates the MIME type of audio low bitrate voice codec. + * @brief Enumerates the mime type of audio low bitrate voice codec. * * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 12 @@ -292,7 +292,7 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_G711MU; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_LBVC; /** - * @brief Enumerates the MIME type of audio ape codec. + * @brief Enumerates the mime type of audio ape codec. * * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 12 @@ -300,7 +300,7 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_LBVC; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_APE; /** - * @brief Enumerates the MIME type of subtitle. + * @brief Enumerates the mime type of subtitle srt. * * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 12 -- Gitee From 2ed2aa5a4f6e8809fd76502c72f41a1480f5e699 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Thu, 11 Jul 2024 22:46:19 +0800 Subject: [PATCH 08/11] fix format Signed-off-by: y30025806 Change-Id: I464c1eae0de5f2a7dd128efc9e7622ff19bf0729 --- multimedia/av_codec/native_avcodec_base.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 0347e9662..96d015028 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -188,38 +188,38 @@ typedef struct OH_AVDataSource { } OH_AVDataSource; /** - * @brief Enumerates the mime types of video avc codecs. + * @brief Enumerates the mime types of video avc codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC; /** - * @brief Enumerates the mime types of audio aac codecs. + * @brief Enumerates the mime types of audio aac codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC; /** - * @brief Enumerates the mime types of audio flac codecs. + * @brief Enumerates the mime types of audio flac codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; /** - * @brief Enumerates the mime types of audio vorbis codecs. + * @brief Enumerates the mime types of audio vorbis codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; /** - * @brief Enumerates the mime types of audio mpeg codecs. + * @brief Enumerates the mime types of audio mpeg codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG; /** - * @brief Enumerates the mime types of video hevc codecs. + * @brief Enumerates the mime types of video hevc codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ @@ -253,31 +253,31 @@ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; /** - * @brief Enumerates the mime types of audio vivid codecs. + * @brief Enumerates the mime types of audio vivid codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VIVID; /** - * @brief Enumerates the mime types of audio amrnb codecs. + * @brief Enumerates the mime types of audio amrnb codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_NB; /** - * @brief Enumerates the mime types of audio amrwb codecs. + * @brief Enumerates the mime types of audio amrwb codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AMR_WB; /** - * @brief Enumerates the mime types of audio opus codecs. + * @brief Enumerates the mime types of audio opus codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_OPUS; /** - * @brief Enumerates the mime types of audio g711mu codecs. + * @brief Enumerates the mime types of audio g711mu codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 11 */ -- Gitee From 0697d8a18c4d25ae1c4963466bfc970083f3a476 Mon Sep 17 00:00:00 2001 From: y30025806 Date: Fri, 12 Jul 2024 11:30:33 +0800 Subject: [PATCH 09/11] fix format Signed-off-by: y30025806 Change-Id: I0c22b393fa3ad3f6a8f38e1ee77a7f342e2fcb94 --- multimedia/av_codec/native_avcodec_base.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 96d015028..bd37b6532 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -213,7 +213,7 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; */ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; /** - * @brief Enumerates the mime types of audio mpeg codec. + * @brief Enumerates the mime types of audio mp3 codec. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ @@ -234,19 +234,19 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4; /** - * @brief Enumerates the mime types of video jpg muxer. + * @brief Enumerates the mime types of cover jpg muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; /** - * @brief Enumerates the mime types of video png muxer. + * @brief Enumerates the mime types of cover png muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; /** - * @brief Enumerates the mime types of video bmp muxer. + * @brief Enumerates the mime types of cover bmp muxer. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ @@ -369,7 +369,7 @@ extern const char *OH_MD_KEY_HEIGHT; */ extern const char *OH_MD_KEY_PIXEL_FORMAT; /** - * @brief key for audio raw format, value type is int32_t , see @AudioSampleFormat. + * @brief key for audio raw format, value type is int32_t , see @OH_BitsPerS1ample. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ -- Gitee From 9690c9f5e383da59442cfce98e6e674080a4c05c Mon Sep 17 00:00:00 2001 From: y30025806 Date: Fri, 12 Jul 2024 11:36:01 +0800 Subject: [PATCH 10/11] fix format Signed-off-by: y30025806 Change-Id: I75713d6ecf697fc0cd02273a585d58aa556f9a8b --- multimedia/av_codec/native_avcodec_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index bd37b6532..4e6fccafb 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -369,7 +369,7 @@ extern const char *OH_MD_KEY_HEIGHT; */ extern const char *OH_MD_KEY_PIXEL_FORMAT; /** - * @brief key for audio raw format, value type is int32_t , see @OH_BitsPerS1ample. + * @brief key for audio raw format, value type is int32_t , see @OH_BitsPerSample. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 9 */ -- Gitee From 07b3135018fea7a684af42573b73cd5b56b4f84a Mon Sep 17 00:00:00 2001 From: y30025806 Date: Fri, 12 Jul 2024 14:44:30 +0800 Subject: [PATCH 11/11] fix format Signed-off-by: y30025806 Change-Id: I68a90d70bae3b72daeff7867223e7d061f067efa --- multimedia/av_codec/native_avcodec_base.h | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 4e6fccafb..d273dd428 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -459,161 +459,138 @@ extern const char *OH_MD_KEY_REQUEST_I_FRAME; extern const char *OH_MD_KEY_QUALITY; /** * @brief Key of the codec specific data. value type is a uint8_t pointer. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_CODEC_CONFIG; /** * @brief source format Key for title, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_TITLE; /** * @brief source format Key for artist, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_ARTIST; /** * @brief source format Key for album, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_ALBUM; /** * @brief source format Key for album artist, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_ALBUM_ARTIST; /** * @brief source format Key for date, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_DATE; /** * @brief source format Key for comment, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_COMMENT; /** * @brief source format Key for genre, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_GENRE; /** * @brief source format Key for copyright, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_COPYRIGHT; /** * @brief source format Key for language, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_LANGUAGE; /** * @brief source format Key for description, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_DESCRIPTION; /** * @brief source format Key for lyrics, value type is string. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_LYRICS; /** * @brief source format Key for track count, value type is int32_t. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_TRACK_COUNT; /** * @brief Key for the desired encoding channel layout, value type is int64_t, this key is only supported for encoders. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_CHANNEL_LAYOUT; /** * @brief Key for bits per coded sample, value type is int32_t, supported for flac encoder, see @OH_BitsPerSample. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_BITS_PER_CODED_SAMPLE; /** * @brief Key for the aac format, value type is int32_t, supported for aac decoder. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_AAC_IS_ADTS; /** * @brief Key for aac sbr mode, value type is int32_t, supported for aac encoder. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_SBR; /** * @brief Key for flac compliance level, value type is int32_t. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_COMPLIANCE_LEVEL; /** * @brief Key for vorbis identification header, value type is a uint8_t pointer, supported only for vorbis decoder. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_IDENTIFICATION_HEADER; /** * @brief Key for vorbis setup header, value type is a uint8_t pointer, supported only for vorbis decoder. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_SETUP_HEADER; /** * @brief Key for video scale type, value type is int32_t, see @OH_ScalingMode. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_KEY_SCALING_MODE; /** * @brief Key for max input buffer count, value type is int32_t. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ extern const char *OH_MD_MAX_INPUT_BUFFER_COUNT; /** * @brief Key for max output buffer count, value type is int32_t. - * supported for encoders that are configured in constant quality mode. * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 10 */ -- Gitee