From c24b03d43977b75db84e03bfcdbe3a7b1ae2c1ea Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 11:30:00 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
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