From cc445067d1f61e12dbea4e6458f2c85ba58f01bf Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 30 十二月 2016 14:28:14 +0800
Subject: [PATCH] fix config, fix some log and todo
---
RtspFace/PL_RTSPServer.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/RtspFace/PL_RTSPServer.cpp b/RtspFace/PL_RTSPServer.cpp
index 79b78fd..6d31f34 100644
--- a/RtspFace/PL_RTSPServer.cpp
+++ b/RtspFace/PL_RTSPServer.cpp
@@ -113,7 +113,7 @@
*FrameBuffer = pBuffer;
*FrameSize = newBufferSize;
- LOG(DEBUG) << "send frame size=" << in.buffSize;
+ LOG_DEBUG << "send frame size=" << in.buffSize;
}
virtual char ReleaseFrame()
@@ -125,7 +125,7 @@
int ret = pthread_mutex_unlock(in.frame_mutex);
if(ret != 0)
{
- LOG(WARN) << "pthread_mutex_unlock frame_mutex: " << strerror(ret);
+ LOG_WARN << "pthread_mutex_unlock frame_mutex: " << strerror(ret);
return 0;
}
}
@@ -143,7 +143,7 @@
int ret = pthread_mutex_lock(in.frame_mutex);
if(ret != 0)
{
- LOG(WARN) << "pthread_mutex_lock frame_mutex: " << strerror(ret);
+ LOG_WARN << "pthread_mutex_lock frame_mutex: " << strerror(ret);
return;
}
}
@@ -197,7 +197,7 @@
int ret = pthread_create(&(in->live_daemon_thid), NULL, live_daemon_thd, in);
if(ret != 0)
{
- LOG(ERROR) << "pthread_create: " << strerror(ret);
+ LOG_ERROR << "pthread_create: " << strerror(ret);
return false;
}
@@ -220,12 +220,12 @@
if (pm.type != PipeMaterial::PMT_FRAME)
{
- LOG(ERROR) << "PL_RTSPServer::pay only support PMT_FRAME";
+ LOG_ERROR << "PL_RTSPServer::pay only support PMT_FRAME";
return false;
}
if (in->buffSize > 0)
- LOG(WARN) << "PL_RTSPServer::pay may lost data size=" << in->buffSize;
+ LOG_WARN << "PL_RTSPServer::pay may lost data size=" << in->buffSize;
MB_Frame* frame = (MB_Frame*)pm.buffer;
if (frame->buffer == nullptr)
--
Gitblit v1.8.0