Skip to content
Snippets Groups Projects
Commit e6e5d1e8 authored by am0ebe's avatar am0ebe
Browse files

gitignore. lil bits.

parent 49866714
No related branches found
No related tags found
No related merge requests found
*Make/object/* *object/*
*Make/binary/* *binary/*
*avi *.avi
*.sublime-workspace
...@@ -135,17 +135,18 @@ class OpenCVRecorder: public QThread ...@@ -135,17 +135,18 @@ class OpenCVRecorder: public QThread
// Example FOURCC codes that can be used with the OpenCVRecorder // Example FOURCC codes that can be used with the OpenCVRecorder
// //
VmbUint32_t maxQueueElements() const { return 3; } VmbUint32_t maxQueueElements() const { return 3; }
enum // enum
{ // {
FOURCC_USER_SELECT = CV_FOURCC_PROMPT, // FOURCC_USER_SELECT = CV_FOURCC_PROMPT,
FOURCC_DEFAULT = CV_FOURCC_MACRO('I','Y','U','V'), // FOURCC_DEFAULT = CV_FOURCC_MACRO('I','Y','U','V'),
FOURCC_MPEG1 = CV_FOURCC_MACRO('P','I','M','1'), // FOURCC_MPEG1 = CV_FOURCC_MACRO('P','I','M','1'),
FOURCC_MJPEG = CV_FOURCC_MACRO('M','J','P','G'), // FOURCC_MJPEG = CV_FOURCC_MACRO('M','J','P','G'),
FOURCC_MPEG42 = CV_FOURCC_MACRO('M','P','4','2'), // FOURCC_MPEG42 = CV_FOURCC_MACRO('M','P','4','2'),
FOURCC_MPEG43 = CV_FOURCC_MACRO('M','P','4','3'), // FOURCC_MPEG43 = CV_FOURCC_MACRO('M','P','4','3'),
FOURCC_DIVX = CV_FOURCC_MACRO('D','I','V','X'), // FOURCC_DIVX = CV_FOURCC_MACRO('D','I','V','X'),
FOURCC_X264 = CV_FOURCC_MACRO('X','2','6','4'), // FOURCC_X264 = CV_FOURCC_MACRO('X','2','6','4'),
}; // };
int FOURCC_X264 = cv::VideoWriter::fourcc('X','2','6','4');
// //
// frame data temporary storage // frame data temporary storage
// //
...@@ -310,11 +311,11 @@ class OpenCVRecorder: public QThread ...@@ -310,11 +311,11 @@ class OpenCVRecorder: public QThread
public: public:
OpenCVRecorder(const QString &fileName, VmbFloat_t fps, VmbUint32_t Width, VmbUint32_t Height) OpenCVRecorder(const QString &fileName, VmbFloat_t fps, VmbUint32_t Width, VmbUint32_t Height)
: m_StopThread( false ) : m_StopThread( false )
#ifdef _MSC_VER // codec selection only supported by Windows // #ifdef _MSC_VER // codec selection only supported by Windows
, m_VideoWriter(fileName.toStdString(), FOURCC_USER_SELECT, fps, cv::Size(Width,Height),true ) // , m_VideoWriter(fileName.toStdString(), FOURCC_USER_SELECT, fps, cv::Size(Width,Height),true )
#else // #else
, m_VideoWriter(fileName.toStdString(), FOURCC_X264, fps, cv::Size(Width,Height),true ) , m_VideoWriter(fileName.toStdString(), FOURCC_X264, fps, cv::Size(Width,Height),true )
#endif // #endif
, m_ConvertImage( Height, Width, CV_8UC3) , m_ConvertImage( Height, Width, CV_8UC3)
{ {
if( ! m_VideoWriter.isOpened() ) if( ! m_VideoWriter.isOpened() )
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
}, },
{ {
"path": "../../.." "path": "../../.."
} },
{
"path": "~/dox/idiv/camtron",
"name": "camtron-dox"
},
] ]
} }
## use Qt5 ## use QT5
replace Qt.mk with Qt5.mk in Makefile replace Qt.mk with Qt5.mk in Makefile
> add qt5widgets? > add qt5widgets?
> see async grab notes! > see async grab notes!
## use opencv4 ## use openCV4
apt install opencv-dev apt install opencv-dev
pkg-config --cflags --libs opencv4 # test it! pkg-config --cflags --libs opencv4 # test it!
...@@ -17,4 +17,8 @@ replace opencv with opencv4 ...@@ -17,4 +17,8 @@ replace opencv with opencv4
"common_flags" : [ "common_flags" : [
"-I/usr/include/opencv4", "-I/usr/include/opencv4",
// ... // ...
# in OpenCVRecorder.h
replace fourcc enum with:
int FOURCC_X264 = cv::VideoWriter::fourcc('X','2','6','4');
] ]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment