From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制,国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/StructureApp/HiredisTool.h | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/HiredisTool.h b/QiaoJiaSystem/StructureApp/HiredisTool.h
index b57e0ee..d4adab1 100644
--- a/QiaoJiaSystem/StructureApp/HiredisTool.h
+++ b/QiaoJiaSystem/StructureApp/HiredisTool.h
@@ -2,12 +2,14 @@
#define HIREDISTOOL_H
#include <opencv/cv.h>
//#include <hiredis.h>
+#include <basic/util/BASE64/Base64.h>
#include "../../BasicPlatForm/libs/hiredis-master/include/hiredis.h"
#include <map>
#include <queue>
struct ImgInfo
{
std::string time;
+ uint64_t framePts;
cv::Mat img;
};
@@ -22,6 +24,10 @@
// std::map<std::string,int> findAllCamera();
bool clearAllImageBuf();
+ bool setKeyImage(const std::string& file_name,const cv::Mat& img);
+ void getKeyImage(const std::string& imageName,cv::Mat& img);
+
+
bool pushImageBuf(const std::string& file_name,const cv::Mat& img);
void getImage(const std::string& file_name,cv::Mat& img);
@@ -32,6 +38,7 @@
bool delKey(const std::string& key);
bool listRpop(const std::string& key,std::string& value);
+ bool listLpush(const std::string& key,const std::string& value);
int getSize(const std::string& key);
bool hashDel(const std::string& tab,const std::string &key);
bool hashSet(const std::string& tab,const std::string& key,const int& value);
@@ -40,15 +47,18 @@
bool listLindex(const std::string& key,std::string& value);
// bool listRpop(const std::string& key,std::string& value);
- bool listLpush(const std::string& key,const std::string& value);
-
-
+ //bool listLpush(const std::string& key,const std::string& value);
+ //Redis SET KEY VALUE cmd
+ bool setKeyValue(const std::string& key,const std::string& value);
+ //bool GET KEY cmd
+ bool getKeyValue(const std::string& key,std::string& value);
bool checkParam();
bool checkResult(redisReply *reply);
void init();
private:
redisContext *m_redis;
int m_nImgListLen;
+ Base64 m_base64;
};
--
Gitblit v1.8.0