Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Set time-outs to 60 sec (#97)
* Added hough3d sources

* Calculate 3D hough trajectory lines

* Added fps

* Some warnings removing

* Fixed warning

* Added small crops in DNN detector for High resolution videos and small objects

* Small refactoring

* Some fix for single tracking

* Added openmp flags to the compiler

* Draw trajectory option

* Update Readme

* Fixed link

* Hough3D disabled now in CMake

* Added Yolo (and Tiny Yolo) detector

* Update Readme

* Remove unused Hybrid face detector

* Extract Capture+Detection into the separate thread

* Fixed potential deadlock

* Points visualization

* Control out the frame moving

* Remove hough3d from master

* Fixed NMS for object with different types

* Fix in Readme and TODO

* OpenCV 4.0 ready

* Added YOLO v3 tiny

* Added compute target for DNN examples (default is OpenCL_FP16)

* Fixed compatible bug with OpenCV version < 4.0

* Fixed project name in CMake

* Simple implementation of the Abandoned detection

* Increased timeout

* Fixed help message

* Added Abandoned to the Readme

* Fixed Readme

* Switch travis to the latest OpenCV 3.4.1 version

* Set timeouts to 60 sec

* Fixed travis script for OpenCV 3.4.1

* Fixed travis for gcc6

* Fixed linker error

* Fixed compiler in travis

* Fixed travis and CMakeLists for C++14 support
  • Loading branch information
Nuzhny007 authored and Smorodov committed Jul 11, 2018
1 parent 7cecf19 commit ca4da5a
Show file tree
Hide file tree
Showing 4 changed files with 368 additions and 352 deletions.
28 changes: 7 additions & 21 deletions .travis.yml
Expand Up @@ -4,10 +4,8 @@ dist: trusty
compiler:
- g++


matrix:
include:
# works on Precise and Trusty
- os: linux
addons:
apt:
Expand All @@ -18,36 +16,24 @@ matrix:
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"

# works on Precise and Trusty
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"


before_install:
- eval "${MATRIX_EVAL}"
- sudo apt-get update
- sudo apt-get update -qq

install:

# OpenCV v3.0.0 (beta) install code (modified from orignal source: https://github.com/jayrambhia/Install-OpenCV)
# OpenCV v3.0.0 install code (modified from orignal source: https://github.com/jayrambhia/Install-OpenCV)

# OpenCV dependencies - Details available at: http://docs.opencv.org/trunk/doc/tutorials/introduction/linux_install/linux_install.html
- sudo apt-get install -y build-essential
- sudo apt-get install -y cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
- sudo apt-get install -y python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
- sudo apt-get install -y --allow-unauthenticated build-essential
- sudo apt-get install -y --allow-unauthenticated cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
- sudo apt-get install -y --allow-unauthenticated python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev

# Download v3.0.0 .zip file and extract.
- curl -sL https://github.com/Itseez/opencv/archive/3.3.1.zip > opencv.zip
- curl -sL https://github.com/Itseez/opencv/archive/3.4.1.zip > opencv.zip
- unzip opencv.zip
- cd opencv-3.3.1
- cd opencv-3.4.1

# Create a new 'build' folder.
- mkdir build
Expand All @@ -73,4 +59,4 @@ install:

script:
- cmake .
- make
- make
3 changes: 2 additions & 1 deletion CMakeLists.txt
Expand Up @@ -13,7 +13,7 @@ if (OPENMP_FOUND)
endif()

if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors --std=gnu++14" CACHE STRING COMPILE_FLAGS FORCE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors -std=c++14" CACHE STRING COMPILE_FLAGS FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -march=native -mtune=native --fast-math -ffast-math -funroll-loops -Wall -DNDEBUG -DBOOST_DISABLE_ASSERTS" CACHE STRING COMPILE_FLAGS FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -march=native -mtune=native -Wall -DDEBUG" CACHE STRING COMPILE_FLAGS FORCE)
elseif (MSVC)
Expand All @@ -34,6 +34,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
# ----------------------------------------------------------------------------
set(folder_source
main.cpp
VideoExample.cpp

Detector/BaseDetector.cpp
Detector/MotionDetector.cpp
Expand Down

0 comments on commit ca4da5a

Please sign in to comment.