From d536b312ec9900b479e927dab9977264e5a9c2dd Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Wed, 27 Aug 2025 18:31:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0av1/vp9/vp8/vc1/msvideo1/?= =?UTF-8?q?wmv3/mjpeg=E7=9A=84MIME/profile/level=E5=AE=9A=E4=B9=89=20Signe?= =?UTF-8?q?d-off-by:Wangwei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libnative_media_codecbase.ndk.json | 28 +++ multimedia/av_codec/native_avcodec_base.h | 232 ++++++++++++++++++ 2 files changed, 260 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 98f900d10a6..70a64bba5c6 100644 --- a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json +++ b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json @@ -95,6 +95,34 @@ "first_introduced": "17", "name": "OH_AVCODEC_MIMETYPE_VIDEO_H263" }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_AV1" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_VP9" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_VP8" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_VC1" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_MSVIDEO1" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_WMV3" + }, + { + "first_introduced": "22", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_MJPEG" + }, { "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 0042b76b4a2..f542609b87c 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -422,6 +422,62 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; +/** + * @brief Enumerates the MIME type of video av1 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AV1; + +/** + * @brief Enumerates the MIME type of video vp9 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP9; + +/** + * @brief Enumerates the MIME type of video VP8 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP8; + +/** + * @brief Enumerates the MIME type of video vc-1 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VC1; + +/** + * @brief Enumerates the MIME type of video msvideo1 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MSVIDEO1; + +/** + * @brief Enumerates the MIME type of video wmv3 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_WMV3; + +/** + * @brief Enumerates the MIME type of video mjpeg codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MJPEG; + /** * @brief Key for timeStamp in surface's extraData, value type is int64_t. * @@ -1389,6 +1445,54 @@ typedef enum OH_H263Profile { H263_PROFILE_VERSION_1_BACKWARD_COMPATIBILITY = 2, } OH_H263Profile; +/** + * @brief AV1 Profile + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_AV1Profile { + AV1_PROFILE_MAIN = 0, + AV1_PROFILE_HIGH = 1, + AV1_PROFILE_PROFESSIONAL = 2, +} OH_AV1Profile; + +/** + * @brief VP9 Profile + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_VP9Profile { + VP9_PROFILE_0 = 0, + VP9_PROFILE_1 = 1, + VP9_PROFILE_2 = 2, + VP9_PROFILE_3 = 3, +} OH_VP9Profile; + +/** + * @brief VC1 Profile + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_VC1Profile { + VC1_PROFILE_SIMPLE = 0, + VC1_PROFILE_MAIN = 1, + VC1_PROFILE_ADVANCED = 2, +} OH_VC1Profile; + +/** + * @brief WMV3 Profile + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_WMV3Profile { + WMV3_PROFILE_SIMPLE = 0, + WMV3_PROFILE_MAIN = 1, +} OH_WMV3Profile; + /** * @brief Enumerates the muxer output file format * @@ -1713,6 +1817,134 @@ typedef enum OH_H263Level { H263_LEVEL_70 = 7, } OH_H263Level; +/** + * @brief AV1 Level. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_AV1Level { + /** 2.0 level */ + AV1_LEVEL_20 = 0, + /** 2.1 level */ + AV1_LEVEL_21 = 1, + /** 2.2 level */ + AV1_LEVEL_22 = 2, + /** 2.3 level */ + AV1_LEVEL_23 = 3, + /** 3.0 level */ + AV1_LEVEL_30 = 4, + /** 3.1 level */ + AV1_LEVEL_31 = 5, + /** 3.2 level */ + AV1_LEVEL_32 = 6, + /** 3.3 level */ + AV1_LEVEL_33 = 7, + /** 4.0 level */ + AV1_LEVEL_40 = 8, + /** 4.1 level */ + AV1_LEVEL_41 = 9, + /** 4.2 level */ + AV1_LEVEL_42 = 10, + /** 4.3 level */ + AV1_LEVEL_43 = 11, + /** 5.0 level */ + AV1_LEVEL_50 = 12, + /** 5.1 level */ + AV1_LEVEL_51 = 13, + /** 5.2 level */ + AV1_LEVEL_52 = 14, + /** 5.3 level */ + AV1_LEVEL_53 = 15, + /** 6.0 level */ + AV1_LEVEL_60 = 16, + /** 6.1 level */ + AV1_LEVEL_61 = 17, + /** 6.2 level */ + AV1_LEVEL_62 = 18, + /** 6.3 level */ + AV1_LEVEL_63 = 19, + /** 7.0 level */ + AV1_LEVEL_70 = 20, + /** 7.1 level */ + AV1_LEVEL_71 = 21, + /** 7.2 level */ + AV1_LEVEL_72 = 22, + /** 7.3 level */ + AV1_LEVEL_73 = 23, +} OH_AV1Level; + +/** + * @brief VP9 Level. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_VP9Level { + /** 1 level */ + VP9_LEVEL_1 = 0, + /** 1.1 level */ + VP9_LEVEL_11 = 1, + /** 2 level */ + VP9_LEVEL_2 = 2, + /** 2.1 level */ + VP9_LEVEL_21 = 3, + /** 3 level */ + VP9_LEVEL_3 = 4, + /** 3.1 level */ + VP9_LEVEL_31 = 5, + /** 4 level */ + VP9_LEVEL_4 = 6, + /** 4.1 level */ + VP9_LEVEL_41 = 7, + /** 5 level */ + VP9_LEVEL_5 = 8, + /** 5.1 level */ + VP9_LEVEL_51 = 9, + /** 5.2 level */ + VP9_LEVEL_52 = 10, + /** 6 level */ + VP9_LEVEL_6 = 11, + /** 6.1 level */ + VP9_LEVEL_61 = 12, + /** 6.2 level */ + VP9_LEVEL_62 = 13, +} OH_VP9Level; + +/** + * @brief VC1 Level. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_VC1Level { + /** L0 level */ + VC1_LEVEL_L0 = 0, + /** L1 level */ + VC1_LEVEL_L1 = 1, + /** L2 level */ + VC1_LEVEL_L2 = 2, + /** L3 level */ + VC1_LEVEL_L3 = 3, + /** L4 level */ + VC1_LEVEL_L4 = 4, +} OH_VC1Level; + +/** + * @brief WMV3 Level. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 22 + */ +typedef enum OH_WMV3Level { + /** LOW level */ + WMV3_LEVEL_LOW = 0, + /** MEDIUM level */ + WMV3_LEVEL_MEDIUM = 1, + /** HIGH level */ + WMV3_LEVEL_HIGH = 2, +} OH_WMV3Level; + /** * @brief The reference mode in temporal group of picture. * -- Gitee From b74e1e101174959c32705a75ab1f917d8d14d2ae Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Thu, 28 Aug 2025 16:54:15 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=20Sign?= =?UTF-8?q?ed-off-by:Wangwei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multimedia/av_codec/native_avcodec_base.h | 36 ++++++++++------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index f542609b87c..92297347a95 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -425,7 +425,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; /** * @brief Enumerates the MIME type of video av1 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AV1; @@ -433,7 +432,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AV1; /** * @brief Enumerates the MIME type of video vp9 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP9; @@ -441,7 +439,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP9; /** * @brief Enumerates the MIME type of video VP8 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP8; @@ -449,7 +446,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP8; /** * @brief Enumerates the MIME type of video vc-1 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VC1; @@ -457,7 +453,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VC1; /** * @brief Enumerates the MIME type of video msvideo1 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MSVIDEO1; @@ -465,7 +460,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MSVIDEO1; /** * @brief Enumerates the MIME type of video wmv3 codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_WMV3; @@ -473,7 +467,6 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_WMV3; /** * @brief Enumerates the MIME type of video mjpeg codec. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MJPEG; @@ -1452,8 +1445,11 @@ typedef enum OH_H263Profile { * @since 22 */ typedef enum OH_AV1Profile { + /** Main profile */ AV1_PROFILE_MAIN = 0, + /** High profile */ AV1_PROFILE_HIGH = 1, + /** Professional profile */ AV1_PROFILE_PROFESSIONAL = 2, } OH_AV1Profile; @@ -1464,9 +1460,13 @@ typedef enum OH_AV1Profile { * @since 22 */ typedef enum OH_VP9Profile { + /** 0 profile */ VP9_PROFILE_0 = 0, + /** 1 profile */ VP9_PROFILE_1 = 1, + /** 2 profile */ VP9_PROFILE_2 = 2, + /** 3 profile */ VP9_PROFILE_3 = 3, } OH_VP9Profile; @@ -1477,8 +1477,11 @@ typedef enum OH_VP9Profile { * @since 22 */ typedef enum OH_VC1Profile { + /** Simple profile */ VC1_PROFILE_SIMPLE = 0, + /** Main profile */ VC1_PROFILE_MAIN = 1, + /** Advanced profile */ VC1_PROFILE_ADVANCED = 2, } OH_VC1Profile; @@ -1489,7 +1492,9 @@ typedef enum OH_VC1Profile { * @since 22 */ typedef enum OH_WMV3Profile { + /** Advanced profile */ WMV3_PROFILE_SIMPLE = 0, + /** Advanced profile */ WMV3_PROFILE_MAIN = 1, } OH_WMV3Profile; @@ -1928,22 +1933,13 @@ typedef enum OH_VC1Level { VC1_LEVEL_L3 = 3, /** L4 level */ VC1_LEVEL_L4 = 4, -} OH_VC1Level; - -/** - * @brief WMV3 Level. - * - * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 22 - */ -typedef enum OH_WMV3Level { /** LOW level */ - WMV3_LEVEL_LOW = 0, + VC1_LEVEL_LOW = 5, /** MEDIUM level */ - WMV3_LEVEL_MEDIUM = 1, + VC1_LEVEL_MEDIUM = 6, /** HIGH level */ - WMV3_LEVEL_HIGH = 2, -} OH_WMV3Level; + VC1_LEVEL_HIGH = 7, +} OH_VC1Level; /** * @brief The reference mode in temporal group of picture. -- Gitee From c4e91e77ac6ae6f549b7888b6d176f9ed280b576 Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Thu, 28 Aug 2025 16:57:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=20Sign?= =?UTF-8?q?ed-off-by:Wangwei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multimedia/av_codec/native_avcodec_base.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 92297347a95..5bd9320e5cc 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -1825,7 +1825,6 @@ typedef enum OH_H263Level { /** * @brief AV1 Level. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_AV1Level { @@ -1882,7 +1881,6 @@ typedef enum OH_AV1Level { /** * @brief VP9 Level. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_VP9Level { @@ -1919,7 +1917,6 @@ typedef enum OH_VP9Level { /** * @brief VC1 Level. * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_VC1Level { -- Gitee From 29bdbc34e468ef9c513aed4ca63b43181d36669b Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Thu, 28 Aug 2025 19:19:02 +0800 Subject: [PATCH 4/8] wm3 level add Signed-off-by:Wangwei --- multimedia/av_codec/native_avcodec_base.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 5bd9320e5cc..afd0f7883a6 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -1938,6 +1938,20 @@ typedef enum OH_VC1Level { VC1_LEVEL_HIGH = 7, } OH_VC1Level; +/** + * @brief WMV3 Level. + * + * @since 22 + */ +typedef enum OH_WMV3Level { + /** LOW level */ + WMV3_LEVEL_LOW = 0, + /** MEDIUM level */ + WMV3_LEVEL_MEDIUM = 1, + /** HIGH level */ + WMV3_LEVEL_HIGH = 2, +} OH_WMV3Level; + /** * @brief The reference mode in temporal group of picture. * -- Gitee From 1dca56687b15875301b3e2835080bf171160d5f0 Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Thu, 28 Aug 2025 19:26:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A=20Sign?= =?UTF-8?q?ed-off-by:Wangwei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multimedia/av_codec/native_avcodec_base.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index afd0f7883a6..c72f72a7604 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -1441,7 +1441,6 @@ typedef enum OH_H263Profile { /** * @brief AV1 Profile * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_AV1Profile { @@ -1456,7 +1455,6 @@ typedef enum OH_AV1Profile { /** * @brief VP9 Profile * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_VP9Profile { @@ -1473,7 +1471,6 @@ typedef enum OH_VP9Profile { /** * @brief VC1 Profile * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_VC1Profile { @@ -1488,7 +1485,6 @@ typedef enum OH_VC1Profile { /** * @brief WMV3 Profile * - * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 22 */ typedef enum OH_WMV3Profile { -- Gitee From d8a84ca1fd08bd2518fb477bccc815bd7c1b9fe8 Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Fri, 19 Sep 2025 12:10:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9vc1=20advanced=20profile?= =?UTF-8?q?=20Signed-off-by:Wangwei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multimedia/av_codec/native_avcodec_base.h | 32 ++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index c72f72a7604..ce76cfb7326 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -423,14 +423,14 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; /** - * @brief Enumerates the MIME type of video av1 codec. + * @brief Enumerates the MIME type of video AV1 codec. * * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AV1; /** - * @brief Enumerates the MIME type of video vp9 codec. + * @brief Enumerates the MIME type of video VP9 codec. * * @since 22 */ @@ -444,28 +444,28 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP9; extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VP8; /** - * @brief Enumerates the MIME type of video vc-1 codec. + * @brief Enumerates the MIME type of video VC-1 codec. * * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_VC1; /** - * @brief Enumerates the MIME type of video msvideo1 codec. + * @brief Enumerates the MIME type of video MS VIDEO1 codec. * * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MSVIDEO1; /** - * @brief Enumerates the MIME type of video wmv3 codec. + * @brief Enumerates the MIME type of video WMV3 codec. * * @since 22 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_WMV3; /** - * @brief Enumerates the MIME type of video mjpeg codec. + * @brief Enumerates the MIME type of video MJPEG codec. * * @since 22 */ @@ -1916,6 +1916,20 @@ typedef enum OH_VP9Level { * @since 22 */ typedef enum OH_VC1Level { + /** LOW level */ + VC1_LEVEL_LOW = 0, + /** MEDIUM level */ + VC1_LEVEL_MEDIUM = 1, + /** HIGH level */ + VC1_LEVEL_HIGH = 2, +} OH_VC1Level; + +/** + * @brief VC1 Advanced Profile Level. + * + * @since 22 + */ +typedef enum OH_VC1AdvancedLevel { /** L0 level */ VC1_LEVEL_L0 = 0, /** L1 level */ @@ -1926,12 +1940,6 @@ typedef enum OH_VC1Level { VC1_LEVEL_L3 = 3, /** L4 level */ VC1_LEVEL_L4 = 4, - /** LOW level */ - VC1_LEVEL_LOW = 5, - /** MEDIUM level */ - VC1_LEVEL_MEDIUM = 6, - /** HIGH level */ - VC1_LEVEL_HIGH = 7, } OH_VC1Level; /** -- Gitee From f3bfddca6fd5b6ecd6fd5825e7eefec7d46c4f27 Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Mon, 22 Sep 2025 09:13:41 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9vc1=20advanced=20profile?= =?UTF-8?q?=20Signed-off-by:Ulimax=5F001@163.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 ce76cfb7326..aba1efd8afb 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -1940,7 +1940,7 @@ typedef enum OH_VC1AdvancedLevel { VC1_LEVEL_L3 = 3, /** L4 level */ VC1_LEVEL_L4 = 4, -} OH_VC1Level; +} OH_VC1AdvancedLevel; /** * @brief WMV3 Level. -- Gitee From e318d351077748ce6f33d1e647cfb0e1819426ae Mon Sep 17 00:00:00 2001 From: ulimax_001 Date: Tue, 23 Sep 2025 15:54:26 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=9B=9E=E9=80=80vc1=E7=9A=84level=20Signe?= =?UTF-8?q?d-off-by:Ulimax=5F001@163.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- multimedia/av_codec/native_avcodec_base.h | 30 +++++++++-------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index aba1efd8afb..1c05c6133f5 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -1469,7 +1469,7 @@ typedef enum OH_VP9Profile { } OH_VP9Profile; /** - * @brief VC1 Profile + * @brief VC-1 Profile * * @since 22 */ @@ -1488,9 +1488,9 @@ typedef enum OH_VC1Profile { * @since 22 */ typedef enum OH_WMV3Profile { - /** Advanced profile */ + /** Simple profile */ WMV3_PROFILE_SIMPLE = 0, - /** Advanced profile */ + /** Main profile */ WMV3_PROFILE_MAIN = 1, } OH_WMV3Profile; @@ -1911,25 +1911,11 @@ typedef enum OH_VP9Level { } OH_VP9Level; /** - * @brief VC1 Level. + * @brief VC-1 Level. * * @since 22 */ typedef enum OH_VC1Level { - /** LOW level */ - VC1_LEVEL_LOW = 0, - /** MEDIUM level */ - VC1_LEVEL_MEDIUM = 1, - /** HIGH level */ - VC1_LEVEL_HIGH = 2, -} OH_VC1Level; - -/** - * @brief VC1 Advanced Profile Level. - * - * @since 22 - */ -typedef enum OH_VC1AdvancedLevel { /** L0 level */ VC1_LEVEL_L0 = 0, /** L1 level */ @@ -1940,7 +1926,13 @@ typedef enum OH_VC1AdvancedLevel { VC1_LEVEL_L3 = 3, /** L4 level */ VC1_LEVEL_L4 = 4, -} OH_VC1AdvancedLevel; + /** LOW level */ + VC1_LEVEL_LOW = 5, + /** MEDIUM level */ + VC1_LEVEL_MEDIUM = 6, + /** HIGH level */ + VC1_LEVEL_HIGH = 7, +} OH_VC1Level; /** * @brief WMV3 Level. -- Gitee