From 3846cd12e4e39c2026184f120706d7f7ca9d79c0 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期二, 01 八月 2017 15:12:46 +0800 Subject: [PATCH] --- FaceServer/test_client_compare.cpp | 42 ++++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/FaceServer/test_client_compare.cpp b/FaceServer/test_client_compare.cpp index 833808d..9beb4b0 100644 --- a/FaceServer/test_client_compare.cpp +++ b/FaceServer/test_client_compare.cpp @@ -43,7 +43,7 @@ { EVPHeader* evpHeader = new (mesg) EVPHeader; evpHeader->proto = EVPProto::EVPP_RAW_BIN; // 1 - evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_COMPARE; // 133 + evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_COMPARE; // 134 evpHeader->size = sizeof(EVPHeader); FDP_Image* fdpImage1 = nullptr; @@ -59,28 +59,46 @@ fdpImage1->size = fread(fdpImage1->buff, 1, length, pFile); fclose(pFile); pFile = nullptr; - - fdpImage1->hton(); + evpHeader->size += sizeof(FDP_Image) + fdpImage1->size; + fdpImage1->hton(); } FDP_Image* fdpImage2 = nullptr; { fdpImage2 = new (mesg + evpHeader->size) FDP_Image; - + fdpImage2->db_id = 0; // -1 - fdpImage2->mb_type = MB_Frame::MBFT_RGB565; // 14 - fdpImage2->width = 52; - fdpImage2->height = 52; + fdpImage2->mb_type = MB_Frame::MBFT_JPEG; // 7 + fdpImage2->width = 198; + fdpImage2->height = 154; - FILE* pFile = fopen("face-13-w52-h52.rgb565", "rb"); + FILE* pFile = fopen("compare2.jpg", "rb"); fdpImage2->size = fread(fdpImage2->buff, 1, length, pFile); fclose(pFile); pFile = nullptr; - - fdpImage1->hton(); + evpHeader->size += sizeof(FDP_Image) + fdpImage2->size; - } + fdpImage2->hton(); + } + + //FDP_Image* fdpImage2 = nullptr; + //{ + // fdpImage2 = new (mesg + evpHeader->size) FDP_Image; + // + // fdpImage2->db_id = 0; // -1 + // fdpImage2->mb_type = MB_Frame::MBFT_RGB565; // 14 + // fdpImage2->width = 52; + // fdpImage2->height = 52; + // + // FILE* pFile = fopen("face-13-w52-h52.rgb565", "rb"); + // fdpImage2->size = fread(fdpImage2->buff, 1, length, pFile); + // fclose(pFile); + // pFile = nullptr; + // + // evpHeader->size += sizeof(FDP_Image) + fdpImage2->size; + // fdpImage2->hton(); + //} length = evpHeader->size; evpHeader->hton(); @@ -100,7 +118,7 @@ make_msg(mesg, length); printf("%s\n", mesg); - printf("%d\n", (int)strlen(mesg)); + printf("%d\n", length); // build socket int port = 15436; -- Gitblit v1.8.0