Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-15 c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab

 QiaoJiaSystem/EncodeServer/EncodeVideo.cpp

@@ -12,7 +12,8 @@

void EncodeVideo::threadFunc()
{

//    std::string tmp="threadFunc";
//    ClockTimer cl(tmp);

    std::string src_path=getProperty("src_path");
    if(src_path.empty())
@@ -45,7 +46,7 @@

            videoEncoderElement.doFunc(img);
        }
         usleep(2*1000);
       //  usleep(1000);
    }

    videoEncoderElement.threadClosing();