Replace to emplace C++11 for code refactor and optimize inserts

Signed-off-by: Herman Semenov <[email protected]>

Author: GermanAizek

media_common/agnostic/common/shared/media_factory.h

@@ -68,19 +68,17 @@ class MediaFactory
         Iterator creator = creators.find(key);
         if (creator == creators.end())
         {
-            std::pair<Iterator, bool> result =
-                creators.insert(std::make_pair(key, Create<C>));
-            sizes.insert(std::make_pair(key, (uint32_t)sizeof(C)));
-            placecreators.insert(std::make_pair(key, PlaceCreate<C>));
+            std::pair<Iterator, bool> result = creators.emplace(key, Create<C>);
+            sizes.emplace(key, (uint32_t)sizeof(C));
+            placecreators.emplace(key, PlaceCreate<C>);
             return result.second;
         }
         else
         {
             if (forceReplace)
             {
                 creators.erase(creator);
-                std::pair<Iterator, bool> result =
-                    creators.insert(std::make_pair(key, Create<C>));
+                std::pair<Iterator, bool> result = creators.emplace(key, Create<C>);
                 return result.second;
             }
             return true; //If it is registered, do nothing then return true.

media_driver/agnostic/common/codec/hal/codechal_kernel_base.cpp

@@ -146,7 +146,7 @@ MOS_STATUS CodechalKernelBase::CreateKernelState(
     CODECHAL_ENCODE_CHK_NULL_RETURN(m_kernelBinary);
 
     CODECHAL_ENCODE_CHK_NULL_RETURN((*kernelState) = MOS_New(MHW_KERNEL_STATE));
-    m_kernelStatePool.insert(std::make_pair(kernelIndex, *kernelState));
+    m_kernelStatePool.emplace(kernelIndex, *kernelState);
 
     CODECHAL_KERNEL_HEADER kernelHeader = {};
     uint32_t               kernelSize = 0;
@@ -319,7 +319,7 @@ MOS_STATUS CodechalKernelBase::AllocateSurface(PMOS_ALLOC_GFXRES_PARAMS param, P
 {
     CODECHAL_ENCODE_CHK_NULL_RETURN(param);
     CODECHAL_ENCODE_CHK_NULL_RETURN(surface);
-    m_surfacePool.insert(std::make_pair(surfaceId, surface));
+    m_surfacePool.emplace(surfaceId, surface);
 
     CODECHAL_ENCODE_CHK_STATUS_RETURN(
         m_osInterface->pfnAllocateResource(

media_driver/agnostic/common/os/mos_util_user_interface.cpp

@@ -36,13 +36,13 @@ MOS_STATUS MosUtilUserInterface::AddEntry(const uint32_t keyId, PMOS_USER_FEATUR
 
     if (result == m_userFeatureKeyMap.end())
     {
-        m_userFeatureKeyMap.insert(std::make_pair(keyId, userFeatureKey));
+        m_userFeatureKeyMap.emplace(keyId, userFeatureKey);
     }
     else
     {
         MOS_OS_NORMALMESSAGE("User feature key already exist, replacing the old one.");
         m_userFeatureKeyMap.erase(keyId);
-        m_userFeatureKeyMap.insert(std::make_pair(keyId, userFeatureKey));
+        m_userFeatureKeyMap.emplace(keyId, userFeatureKey);
         m_mosMutex.Unlock();
         return MOS_STATUS_SUCCESS;
     }

media_driver/linux/common/ddi/media_ddi_factory.h

@@ -154,8 +154,7 @@ class MediaDdiFactoryNoArg
     template <class C>
     static bool RegisterCodec(const KeyType &key)
     {
-        std::pair<iterator, bool> result =
-            GetCreators().insert(std::make_pair(key, create<C>));
+        std::pair<iterator, bool> result = GetCreators().emplace(key, create<C>);
 
         return result.second;
     }

media_softlet/agnostic/common/codec/hal/dec/shared/packet/decode_sub_packet_manager.cpp

@@ -48,7 +48,7 @@ MOS_STATUS DecodeSubPacketManager::Register(uint32_t packetId, DecodeSubPacket&
     auto iter = m_subPacketList.find(packetId);
     DECODE_CHK_COND(iter != m_subPacketList.end(), "Failed to register sub packet %d", packetId);
 
-    m_subPacketList.insert(std::make_pair(packetId, &subPacket));
+    m_subPacketList.emplace(packetId, &subPacket);
     return MOS_STATUS_SUCCESS;
 }
 

media_softlet/agnostic/common/codec/hal/dec/shared/pipeline/decode_sub_pipeline.cpp

@@ -72,7 +72,7 @@ MOS_STATUS DecodeSubPipeline::RegisterPacket(uint32_t packetId, MediaPacket& pac
     auto iter = m_packetList.find(packetId);
     if (iter == m_packetList.end())
     {
-        m_packetList.insert(std::make_pair(packetId, &packet));
+        m_packetList.emplace(packetId, &packet);
     }
 
     return MOS_STATUS_SUCCESS;

media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_recycle_resource.cpp

@@ -84,7 +84,7 @@ MOS_STATUS RecycleResource::RegisterResource(
         return MOS_STATUS_CLIENT_AR_NO_SPACE;
     }
 
-    m_resourceQueues.insert(std::make_pair(id, que));
+    m_resourceQueues.emplace(id, que);
 
     return MOS_STATUS_SUCCESS;
 }

media_softlet/agnostic/common/codec/hal/enc/shared/bufferMgr/encode_tracked_buffer.cpp

@@ -66,7 +66,7 @@ MOS_STATUS TrackedBuffer::RegisterParam(BufferType type, MOS_ALLOC_GFXRES_PARAMS
     auto iter = m_allocParams.find(type);
     if (iter == m_allocParams.end())
     {
-        m_allocParams.insert(std::make_pair(type, param));
+        m_allocParams.emplace(type, param);
     }
     else
     {
@@ -279,7 +279,7 @@ std::shared_ptr<BufferQueue> TrackedBuffer::GetBufferQueue(BufferType type)
 
         auto alloc = std::make_shared<BufferQueue>(m_allocator, param->second, m_maxSlotCnt);
         alloc->SetResourceType(resType);
-        m_bufferQueue.insert(std::make_pair(type, alloc));
+        m_bufferQueue.emplace(type, alloc);
         return alloc;
     }
     else

media_softlet/agnostic/common/media_interfaces/skuwa_factory.h

@@ -60,8 +60,7 @@ class DeviceInfoFactory
     //!
     static bool RegisterDevice(KeyType key, Type value)
     {
-        std::pair<iterator, bool> result =
-            GetCreators().insert(std::make_pair(key, value));
+        std::pair<iterator, bool> result = GetCreators().emplace(key, value);
 
         return result.second;
     }

media_softlet/agnostic/common/os/mos_oca_rtlog_mgr.cpp

@@ -103,7 +103,7 @@ MOS_STATUS MosOcaRTLogMgr::RegisterRes(OsContextNext *osDriverContext, MOS_OCA_R
         MOS_OS_CHK_STATUS_RETURN(status);
     }
     s_ocaMutex.Lock();
-    m_resMap.insert(std::make_pair(osDriverContext, *resInterface));
+    m_resMap.emplace(osDriverContext, *resInterface);
     s_ocaMutex.Unlock();
     osDriverContext->SetRtLogRes(resInterface->ocaRTLogResource);
     return MOS_STATUS_SUCCESS;