bug fix for client

houxiao

2017-08-11 eb69d9c33b307bfc2d6c7f46a210f98c5fa306c5

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

@@ -10,7 +10,7 @@
#include <PL_BlockGrouping.h>

#include <PL_ColorConv.h>

#include <PL_AndroidMediaCodecEncoder.h>

#include <PL_RTSPServer.h>

#include <PL_RTSPServer2.h>

CameraWrapper::~CameraWrapper()

{

   stop();

@@ -104,7 +104,7 @@
    PipeLine::register_global_elem_creator("PL_V4L2Source", create_PL_V4L2Source);

    PipeLine::register_global_elem_creator("PL_BlockGrouping", create_PL_BlockGrouping);

   PipeLine::register_global_elem_creator("PL_AndroidMediaCodecEncoder", create_PL_AndroidMediaCodecEncoder);

   PipeLine::register_global_elem_creator("PL_RTSPServer", create_PL_RTSPServer);

   PipeLine::register_global_elem_creator("PL_RTSPServer2", create_PL_RTSPServer2);



    bool ret = initPl_DecoderPl();

    if (!ret)

@@ -169,8 +169,8 @@
            return  false;

        }



      PL_RTSPServer* plRtspServer = (PL_RTSPServer*)pipeLineRender->push_elem("PL_RTSPServer");

      RTSPServerConfig rtspServerConfig;

      PL_RTSPServer2* plRtspServer = (PL_RTSPServer2*)pipeLineRender->push_elem("PL_RTSPServer2");

      RTSPServer2Config rtspServerConfig;

      //rtspServerConfig.syncDeliverFrame = false;

      ret = plRtspServer->init(&rtspServerConfig);

      if (!ret)

@@ -380,14 +380,17 @@
        return false;

    cameraWrapper.faceCache.cachePm(*pm);

    //remote call start, 为了保证通用性，未将以下步骤封入RtspFaceDetectClient

    RtspFaceDetectClient &client = getRtspFaceDetectClient();

    auto request = client.fireFaceCountListenerRequest();

    RtspFaceDetectClient* client = getRtspFaceDetectClient();

    if (client == nullptr)

        return false;



    auto request = client->fireFaceCountListenerRequest();

    request.setCameraIndex(cameraWrapper.cameraIdx);

    request.setFaceCount(cameraWrapper.faceCache.getFaceCount(*pm));

    auto sendAct = request.send();

    sendAct.wait(client.getWaitScope());

    sendAct.wait(client->getWaitScope());

    //remote call end

    return false;

    return true;

}



void test_paint(CameraWrapper& cameraWrapper)

@@ -413,14 +416,6 @@
    cameraWrapper.plplContext.params.push_back(100);

    cameraWrapper.plplContext.params.push_back(100);

}



//struct ScopeMutexLocker

//{

//    pthread_mutex_t* mut;

//    ScopeMutexLocker(pthread_mutex_t* _mut) : mut(_mut){pthread_mutex_lock(mut);};

//    ~ScopeMutexLocker(){pthread_mutex_unlock(mut);}

//    //ScopeMutexLocker(&(cameraWrapper.live_daemon_mut));

//};



void cw_elem_destory_func(PipeLineElem* elem)

{