From d4109b2cef809daba0f95f244029456613383f01 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 06 一月 2017 11:31:42 +0800 Subject: [PATCH] add pm list test --- RtspFace/PipeLine.cpp | 67 ++++++++++++++++++++++++++++----- 1 files changed, 57 insertions(+), 10 deletions(-) diff --git a/RtspFace/PipeLine.cpp b/RtspFace/PipeLine.cpp index 1f3aba9..0aabd47 100644 --- a/RtspFace/PipeLine.cpp +++ b/RtspFace/PipeLine.cpp @@ -16,7 +16,9 @@ } } -PipeLine::PipeLine() : global_params_map(), elem_create_func_map(), elems() +PipeLine::elem_create_func_map_t PipeLine::global_elem_create_func_map; + +PipeLine::PipeLine() : params_map(), elem_create_func_map(), elems() { } @@ -27,7 +29,7 @@ for(elem_vec_t::iterator iter = elems.begin(); iter != elems.end(); ++iter) { PipeLineElem* elem = *iter; - if (elem != nullptr) + if (elem != nullptr && elem->manager == this) { elem->finit(); delete *iter; @@ -50,6 +52,21 @@ return true; } + +//static +bool PipeLine::register_global_elem_creator(const std::string& type, elem_create_func_t func) +{ + if (type.empty() || func == nullptr) + return false; + + elem_create_func_map_t::iterator iter = global_elem_create_func_map.find(type); + if (iter != global_elem_create_func_map.end()) + return false; + + global_elem_create_func_map.insert(std::make_pair(type, func)); + return true; +} + void PipeLine::push_elem(PipeLineElem* elem) { if(elem != nullptr) @@ -59,11 +76,41 @@ } } +void PipeLine::push_front_elem(PipeLineElem* elem) +{ + if(elem != nullptr) + { + elem->manager = this; + elems.insert(elems.begin(), elem); + } +} + +bool PipeLine::remove_elem(PipeLineElem* elem) +{ + if(elem != nullptr) + { + for(elem_vec_t::iterator iter = elems.begin(); iter != elems.end(); ++iter) + { + if (*iter == elem) + { + iter = elems.erase(iter); + return true; + } + } + } + + return false; +} + PipeLineElem* PipeLine::push_elem(const std::string& type) { elem_create_func_map_t::iterator iter = elem_create_func_map.find(type); if (iter == elem_create_func_map.end()) - return nullptr; + { + iter = global_elem_create_func_map.find(type); + if (iter == global_elem_create_func_map.end()) + return nullptr; + } elem_create_func_t func = iter->second; if (func == nullptr) @@ -170,22 +217,22 @@ return nullptr; } -void PipeLine::set_global_param(const std::string& name, const std::string& value) +void PipeLine::set_param(const std::string& name, const std::string& value) { if (name.empty()) return; - global_params_map_t::iterator iter = global_params_map.find(name); - if (iter == global_params_map.end()) - global_params_map.insert(std::make_pair(name, value)); + params_map_t::iterator iter = params_map.find(name); + if (iter == params_map.end()) + params_map.insert(std::make_pair(name, value)); else iter->second = value; } -std::string PipeLine::get_global_param(const std::string& name) const +std::string PipeLine::get_param(const std::string& name) const { - global_params_map_t::const_iterator iter = global_params_map.find(name); - if (iter == global_params_map.end()) + params_map_t::const_iterator iter = params_map.find(name); + if (iter == params_map.end()) return ""; else return iter->second; -- Gitblit v1.8.0