修复channelMap可能导致的崩溃

Hu Chunming
1 parent 6dc4fd39
Showing 2 changed files with 11 additions and 8 deletions
src/decoder/dvpp/DvppSourceManager.cpp
src/decoder/dvpp/DvppSourceManager.h
@@ -7,18 +7,19 @@ using namespace std;
 DvppSourceManager::~DvppSourceManager()
 {
-    channelMap.clear();
+    m_channelMap.clear();
     // aclFinalize();
 }
 int DvppSourceManager::getChannel(int devId){
+    std::lock_guard<std::mutex> l(m_channelMap_mtx);
     // channel 最大值暂定为32， 华为没有接口获取最大channel，只有文档说明
     for(int iChannel = 0; iChannel < 32; iChannel++){
         string channelKey = "channel_" + to_string(devId) + "_" + to_string(iChannel) ;
-        auto it = channelMap.find(channelKey);
-        if(it == channelMap.end()){
-            channelMap[channelKey] = iChannel;
+        auto it = m_channelMap.find(channelKey);
+        if(it == m_channelMap.end()){
+            m_channelMap[channelKey] = iChannel;
             return iChannel;
         }
     }
@@ -26,9 +27,10 @@ int DvppSourceManager::getChannel(int devId){
 }
 void DvppSourceManager::releaseChannel(int devId, int iChannel){
+    std::lock_guard<std::mutex> l(m_channelMap_mtx);
     string channelKey = "channel_" + to_string(devId) + "_" + to_string(iChannel) ;
-    auto it = channelMap.find(channelKey);
-    if(it != channelMap.end()){
-        channelMap.erase(channelKey);
+    auto it = m_channelMap.find(channelKey);
+    if(it != m_channelMap.end()){
+        m_channelMap.erase(channelKey);
     }
 }
 \ No newline at end of file
@@ -24,5 +24,6 @@ private:
 	~DvppSourceManager();
 private:
-	map<string, int> channelMap;
+	map<string, int> m_channelMap;
+	mutex m_channelMap_mtx;
 };
 \ No newline at end of file