add release

houxiao

2017-04-11 a05971bb73cced9426e11e26708a3f3cd2c3fc17

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

@@ -66,6 +66,39 @@
   return true;

}



static void java_mt_callback() {



}



static void invokeCallback(CameraWrapper& cameraWrapper, int faceCount)

{

    //jni thread may not able to invoke java callback

    // double check it's all ok

    int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);

    if (getEnvStat == JNI_EDETACHED)

    {

        //LOG_WARN << "GetEnv: not attached" << std::endl;

        if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)

            LOG_WARN << "Failed to attach" << LOG_ENDL;

        else

            getEnvStat = JNI_OK;

    }

    else if (getEnvStat == JNI_OK)

    {

    }

    else if (getEnvStat == JNI_EVERSION)

        LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;

    else if (getEnvStat == JNI_ERR)

        LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;



    cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, faceCount);



    if (cameraWrapper.javaEnv->ExceptionCheck())

        cameraWrapper.javaEnv->ExceptionDescribe();



    cameraWrapper.javaVM->DetachCurrentThread();

}



/*static*/ void* CameraWrapper::live_daemon_thd(void* arg)

{

   LOG_INFO << "CameraWrapper::live_daemon_thd start" << LOG_ENDL;

@@ -93,11 +126,8 @@


      int faceCount = cameraWrapper.faceCache.cachePm(pm);



      if (faceCount != 0 && cameraWrapper.faceCallback != 0)

      {

         // #todo jni thread may not able to invoke java callback

         //env->CallVoidMethod(obj, callback, cameraIdx , faceCount);

      }

      if (faceCount > 0 && cameraWrapper.faceCallbackFunc != 0)

            invokeCallback(cameraWrapper, faceCount);

#endif

   }