Merge branch 'master' of github.com:tobybreckon/python-examples-ip

Author: tobybreckon

TESTING.md

@@ -139,12 +139,12 @@ python3 ./save_video.py -c 0
 
 ## Test #4 - test video read function:
 
-(for MS Windows download video from [here](http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4) and save as video.avi in directory python-examples-ip-master)
+(for MS Windows download video from [here](https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi) and save as video.avi in directory python-examples-ip-master)
 
 ```
 .. (as per test 1 for steps 1 + 2)
-wget http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4
-mv big_buck_bunny.mp4 video.avi
+wget https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi
+mv big_buck_bunny_720p_surround.avi video.avi
 python3 ./capture_video.py
 ```
 

capture_video.py

@@ -47,17 +47,7 @@
 
 # define video capture object
 
-try:
-    # to use a non-buffered camera stream (via a separate thread)
-
-    import camera_stream
-    cap = camera_stream.CameraVideoStream(use_tapi=False)
-
-except BaseException:
-    # if not then just use OpenCV default
-
-    print("INFO: camera_stream class not found - camera input may be buffered")
-    cap = cv2.VideoCapture()
+cap = cv2.VideoCapture()
 
 # define display window name