From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
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