1、添加配置文件控制推流参数;
2、解决遥控器解码时帧序混乱的问题(gop_size = 1); 3、完善代码;
This commit is contained in:
@ -27,6 +27,8 @@
|
||||
#include <exception>
|
||||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
#include <cmath>
|
||||
#include <vector>
|
||||
|
||||
#include <QObject>
|
||||
#include <QDateTime>
|
||||
@ -125,6 +127,32 @@ public slots:
|
||||
signals:
|
||||
};
|
||||
|
||||
class PushFlow : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
PushFlow();
|
||||
void setParm(rgbImage * img, int width, int height, int framerateVideo);
|
||||
void exitPushFlow();
|
||||
void setVedioFilePath(QString path);
|
||||
|
||||
private:
|
||||
QString m_QVedioFilePath;
|
||||
bool isExitPushFlow;
|
||||
|
||||
rgbImage * m_rgbImage;
|
||||
|
||||
int m_iWidth;
|
||||
int m_iHeight;
|
||||
int m_iFramerateVideo;
|
||||
|
||||
public slots:
|
||||
void encodePushFlow();
|
||||
|
||||
signals:
|
||||
};
|
||||
|
||||
class XimeaImager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -148,6 +176,9 @@ public:
|
||||
int getWindowEndBand();
|
||||
double geWavelengthAtBand(int x);
|
||||
|
||||
static int findClosestIndex(const std::vector<double>& numbers, double target);
|
||||
void getRgbBandNumber(int &redBandNumber, int &greenBandNumber, int &blueBandNumber);
|
||||
|
||||
void stopRecord();
|
||||
int getFrameCounter();
|
||||
void writeXiApiErrorCodes(QString filePath, int xiApiErrorCodes);
|
||||
@ -155,8 +186,6 @@ public:
|
||||
int getMaxValueOfOneFrame(unsigned short * data, int numberOfPixel);
|
||||
|
||||
int getImagerState() const;
|
||||
|
||||
Encode ffmpegEncode;
|
||||
private:
|
||||
//0-61:ximea官方错误代码;99:发生的ximea官方错误代码,没有处理;100:未打开;101:打开;102:设置帧率;103:自动曝光;104:正在采集;
|
||||
int m_iImagerState;
|
||||
@ -174,6 +203,10 @@ private:
|
||||
queue<int> * m_qFrameCounter;
|
||||
MemoryPool<DataBuffer> * m_pool;
|
||||
|
||||
QThread * m_pushFlowThread;
|
||||
PushFlow * m_pushFlow;
|
||||
int m_iFlowSwitch;
|
||||
|
||||
QString m_baseFileName;
|
||||
QString m_ximeaTemperatureCSVPath;
|
||||
|
||||
@ -212,6 +245,7 @@ signals:
|
||||
|
||||
void recordXimeaTemperatureSignal(QString);
|
||||
void startWriteDiskSignal();
|
||||
void startPushFlowSignal();
|
||||
|
||||
void autoExposeMaxValueOfOneFrame(int, double);
|
||||
void frameRateSignal(double);
|
||||
|
Reference in New Issue
Block a user