jens/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored resolution

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/opencv@334 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2016-10-22 13:14:30 +00:00
parent 176b58d9cc
commit 8981a95af6
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
piCameraPipeline/PiCameraPipeline.py
+13 -13
View File
@@ -60,10 +60,10 @@ class Fifo(object):
return data
class RgbProcess(Fifo):
def __init__(self, name='RgbProcess', resolution=(320, 240, 3), numEntries=2, next=None):
super(RgbProcess, self).__init__((numEntries, ) + resolution)
def __init__(self, name='RgbProcess', res=(320, 240, 3), numEntries=2, next=None):
super(RgbProcess, self).__init__((numEntries, res[1], res[0], res[2]))
self.name = name
self.res = resolution
self.res = res
self.next = next
self.thread = Thread(target=self.run)
self.cancel = False
@@ -136,9 +136,9 @@ class RgbProcess(Fifo):
print(self.name + ": FPS = " + str(self.frames/self.fps.elapsed()))
class RgbProcessorAdapter(object):
def __init__(self, resolution=(320, 240, 3)):
self.resolution = resolution
self.frameSize = resolution[0]*resolution[1]*resolution[2]
def __init__(self, res=(320, 240, 3)):
self.res = res
self.frameSize = res[0]*res[1]*res[2]
self.size = 0
self.fps = None
self.processors = []
@@ -161,7 +161,7 @@ class RgbProcessorAdapter(object):
self.fps = FPS().start()
res = (self.resolution[0], self.resolution[1])
res = (self.res[0], self.res[1])
if self.needRgbConversion:
rgbData = array.bytes_to_rgb(data, res)
@@ -190,8 +190,8 @@ if ("__main__" == __name__):
# Unit test with to threaded processors
class MyRgbProcess1(RgbProcess):
def __init__(self, name, resolution=(320, 240, 3), numEntries=2, next=None):
super(MyRgbProcess1, self).__init__(name, resolution, numEntries, next)
def __init__(self, name, res=(320, 240, 3), numEntries=2, next=None):
super(MyRgbProcess1, self).__init__(name, res, numEntries, next)
def onProcess(self):
data = self.read(1.0)
@@ -206,8 +206,8 @@ if ("__main__" == __name__):
self.next.write(cv2.cvtColor(gray_blurred,cv2.COLOR_GRAY2BGR))
class MyRgbProcess2(RgbProcess):
def __init__(self, name, resolution=(320, 240, 3), numEntries=2, next=None):
super(MyRgbProcess2, self).__init__(name, resolution, numEntries, next)
def __init__(self, name, res=(320, 240, 3), numEntries=2, next=None):
super(MyRgbProcess2, self).__init__(name, res, numEntries, next)
def onProcess(self):
data = self.read(1.0)
@@ -224,8 +224,8 @@ if ("__main__" == __name__):
camera.resolution = (320, 240)
camera.framerate = 60
frameDim = (camera.resolution[0], camera.resolution[1], 3)
myProcessor2 = MyRgbProcess2('Process 2', (240, 320, 3), 4)
myProcessor1 = MyRgbProcess1('Process 1', (240, 320, 3), 4, myProcessor2)
myProcessor2 = MyRgbProcess2('Process 2', (320, 240, 3), 4)
myProcessor1 = MyRgbProcess1('Process 1', (320, 240, 3), 4, myProcessor2)
myRgbProcessorAdapter = RgbProcessorAdapter(frameDim)
myRgbProcessorAdapter.processorAdd(myProcessor1)
camera.start_recording(myRgbProcessorAdapter, format="bgr")