From a01beab3e8e087010724539dc50378af49575419 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Mon, 29 May 2023 21:28:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E5=8C=97=E5=90=91=E6=8E=A5=E5=8F=A3=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0codecName=E5=92=8CmimeType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- .../capi/avcodec/native_avcodec_base.cpp | 13 +++++++++++ interfaces/kits/c/native_avcodec_base.h | 23 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/frameworks/native/capi/avcodec/native_avcodec_base.cpp b/frameworks/native/capi/avcodec/native_avcodec_base.cpp index 8f3f2ae22..fdaf9ac67 100644 --- a/frameworks/native/capi/avcodec/native_avcodec_base.cpp +++ b/frameworks/native/capi/avcodec/native_avcodec_base.cpp @@ -23,10 +23,21 @@ const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC = "video/avc"; const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es"; const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC = "video/hevc"; const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm"; +const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC = "audio/flac"; +const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS = "audio/vorbis"; const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG = "audio/mpeg"; const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG = "image/jpeg"; const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG = "image/png"; const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP = "image/bmp"; + +const char *OH_AVCODEC_DECODER_NAME_MP3 = "OH.Media.Codec.Decoder.Audio.Mpeg"; +const char *OH_AVCODEC_DECODER_NAME_AAC = "OH.Media.Codec.Decoder.Audio.AAC"; +const char *OH_AVCODEC_DECODER_NAME_VORBIS = "OH.Media.Codec.Decoder.Audio.Vorbis"; +const char *OH_AVCODEC_DECODER_NAME_FLAC = "OH.Media.Codec.Decoder.Audio.Flac"; +const char *OH_AVCODEC_DECODER_NAME_AVC = "OH.Media.Codec.Decoder.Video.AVC"; +const char *OH_AVCODEC_ENCODER_NAME_FLAC = "OH.Media.Codec.Encoder.Audio.Flac"; +const char *OH_AVCODEC_ENCODER_NAME_AAC = "OH.Media.Codec.Encoder.Audio.AAC"; + const char *OH_ED_KEY_TIME_STAMP = "timeStamp"; const char *OH_ED_KEY_EOS = "endOfStream"; const char *OH_MD_KEY_TRACK_TYPE = "track_type"; @@ -66,6 +77,8 @@ const char *OH_MD_KEY_LANGUAGE = "language"; const char *OH_MD_KEY_DESCRIPTION = "description"; const char *OH_MD_KEY_LYRICS = "lyrics"; const char *OH_MD_KEY_TRACK_COUNT = "track_count"; + + #ifdef __cplusplus } #endif diff --git a/interfaces/kits/c/native_avcodec_base.h b/interfaces/kits/c/native_avcodec_base.h index bd803015d..61d8443e3 100644 --- a/interfaces/kits/c/native_avcodec_base.h +++ b/interfaces/kits/c/native_avcodec_base.h @@ -165,6 +165,29 @@ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; +/** + * @brief Enumerates the MIME types of audio and video codecs + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + * @version 1.0 + */ +extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; +extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; + +/** + * @brief Name of audio and video codecs + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 10 + * @version 1.0 + */ +extern const char *OH_AVCODEC_DECODER_NAME_MP3; +extern const char *OH_AVCODEC_DECODER_NAME_AAC; +extern const char *OH_AVCODEC_DECODER_NAME_VORBIS; +extern const char *OH_AVCODEC_DECODER_NAME_FLAC; +extern const char *OH_AVCODEC_DECODER_NAME_AVC; +extern const char *OH_AVCODEC_ENCODER_NAME_FLAC; +extern const char *OH_AVCODEC_ENCODER_NAME_AAC; + /** * @brief The extra data's key of surface Buffer * @syscap SystemCapability.Multimedia.Media.CodecBase -- Gitee From 4c0f7a96044c0de75c8585ec50768936a8c7fa16 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Mon, 29 May 2023 21:34:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- frameworks/native/capi/avcodec/native_avcodec_base.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/frameworks/native/capi/avcodec/native_avcodec_base.cpp b/frameworks/native/capi/avcodec/native_avcodec_base.cpp index fdaf9ac67..0a631c7f6 100644 --- a/frameworks/native/capi/avcodec/native_avcodec_base.cpp +++ b/frameworks/native/capi/avcodec/native_avcodec_base.cpp @@ -77,8 +77,6 @@ const char *OH_MD_KEY_LANGUAGE = "language"; const char *OH_MD_KEY_DESCRIPTION = "description"; const char *OH_MD_KEY_LYRICS = "lyrics"; const char *OH_MD_KEY_TRACK_COUNT = "track_count"; - - #ifdef __cplusplus } #endif -- Gitee From 27dd44c61f5ce058834f18602e852c5e0bea891c Mon Sep 17 00:00:00 2001 From: yangpeng Date: Mon, 29 May 2023 21:51:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- .../capi/avcodec/native_avcodec_base.cpp | 14 +++++----- interfaces/kits/c/native_avcodec_base.h | 26 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frameworks/native/capi/avcodec/native_avcodec_base.cpp b/frameworks/native/capi/avcodec/native_avcodec_base.cpp index 0a631c7f6..2364bd192 100644 --- a/frameworks/native/capi/avcodec/native_avcodec_base.cpp +++ b/frameworks/native/capi/avcodec/native_avcodec_base.cpp @@ -30,13 +30,13 @@ const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG = "image/jpeg"; const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG = "image/png"; const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP = "image/bmp"; -const char *OH_AVCODEC_DECODER_NAME_MP3 = "OH.Media.Codec.Decoder.Audio.Mpeg"; -const char *OH_AVCODEC_DECODER_NAME_AAC = "OH.Media.Codec.Decoder.Audio.AAC"; -const char *OH_AVCODEC_DECODER_NAME_VORBIS = "OH.Media.Codec.Decoder.Audio.Vorbis"; -const char *OH_AVCODEC_DECODER_NAME_FLAC = "OH.Media.Codec.Decoder.Audio.Flac"; -const char *OH_AVCODEC_DECODER_NAME_AVC = "OH.Media.Codec.Decoder.Video.AVC"; -const char *OH_AVCODEC_ENCODER_NAME_FLAC = "OH.Media.Codec.Encoder.Audio.Flac"; -const char *OH_AVCODEC_ENCODER_NAME_AAC = "OH.Media.Codec.Encoder.Audio.AAC"; +const char *OH_AVCODEC_DECODER_AUDIO_NAME_MP3 = "OH.Media.Codec.Decoder.Audio.Mpeg"; +const char *OH_AVCODEC_DECODER_AUDIO_NAME_AAC = "OH.Media.Codec.Decoder.Audio.AAC"; +const char *OH_AVCODEC_DECODER_AUDIO_NAME_VORBIS = "OH.Media.Codec.Decoder.Audio.Vorbis"; +const char *OH_AVCODEC_DECODER_AUDIO_NAME_FLAC = "OH.Media.Codec.Decoder.Audio.Flac"; +const char *OH_AVCODEC_DECODER_VIDEO_NAME_AVC = "OH.Media.Codec.Decoder.Video.AVC"; +const char *OH_AVCODEC_ENCODER_AUDIO_NAME_FLAC = "OH.Media.Codec.Encoder.Audio.Flac"; +const char *OH_AVCODEC_ENCODER_AUDIO_NAME_AAC = "OH.Media.Codec.Encoder.Audio.AAC"; const char *OH_ED_KEY_TIME_STAMP = "timeStamp"; const char *OH_ED_KEY_EOS = "endOfStream"; diff --git a/interfaces/kits/c/native_avcodec_base.h b/interfaces/kits/c/native_avcodec_base.h index 61d8443e3..615970dd8 100644 --- a/interfaces/kits/c/native_avcodec_base.h +++ b/interfaces/kits/c/native_avcodec_base.h @@ -157,13 +157,7 @@ typedef struct OH_AVCodecAsyncCallback { * @version 1.0 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_AVC; -extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4; -extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_AAC; -extern const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG; -extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; -extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; -extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; /** * @brief Enumerates the MIME types of audio and video codecs @@ -171,6 +165,12 @@ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; * @since 10 * @version 1.0 */ +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4; +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_HEVC; +extern const char *OH_AVCODEC_MIMETYPE_AUDIO_MPEG; +extern const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG; +extern const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG; +extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; @@ -180,13 +180,13 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; * @since 10 * @version 1.0 */ -extern const char *OH_AVCODEC_DECODER_NAME_MP3; -extern const char *OH_AVCODEC_DECODER_NAME_AAC; -extern const char *OH_AVCODEC_DECODER_NAME_VORBIS; -extern const char *OH_AVCODEC_DECODER_NAME_FLAC; -extern const char *OH_AVCODEC_DECODER_NAME_AVC; -extern const char *OH_AVCODEC_ENCODER_NAME_FLAC; -extern const char *OH_AVCODEC_ENCODER_NAME_AAC; +extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_MP3; +extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_AAC; +extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_VORBIS; +extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_FLAC; +extern const char *OH_AVCODEC_DECODER_VIDEO_NAME_AVC; +extern const char *OH_AVCODEC_ENCODER_AUDIO_NAME_FLAC; +extern const char *OH_AVCODEC_ENCODER_AUDIO_NAME_AAC; /** * @brief The extra data's key of surface Buffer -- Gitee From 292d93ec9dc02bbe9255391f392f587c13f0e6b6 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Mon, 29 May 2023 21:55:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91codecName=E4=B8=8D=E5=AF=B9=E5=A4=96=E6=9A=B4?= =?UTF-8?q?=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- .../native/capi/avcodec/native_avcodec_base.cpp | 8 -------- interfaces/kits/c/native_avcodec_base.h | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/frameworks/native/capi/avcodec/native_avcodec_base.cpp b/frameworks/native/capi/avcodec/native_avcodec_base.cpp index 2364bd192..115105bd6 100644 --- a/frameworks/native/capi/avcodec/native_avcodec_base.cpp +++ b/frameworks/native/capi/avcodec/native_avcodec_base.cpp @@ -30,14 +30,6 @@ const char *OH_AVCODEC_MIMETYPE_IMAGE_JPG = "image/jpeg"; const char *OH_AVCODEC_MIMETYPE_IMAGE_PNG = "image/png"; const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP = "image/bmp"; -const char *OH_AVCODEC_DECODER_AUDIO_NAME_MP3 = "OH.Media.Codec.Decoder.Audio.Mpeg"; -const char *OH_AVCODEC_DECODER_AUDIO_NAME_AAC = "OH.Media.Codec.Decoder.Audio.AAC"; -const char *OH_AVCODEC_DECODER_AUDIO_NAME_VORBIS = "OH.Media.Codec.Decoder.Audio.Vorbis"; -const char *OH_AVCODEC_DECODER_AUDIO_NAME_FLAC = "OH.Media.Codec.Decoder.Audio.Flac"; -const char *OH_AVCODEC_DECODER_VIDEO_NAME_AVC = "OH.Media.Codec.Decoder.Video.AVC"; -const char *OH_AVCODEC_ENCODER_AUDIO_NAME_FLAC = "OH.Media.Codec.Encoder.Audio.Flac"; -const char *OH_AVCODEC_ENCODER_AUDIO_NAME_AAC = "OH.Media.Codec.Encoder.Audio.AAC"; - const char *OH_ED_KEY_TIME_STAMP = "timeStamp"; const char *OH_ED_KEY_EOS = "endOfStream"; const char *OH_MD_KEY_TRACK_TYPE = "track_type"; diff --git a/interfaces/kits/c/native_avcodec_base.h b/interfaces/kits/c/native_avcodec_base.h index 615970dd8..101454d0e 100644 --- a/interfaces/kits/c/native_avcodec_base.h +++ b/interfaces/kits/c/native_avcodec_base.h @@ -174,20 +174,6 @@ extern const char *OH_AVCODEC_MIMETYPE_IMAGE_BMP; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_FLAC; extern const char *OH_AVCODEC_MIMETYPE_AUDIO_VORBIS; -/** - * @brief Name of audio and video codecs - * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 10 - * @version 1.0 - */ -extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_MP3; -extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_AAC; -extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_VORBIS; -extern const char *OH_AVCODEC_DECODER_AUDIO_NAME_FLAC; -extern const char *OH_AVCODEC_DECODER_VIDEO_NAME_AVC; -extern const char *OH_AVCODEC_ENCODER_AUDIO_NAME_FLAC; -extern const char *OH_AVCODEC_ENCODER_AUDIO_NAME_AAC; - /** * @brief The extra data's key of surface Buffer * @syscap SystemCapability.Multimedia.Media.CodecBase -- Gitee From 3316c90fc9dddba87365d19f271c6f695f29ad4b Mon Sep 17 00:00:00 2001 From: yangpeng Date: Tue, 30 May 2023 10:24:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E6=B7=BB=E5=8A=A0av=5Faudio=5Fencoder=5Fcapi?= =?UTF-8?q?=5Funit=5Ftest=20UT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index 5c65ce587..20ceeb511 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -30,6 +30,7 @@ group("av_codec_unit_test") { "unittest:av_audio_capi_unit_test", "unittest:av_audio_codecbase_unit_test", "unittest:av_audio_inner_unit_test", + "unittest:av_audio_encoder_capi_unit_test", "unittest:av_video_unit_test", "unittest/avcodec_test:acodec_capi_unit_test", "unittest/avcodec_test:vcodec_capi_unit_test", -- Gitee From 258a43bcae2049469dced783af9a217f94d6ea33 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Tue, 30 May 2023 12:36:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91gn=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 20ceeb511..7e7156198 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -29,8 +29,8 @@ group("av_codec_unit_test") { deps += [ "unittest:av_audio_capi_unit_test", "unittest:av_audio_codecbase_unit_test", - "unittest:av_audio_inner_unit_test", "unittest:av_audio_encoder_capi_unit_test", + "unittest:av_audio_inner_unit_test", "unittest:av_video_unit_test", "unittest/avcodec_test:acodec_capi_unit_test", "unittest/avcodec_test:vcodec_capi_unit_test", -- Gitee