From 3143aab798b6ea93a472a6b32f69a6aabc7da04e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 16:28:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.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