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/main.cpp | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/RtspFace/main.cpp b/RtspFace/main.cpp
index 2e9ae59..8b87ae0 100644
--- a/RtspFace/main.cpp
+++ b/RtspFace/main.cpp
@@ -28,7 +28,7 @@
{
PL_RTSPClient* rtspClient = (PL_RTSPClient*)pipeLine.push_elem("PL_RTSPClient");
- RTSPConfig rtspConfig;
+ PL_RTSPClient_Config rtspConfig;
rtspConfig.progName = argv[0];
rtspConfig.rtspURL = argv[1];
rtspConfig.aux = true; // ffmpeg need aux, but live555 not
@@ -38,7 +38,7 @@
bool ret = rtspClient->init(&rtspConfig);
if (!ret)
{
- LOG(ERROR) << "rtspClient.init error";
+ LOG_ERROR << "rtspClient.init error";
exit(EXIT_FAILURE);
}
}
@@ -65,7 +65,7 @@
// bool ret = queue1->init(&config);
// if (!ret)
// {
- // LOG(ERROR) << "queue1.init error";
+ // LOG_ERROR << "queue1.init error";
// exit(EXIT_FAILURE);
// }
//}
@@ -76,20 +76,19 @@
}
{
- RTSPServerConfig config;
PL_RTSPServer* rtspServer = (PL_RTSPServer*)pipeLine.push_elem("PL_RTSPServer");
- bool ret = rtspServer->init(&config);
+ bool ret = rtspServer->init(nullptr);
if (!ret)
{
- LOG(ERROR) << "rtspServer.init error";
+ LOG_ERROR << "rtspServer.init error";
exit(EXIT_FAILURE);
}
}
while(true)
{
- //LOG(ERROR) << "begin pipe";
+ //LOG_ERROR << "begin pipe";
pipeLine.pipe();
- //LOG(ERROR) << "end pipe";
+ //LOG_ERROR << "end pipe";
}
}
--
Gitblit v1.8.0