hzt_asc 1.0.9 → 1.1.0

package/ask.cc

@@ -718,7 +718,7 @@ MUInt8* ASK::processFile(const char*  filePath, int& picWidth, int& picHeight) {
     cout<<filePath<<endl;
     int Width = src.cols;
 	int Height = src.rows;
-    cout << "Width:" << Width << ",Height:"<<Height<<endl;
+    cout << "Width:" << Width << ",Height:"<<Height << " flags: "<< src.flags << " dims: " << src.dims <<endl;
     int wScore = Width % 4;
     int hScore = Height % 2;
     cv::Mat dest;
@@ -776,43 +776,61 @@ cv::Mat curlImg(const char *img_url, int timeout=100000)
     return imdecode(stream, -1); // 'keep-as-is'
 }
 
+void modifyImageFormat(cv::Mat& out, cv::Mat& in, int channel) 
+{
+    if (channel == 4) {
+        in.convertTo(out, CV_8UC4);
+    } else if (channel == 3) {
+        in.convertTo(out, CV_8UC3);
+    } else if (channel == 2) {
+        in.convertTo(out, CV_8UC2);
+    } else {
+        in.convertTo(out, CV_8U);
+    }
+}
+
 MUInt8* ASK::processFileUrl(const char*  url, int& picWidth, int& picHeight) {
     cv::Mat src = curlImg(url);
     int Width = src.cols;
 	int Height = src.rows;
-    //const int Depth = src.depth;
-    cout << "Width:" << Width << ",Height:"<<Height << " " <<endl;
+    int depth = src.depth();
+    int channel = src.channels();
+    cout << "Width:" << Width << ",Height:"<<Height <<endl;
+    cout << "dims: " << src.dims << endl;
+    cout << "channels: " << channel << endl;
+    cout << "depth: " << depth << endl;
+
     int wScore = Width % 4;
     int hScore = Height % 2;
     cv::Mat dest;
     if (wScore != 0 || hScore != 0) {
+        cout << "processFileUrl ou:" <<endl;
         Width -= wScore;
         Height -= hScore;
         cv::Mat dst;
         cv::resize(src, dst, cv::Size(Width, Height));
-        src.release();
-
-        cv::Mat mid;
-        dst.convertTo(mid, CV_8UC3);
-        cvtColor(mid, dest, COLOR_BGR2YUV_I420);
-        //cout << "processFileUrl3:" << mid.cols << ",mid.rows:"<<Height<<endl;
-        mid.release();
+        if (depth != 0) { //bit数仅支持8
+            cv::Mat mid;
+            modifyImageFormat(mid, dst, channel);
+            cvtColor(mid, dest, COLOR_BGR2YUV_I420);
+            mid.release();
+        } else {
+            cvtColor(dst, dest, COLOR_BGR2YUV_I420);
+        }
 
-        //cvtColor(dst, dest, COLOR_BGR2YUV_I420);
         dst.release();
     } else {
-        //cvtColor(src, dest, COLOR_BGR2YUV_I420);
-        cv::Mat mid;
-        src.convertTo(mid, CV_8UC3);
-        cvtColor(mid, dest, COLOR_BGR2YUV_I420);
-        //cout << "processFileUrl3:" << mid.cols << ",mid.rows:"<<Height<<endl;
-        mid.release();
-    }
-    // cv::Mat mid;
-    // src.convertTo(mid, CV_8UC3);
-    // cout << "processFileUrl2:" << Width << ",Height:"<<Height<<endl;
-    // cvtColor(mid, dest, COLOR_BGR2YUV_I420);
-    // cout << "processFileUrl3:" << mid.cols << ",mid.rows:"<<Height<<endl;
+        cout << "processFileUrl ji:" <<endl;
+        if (depth != 0) { //bit数仅支持8
+            cv::Mat mid;
+            modifyImageFormat(mid, src, channel);
+            cvtColor(mid, dest, COLOR_BGR2YUV_I420);
+            mid.release();
+        } else {
+            cvtColor(src, dest, COLOR_BGR2YUV_I420);
+        }
+    }
+    
     int len = Height*Width*3/2;
     MUInt8* imageData = (MUInt8*)malloc(len);
     memset(imageData, 0, len);    

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzt_asc",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "main": "index.js",
   "description": "hzt_asc_v3.",
   "author": {

package/sample/demo.js

@@ -17,10 +17,14 @@ let start = Date.now();
 let ask = new addon.ASK(APPID, SDKKEY, ACTIVEKEY);
 //let ask2 = new addon.ASK(APPID, SDKKEY, ACTIVEKEY);
 printMem()
+let xx2 = ask.FaceDetectUrl("http://image.haizitong.com/cc123be3667143e3af5c53a5906c6b42");
+console.log("init end", xx2, Date.now() - start);
 
 let xx = ask.FaceDetectUrl("http://upload-file.haizitong.com/api/getFile/119c44a5-193f-4953-b59c-c1e55cd29f1a")
-let xx2 = ask.FaceDetectUrl("http://image.haizitong.com/cc123be3667143e3af5c53a5906c6b42");
-console.log("init end", xx, xx2, Date.now() - start);
+//let xx = ask.FaceDetectUrl("https://min.haizitong.com/2/ali/i/fbad726e022742a78a2666580a9a0f0f139317")
+//
+
+console.log("init end", xx, Date.now() - start);
 
 // for(let i = 0; i < 10000; ++i) {
 //     let num = ask.FaceFeatureExtractUrl("http://min.haizitong.com/2/ali/i/a5f91d52783d49989777e8b82b545e2c");