From 265f4a0114da8913277d8510559ccd76a9885565 Mon Sep 17 00:00:00 2001 From: li-jianchao1993 Date: Sat, 13 Jul 2024 17:37:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=20=E5=A2=9E=E5=8A=A0key=20SUBTITLE=5FWEBVTT?= =?UTF-8?q?=E5=92=8CVIDEO=5FVVC,=E6=9E=9A=E4=B8=BEMEDIA=5FTYPE=5FSUBTITLE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-jianchao1993 --- .../libnative_media_codecbase.ndk.json | 8 ++++++++ multimedia/av_codec/native_avcodec_base.h | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json index 186a6ed28..5dae4e574 100644 --- a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json +++ b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json @@ -71,6 +71,14 @@ "first_introduced": "12", "name": "OH_AVCODEC_MIMETYPE_SUBTITLE_SRT" }, + { + "first_introduced": "12", + "name": "OH_AVCODEC_MIMETYPE_SUBTITLE_WEBVTT" + }, + { + "first_introduced": "12", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_VVC" + }, { "first_introduced": "9", "name": "OH_ED_KEY_TIME_STAMP" diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index c3c5da64b..0c5de5245 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -253,6 +253,22 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_APE; */ extern const char *OH_AVCODEC_MIMETYPE_SUBTITLE_SRT; +/** + * @brief Enumerates the mime type of subtitle webvtt. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 12 + */ +extern const char *OH_AVCODEC_MIMETYPE_SUBTITLE_WEBVTT; + +/** + * @brief Enumerates the MIME type of versatile video coding. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 12 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VVC; + /** * @brief The extra data's key of surface Buffer * @syscap SystemCapability.Multimedia.Media.CodecBase @@ -623,6 +639,8 @@ typedef enum OH_MediaType { MEDIA_TYPE_AUD = 0, /* track is video. */ MEDIA_TYPE_VID = 1, + /* track is subtitle. */ + MEDIA_TYPE_SUBTITLE = 2, } OH_MediaType; /** -- Gitee From 8122ca41d774594dd0fd2a1bf10549f2d4094e23 Mon Sep 17 00:00:00 2001 From: li-jianchao1993 Date: Sat, 13 Jul 2024 18:37:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=20=E5=A2=9E=E5=8A=A0key=20VIDEO=5FDECODER=5F?= =?UTF-8?q?OUTPUT=5FCOLOR=5FSPACE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-jianchao1993 --- .../libnative_media_codecbase.ndk.json | 4 ++++ multimedia/av_codec/native_avcodec_base.h | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json index 5dae4e574..56ac1ed5f 100644 --- a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json +++ b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json @@ -493,5 +493,9 @@ { "first_introduced": "12", "name": "OH_AVCapability_GetFeatureProperties" + }, + { + "first_introduced": "12", + "name": "OH_MD_KEY_VIDEO_DECODER_OUTPUT_COLOR_SPACE" } ] diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 0c5de5245..6eff143ff 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -627,6 +627,22 @@ extern const char *OH_MD_KEY_VIDEO_SAR; * @since 12 */ extern const char *OH_MD_KEY_START_TIME; +/** + * @brief Key for setting the output color space of video decoder. The value type is int32_t. + * The supported value is {@link OH_COLORSPACE_BT709_LIMIT}, see {@link OH_NativeBuffer_ColorSpace}. It is used in + * {@link OH_VideoDecoder_Configure}. If the color space conversion capability is supported and this key is configured, + * the video decoder will automatically transcode an HDR Vivid video to an SDR video with color space BT709. + * If the value of this key is not configured as {@link OH_COLORSPACE_BT709_LIMIT}, {@link OH_VideoDecoder_Configure} + * returns @{link AV_ERR_INVALID_VAL}. + * If color space conversion capability is not supported, {@link OH_VideoDecoder_Configure} returns + * {@link AV_ERR_INVALID_VAL}. + * If the input video is not an HDR vivid video, an error {@link AV_ERR_UNSUPPORT} will be reported by callback + * function {@link OH_AVCodecOnError}. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 12 + */ +extern const char *OH_MD_KEY_VIDEO_DECODER_OUTPUT_COLOR_SPACE; /** * @brief Media type. -- Gitee From d7fd341605f880f5fb4e1fc980d2577ab1fdd99f Mon Sep 17 00:00:00 2001 From: li-jianchao1993 Date: Mon, 15 Jul 2024 21:43:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=20=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-jianchao1993 --- multimedia/av_codec/native_avcodec_base.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 6eff143ff..eaa835870 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -655,7 +655,9 @@ typedef enum OH_MediaType { MEDIA_TYPE_AUD = 0, /* track is video. */ MEDIA_TYPE_VID = 1, - /* track is subtitle. */ + /** track is subtitle. + * @since 12 + */ MEDIA_TYPE_SUBTITLE = 2, } OH_MediaType; -- Gitee