From c7e79fec9ed656ffe248c8622288ce5f93762735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=BC=E6=AD=A4=E5=BD=BC=E6=AD=A4?= Date: Thu, 12 Dec 2024 09:39:54 +0800 Subject: [PATCH] add audio vivid demuxer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 彼此彼此 --- interface/inner_api/meta/meta.h | 2 ++ interface/inner_api/meta/meta_key.h | 5 ++++- src/meta/meta.cpp | 2 ++ tests/unittest/meta/meta_func_unit_test.cpp | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/inner_api/meta/meta.h b/interface/inner_api/meta/meta.h index 98ba3f73..993b1f71 100644 --- a/interface/inner_api/meta/meta.h +++ b/interface/inner_api/meta/meta.h @@ -224,6 +224,8 @@ public: tagCharSeq == Tag::AUDIO_AAC_LEVEL or tagCharSeq == Tag::AUDIO_MAX_INPUT_SIZE or tagCharSeq == Tag::AUDIO_MAX_OUTPUT_SIZE or + tagCharSeq == Tag::AUDIO_SOUNDBED_CHANNELS_NUMBER or + tagCharSeq == Tag::AUDIO_HOA_ORDER or tagCharSeq == Tag::VIDEO_WIDTH or tagCharSeq == Tag::VIDEO_HEIGHT or tagCharSeq == Tag::VIDEO_DELAY or diff --git a/interface/inner_api/meta/meta_key.h b/interface/inner_api/meta/meta_key.h index 75d535b9..562875be 100644 --- a/interface/inner_api/meta/meta_key.h +++ b/interface/inner_api/meta/meta_key.h @@ -150,7 +150,10 @@ public: "audio_object_number_key"; ///< Key for audio object number static constexpr const char OH_MD_KEY_AUDIO_VIVID_METADATA[] = "audio_vivid_metadata_key"; ///< Key for audio vivid metadata - + static constexpr const char AUDIO_SOUNDBED_CHANNELS_NUMBER[] = + "audio.soundbed.channels.number"; ///< Key for audio soundbed channels number + static constexpr const char AUDIO_HOA_ORDER[] = + "audio.hoa.order"; ///< Key for audio hoa order /* -------------------- video universal tag -------------------- */ static constexpr const char VIDEO_WIDTH[] = "width"; ///< video width static constexpr const char VIDEO_HEIGHT[] = "height"; ///< video height diff --git a/src/meta/meta.cpp b/src/meta/meta.cpp index bb93ef1f..22afbf70 100644 --- a/src/meta/meta.cpp +++ b/src/meta/meta.cpp @@ -286,6 +286,8 @@ static std::map g_metadataDefaultValueMap = { {Tag::AUDIO_MPEG_LAYER, defaultInt32}, {Tag::AUDIO_AAC_LEVEL, defaultInt32}, {Tag::AUDIO_OBJECT_NUMBER, defaultInt32}, + {Tag::AUDIO_SOUNDBED_CHANNELS_NUMBER, defaultInt32}, + {Tag::AUDIO_HOA_ORDER, defaultInt32}, {Tag::AUDIO_MAX_INPUT_SIZE, defaultInt32}, {Tag::AUDIO_MAX_OUTPUT_SIZE, defaultInt32}, {Tag::VIDEO_WIDTH, defaultInt32}, diff --git a/tests/unittest/meta/meta_func_unit_test.cpp b/tests/unittest/meta/meta_func_unit_test.cpp index e79f99bd..ff96d6bb 100644 --- a/tests/unittest/meta/meta_func_unit_test.cpp +++ b/tests/unittest/meta/meta_func_unit_test.cpp @@ -368,6 +368,8 @@ map testInt32Data = { {Tag::AUDIO_AAC_LEVEL, 12}, {Tag::AUDIO_MAX_INPUT_SIZE, 21}, {Tag::AUDIO_MAX_OUTPUT_SIZE, 32}, + {Tag::AUDIO_SOUNDBED_CHANNELS_NUMBER, 6}, + {Tag::AUDIO_HOA_ORDER, 6}, {Tag::VIDEO_WIDTH, 12}, {Tag::VIDEO_HEIGHT, 31}, {Tag::VIDEO_DELAY, 54}, -- Gitee