Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg

chenshijun

2019-10-29 4587f8d5507300782e329f9527f35f905f3bb697

 csrc/thirdparty/gb28181/include/PsToEs.hpp

@@ -75,6 +75,16 @@
      while (!q.empty()) q.pop_front();
      pthread_mutex_unlock(&mtx);
    }
	
   void clearAll(std::function<void(T)> fn){
      pthread_mutex_lock(&mtx);
      while (!q.empty()){
         T value = q.front();
         fn(value);
         q.pop_front();
      } 
      pthread_mutex_unlock(&mtx);
   }
private:
    deque<T> q;
    pthread_mutex_t mtx;
@@ -96,7 +106,11 @@

   ~GB28181API(){
      printf("GB28181API end!\n");
      m_rtpQueue.clearAll();
      // m_rtpQueue.clearAll();
      m_rtpQueue.clearAll([](frameBuffInfo *info){
         delete[] info->buff;
         delete info;
      });
      deleteCamera();
   }