Merged the trunk r8408:8457 (inclusive)

samples/python2/common.py

@@ -56,8 +56,8 @@ def mtx2rvec(R):
     return axis * np.arctan2(s, c)
 
 def draw_str(dst, (x, y), s):
-    cv2.putText(dst, s, (x+1, y+1), cv2.FONT_HERSHEY_PLAIN, 1.0, (0, 0, 0), thickness = 2, linetype=cv2.CV_AA)
-    cv2.putText(dst, s, (x, y), cv2.FONT_HERSHEY_PLAIN, 1.0, (255, 255, 255), linetype=cv2.CV_AA)
+    cv2.putText(dst, s, (x+1, y+1), cv2.FONT_HERSHEY_PLAIN, 1.0, (0, 0, 0), thickness = 2, lineType=cv2.CV_AA)
+    cv2.putText(dst, s, (x, y), cv2.FONT_HERSHEY_PLAIN, 1.0, (255, 255, 255), lineType=cv2.CV_AA)
 
 class Sketcher:
     def __init__(self, windowname, dests, colors_func):

samples/python2/gaussian_mix.py

@@ -35,9 +35,10 @@ if __name__ == '__main__':
         points, ref_distrs = make_gaussians(cluster_n, img_size)
 
         print 'EM (opencv) ...'
-        em = cv2.EM(points, params = dict( nclusters = cluster_n, cov_mat_type = cv2.EM_COV_MAT_GENERIC) )
-        means = em.getMeans()
-        covs = em.getCovs()
+        em = cv2.EM(cluster_n, cv2.EM_COV_MAT_GENERIC)
+        em.train(points)
+        means = em.getMat('means')
+        covs = em.getMatVector('covs')
         found_distrs = zip(means, covs)
         print 'ready!\n'
 

samples/python2/lk_homography.py

@@ -25,8 +25,7 @@ from common import draw_str
 
 lk_params = dict( winSize  = (19, 19), 
                   maxLevel = 2, 
-                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03),
-                  derivLambda = 0.0 )    
+                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03))    
 
 feature_params = dict( maxCorners = 1000, 
                        qualityLevel = 0.01,

samples/python2/lk_track.py

@@ -24,8 +24,7 @@ from time import clock
 
 lk_params = dict( winSize  = (15, 15), 
                   maxLevel = 2, 
-                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03),
-                  derivLambda = 0.0 )    
+                  criteria = (cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03))    
 
 feature_params = dict( maxCorners = 500, 
                        qualityLevel = 0.3,

samples/python2/video_dmtx.py

@@ -1,4 +1,4 @@
-help='''
+'''
 Data matrix detector sample.
 Usage:
    video_dmtx {<video device number>|<video file name>}
@@ -52,7 +52,7 @@ def data_matrix_demo(cap):
 
 
 if __name__ == '__main__':
-    print help
+    print __doc__
 
     if len(sys.argv) == 1:
         cap = cv2.VideoCapture(0)

samples/python2/video_threaded.py

@@ -0,0 +1,63 @@
+import numpy as np
+import cv2
+
+from Queue import Queue
+from threading import Thread
+from collections import deque
+
+class Worker(Thread):
+    def __init__(self, tasks):
+        Thread.__init__(self)
+        self.tasks = tasks
+        self.daemon = True
+        self.start()
+    
+    def run(self):
+        while True:
+            func, args, kargs = self.tasks.get()
+            try: func(*args, **kargs)
+            except Exception, e: print e
+            self.tasks.task_done()
+
+class ThreadPool:
+    def __init__(self, num_threads):
+        self.tasks = Queue(num_threads)
+        for _ in range(num_threads): Worker(self.tasks)
+
+    def add_task(self, func, *args, **kargs):
+        self.tasks.put((func, args, kargs))
+
+    def wait_completion(self):
+        self.tasks.join()
+
+if __name__ == '__main__':
+    results = deque()
+
+    def process_frame(i, frame):
+        global results
+        res = cv2.medianBlur(frame, 15)
+        results.append((i, res))
+    
+    pool = ThreadPool(4)
+    cap = cv2.VideoCapture(0)
+    frame_count = 0
+    last_frame = None
+    last_count = -1
+    while True:
+        ret, frame = cap.read()
+        pool.add_task(process_frame, frame_count, frame.copy())
+        frame_count += 1
+        while len(results) > 0:
+            i, frame = results.popleft()
+            if i > last_count:
+                last_count, last_frame = i, frame
+        if last_frame is not None:
+            cv2.imshow('res', last_frame)
+        if cv2.waitKey(1) == 27:
+            break
+
+    pool.wait_completion()
+
+
+
+