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

miyanhui

2019-02-13 f76e6f73d57015a04272f05a48c27bfd42b14015

 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();