bug fix

houxiao

2017-04-25 521e435d5d63fc76097e6667ba5ef9bcd1393a7b

 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp

@@ -10,6 +10,13 @@

#include <pthread.h>

#include <ev_proto.h>
#include <face_daemon_proto.h>

#include <stdlib.h>

#include "DebugNetwork.h"

std::stringstream logss;
//std::fstream logss("/storage/sdcard/log.log", std::fstream::out);
//std::fstream logss("/storage/emulated/0/log.log", std::fstream::out);
@@ -22,10 +29,7 @@

void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
   g_logger.set_level(VERBOSE);
	
   PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
   PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
   g_logger.set_level(INFO);

#ifdef USE_ST_SDK
   PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
@@ -38,6 +42,20 @@
      g_CameraWrappers[i].pipeLine = new PipeLine;
      PipeLine& pipeLine(*(g_CameraWrappers[i].pipeLine));
   }
}

void Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP(JNIEnv *env, jclass clazz, jstring ipaddr)
{
    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP" << LOG_ENDL;

    const char *utf8 = env->GetStringUTFChars(ipaddr, NULL);
    for (size_t i = 0; i < CAMERA_COUNT; i++)
    {
        g_CameraWrappers[i].rtspConfig.receivingInterfaceAddr = utf8;
        g_CameraWrappers[i].rtspConfig.desiredPortNum = 10056 + i * 4;
        g_CameraWrappers[i].rtspConfig.requestStreamingOverTcp = true;
    }
    env->ReleaseStringUTFChars(ipaddr, utf8);
}

// set the surface
@@ -81,23 +99,32 @@

   {
      cameraWrapper.amcdConfig.ak_mime = "video/avc";
      cameraWrapper.amcdConfig.ak_width = 1920;
      cameraWrapper.amcdConfig.ak_height = 1080;
        cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window = nullptr;//#todo
      cameraWrapper.amcdConfig.ak_width = 640;
      cameraWrapper.amcdConfig.ak_height = 480;
        cameraWrapper.amcdConfig.windowSurface = nullptr; // cameraWrapper.window
      cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
        cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
        cameraWrapper.amcdConfig.renderFromOutputBuffIdx = false;//true
        cameraWrapper.amcdConfig.renderFromOutputBuff = false;
#ifndef USE_ST_SDK
        cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
#endif
   }
	
   {

    {
        cameraWrapper.asvrConfig.windowSurface = cameraWrapper.window;
        cameraWrapper.asvrConfig.outputOriginFrame = true;
        cameraWrapper.asvrConfig.outputRenderFrame = true;
    }

    {
      cameraWrapper.sftConfig.point_size = 21;
      cameraWrapper.sftConfig.detect_face_cnt_limit = MAX_FACE;
      cameraWrapper.sftConfig.draw_face_rect = false;
      cameraWrapper.sftConfig.draw_face_feature_point = false;
      cameraWrapper.sftConfig.generate_face_feature = true;
   }
        cameraWrapper.sftConfig.doTrackPerFrame = 50;
    }

   bool ret = cameraWrapper.initPl();
   if (ret)
@@ -201,21 +228,23 @@
   cameraWrapper.releaseFace();
}

jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb)
jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jint dbId, jobject faceListPb)
{
   LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL;
   assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
   cameraIdx -= 1;
   CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
	
   // Y channel of YUV420p, packed in protobuf
   uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT]; // #todo optimize not copy data here, set data to jbyteArray directly
    size_t buffSize = sizeof(buffer);
    const size_t arrSize = env->GetArrayLength(faceListPb);
   bool ret = false;

    // #todo optimize not copy data here, set data to jbyteArray directly
   // Y channel of YUV420p, packed in protobuf
   uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0};
    size_t buffSize = sizeof(buffer);

    bool ret = false;
