bug fixed

zhangmeng

2022-07-21 f346559ee07016172cab40b7fca5b2c5e09df899

 csrc/thirdparty/gb28181/include/PsToEs.hpp

@@ -7,20 +7,23 @@
#include <unistd.h>
#include "librtsp.h"
#include <sys/time.h>

#include <errno.h>

using namespace std;

template<typename T>
class MyQueue {
public:
    MyQueue():mtx(PTHREAD_MUTEX_INITIALIZER), cond(PTHREAD_COND_INITIALIZER){
        t.tv_sec = 0;
        t.tv_nsec = 0;
    MyQueue():mtx(PTHREAD_MUTEX_INITIALIZER){
        pthread_condattr_t attr;
        pthread_condattr_init(&attr);
        pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
        pthread_cond_init(&cond, &attr);
        pthread_condattr_destroy(&attr);
    }

    ~MyQueue() {

        pthread_cond_destroy(&cond);
    }

public:
@@ -40,14 +43,22 @@
    }

    T pop() {
        struct timespec now, end;
        clock_gettime(CLOCK_MONOTONIC, &now);
        static uint64_t waitS = 12; // wait
        end.tv_sec = now.tv_sec + waitS;
        end.tv_nsec = now.tv_nsec;

        // printf("======>>wait stream data\n");
        pthread_mutex_lock(&mtx);
        if (q.empty()) {
            gettimeofday(&now, NULL);
            t.tv_sec = now.tv_sec + 3;
            t.tv_nsec = now.tv_usec * 1000;
//            pthread_cond_wait(&cond, &mtx);
            pthread_cond_timedwait(&cond, &mtx, &t);
        while(q.empty()){
            if(pthread_cond_timedwait(&cond, &mtx, &end) == ETIMEDOUT){
                printf("======>>timeout quit\n");
                break;
            }
        }
        // printf("======>>queue size %lu\n", q.size());

        if (q.empty()) {
            pthread_mutex_unlock(&mtx);
            return 0;
@@ -77,7 +88,8 @@
      pthread_mutex_unlock(&mtx);
    }
   
   void clearAll(std::function<void(T)> fn){
    template<class F>
   void clearAll(F&& fn){
      pthread_mutex_lock(&mtx);
      while (!q.empty()){
         T value = q.front();
@@ -90,8 +102,6 @@
    deque<T> q;
    pthread_mutex_t mtx;
    pthread_cond_t cond;
    timespec t;
    struct timeval now;
};

typedef struct _buffInfo {
@@ -109,13 +119,23 @@
      printf("GB28181API end!\n");
      // m_rtpQueue.clearAll();
      m_rtpQueue.clearAll([](frameBuffInfo *info){
         delete[] info->buff;
         delete info;
         if (info){
            delete[] info->buff;
            delete info;
         }
      });
      deleteCamera();
   }

   bool pushInfo(unsigned char *data, int datalen) {

      while(m_rtpQueue.count_queue() > 120){
            auto p = m_rtpQueue.popNotWait();
            if (p){
                delete[] p->buff;
                delete p;
            }
        }

      frameBuffInfo *info = new frameBuffInfo();
      info->buff = new unsigned char[datalen];
@@ -155,6 +175,13 @@
            info->buff = new unsigned char[buffinfo->buffLen - len]{};
            memcpy(info->buff, buffinfo->buff + len, buffinfo->buffLen - len);

            while(_this->m_rtpQueue.count_queue() > 120){
                    auto p = _this->m_rtpQueue.popNotWait();
                    if (p){
                        delete[] p->buff;
                        delete p;
                    }
                }
//            printf("/帧长大于info->buffLen:%d\n", info->buffLen);
            _this->m_rtpQueue.push_front_one(info);
//            printf("/帧长大于info->buffLen\n");
@@ -191,7 +218,7 @@
            //从缓存中获取buffinfo
            if (_this->m_rtpQueue.count_queue() == 0) {
//                printf(" count_queue == 0 \n");
                usleep(10000);
                usleep(200000);
                continue;
            }

@@ -210,6 +237,8 @@
               if (!buffinfo){
                  buffinfo = _this->m_rtpQueue.pop();
               }
               if (!buffinfo) continue;

               auto fpIframe = fopen(fileIFrameName, "wb+");
               fwrite(buffinfo->buff, buffinfo->buffLen, 1, fpIframe);
               fflush(fpIframe);
@@ -270,7 +299,7 @@

   void deleteCamera(){
      printf("RTSPSTREAM_Close\n");
      if(handle != -1){
      if(handle > -1){
         RTSPSTREAM_Close(handle);
      }