From ab3d17cd44625a762fc10f0f1fd8f2c46b980aff Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 四月 2022 11:42:19 +0800
Subject: [PATCH] capture use cpu and add arm version
---
csrc/thirdparty/gb28181/include/PsToEs.hpp | 116 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 18 deletions(-)
diff --git a/csrc/thirdparty/gb28181/include/PsToEs.hpp b/csrc/thirdparty/gb28181/include/PsToEs.hpp
index 30a1903..4128360 100644
--- a/csrc/thirdparty/gb28181/include/PsToEs.hpp
+++ b/csrc/thirdparty/gb28181/include/PsToEs.hpp
@@ -4,6 +4,7 @@
#include <deque>
#include <pthread.h>
+#include <unistd.h>
#include "librtsp.h"
#include <sys/time.h>
@@ -76,7 +77,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();
@@ -108,13 +110,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];
@@ -154,6 +166,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");
@@ -176,21 +195,79 @@
return bufsize;
}
+ static int capturePic(void *opaque, char *buf, int *bufsize, const int tt) {
+
+ GB28181API *_this = (GB28181API *) opaque;
+ int len = 0;
+ *bufsize = 0;
+
+ int ttt = 0;
+ do {
+ if (ttt > tt) return 0;
+ ttt++;
+
+ //浠庣紦瀛樹腑鑾峰彇buffinfo
+ if (_this->m_rtpQueue.count_queue() == 0) {
+// printf(" count_queue == 0 \n");
+ usleep(200000);
+ continue;
+ }
+
+ frameBuffInfo *buffinfo = _this->m_rtpQueue.pop();
+ if (buffinfo == nullptr) {
+ printf(" buffinfo == nullptr \n");
+ return 0;
+ }
+////////////////////////////////////////////////////////
+ FILE* fpJpg = NULL;
+ char fileJpgName[32] = "./tmpCaptureJpg.jpg";
+ char fileIFrameName[32] = "./tmpCaptureX264IFrame";
+ char cmd[512] = {0};
+
+ for(int i = 0; i < 10 * 25; i++){
+ if (!buffinfo){
+ buffinfo = _this->m_rtpQueue.pop();
+ }
+ if (!buffinfo) continue;
+
+ auto fpIframe = fopen(fileIFrameName, "wb+");
+ fwrite(buffinfo->buff, buffinfo->buffLen, 1, fpIframe);
+ fflush(fpIframe);
+ fclose(fpIframe);
+
+ memset(cmd, 0, 512);
+ sprintf(cmd, "ffmpeg -i %s -y -f image2 -ss 00:00:00 -vframes 1 %s >/dev/null", fileIFrameName,
+ fileJpgName);
+ int rr = system(cmd);
+
+ delete[] buffinfo->buff;
+ delete buffinfo;
+ buffinfo = nullptr;
+
+ fpJpg = fopen(fileJpgName, "rb");
+ if (fpJpg) {
+ break;
+ }
+ }
+///////////////////////////////////////////////////////////
+
+ fseek(fpJpg, 0, SEEK_END);
+ len = ftell(fpJpg);
+ fseek(fpJpg, 0, SEEK_SET);
+ *bufsize = fread(buf, sizeof(char), len, fpJpg);
+ fclose(fpJpg);
+
+ memset(cmd, 0, 128);
+ sprintf(cmd, "rm %s %s >/dev/null", fileIFrameName, fileJpgName);
+ system(cmd);
+ } while (*bufsize == 0);
+
+ return *bufsize;
+ }
+
static void streamCallBack(int datatype, int frametype, unsigned char *data, unsigned int datalen, long userdata)
{
GB28181API *_this = (GB28181API *)userdata;
- //printf("userdata:%ld,datatype:%d, frametype:%d, datalen:%d\n", userdata, datatype, frametype, datalen);
-
- /*static FILE* fp_write = NULL;
- if (!fp_write)
-
- {
-
- fp_write = fopen("stream_callback.mp4", "wb+");
-
- }
-
- fwrite(data, sizeof(char), datalen, fp_write); */
static bool startFlag = false;
if(frametype == GB_VIDEO_FRAME_I){
@@ -202,9 +279,12 @@
}
long addCamera(string &rtsp){
-// long userdata = 1001;//
- handle = RTSPSTREAM_Open(rtsp.c_str(), streamCallBack, (long)this);
- printf("RTSPSTREAM_Open, handle:%ld \n", handle);
+ int count = 0;
+ while (handle == -1 && count <= 3) {
+ count ++;
+ handle = RTSPSTREAM_Open(rtsp.c_str(), streamCallBack, (long) this);
+ printf("RTSPSTREAM_Open, handle:%ld \n", handle);
+ }
return handle;
}
--
Gitblit v1.8.0