Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "3 New OpenCV Effects (Tracker, Stabilization, and Object Detection)" #623

Closed
wants to merge 1 commit into from

Conversation

jonoomph
Copy link
Member

Reverts #585

I'm seeing lots of failures on our build servers all of a sudden. Need to investigate. @BrennoCaldato

@jonoomph
Copy link
Member Author

[ 66%] Building CXX object src/CMakeFiles/openshot.dir/effects/Stabilizer.cpp.obj
cd /C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build/src && /C/msys64/mingw64/bin/g++.exe  -DHAVE_ISFINITE=1 -DIGNORE_JUCE_HYPOT=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DUSE_OPENCV=1 -DUSE_RESVG=1 -Dopenshot_EXPORTS -I/C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build/src/openshot_autogen/include -I/C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/src -I/C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build/src -isystem /C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build/install-x64/include/libopenshot-audio -isystem /C/msys64/mingw64/include/QtCore -isystem /C/msys64/mingw64/share/qt5/mkspecs/win32-g++ -isystem /C/msys64/mingw64/include/QtGui -isystem /C/msys64/mingw64/include/QtWidgets -isystem /C/msys64/usr/include/resvg -isystem /C/msys64/usr/local/include  -O3 -DNDEBUG   -include cmath -fopenmp -std=c++11 -o CMakeFiles/openshot.dir/effects/Stabilizer.cpp.obj -c /C/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/src/effects/Stabilizer.cpp
C:/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/src/effects/Stabilizer.cpp: In member function 'virtual void openshot::Stabilizer::SetJson(std::string)':
C:/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/src/effects/Stabilizer.cpp:204:9: error: 'InvalidJSON' was not declared in this scope
  204 |   throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
      |         ^~~~~~~~~~~
mingw32-make[2]: *** [src/CMakeFiles/openshot.dir/build.make:911: src/CMakeFiles/openshot.dir/effects/Stabilizer.cpp.obj] Error 1
mingw32-make[2]: Leaving directory 'C:/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build'
mingw32-make[1]: *** [CMakeFiles/Makefile2:194: src/CMakeFiles/openshot.dir/all] Error 2
mingw32-make[1]: Leaving directory 'C:/Users/Administrator/builds/7546b651/0/OpenShot/libopenshot/build'
mingw32-make: *** [Makefile:155: all] Error 2

@codecov
Copy link

codecov bot commented Jan 29, 2021

Codecov Report

Merging #623 (604e974) into develop (47afa20) will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #623   +/-   ##
========================================
  Coverage    52.79%   52.80%           
========================================
  Files          130      130           
  Lines        10882    10880    -2     
========================================
  Hits          5745     5745           
+ Misses        5137     5135    -2     
Impacted Files Coverage Δ
src/Clip.cpp 43.74% <0.00%> (ø)
src/Clip.h 75.00% <ø> (ø)
src/EffectInfo.cpp 0.00% <ø> (ø)
src/FFmpegReader.cpp 69.19% <ø> (+0.12%) ⬆️
src/FFmpegReader.h 66.66% <ø> (ø)
src/Frame.cpp 46.50% <ø> (ø)
src/Frame.h 100.00% <ø> (ø)
src/Qt/PlayerPrivate.cpp 0.00% <0.00%> (ø)
src/Qt/VideoCacheThread.cpp 0.00% <0.00%> (ø)
tests/Frame_Tests.cpp 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 47afa20...604e974. Read the comment docs.

@jonoomph
Copy link
Member Author

I think it might be related to a bad merge with develop, and the exclusion of "Exceptions.h" in "OpenShot.h" header

@jonoomph
Copy link
Member Author

@ferdnyc @BrennoCaldato Any ideas on a fix for develop? Or do you think I should revert this entire thing and we can fix it offline? I have a feeling something related to "Exceptions.h" was merged in from develop incorrectly.

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

@jonoomph Sounds like my fault. Sorry, been busy this week, we've been having plumbing crises. But let me take a quick look now.

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

It looks like Stabilizer.cpp just needs a #include "Exceptions.h" -- it was probably picking it up from some random one of the other headers, previously. (That's the sort of header creep I've been trying to tame, by moving includes into the source files when possible.

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

Fixing in #625.

@github-actions github-actions bot added the conflicts A PR with unresolved merge conflicts label Jan 29, 2021
@github-actions
Copy link

Merge conflicts have been detected on this PR, please resolve.

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

@jonoomph @BrennoCaldato

Anybody know the Ubuntu apt packages that need to be installed for OpenCV and Protocol Buffers support? My VM is being a pain about starting up and looking it up on the web sounds like a chore.

@jonoomph
Copy link
Member Author

Here are the basic instructions I've been using:

sudo apt-get install build-essential

sudo apt-get install cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev

sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev

sudo apt -y install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev

sudo apt -y install libgtk2.0-dev libtbb-dev qt5-default

sudo apt-get install ffmpeg libeigen3-dev

mkdir Libraries
cd Libraries/

git clone https://github.com/opencv/opencv
cd opencv/
git checkout '4.3.0'
cd ..

git clone https://github.com/opencv/opencv_contrib
cd opencv_contrib/
git checkout '4.3.0'
cd ..

cd opencv
mkdir build
cd build/

cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D INSTALL_C_EXAMPLES=ON -D INSTALL_PYTHON_EXAMPLES=ON -D WITH_TBB=OFF -D WITH_V4L=ON -D OPENCV_PYTHON3_INSTALL_PATH=$cwd/OpenCV-$cvVersion-py3/lib/python3.5/site-packages -D WITH_QT=ON -D WITH_CUDA=ON -D WITH_OPENGL=ON -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules -D OPENCV_GENERATE_PKGCONFIG=ON -D BUILD_EXAMPLES=ON ..

make -j9
sudo make install

@jonoomph
Copy link
Member Author

I'm not sure what repo versions and apt packages are required though

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

I believe I've got it. The answer, from an apt perspective, appears to be:

libopencv-dev libprotobuf-dev protobuf-compiler

(Leave out that last one, you'll get very strange errors because instead of being replaced with the path to the protoc executable, the protobuf::protoc target ends up in the Makefile as a dependency. Which breaks it completely, :: not being valid unescaped path characters in Make.)

Installing individual OpenCV library components (e.g. libopencv-core-dev, etc. is a nice idea, to avoid installation bloat, and that's how I started. But none of them install the CMake configs needed to properly configure the targets. So I have to figure out which package those files live in, to make it more focused.

Edit: Crap. The CMake configs are only in libopencv-dev itself. Oh well, I tried. It'll just have to install everything.

@ferdnyc
Copy link
Contributor

ferdnyc commented Jan 29, 2021

@jonoomph @BrennoCaldato

So, builds are fixed, I think this can be closed unmerged no? Doesn't seem necessary.

@jonoomph
Copy link
Member Author

@ferdnyc Yup, closing now. Thanks so much! And good notes on the packages above!

@jonoomph jonoomph closed this Jan 29, 2021
@jonoomph jonoomph deleted the revert-585-opencv branch August 24, 2021 03:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts A PR with unresolved merge conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants