Commit d484eb77 authored by Samuel Warfield's avatar Samuel Warfield

Merge branch 'master' into 'vignette'

# Conflicts:
#   quick_fft.py
parents 2ec0e50a 7752eed4
......@@ -79,7 +79,7 @@ elif load_from_file == True:
# fft_plot = fig.add_subplot(121)
#image = fig.add_subplot(122)
image = np.ones((720, 1280, 3))
sounddevice.play(wav_data, rate)
......@@ -89,13 +89,16 @@ timestep = .01
t = time.time()
origin = time.time()
nextBeat = 0
if playing:
cap = cv2.VideoCapture('outpy.avi')
else:
cap = cv2.VideoCapture('snow.webm')
fps = cap.get(cv2.CAP_PROP_FPS)
timestep = 1/fps
print(timestep)
image = np.ones((int(cap.get(4)), int(cap.get(3)), 3))
is_beat = False
beat_distance = 0
# Default resolutions of the frame are obtained.The default resolutions are system dependent.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment