fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 删除视频识别一个没用的参数

Browse Source
This commit is contained in:
MistEO
2023-04-27 23:36:49 +08:00
parent b6c9be5969
commit e465694bb5
3 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp
View File

@@ -28,12 +28,6 @@ bool asst::CombatRecordRecognitionTask::set_video_path(const std::filesystem::pa
return true;
}
bool asst::CombatRecordRecognitionTask::set_stage_name(const std::string& stage_name)
{
m_stage_name = stage_name;
return true;
}
bool asst::CombatRecordRecognitionTask::_run()
{
LogTraceFunction;
@@ -177,48 +171,46 @@ bool asst::CombatRecordRecognitionTask::analyze_stage()
{
LogTraceFunction;
if (m_stage_name.empty()) {
callback(AsstMsg::SubTaskStart, basic_info_with_what("OcrStage"));
callback(AsstMsg::SubTaskStart, basic_info_with_what("OcrStage"));
const auto stage_name_task_ptr = Task.get("BattleStageName");
const int skip_count = m_video_fps > m_stage_ocr_fps ? static_cast<int>(m_video_fps / m_stage_ocr_fps) - 1 : 0;
const auto stage_name_task_ptr = Task.get("BattleStageName");
const int skip_count = m_video_fps > m_stage_ocr_fps ? static_cast<int>(m_video_fps / m_stage_ocr_fps) - 1 : 0;
for (size_t i = m_formation_end_frame; i < m_video_frame_count; i += skip_frames(skip_count) + 1) {
cv::Mat frame;
*m_video_ptr >> frame;
if (frame.empty()) {
Log.error(i, "frame is empty");
callback(AsstMsg::SubTaskError, basic_info_with_what("OcrStage"));
return false;
}
cv::resize(frame, frame, cv::Size(), m_scale, m_scale, cv::INTER_AREA);
OcrWithPreprocessImageAnalyzer stage_analyzer(frame);
stage_analyzer.set_task_info(stage_name_task_ptr);
bool analyzed = stage_analyzer.analyze().has_value();
show_img(stage_analyzer);
if (!analyzed) {
// BattleImageAnalyzer battle_analyzer(frame);
// if (battle_analyzer.analyze()) {
// Log.error(i, "already start button, but still failed to analyze stage name");
// m_stage_ocr_end_frame = i;
// callback(AsstMsg::SubTaskError, basic_info_with_what("OcrStage"));
// return false;
// }
continue;
}
const std::string& text = stage_analyzer.get_result().text;
if (text.empty() || !Tile.find(text)) {
continue;
}
m_stage_name = text;
m_stage_ocr_end_frame = i;
break;
for (size_t i = m_formation_end_frame; i < m_video_frame_count; i += skip_frames(skip_count) + 1) {
cv::Mat frame;
*m_video_ptr >> frame;
if (frame.empty()) {
Log.error(i, "frame is empty");
callback(AsstMsg::SubTaskError, basic_info_with_what("OcrStage"));
return false;
}
cv::resize(frame, frame, cv::Size(), m_scale, m_scale, cv::INTER_AREA);
OcrWithPreprocessImageAnalyzer stage_analyzer(frame);
stage_analyzer.set_task_info(stage_name_task_ptr);
bool analyzed = stage_analyzer.analyze().has_value();
show_img(stage_analyzer);
if (!analyzed) {
// BattleImageAnalyzer battle_analyzer(frame);
// if (battle_analyzer.analyze()) {
// Log.error(i, "already start button, but still failed to analyze stage name");
// m_stage_ocr_end_frame = i;
// callback(AsstMsg::SubTaskError, basic_info_with_what("OcrStage"));
// return false;
// }
continue;
}
const std::string& text = stage_analyzer.get_result().text;
if (text.empty() || !Tile.find(text)) {
continue;
}
m_stage_name = text;
m_stage_ocr_end_frame = i;
break;
}
Log.info("Stage", m_stage_name);

1
src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.h
View File

@@ -24,7 +24,6 @@ namespace asst
virtual ~CombatRecordRecognitionTask() override = default;
bool set_video_path(const std::filesystem::path& path);
bool set_stage_name(const std::string& stage_name);
protected:
virtual bool _run() override;

2
src/MaaCore/Task/Interface/VideoRecognitionTask.cpp
View File

@@ -22,12 +22,10 @@ bool asst::VideoRecognitionTask::set_params(const json::value& params)
Log.error("No filename");
return false;
}
std::string stage_name = params.get("stage", "");
auto export_task_ptr = std::make_shared<CombatRecordRecognitionTask>(m_callback, m_inst, TaskType);
export_task_ptr->set_retry_times(0);
bool ret = export_task_ptr->set_video_path(utils::path(*filename_opt));
ret &= export_task_ptr->set_stage_name(stage_name);
if (!ret) {
return false;
}