Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ...

miyanhui

2019-02-13 f76e6f73d57015a04272f05a48c27bfd42b14015

 QiaoJiaSystem/DataManagerServer/AppPipeController.cpp

@@ -9,6 +9,10 @@
                        cv::Size(appPref.getIntData("pulish.width"),appPref.getIntData("pulish.height")),
                        "flv", 25, appPref.getLongData("gpu.index"))
{
    if(appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0)
    {
        ERR("pulish.width:  "<<appPref.getIntData("pulish.width") <<"  Height: "<< appPref.getIntData("pulish.height"));
    }
    videoCaptureElement.registerConnector([&]{
        //if(!videoPublishElement.isBusy()){
            videoPublishElement.setImage(videoCaptureElement.getImage());