- refactored resolution

git-svn-id: http://moon:8086/svn/software/trunk/projects/opencv@334 b431acfa-c32f-4a4a-93f1-934dc6c82436

piCameraPipeline/VideoSource.py

@@ -6,17 +6,17 @@ from picamera import PiCamera
 from piCameraPipeline.PiCameraPipeline import RgbProcessorAdapter
 
 class VideoSource(RgbProcessorAdapter):
-	def __init__(self, fileName, resolution, framerate):
-		super(VideoSource, self).__init__(resolution)
+	def __init__(self, fileName, res, framerate):
+		super(VideoSource, self).__init__(res)
 		self.fileName = fileName
-		self.resolution = resolution
+		self.res = res
 		self.framerate = framerate
 		self.thread = None
 		self.camera = None
 		self.cancel = False
 		if fileName == 'piCamera':
 			self.camera = PiCamera()
-			self.camera.resolution = (self.resolution[0], self.resolution[1])
+			self.camera.resolution = (self.res[0], self.res[1])
 			self.camera.framerate = self.framerate
 		else:
 			self.needRgbConversion = False
@@ -45,14 +45,14 @@ class VideoSource(RgbProcessorAdapter):
 		cap_w = cap.get(cv2.CAP_PROP_FRAME_WIDTH)
 		cap_h = cap.get(cv2.CAP_PROP_FRAME_HEIGHT) 
 		needResize = False
-		if self.resolution[0] != cap_w or self.resolution[1] != cap_h:
+		if self.res[0] != cap_w or self.res[1] != cap_h:
 			needResize = True
 
 		while not self.cancel:
 			ret, frame = cap.read()
 			if ret:
 				if needResize:
-					self.write(imutils.resize(frame, width=self.resolution[0], height=self.resolution[1]))
+					self.write(imutils.resize(frame, width=self.res[0], height=self.res[1]))
 				else:
 					self.write(frame)
 			else: