From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2

---
 QiaoJiaSystem/EncodeServer/EncodeVideo.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/EncodeServer/EncodeVideo.cpp b/QiaoJiaSystem/EncodeServer/EncodeVideo.cpp
index b9ce644..9341a44 100644
--- a/QiaoJiaSystem/EncodeServer/EncodeVideo.cpp
+++ b/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();

--
Gitblit v1.8.0