From b3feccd1ee1186c37b39844dc566d39aedaa54ed Mon Sep 17 00:00:00 2001 From: Peng Li Date: Tue, 10 Jul 2018 11:50:11 +0800 Subject: [PATCH 1/1] improvement --- log4cpp.properties | 2 +- main.cpp | 2 +- src/Engine.cpp | 4 ++-- src/Engine.h | 2 +- src/VideoReader.cpp | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/log4cpp.properties b/log4cpp.properties index c24614b..991b5c3 100644 --- a/log4cpp.properties +++ b/log4cpp.properties @@ -2,7 +2,7 @@ log4cpp.rootCategory=DEBUG, rootAppender, console log4cpp.appender.console=ConsoleAppender log4cpp.appender.console.layout=PatternLayout -log4cpp.appender.console.layout.ConversionPattern=%d [%p] %m%n +log4cpp.appender.console.layout.ConversionPattern=%d [%t] [%p] %m%n log4cpp.appender.rootAppender=RollingFileAppender log4cpp.appender.rootAppender.maxFileSize=400000 diff --git a/main.cpp b/main.cpp index acbe99a..c38b655 100644 --- a/main.cpp +++ b/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) Engine* e = Engine::create(); e->addObserver(new Callback()); - e->setVideoSrc("xxxx"); + e->setVideoSrc(VideoSrcType::URL, "rtsp://192.168.1.75:554/stream1"); e->start(); e->destroy(); diff --git a/src/Engine.cpp b/src/Engine.cpp index e51dd65..c044ab7 100644 --- a/src/Engine.cpp +++ b/src/Engine.cpp @@ -39,10 +39,10 @@ Engine::~Engine() delete tracker; } -void Engine::setVideoSrc(const std::string& url) +void Engine::setVideoSrc(VideoSrcType type, const std::string& url) { videoSrc = url; - reader = VideoReaderFactory::createVideoReader(VideoSrcType::URL,"rtsp://192.168.1.75:554/stream1"); + reader = VideoReaderFactory::createVideoReader(type, url); } void Engine::run() diff --git a/src/Engine.h b/src/Engine.h index 3ae02f4..a0da903 100644 --- a/src/Engine.h +++ b/src/Engine.h @@ -19,7 +19,7 @@ public: void destroy(); virtual void start(); void addObserver(EngineObserver* o); - void setVideoSrc(const std::string& url); + void setVideoSrc(VideoSrcType type, const std::string& url); private: Engine(); diff --git a/src/VideoReader.cpp b/src/VideoReader.cpp index 22036cb..90e3d8a 100644 --- a/src/VideoReader.cpp +++ b/src/VideoReader.cpp @@ -39,6 +39,7 @@ UrlReader::UrlReader(VideoSrcType type, const std::string& url) : VideoReader(ty LOG_ERROR(TAG, "open video " + url); throw std::runtime_error("Cannot open video url " + url); } + LOG_DEBUG(TAG, "reader video sourc succeed."); } UrlReader::~UrlReader() -- 2.11.0