提交 6e783098 authored 作者: blu's avatar blu

upload video files

上级 4341a93a
...@@ -104,12 +104,12 @@ private: ...@@ -104,12 +104,12 @@ private:
else { else {
spdlog::info("evslicer {} received msg from {}, type = {}, data = {}", selfId, peerId, meta, data.dump()); spdlog::info("evslicer {} received msg from {}, type = {}, data = {}", selfId, peerId, meta, data.dump());
if(data["type"] == "event") { if(data["type"] == "event") {
lock_guard<mutex> lock(mutEvent); lock_guard<mutex> lock(this->mutEvent);
eventQueue.push(data.dump()); eventQueue.push(data.dump());
if(eventQueue.size() > MAX_EVENT_QUEUE_SIZE) { if(eventQueue.size() > MAX_EVENT_QUEUE_SIZE) {
eventQueue.pop(); eventQueue.pop();
} }
cvEvent.notify_one(); //cvEvent.notify_one();
} }
} }
} }
...@@ -794,15 +794,19 @@ public: ...@@ -794,15 +794,19 @@ public:
thEventHandler = thread([this] { thEventHandler = thread([this] {
while(true) while(true)
{ {
unique_lock<mutex> lk(this->mutEvent); string evt;
this->cvEvent.wait(lk, [this] {return !(this->eventQueue.empty());}); // unique_lock<mutex> lk(this->mutEvent);
// this->cvEvent.wait(lk, [this] {return !(this->eventQueue.empty());});
{
auto lg = lock_guard(this->mutEvent);
if(this->eventQueue.empty()) { if(this->eventQueue.empty()) {
this_thread::sleep_for(chrono::seconds(5));
continue; continue;
} }
auto evt = this->eventQueue.front(); auto evt = this->eventQueue.front();
this->eventQueue.pop(); this->eventQueue.pop();
}
json jEvt = json::parse(evt); json jEvt = json::parse(evt);
if(jEvt["type"] == "event") { if(jEvt["type"] == "event") {
...@@ -828,7 +832,7 @@ public: ...@@ -828,7 +832,7 @@ public:
for(auto &i: v) { for(auto &i: v) {
string fname = this->urlOut + "/" + i + ".mp4"; string fname = this->urlOut + "/" + i + ".mp4";
fileNames.push_back(fname); fileNames.push_back(fname);
sf+="file\t" + fname + "\n"; sf+="\tfile\t" + fname + "\n";
} }
spdlog::info("evslicer {} file upload url: {}", selfId, this->videoFileServerApi); spdlog::info("evslicer {} file upload url: {}", selfId, this->videoFileServerApi);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论