Commit 0331ce23 authored by zzx's avatar zzx

1.新增不规则裁剪接口

parent 39527c30
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -152,6 +152,8 @@ int CommonTools::upload_file1(const char* url, const char* fileName1, const char
curl_formadd(&post, &last, CURLFORM_PTRNAME, "file2", CURLFORM_FILE, fileName2, CURLFORM_FILENAME, res[1].c_str(), CURLFORM_END);
curl_formadd(&post, &last, CURLFORM_PTRNAME, "file3", CURLFORM_FILE, fileName3, CURLFORM_FILENAME, res[2].c_str(), CURLFORM_END);
curl_formadd(&post, &last, CURLFORM_PTRNAME,"type", CURLFORM_PTRCONTENTS, res[3].c_str(), CURLFORM_END);
curl_formadd(&post, &last, CURLFORM_PTRNAME, "tenantName", CURLFORM_PTRCONTENTS, res[4].c_str(), CURLFORM_END);
curl_formadd(&post, &last, CURLFORM_PTRNAME, "posNum", CURLFORM_PTRCONTENTS, res[5].c_str(), CURLFORM_END);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, post); //构造post参数
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 3);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); //绑定相应
......
......@@ -25,7 +25,6 @@ public:
static int download_file(const char* url, const char outfilename[FILENAME_MAX]);
// 文件上传
static int upload_file(const char* url, const char* fileName, string& response);
static int upload_file1(const char* url, const char* fileName1, const char* fileName2, const char* fileName3, vector<string>& res, string& response);
// http get 请求
static CURLcode HttpGet(const std::string& strUrl, std::string& strResponse, int nTimeout);
// htpp post 请求
......@@ -33,4 +32,5 @@ public:
// htpp put 请求
static CURLcode HttpPut(const std::string& strUrl, std::string szJson, std::string& strResponse, int nTimeout);
static CURLcode HttpDelete(const std::string& strUrl, std::string& strResponse, int nTimeout);
static int upload_file1(const char* url, const char* fileName1, const char* fileName2, const char* fileName3, vector<string>& res, string& response);
};
\ No newline at end of file
......@@ -63,4 +63,5 @@ BOOL DeleteDirectory(const char* DirName)
return FALSE;
}
return TRUE;
}
\ No newline at end of file
}
No preview for this file type
No preview for this file type
No preview for this file type
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\vc142.pdb
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmacekg-x86.obj
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\dllmain.obj
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\cppsqlite3.obj
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\commontools.obj
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\characterconversion.obj
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll-x86.res
c:\users\1\documents\fresh-plug-ins-dll-new\bin\x86\wmacekg-x86.dll
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\cl.command.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\cl.read.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\cl.write.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\link.command.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\link.read.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\link.write.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\rc.command.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\rc.read.1.tlog
c:\users\1\documents\fresh-plug-ins-dll-new\release\x86\wmai-dll.tlog\rc.write.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\vc142.pdb
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmacekg-x86.obj
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\dllmain.obj
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\cppsqlite3.obj
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\commontools.obj
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\characterconversion.obj
c:\users\zhxx\desktop\work\fresh-plug-ins\bin\x86\wmacekg-x86.dll
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmacekg-x86.ipdb
c:\users\zhxx\desktop\work\fresh-plug-ins\bin\x86\wmacekg-x86.pdb
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmacekg-x86.iobj
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll-x86.res
c:\users\zhxx\desktop\work\fresh-plug-ins\bin\x86\wmacekg-x86.lib
c:\users\zhxx\desktop\work\fresh-plug-ins\bin\x86\wmacekg-x86.exp
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\cl.command.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\cl.read.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\cl.write.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\link.command.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\link.read.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\link.write.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\rc.command.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\rc.read.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\rc.write.1.tlog
c:\users\zhxx\desktop\work\fresh-plug-ins\release\x86\wmai-dll.tlog\wmai-dll.write.1u.tlog
......@@ -2,7 +2,7 @@
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\Users\1\Documents\fresh-plug-ins-dll-new\bin\x86\WmAceKG-x86.dll</FullPath>
<FullPath>C:\Users\zhxx\Desktop\work\fresh-plug-ins\bin\x86\WmAceKG-x86.dll</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
This diff is collapsed.
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\CHARACTERCONVERSION.CPP
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\CHARACTERCONVERSION.CPP
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\CHARACTERCONVERSION.CPP|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\COMMONTOOLS.CPP|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\CPPSQLITE3.CPP|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\DLLMAIN.CPP|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\WMACEKG-X86.CPP
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CHARACTERCONVERSION.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\COMMONTOOLS.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CPPSQLITE3.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\DLLMAIN.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMACEKG-X86.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMAI-DLL-X86.RES
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CHARACTERCONVERSION.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\COMMONTOOLS.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CPPSQLITE3.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\DLLMAIN.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMACEKG-X86.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMAI-DLL-X86.RES
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CHARACTERCONVERSION.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\COMMONTOOLS.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\CPPSQLITE3.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\DLLMAIN.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMACEKG-X86.OBJ|C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\RELEASE\X86\WMAI-DLL-X86.RES
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\WMAI-DLL-X86.RC
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\WMAI-DLL-X86.RC
......
B^C:\USERS\ZHXX\DESKTOP\WORK\FRESH-PLUG-INS\WMAI-DLL-X86.RC
......
PlatformToolSet=v142:VCToolArchitecture=Native64Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
Release|Win32|C:\Users\1\Documents\fresh-plug-ins-dll-new\|
Release|Win32|C:\Users\zhxx\Desktop\work\fresh-plug-ins\|
B^C:\Users\zhxx\Desktop\work\fresh-plug-ins\wmai-dll-x86.vcxproj
......
This diff is collapsed.
......@@ -130,7 +130,7 @@ extern "C" {
extern WMAI_EXPORT int WMAI_API Init(char* path);
extern WMAI_EXPORT int WMAI_API RealTimeDetect(char* code , char* sessionId, bool &state );
extern WMAI_EXPORT int WMAI_API RealTimeDetect(char* code , char* sessionId, int &state );
/// <summary>
/// 保存未识别的商品
/// </summary>
......@@ -240,7 +240,7 @@ extern "C" {
/// 测试加载5万个向量
/// </summary>
/// <returns>0:正常,非0:异常</returns>
extern WMAI_EXPORT int WMAI_API Test50000(char* code,char* path);
extern WMAI_EXPORT int WMAI_API QuickLearn(char* code,char* path);
/// <summary>
/// 视频流识别
......@@ -273,19 +273,21 @@ extern "C" {
extern WMAI_EXPORT int WMAI_API SetLogoCoordinate(int x1, int y1, int width1, int height1);
extern WMAI_EXPORT int WMAI_API inputPluToDetect(char* code, char* sessionId);
extern WMAI_EXPORT int WMAI_API InputPluToDetect(char* code, char* sessionId);
extern WMAI_EXPORT int WMAI_API getDetectImage(char* path);
extern WMAI_EXPORT int WMAI_API GetDetectImage(char* path);
extern WMAI_EXPORT bool WMAI_API judgeScanTheCode();
extern WMAI_EXPORT bool WMAI_API JudgeScanTheCode();
extern WMAI_EXPORT bool WMAI_API getInitResults();
extern WMAI_EXPORT bool WMAI_API GetInitResults();
extern WMAI_EXPORT bool WMAI_API returnCameraState();
extern WMAI_EXPORT bool WMAI_API ReturnCameraState();
extern WMAI_EXPORT int WMAI_API freshChangeError(const char* code);
extern WMAI_EXPORT int WMAI_API FreshChangeError(const char* code);
extern WMAI_EXPORT int WMAI_API setVideoDetect(int ch);
extern WMAI_EXPORT int WMAI_API SetVideoDetect(int ch);
extern WMAI_EXPORT int WMAI_API LrregularCrop(int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
#ifdef __cplusplus
}
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -4,4 +4,5 @@ mode=WM_MODE_50
openSync=0
filterScore=0.8
areaThreshold=0.05
movementThreshold=0.1
\ No newline at end of file
movementThreshold=0.1
videoTime=150
\ No newline at end of file
......@@ -20,7 +20,7 @@ namespace libvideopipe
#define WM_AI_VIDEO_MOTION_PIPE_INPUT_FRAME_EMPTY 0x10020101
#define WM_AI_VIDEO_MOTION_PIPE_INIT_PARAM_ERROR 0x10020102
#define WM_AI_VIDEO_MOTION_PIPE_HANDLE_EMPTY 0x10020103
#define WM_AI_VIDEO_MOTION_PIPE_MARK_EMPTY 0x10020004 // 输入temp为空
#define WM_AI_VIDEO_DEPTH_PIPE_INPUT_FRAME_EMPTY 0x10020201
#define WM_AI_VIDEO_DEPTH_PIPE_INPUT_PARAM_ERROR 0x10020202
......@@ -32,9 +32,10 @@ namespace libvideopipe
struct INIT_INFO
{
bool enable_ai = false; // 是否启动ai匹配判断 FOOD
bool gpu_enable = false; // 是否开启gpu FOOD Motion
bool lat3d_enable = true; // 是否开启lat3d算法 Motion
int match_type = 0; // 0: 边缘 1:orb
bool gpu_enable = false; // 是否开启gpu FOOD MOTION
bool lat3d_enable = true; // 是否开启lat3d算法 MOTION
int match_type = 0; // 0: 边缘 1:orb FOOD
int motion_min_static_obj_frame_num = 3; // 最小静止帧数(才回调结果) MOTION
};
//*****************************************
//food
......@@ -257,11 +258,11 @@ namespace libvideopipe
struct DEPTH_VIDEOPIPE_OUTPUT
{
int index; // 图像索引,目前该字段无效
unsigned long int output_pts; // 当前时刻帧的时间戳(与输入时的时间戳一致)
unsigned long int output_pts; // 当前时刻帧的时间戳(与输入时的时间戳一致)
DEPTH_VIDEOPIPE_STATUS status; // 状态
cv::Mat best_img; // 最佳的图像帧
float best_area; // 最佳的面积
unsigned long int best_pts; // 最佳的图像帧的时间戳
unsigned long int best_pts; // 最佳的图像帧的时间戳
bool debug_mode; // 是否debug模式
int error_code; // 错误码
};
......
File added
No preview for this file type
No preview for this file type
......@@ -110,7 +110,7 @@
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;WMAIDLLX86_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;RAPIDJSON_HAS_STDSTRING;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
......
......@@ -15,7 +15,7 @@ EXPORTS
ExportData @10
ImportData @11
Close @12
Test50000 @13
QuickLearn @13
WMrelease @15
UnbindPos @17
ClearTrainedData @18
......@@ -28,10 +28,11 @@ EXPORTS
WriteLog @25
Init @26
SetLogoCoordinate @27
inputPluToDetect @28
getDetectImage @29
judgeScanTheCode @30
getInitResults @31
returnCameraState @32
freshChangeError @33
setVideoDetect @34
InputPluToDetect @28
GetDetectImage @29
JudgeScanTheCode @30
GetInitResults @31
ReturnCameraState @32
FreshChangeError @33
SetVideoDetect @34
LrregularCrop @35
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment