From a22a3fe0407a9c3c69afd6e91648c2d6f7038622 Mon Sep 17 00:00:00 2001 From: TianYuan Date: Mon, 13 Mar 2023 13:18:15 +0000 Subject: [PATCH] fix GetSegResult --- demos/TTSCppFrontend/src/front/front_interface.cpp | 12 ++++++------ demos/TTSCppFrontend/src/front/front_interface.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/TTSCppFrontend/src/front/front_interface.cpp b/demos/TTSCppFrontend/src/front/front_interface.cpp index 4f05f4b05..930570dac 100644 --- a/demos/TTSCppFrontend/src/front/front_interface.cpp +++ b/demos/TTSCppFrontend/src/front/front_interface.cpp @@ -213,11 +213,11 @@ int FrontEngineInterface::GenDict(const std::string &dict_file, } int FrontEngineInterface::GetSegResult( - std::vector> &seg, - std::vector &seg_words) { + std::vector> *seg, + std::vector *seg_words) { std::vector>::iterator iter; - for (iter = seg.begin(); iter != seg.end(); iter++) { - seg_words.push_back((*iter).first); + for (iter = seg->begin(); iter != seg->end(); iter++) { + seg_words->push_back((*iter).first); } return 0; } @@ -724,7 +724,7 @@ int FrontEngineInterface::MergeforModify( std::vector> &seg_word_type, std::vector> &modify_seg_word_type) { std::vector seg_result; - GetSegResult(seg_word_type, seg_result); + GetSegResult(&seg_word_type, &seg_result); LOG(INFO) << "Before merge, seg result is: " << limonp::Join(seg_result.begin(), seg_result.end(), "/"); @@ -736,7 +736,7 @@ int FrontEngineInterface::MergeforModify( modify_seg_word_type = MergeEr(modify_seg_word_type); seg_result = {}; - GetSegResult(modify_seg_word_type, seg_result); + GetSegResult(&modify_seg_word_type, &seg_result); LOG(INFO) << "After merge, seg result is: " << limonp::Join(seg_result.begin(), seg_result.end(), "/"); diff --git a/demos/TTSCppFrontend/src/front/front_interface.h b/demos/TTSCppFrontend/src/front/front_interface.h index 3628debaa..8479cec46 100644 --- a/demos/TTSCppFrontend/src/front/front_interface.h +++ b/demos/TTSCppFrontend/src/front/front_interface.h @@ -50,8 +50,8 @@ class FrontEngineInterface : public TextNormalizer { std::map &map); // 由 词+词性的分词结果转为仅包含词的结果 - int GetSegResult(std::vector> &seg, - std::vector &seg_words); + int GetSegResult(std::vector> *seg, + std::vector *seg_words); // 生成句子的音素,音调id。如果音素和音调未分开,则 toneids // 为空(fastspeech2),反之则不为空(speedyspeech)