Merge pull request #748 from ai0376/fix-issues

reset videoMixer crashed at sometimes

Author: daijh

source/agent/video/videoMixer/SoftVideoCompositor.cpp

@@ -310,6 +310,8 @@ SoftFrameGenerator::~SoftFrameGenerator()
 {
     ELOG_DEBUG_T("Exit");
 
+    m_jobTimer->stop();
+
     if (m_srvWork)
         m_srvWork.reset();
 
@@ -323,8 +325,6 @@ SoftFrameGenerator::~SoftFrameGenerator()
         m_thrGrp.reset();
     }
 
-    m_jobTimer->stop();
-
     for (uint32_t i = 0; i <  m_outputs.size(); i++) {
         if (m_outputs[i].size())
             ELOG_WARN_T("Outputs not empty!!!");

source/core/owt_base/MsdkFrameEncoder.cpp

@@ -73,12 +73,13 @@ class StreamEncoder : public FrameSource, public JobTimerListener
 
     ~StreamEncoder()
     {
+        m_keyFrameTimer->stop();
+
         m_srvWork.reset();
         m_srv->stop();
         m_thread.reset();
         m_srv.reset();
 
-        m_keyFrameTimer->stop();
         removeVideoDestination(m_dest);
 
         if (m_enc) {