#ifdef USE_ST_SDK
    ret = cameraWrapper.faceCache.getFaceListPb(buffer, buffSize);
    uint8_t * pBufPB = buffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
    buffSize = sizeof(buffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
    ret = cameraWrapper.faceCache.getFaceListPb(pBufPB, buffSize);
#endif
   
   if (!ret)
@@ -223,70 +252,195 @@
      LOG_INFO << "No face captured" << LOG_ENDL;
      return 0;
   }
    else
    {
        LOG_INFO << "Face captured " << LOG_ENDL;

        buffSize = std::min(buffSize, arrSize);
        env->SetByteArrayRegion(faceListPb, 0, buffSize, (const jbyte*)buffer);
        return buffSize;
    }
    LOG_INFO << "Face captured " << LOG_ENDL;

    EVPHeader* evpHeader = new (buffer) EVPHeader;
    evpHeader->proto = EVPProto::EVPP_PROTOBUF;
    evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_PB;
    evpHeader->size = sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB) + buffSize;
    buffSize = evpHeader->size;

    FDP_FaceDetectPB* fdpFaceDetectPB = new (buffer + sizeof(EVPHeader)) FDP_FaceDetectPB(dbId);

    evpHeader->hton();
    fdpFaceDetectPB->hton();

    //{
    //    static size_t f = 0;
    //    char fname[50];
    //    sprintf(fname, "/sdcard/facelist-%d-%d-%u.pb", dbId, cameraIdx, ++f);
    //    FILE *pFile = fopen(fname, "wb");
    //    fwrite(buffer, 1, buffSize, pFile);
    //    fclose(pFile);
    //    if (f > 10)exit(0);
    //}

    jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
    jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr","[B");

    jbyteArray jbaFaceListPb = env->NewByteArray(buffSize);
    env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte*)buffer);
    env->SetObjectField(faceListPb, jfRefByteArray_arr, jbaFaceListPb);

#ifdef ENABLE_DEBUG_SENDFACEDETECT
    dbgSendFaceDetect(buffer, buffSize);
#endif

    return buffSize;
}

jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceImages)
jobject _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jobject faceImages)
{
   LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
   LOG_DEBUG << "@@@ _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
   assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
   cameraIdx -= 1;
   CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);

   std::vector<NativeImgIdx> imgIdxes;
    size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
   uint8_t* _faceImages = new uint8_t[_faceImagesSize]; // android stack is small
    memset(_faceImages, 0, _faceImagesSize);

   bool ret = false;

#ifdef USE_ST_SDK
   ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif

   if (imgIdxes.size() == 0)
   {
       LOG_INFO << "No face image captured" << LOG_ENDL;
       delete[] _faceImages;
       return nullptr;
   }

    jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
    jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr","[B");

    jbyteArray jbaFaceImages = env->NewByteArray(_faceImagesSize);
    LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
    env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte*)_faceImages);
    env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
    delete[] _faceImages;

    jclass jcArrayList = env->FindClass("java/util/ArrayList");
   jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
   jmethodID jmArrayList_add  = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");

   jclass jcNativeImgIdx = env->FindClass("cn/com/basic/face/util/NativeImgIdx");
   jmethodID jmNativeImgIdx_ctor = env->GetMethodID(jcNativeImgIdx, "<init>", "()V");
   jfieldID jfNativeImgIdx_offset = env->GetFieldID(jcNativeImgIdx, "offset","I");
   jfieldID jfNativeImgIdx_size = env->GetFieldID(jcNativeImgIdx, "size","I");
   jfieldID jfNativeImgIdx_type = env->GetFieldID(jcNativeImgIdx, "type","I");
   jfieldID jfNativeImgIdx_width = env->GetFieldID(jcNativeImgIdx, "width","I");
   jfieldID jfNativeImgIdx_height = env->GetFieldID(jcNativeImgIdx, "height","I");

   jobject jobjArrayList_ImgIdxes = env->NewObject(jcArrayList , jmArrayList_ctor);

   for(size_t i = 0 ; i < imgIdxes.size(); i++)
   {
       jobject jobjNativeImgIdx = env->NewObject(jcNativeImgIdx , jmNativeImgIdx_ctor);
       env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_offset, imgIdxes[i].offset);
       env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_size, imgIdxes[i].size);
       env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_type, imgIdxes[i].type);
       env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_width, imgIdxes[i].width);
       env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_height, imgIdxes[i].height);

       env->CallBooleanMethod(jobjArrayList_ImgIdxes , jmArrayList_add , jobjNativeImgIdx);

       LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
   }

   return jobjArrayList_ImgIdxes;
}

jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx)
{
    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
    cameraIdx -= 1;
    CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);

    std::vector<NativeImgIdx> imgIdxes;
    uint8_t _faceImages[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT];
    size_t _faceImagesSize = std::min(sizeof(_faceImages), size_t(env->GetArrayLength(faceImages)));
    size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
    uint8_t* _faceImages = new uint8_t[_faceImagesSize]; // android stack is small
    memset(_faceImages, 0, _faceImagesSize);

    bool ret = false;

