mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2026-04-29 03:40:11 +08:00
[Model] Integrate FlyCV image processing library (#375)
* Add falcon cmake * Update CMakeLists.txt * Add implementation for more preprocessors * Add more implementation * Add more implementations by flycv * Fix some name * fix some bug * ready to test * add fuse * fix fuse problem * add debug code * add debug * [Android] integrate flycv to Android (#459) * [Android] integrate flycv into Andorid * Falconcv (#27) * [Bug Fix ]Update ppseg visualize python api && demo (#454) Update ppseg visualize python api && demo * [Model] update pptracking letterboxresize and add some comment (#438) * add override mark * delete some * recovery * recovery * add tracking * add tracking py_bind and example * add pptracking * add pptracking * iomanip head file * add opencv_video lib * add python libs package Signed-off-by: ChaoII <849453582@qq.com> * complete comments Signed-off-by: ChaoII <849453582@qq.com> * add jdeTracker_ member variable Signed-off-by: ChaoII <849453582@qq.com> * add 'FASTDEPLOY_DECL' macro Signed-off-by: ChaoII <849453582@qq.com> * remove kwargs params Signed-off-by: ChaoII <849453582@qq.com> * [Doc]update pptracking docs * delete 'ENABLE_PADDLE_FRONTEND' switch * add pptracking unit test * update pptracking unit test Signed-off-by: ChaoII <849453582@qq.com> * modify test video file path and remove trt test * update unit test model url * remove 'FASTDEPLOY_DECL' macro Signed-off-by: ChaoII <849453582@qq.com> * fix build python packages about pptracking on win32 Signed-off-by: ChaoII <849453582@qq.com> * update comment Signed-off-by: ChaoII <849453582@qq.com> * add pptracking model explain Signed-off-by: ChaoII <849453582@qq.com> Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> * [cmake] optimize examples CMakeLists.txt Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> * remove debug log * remove function * remove function Signed-off-by: ChaoII <849453582@qq.com> Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: ChaoII <849453582@qq.com>
This commit is contained in:
@@ -32,7 +32,7 @@ bool LimitShort::ImplByOpenCV(Mat* mat) {
|
||||
if (target != im_size_min) {
|
||||
scale = static_cast<double>(target) / static_cast<double>(im_size_min);
|
||||
}
|
||||
if (scale > 0) {
|
||||
if (fabs(scale - 1.0) > 1e-06) {
|
||||
cv::resize(*im, *im, cv::Size(), scale, scale, interp_);
|
||||
mat->SetWidth(im->cols);
|
||||
mat->SetHeight(im->rows);
|
||||
@@ -40,6 +40,47 @@ bool LimitShort::ImplByOpenCV(Mat* mat) {
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_FLYCV
|
||||
bool LimitShort::ImplByFalconCV(Mat* mat) {
|
||||
fcv::Mat* im = mat->GetFalconCVMat();
|
||||
int origin_w = im->width();
|
||||
int origin_h = im->height();
|
||||
int im_size_min = std::min(origin_w, origin_h);
|
||||
int target = im_size_min;
|
||||
if (max_short_ > 0 && im_size_min > max_short_) {
|
||||
target = max_short_;
|
||||
} else if (min_short_ > 0 && im_size_min < min_short_) {
|
||||
target = min_short_;
|
||||
}
|
||||
double scale = -1.f;
|
||||
if (target != im_size_min) {
|
||||
scale = static_cast<double>(target) / static_cast<double>(im_size_min);
|
||||
}
|
||||
if (fabs(scale - 1.0) > 1e-06) {
|
||||
auto interp_method = fcv::InterpolationType::INTER_LINEAR;
|
||||
if (interp_ == 0) {
|
||||
interp_method = fcv::InterpolationType::INTER_NEAREST;
|
||||
} else if (interp_ == 1) {
|
||||
interp_method = fcv::InterpolationType::INTER_LINEAR;
|
||||
} else if (interp_ == 2) {
|
||||
interp_method = fcv::InterpolationType::INTER_CUBIC;
|
||||
} else {
|
||||
FDERROR << "LimitLong: Only support interp_ be 0/1/2 with FalconCV, but "
|
||||
"now it's "
|
||||
<< interp_ << "." << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
fcv::Mat new_im;
|
||||
fcv::resize(*im, new_im, fcv::Size(), scale, scale, interp_method);
|
||||
mat->SetMat(new_im);
|
||||
mat->SetWidth(new_im.width());
|
||||
mat->SetHeight(new_im.height());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool LimitShort::Run(Mat* mat, int max_short, int min_short, int interp, ProcLib lib) {
|
||||
auto l = LimitShort(max_short, min_short, interp);
|
||||
return l(mat, lib);
|
||||
|
||||
Reference in New Issue
Block a user