From 24bfa9d536c6e828324ffdedb7733927e490139b Mon Sep 17 00:00:00 2001 From: "doris.casus" Date: Mon, 30 Jan 2023 09:02:40 +0100 Subject: [PATCH 1/2] update constants related to opencv4 --- build_flags.sh | 10 +++++----- src/include/video/openCV_HSVHistogram.hpp | 2 +- src/video/openCVSource.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_flags.sh b/build_flags.sh index 0729f95..0c28c09 100644 --- a/build_flags.sh +++ b/build_flags.sh @@ -32,23 +32,23 @@ cmake_flags=( # This ensures that openSMILE runs with optimal performance on the machine it was # compiled on but it may not run at all on other machines. # Disable if the compiled binary needs to be portable. - -DMARCH_NATIVE=OFF + -DMARCH_NATIVE=ON # whether to compile with PortAudio support - -DWITH_PORTAUDIO=OFF + -DWITH_PORTAUDIO=ON # whether to compile with FFmpeg support # 1. download ffmpeg source distribution # 2. run: mkdir build ; cd build # ../configure --enable-shared --disable-static # make ; sudo make install - -DWITH_FFMPEG=OFF + -DWITH_FFMPEG=ON # whether to compile with OpenCV support - -DWITH_OPENCV=OFF + -DWITH_OPENCV=ON # whether to compile with OpenSL ES support (only applies when building for Android) - -DWITH_OPENSLES=ON + -DWITH_OPENSLES=OFF ) build_flags="${build_flags[@]}" diff --git a/src/include/video/openCV_HSVHistogram.hpp b/src/include/video/openCV_HSVHistogram.hpp index 1f12173..865bd44 100644 --- a/src/include/video/openCV_HSVHistogram.hpp +++ b/src/include/video/openCV_HSVHistogram.hpp @@ -68,7 +68,7 @@ inline cv::Mat computeSingleHistogram(cv::Mat& input, int& histSize, const float inline std::vector computeHSVHistogram(cv::Mat& image, int cfgHueSize, int cfgSatSize, int cfgValSize, int normalize) { cv::Mat hsvImage; - cv::cvtColor(image, hsvImage, CV_BGR2HSV); + cv::cvtColor(image, hsvImage, cv::COLOR_BGR2HSV); std::vector hsvPlanes; cv::split(hsvImage, hsvPlanes); diff --git a/src/video/openCVSource.cpp b/src/video/openCVSource.cpp index 5bf8a62..d90966f 100644 --- a/src/video/openCVSource.cpp +++ b/src/video/openCVSource.cpp @@ -249,9 +249,9 @@ int cOpenCVSource::myFinaliseInstance() bool success = mVideoCapture.open(cfgFilename); // open video stream from file // Doesn't work for linux, assume 30 fps... - if(mVideoCapture.get(CV_CAP_PROP_FPS) != 0) + if(mVideoCapture.get(cv::CAP_PROP_FPS) != 0) { - cfgFps = mVideoCapture.get(CV_CAP_PROP_FPS); + cfgFps = mVideoCapture.get(cv::CAP_PROP_FPS); } } else @@ -308,7 +308,7 @@ eTickResult cOpenCVSource::myTick(long long t) mCurrentFrameDisplay_bgr = mCurrentFrame_bgr.clone(); } - cvtColor( mCurrentFrame_bgr, mCurrentFrame_gray, CV_BGR2GRAY ); + cvtColor( mCurrentFrame_bgr, mCurrentFrame_gray, cv::COLOR_BGR2GRAY ); equalizeHist( mCurrentFrame_gray, mCurrentFrame_gray ); auto convertColor = std::chrono::high_resolution_clock::now(); @@ -539,7 +539,7 @@ ExtractedFace cOpenCVSource::extractFace(cv::Mat& frame, cv::Mat& frame_gray) Mat faceROI = frame_gray(insideFrame).clone(); Mat faceResized_gray = Mat::zeros(faceROI.rows, faceROI.cols, faceROI.type()); std::vector eyes; - mEyes_cascade.detectMultiScale( faceROI, eyes, 1.1, 2, 0 |CV_HAAR_SCALE_IMAGE, Size(30, 30) ); + mEyes_cascade.detectMultiScale( faceROI, eyes, 1.1, 2, 0 |cv::CASCADE_SCALE_IMAGE, Size(30, 30) ); if( eyes.size() == 2) { extractedFace.eyesFound = true; From 19170ee5f219fe3ac9ae9130e612d93e3ae857a1 Mon Sep 17 00:00:00 2001 From: "doris.casus" Date: Mon, 30 Jan 2023 09:13:32 +0100 Subject: [PATCH 2/2] edit change-notes in readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 4bbe7f9..9f06fb9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +# Change Notes: + +changed constant names related to opencv. (src/include/video/* and src/video/*). + +changed settings in `build_flags.sh` to turn on PortAudio, ffmpeg, and opencv compiling options. + +

[![Latest release](https://img.shields.io/github/v/release/audeering/opensmile)](https://github.com/audeering/opensmile/releases/latest)