#ifdef USE_ST_SDK
    //bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
    ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif

    if (imgIdxes.size() < 0)
    if (imgIdxes.size() == 0)
    {
        LOG_INFO << "No face image captured" << LOG_ENDL;
        delete[] _faceImages;
        return nullptr;
    }

    env->SetByteArrayRegion(faceImages, 0, _faceImagesSize, (const jbyte*)_faceImages);

    jclass jcArrayList = env->FindClass("java/util/ArrayList");
    jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
    jmethodID jmArrayList_add  = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");

    jclass jcNativeImgIdx = env->FindClass("cn/com/basic/face/util/NativeImgIdx");
    jmethodID jmNativeImgIdx_ctor = env->GetMethodID(jcNativeImgIdx, "<init>", "()V");
    jfieldID jfNativeImgIdx_offset = env->GetFieldID(jcNativeImgIdx, "offset","I");
    jfieldID jfNativeImgIdx_size = env->GetFieldID(jcNativeImgIdx, "size","I");
    jfieldID jfNativeImgIdx_type = env->GetFieldID(jcNativeImgIdx, "type","I");
    jfieldID jfNativeImgIdx_width = env->GetFieldID(jcNativeImgIdx, "width","I");
    jfieldID jfNativeImgIdx_height = env->GetFieldID(jcNativeImgIdx, "height","I");
    jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
    jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
    jfieldID jfNativeImg_size = env->GetFieldID(jcNativeImg, "size","I");
    jfieldID jfNativeImg_type = env->GetFieldID(jcNativeImg, "type","I");
    jfieldID jfNativeImg_width = env->GetFieldID(jcNativeImg, "width","I");
    jfieldID jfNativeImg_height = env->GetFieldID(jcNativeImg, "height","I");
    jfieldID jfNativeImg_image = env->GetFieldID(jcNativeImg, "image","[B");

    jobject jobjArrayList_ImgIdxes = env->NewObject(jcArrayList , jmArrayList_ctor);
    jobject jobjArrayList_Imgs = env->NewObject(jcArrayList , jmArrayList_ctor);

    for(size_t i = 0 ; i < imgIdxes.size(); i++)
    {
        jobject jobjNativeImgIdx = env->NewObject(jcNativeImgIdx , jmNativeImgIdx_ctor);
        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_offset, imgIdxes[i].offset);
        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_size, imgIdxes[i].size);
        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_type, imgIdxes[i].type);
        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_width, imgIdxes[i].width);
        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_height, imgIdxes[i].height);
        jobject jobjNativeImg = env->NewObject(jcNativeImg , jmNativeImg_ctor);
        env->SetIntField(jobjNativeImg, jfNativeImg_size, imgIdxes[i].size);
        env->SetIntField(jobjNativeImg, jfNativeImg_type, imgIdxes[i].type);
        env->SetIntField(jobjNativeImg, jfNativeImg_width, imgIdxes[i].width);
        env->SetIntField(jobjNativeImg, jfNativeImg_height, imgIdxes[i].height);

        env->CallBooleanMethod(jobjArrayList_ImgIdxes , jmArrayList_add , jobjNativeImgIdx);
        jbyteArray jbaFaceImage = env->NewByteArray(imgIdxes[i].size);
        env->SetByteArrayRegion(jbaFaceImage, 0, imgIdxes[i].size, (const jbyte*)(_faceImages + imgIdxes[i].offset));
        env->SetObjectField(jobjNativeImg, jfNativeImg_image, jbaFaceImage);

        env->CallBooleanMethod(jobjArrayList_Imgs, jmArrayList_add , jobjNativeImg);

        LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
    }

    return jobjArrayList_ImgIdxes;
    delete[] _faceImages;
    _faceImages = nullptr;
    return jobjArrayList_Imgs;
}

void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv* env, jclass clazz, jobject faceImage)
{
    jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
    jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
    jfieldID jfNativeImg_size = env->GetFieldID(jcNativeImg, "size","I");
    jfieldID jfNativeImg_type = env->GetFieldID(jcNativeImg, "type","I");
    jfieldID jfNativeImg_width = env->GetFieldID(jcNativeImg, "width","I");
    jfieldID jfNativeImg_height = env->GetFieldID(jcNativeImg, "height","I");
    jfieldID jfNativeImg_image = env->GetFieldID(jcNativeImg, "image","[B");

    NativeImgIdx imgidx;
    imgidx.size = env->GetIntField(faceImage, jfNativeImg_size);
    imgidx.type = env->GetIntField(faceImage, jfNativeImg_type);
    imgidx.width = env->GetIntField(faceImage, jfNativeImg_width);
    imgidx.height = env->GetIntField(faceImage, jfNativeImg_height);

    uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3];
    size_t buffSize = 0;

    jbyteArray jbaFaceImage = (jbyteArray)env->GetObjectField(faceImage, jfNativeImg_image);
    env->GetByteArrayRegion(jbaFaceImage, 0, imgidx.size, (jbyte*)buffer);

#ifdef ENABLE_DEBUG_SENDFACEADD
    dbgSendFaceAdd(imgidx, buffer);
#endif
}

}