Mercurial Hosting > traffic-intelligence
changeset 766:6022350f8173 dev
updated to OpenCV 3.1
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 21 Dec 2015 15:15:45 -0500 |
parents | 9aac5f016842 |
children | 04497166d8f0 |
files | c/Makefile c/Motion.cpp python/cvutils.py |
diffstat | 3 files changed, 41 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/c/Makefile Thu Dec 17 16:28:31 2015 -0500 +++ b/c/Makefile Mon Dec 21 15:15:45 2015 -0500 @@ -19,17 +19,15 @@ ifneq ($(OPENCV), 0) CFLAGS += -DUSE_OPENCV - LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_ml -lopencv_features2d -lopencv_imgproc -lopencv_objdetect + LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_imgcodecs -lopencv_videoio endif #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic ifeq ($(UNAME), Linux) - #OPENCV_HOME=$(HOME)/Research/Code/opencv-2.4.10/release OPENCV_HOME=/usr/local INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv LIBS += -L$(OPENCV_HOME)/lib - #LIBS += -L/usr/lib/gcc/x86_64-linux-gnu/4.8/ LINUX_BOOST_PREFIX = /usr/local CFLAGS += -DLINUX EXE_EXTENSION=''
--- a/c/Motion.cpp Thu Dec 17 16:28:31 2015 -0500 +++ b/c/Motion.cpp Mon Dec 21 15:15:45 2015 -0500 @@ -3,7 +3,8 @@ #include "src/TrajectoryDBAccessList.h" -#include "opencv2/core/core.hpp" +//#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/highgui/highgui.hpp" #include <boost/graph/connected_components.hpp>
--- a/python/cvutils.py Thu Dec 17 16:28:31 2015 -0500 +++ b/python/cvutils.py Mon Dec 21 15:15:45 2015 -0500 @@ -155,7 +155,7 @@ key = -1 ret = True frameNum = firstFrameNum - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) while ret and not quitKey(key): #ret, img = capture.read() for i in xrange(step): @@ -165,7 +165,7 @@ print('frame {0}'.format(frameNum)) frameNum+=step if text is not None: - cv2.putText(img, text, (10,50), cv2.cv.CV_FONT_HERSHEY_PLAIN, 1, cvRed) + cv2.putText(img, text, (10,50), cv2.FONT_HERSHEY_PLAIN, 1, cvRed) cvImshow(windowName, img, rescale) key = cv2.waitKey(wait) if saveKey(key): @@ -176,37 +176,37 @@ def infoVideo(filename): '''Provides all available info on video ''' - cvPropertyNames = {cv2.cv.CV_CAP_PROP_FORMAT: "format", - cv2.cv.CV_CAP_PROP_FOURCC: "codec (fourcc)", - cv2.cv.CV_CAP_PROP_FPS: "fps", - cv2.cv.CV_CAP_PROP_FRAME_COUNT: "number of frames", - cv2.cv.CV_CAP_PROP_FRAME_HEIGHT: "heigh", - cv2.cv.CV_CAP_PROP_FRAME_WIDTH: "width", - cv2.cv.CV_CAP_PROP_RECTIFICATION: "rectification", - cv2.cv.CV_CAP_PROP_SATURATION: "saturation"} + cvPropertyNames = {cv2.CAP_PROP_FORMAT: "format", + cv2.CAP_PROP_FOURCC: "codec (fourcc)", + cv2.CAP_PROP_FPS: "fps", + cv2.CAP_PROP_FRAME_COUNT: "number of frames", + cv2.CAP_PROP_FRAME_HEIGHT: "heigh", + cv2.CAP_PROP_FRAME_WIDTH: "width", + cv2.CAP_PROP_RECTIFICATION: "rectification", + cv2.CAP_PROP_SATURATION: "saturation"} capture = cv2.VideoCapture(filename) if capture.isOpened(): - for cvprop in [#cv2.cv.CV_CAP_PROP_BRIGHTNESS - #cv2.cv.CV_CAP_PROP_CONTRAST - #cv2.cv.CV_CAP_PROP_CONVERT_RGB - #cv2.cv.CV_CAP_PROP_EXPOSURE - cv2.cv.CV_CAP_PROP_FORMAT, - cv2.cv.CV_CAP_PROP_FOURCC, - cv2.cv.CV_CAP_PROP_FPS, - cv2.cv.CV_CAP_PROP_FRAME_COUNT, - cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, - cv2.cv.CV_CAP_PROP_FRAME_WIDTH, - #cv2.cv.CV_CAP_PROP_GAIN, - #cv2.cv.CV_CAP_PROP_HUE - #cv2.cv.CV_CAP_PROP_MODE - #cv2.cv.CV_CAP_PROP_POS_AVI_RATIO - #cv2.cv.CV_CAP_PROP_POS_FRAMES - #cv2.cv.CV_CAP_PROP_POS_MSEC - #cv2.cv.CV_CAP_PROP_RECTIFICATION, - #cv2.cv.CV_CAP_PROP_SATURATION + for cvprop in [#cv2.CAP_PROP_BRIGHTNESS + #cv2.CAP_PROP_CONTRAST + #cv2.CAP_PROP_CONVERT_RGB + #cv2.CAP_PROP_EXPOSURE + cv2.CAP_PROP_FORMAT, + cv2.CAP_PROP_FOURCC, + cv2.CAP_PROP_FPS, + cv2.CAP_PROP_FRAME_COUNT, + cv2.CAP_PROP_FRAME_HEIGHT, + cv2.CAP_PROP_FRAME_WIDTH, + #cv2.CAP_PROP_GAIN, + #cv2.CAP_PROP_HUE + #cv2.CAP_PROP_MODE + #cv2.CAP_PROP_POS_AVI_RATIO + #cv2.CAP_PROP_POS_FRAMES + #cv2.CAP_PROP_POS_MSEC + #cv2.CAP_PROP_RECTIFICATION, + #cv2.CAP_PROP_SATURATION ]: prop = capture.get(cvprop) - if cvprop == cv2.cv.CV_CAP_PROP_FOURCC and prop > 0: + if cvprop == cv2.CAP_PROP_FOURCC and prop > 0: prop = int2FOURCC(int(prop)) print('Video {}: {}'.format(cvPropertyNames[cvprop], prop)) else: @@ -218,12 +218,12 @@ images = [] capture = cv2.VideoCapture(videoFilename) if capture.isOpened(): - rawCount = capture.get(cv2.cv.CV_CAP_PROP_FRAME_COUNT) + rawCount = capture.get(cv2.CAP_PROP_FRAME_COUNT) if rawCount < 0: rawCount = firstFrameNum+nFrames+1 nDigits = int(floor(log10(rawCount)))+1 ret = False - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) imgNum = 0 while imgNum<nFrames: ret, img = capture.read() @@ -246,7 +246,7 @@ def getFPS(videoFilename): capture = cv2.VideoCapture(videoFilename) if capture.isOpened(): - fps = capture.get(cv2.cv.CV_CAP_PROP_FPS) + fps = capture.get(cv2.CAP_PROP_FPS) capture.release() return fps else: @@ -287,8 +287,8 @@ from math import ceil, log10 capture = cv2.VideoCapture(videoFilename) - width = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_WIDTH)) - height = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT)) + width = int(capture.get(cv2.CAP_PROP_FRAME_WIDTH)) + height = int(capture.get(cv2.CAP_PROP_FRAME_HEIGHT)) windowName = 'frame' if rescale == 1.: @@ -300,7 +300,7 @@ key = -1 ret = True frameNum = firstFrameNum - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, firstFrameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, firstFrameNum) if lastFrameNumArg is None: from sys import maxint lastFrameNum = maxint @@ -338,7 +338,7 @@ if len(annotations) > 0: # if we loaded annotations, but there is no match if frameNum not in toMatches[obj.getNum()]: objDescription += " FA" - cv2.putText(img, objDescription, obj.projectedPositions[frameNum-obj.getFirstInstant()].asint().astuple(), cv2.cv.CV_FONT_HERSHEY_PLAIN, 1, cvColors[obj.getNum()]) + cv2.putText(img, objDescription, obj.projectedPositions[frameNum-obj.getFirstInstant()].asint().astuple(), cv2.FONT_HERSHEY_PLAIN, 1, cvColors[obj.getNum()]) # plot object bounding boxes if frameNum in boundingBoxes.keys(): for rect in boundingBoxes[frameNum]: @@ -351,7 +351,7 @@ color = cvColors[gtMatches[gt.getNum()][frameNum]] # same color as object else: color = cvRed - cv2.putText(img, 'Miss', gt.topLeftPositions[frameNum-gt.getFirstInstant()].asint().astuple(), cv2.cv.CV_FONT_HERSHEY_PLAIN, 1, cvRed) + cv2.putText(img, 'Miss', gt.topLeftPositions[frameNum-gt.getFirstInstant()].asint().astuple(), cv2.FONT_HERSHEY_PLAIN, 1, cvRed) cv2.rectangle(img, gt.topLeftPositions[frameNum-gt.getFirstInstant()].asint().astuple(), gt.bottomRightPositions[frameNum-gt.getFirstInstant()].asint().astuple(), color) # saving images and going to next if not saveAllImages: @@ -361,7 +361,7 @@ cv2.imwrite('image-{{:0{}}}.png'.format(nZerosFilename).format(frameNum), img) frameNum += nFramesStep if nFramesStep > 1: - capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, frameNum) + capture.set(cv2.CAP_PROP_POS_FRAMES, frameNum) cv2.destroyAllWindows() else: print 'Cannot load file ' + videoFilename