fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: OCR小细节优化

Browse Source
This commit is contained in:
MistEO
2022-12-02 18:06:39 +08:00
parent 5424776536
commit d44cc3ceeb
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/MaaCore/Config/Miscellaneous/OcrPack.cpp
View File

@@ -118,29 +118,19 @@ std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat& image, const
bool without_det, bool trim)
{
std::string class_type = utils::demangle(typeid(*this).name());
// 如果是带 ROI 的 cv::Mat, data 仍是指向完整的图片数据，仅通过内部的一些其他参数标识 ROI
// 直接取 data 拿到的不是正确的图，所以拷贝一份出来
cv::Mat copied = image.clone();
fastdeploy::vision::OCRResult ocr_result;
if (!without_det) {
LogTraceScope("Ocr System with " + class_type);
LogTraceScope("Ocr Pipeline with " + class_type);
cv::Mat copied = image;
m_ocr->Predict(&copied, &ocr_result);
}
else {
LogTraceScope("Ocr Rec with " + class_type);
std::vector rec_imgs = { std::move(copied) };
std::vector<std::string> rec_texts;
std::vector<float> rec_scores;
m_rec->BatchPredict(rec_imgs, &rec_texts, &rec_scores);
if (!rec_texts.empty()) {
ocr_result.text.emplace_back(std::move(rec_texts.front()));
}
if (!rec_scores.empty()) {
ocr_result.rec_scores.emplace_back(rec_scores.front());
}
m_rec->BatchPredict({ image }, &rec_texts, &rec_scores);
ocr_result.text = std::move(rec_texts);
ocr_result.rec_scores = std::move(rec_scores);
}
#ifdef ASST_DEBUG

9
src/MaaCore/Task/Interface/DebugTask.cpp
View File

@@ -6,13 +6,12 @@
// #include "Plugin/RoguelikeSkillSelectionTaskPlugin.h"
#include "Vision/Miscellaneous/DepotImageAnalyzer.h"
#include "Vision/Roguelike/StageDropsImageAnalyzer.h"
#include "Utils/ImageIo.hpp"
#include "Utils/Logger.hpp"
#include "Vision/Miscellaneous/DepotImageAnalyzer.h"
#include "Vision/Roguelike/StageDropsImageAnalyzer.h"
asst::DebugTask::DebugTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType)
asst::DebugTask::DebugTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType)
{
////auto task_ptr = std::make_shared<RoguelikeSkillSelectionTaskPlugin>(callback, inst, TaskType);
// auto task_ptr = std::make_shared<StageDropsTaskPlugin>(callback, inst, TaskType);
@@ -23,7 +22,7 @@ bool asst::DebugTask::run()
{
size_t total = 0;
size_t success = 0;
for (const auto& entry : std::filesystem::directory_iterator("../../test/drops/screenshots/ja_jp")) {
for (const auto& entry : std::filesystem::directory_iterator("../../test/drops/screenshots/zh_cn")) {
cv::Mat image = asst::imread(entry.path());
if (image.empty()) {
continue;