mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2025-10-16 13:41:30 +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:
@@ -12,6 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "fastdeploy/utils/utils.h"
|
||||
#include "fastdeploy/vision/common/processors/utils.h"
|
||||
|
||||
namespace fastdeploy {
|
||||
@@ -40,7 +41,7 @@ FDDataType OpenCVDataTypeToFD(int type) {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef ENABLE_FALCONCV
|
||||
#ifdef ENABLE_FLYCV
|
||||
FDDataType FalconCVDataTypeToFD(fcv::FCVImageType type) {
|
||||
if (type == fcv::FCVImageType::GRAY_U8) {
|
||||
return FDDataType::UINT8;
|
||||
@@ -103,11 +104,11 @@ FDDataType FalconCVDataTypeToFD(fcv::FCVImageType type) {
|
||||
} else if (type == fcv::FCVImageType::GRAY_F64) {
|
||||
return FDDataType::FP64;
|
||||
}
|
||||
FDASSERT(false, "While calling FalconDataTypeToFD(), get unexpected type:" + std::to_string(int(type)) + ".");
|
||||
return FDDataType::UNKNOWN;
|
||||
FDASSERT(false, "While calling FalconDataTypeToFD(), get unexpected type:%d.", int(type));
|
||||
return FDDataType::UNKNOWN1;
|
||||
}
|
||||
|
||||
fcv::FCVImageType CreateFalconDataCVType(FDDataType type, int channel) {
|
||||
fcv::FCVImageType CreateFalconCVDataType(FDDataType type, int channel) {
|
||||
FDASSERT(channel == 1 || channel == 3 || channel == 4,
|
||||
"Only support channel be 1/3/4 in Falcon.");
|
||||
if (type == FDDataType::UINT8) {
|
||||
@@ -127,9 +128,19 @@ fcv::FCVImageType CreateFalconDataCVType(FDDataType type, int channel) {
|
||||
return fcv::FCVImageType::PACKAGE_BGRA_F32;
|
||||
}
|
||||
}
|
||||
FDASSERT(false, "Data type of " + Str(type) + " is not supported.");
|
||||
FDASSERT(false, "Data type of %s is not supported.", Str(type).c_str());
|
||||
return fcv::FCVImageType::PACKAGE_BGR_F32;
|
||||
}
|
||||
|
||||
fcv::Mat ConvertOpenCVMatToFalconCV(cv::Mat& im) {
|
||||
int type = im.type() % 8;
|
||||
// 0: uint8; 5: float32; 6: float64
|
||||
if (type != 0 && type != 5 && type != 6) {
|
||||
FDASSERT(false, "Only support type of uint8/float/double, but now it's %d.", im.type());
|
||||
}
|
||||
auto fcv_type = CreateFalconCVDataType(OpenCVDataTypeToFD(im.type()), im.channels());
|
||||
return fcv::Mat(im.cols, im.rows, fcv_type, im.ptr());
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user