summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-05 11:44:13 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-05 11:44:13 +0100
commit3f9891137747cd7434ce20f69b8d88b967dbdfaf (patch)
tree186f776eca1bdb8b7f8ce15554984f1425429a65
parent10b4bf78da1dcdb96915506bd61a0ab1b2ea65ed (diff)
A few small fixes.
-rw-r--r--hacks/analog.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/hacks/analog.py b/hacks/analog.py
index 473913de9..cac57d803 100644
--- a/hacks/analog.py
+++ b/hacks/analog.py
@@ -92,10 +92,12 @@ while True:
add_encoder_thread_event(thread, T, 'wake')
elif message.startswith('encoder thread begins local encode'):
add_encoder_thread_event(thread, T, 'begin_encode')
- elif message.startswith('MagickImageProxy begins read and decode'):
+ elif message.startswith('MagickImageProxy begins decode and convert') or message.startswith('MagickImageProxy begins read and decode'):
add_encoder_thread_event(thread, T, 'magick_begin_decode')
- elif message.startswith('MagickImageProxy completes read and decode'):
+ elif message.startswith('MagickImageProxy decode finished'):
add_encoder_thread_event(thread, T, 'magick_end_decode')
+ elif message.startswith('MagickImageProxy completes decode and convert'):
+ add_encoder_thread_event(thread, T, 'magick_end_unpack')
elif message.startswith('encoder thread finishes local encode'):
add_encoder_thread_event(thread, T, 'end_encode')
@@ -143,7 +145,6 @@ elif args.encoder_threads:
plt.plot(x, y)
n += 1
- break
plt.show()
elif args.plot_first_encoder: